Attachment 97424 Details for Bug 77497 – Wait until x session ends and then kill pulseaudio

Wait until x session ends and then kill pulseaudio

0003-exit-with-X-session.patch (text/plain), 1.38 KB, created by Felipe Sateler on 2014-04-15 19:29:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Felipe Sateler

Created: 2014-04-15 19:29:57 UTC

Size: 1.38 KB

patch

obsolete

>--- a/src/daemon/start-pulseaudio-x11.in
>+++ b/src/daemon/start-pulseaudio-x11.in
>@@ -19,6 +19,13 @@
> 
> set -e
> 
>+# check if pulseaudio has already been started by someone else
>+if /usr/bin/pulseaudio --check; then
>+       EXIT_WITH_X_SESSION=no
>+else
>+       EXIT_WITH_X_SESSION=yes
>+fi
>+
> @PA_BINARY@ --start "$@"
> 
> if [ x"$DISPLAY" != x ] ; then
>@@ -30,3 +37,9 @@ if [ x"$DISPLAY" != x ] ; then
> 	@PACTL_BINARY@ load-module module-x11-xsmp "display=$DISPLAY session_manager=$SESSION_MANAGER" > /dev/null
>     fi
> fi
>+
>+# fork and wait for X-session to end, then quit pulseaudio
>+if [ "$EXIT_WITH_X_SESSION" = yes ]; then
>+	/usr/bin/xprop -root -spy > /dev/null 2>&1 || true
>+	/usr/bin/pulseaudio --kill
>+fi &
>--- a/src/daemon/start-pulseaudio-kde.in
>+++ b/src/daemon/start-pulseaudio-kde.in
>@@ -21,6 +21,13 @@ set -e
> 
> [ -z "$PULSE_SERVER" ]
> 
>+# check if pulseaudio has already been started by someone else
>+if /usr/bin/pulseaudio --check; then
>+    EXIT_WITH_X_SESSION=no
>+else
>+    EXIT_WITH_X_SESSION=yes
>+fi
>+
> @PA_BINARY@ --start "$@"
> 
> if [ x"$DISPLAY" != x ] ; then
>@@ -28,3 +35,9 @@ if [ x"$DISPLAY" != x ] ; then
>     @PACTL_BINARY@ load-module module-device-manager "do_routing=1" > /dev/null
> 
> fi
>+
>+# fork and wait for X-session to end, then quit pulseaudio
>+if [ "$EXIT_WITH_X_SESSION" = yes ]; then
>+    /usr/bin/xprop -root -spy > /dev/null 2>&1 || true
>+    /usr/bin/pulseaudio --kill
>+fi &

Actions: View

Attachments on bug 77497: 97424

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.