From 8b39dd8bcd91790c9af5b6a2b0bc53aed8a55e08 Mon Sep 17 00:00:00 2001 From: Colin Guthrie <cguthrie@mandriva.org> Date: Thu, 1 Oct 2009 23:45:49 +0100 Subject: [PATCH 504/504] Apply startup customisation to new KDE module --- src/daemon/start-pulseaudio-kde.in | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/src/daemon/start-pulseaudio-kde.in b/src/daemon/start-pulseaudio-kde.in index a79a50b..dfd8d13 100644 --- a/src/daemon/start-pulseaudio-kde.in +++ b/src/daemon/start-pulseaudio-kde.in @@ -21,10 +21,24 @@ set -e [ -z "$PULSE_SERVER" ] -@PA_BINARY@ --start "$@" +# Some Mandriva customisations +CONFIG=/etc/sound/profiles/current/profile.conf + +PULSE_ARGS=" --log-target=syslog" +[ -r "$CONFIG" ] && . $CONFIG + +if [ "$SOUNDPROFILE" != "pulse" ]; then + echo "Pulseaudio startup disabled due to soundprofile configuration" >&2 +else + +@PA_BINARY@ --start ${PULSE_ARGS} "$@" + +# End Mandriva customisations (except for the "fi" below) if [ x"$DISPLAY" != x ] ; then @PACTL_BINARY@ load-module module-device-manager "do_routing=1" > /dev/null fi + +fi -- 1.6.4.4