From: James Bunton <jamesbunton@delx.net.au>
Date: Sat, 3 Oct 2015 14:47:17 +0000 (+1000)
Subject: mediawrap: support xfce4-volumed on ubuntu
X-Git-Url: https://code.delx.au/mediapc-tools/commitdiff_plain/ed514623652f75de21caa344c2d164e7b8599bcf

mediawrap: support xfce4-volumed on ubuntu
---

diff --git a/mediawrap b/mediawrap
index 42aab9a..eab634f 100755
--- a/mediawrap
+++ b/mediawrap
@@ -35,10 +35,13 @@ fi
 
 # Stop XFCE4 volume control
 if [ "$1" = "--pause-xfce4-volumed" ]; then
-    echo "killall xfce4-volumed-pulse"
-    pause_xfce4_volumed=1
+    echo "killall xfce4-volumed*"
+    if killall -q xfce4-volumed; then
+        pause_xfce4_volumed="xfce4-volumed"
+    elif killall -q xfce4-volumed-pulse; then
+        pause_xfce4_volumed="xfce4-volumed-pulse"
+    fi
     shift
-    killall xfce4-volumed-pulse
 fi
 
 # Run the program
@@ -59,7 +62,7 @@ fi
 
 # Restore volume keys
 if [ -n "$pause_xfce4_volumed" ]; then
-    xfce4-volumed-pulse
+    "$pause_xfce4_volumed"
 fi
 
 ) 200>"$LOCKFILE"