mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-31 22:25:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

daemon: consolidate startup scripts

Browse source 
simplify pulseaudio autostart into one, avoid needless extra
work for kde, and avoid possible startup races.
This commit is contained in:
Rex Dieter 2014-01-22 09:41:35 -06:00 • committed by Tanu Kaskinen
parent 0a5adc95c4
commit 2b85ae0489
4 changed files with 4 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Makefile.am
View file

@ -95,12 +95,10 @@ EXTRA_DIST = \
depmod.py \ depmod.py \
daemon/esdcompat.in \ daemon/esdcompat.in \
daemon/start-pulseaudio-x11.in \ daemon/start-pulseaudio-x11.in \
daemon/start-pulseaudio-kde.in \
utils/padsp.in \ utils/padsp.in \
utils/qpaeq \ utils/qpaeq \
modules/module-defs.h.m4 \ modules/module-defs.h.m4 \
daemon/pulseaudio.desktop.in \ daemon/pulseaudio.desktop.in \
daemon/pulseaudio-kde.desktop.in \
map-file \ map-file \
daemon/pulseaudio-system.conf \ daemon/pulseaudio-system.conf \
modules/echo-cancel/adrian-license.txt modules/echo-cancel/adrian-license.txt

10
src/daemon/pulseaudio-kde.desktop.in
View file

@ -1,10 +0,0 @@
[Desktop Entry]
Version=1.0
_Name=PulseAudio Sound System KDE Routing Policy
_Comment=Start the PulseAudio Sound System with KDE Routing Policy
Exec=start-pulseaudio-kde
Terminal=false
Type=Application
Categories=
GenericName=
OnlyShowIn=KDE;

30
src/daemon/start-pulseaudio-kde.in
View file

@ -1,30 +0,0 @@
#!/bin/sh
# This file is part of PulseAudio.
#
# PulseAudio is free software; you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# PulseAudio is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.
set -e
[ -z "$PULSE_SERVER" ]
@PA_BINARY@ --start "$@"
if [ x"$DISPLAY" != x ] ; then
@PACTL_BINARY@ load-module module-device-manager "do_routing=1" > /dev/null
fi

4
src/daemon/start-pulseaudio-x11.in
View file

@ -26,6 +26,10 @@ if [ x"$DISPLAY" != x ] ; then
@PACTL_BINARY@ load-module module-x11-publish "display=$DISPLAY" > /dev/null @PACTL_BINARY@ load-module module-x11-publish "display=$DISPLAY" > /dev/null
@PACTL_BINARY@ load-module module-x11-cork-request "display=$DISPLAY" > /dev/null @PACTL_BINARY@ load-module module-x11-cork-request "display=$DISPLAY" > /dev/null
if [ x"$KDE_FULL_SESSION" = x"true" ]; then
@PACTL_BINARY@ load-module module-device-manager "do_routing=1" > /dev/null
fi
if [ x"$SESSION_MANAGER" != x ] ; then if [ x"$SESSION_MANAGER" != x ] ; then
@PACTL_BINARY@ load-module module-x11-xsmp "display=$DISPLAY session_manager=$SESSION_MANAGER" > /dev/null @PACTL_BINARY@ load-module module-x11-xsmp "display=$DISPLAY session_manager=$SESSION_MANAGER" > /dev/null
fi fi