X-Git-Url: https://code.delx.au/monosys/blobdiff_plain/9212899c054e969c5b9eb50868fd87cbb476fabc..aa759c4531bcc0a88b11647a2c8fac541d23bea1:/scripts/mediawrap.sh

diff --git a/scripts/mediawrap.sh b/scripts/mediawrap.sh
index ac71287..3b516cc 100755
--- a/scripts/mediawrap.sh
+++ b/scripts/mediawrap.sh
@@ -1,29 +1,61 @@
 #!/bin/bash
 
+PIDFILE="$HOME/.mediawrap.pid"
 PULSESTATE="$HOME/.pulseaudio.state"
 KEYPATH="/apps/gnome_settings_daemon/keybindings"
 
+# Wait for any other wrapped software to finish
+for i in $(seq 6); do
+	if [ ! -r "$PIDFILE" ]; then
+		break
+	fi
+	if [ "$(ps -o cmd= -p "$(cat "$PIDFILE")" | wc -l)" -eq 0 ]; then
+		break
+	fi
+	sleep 0.5
+done
+if [ -r "$PIDFILE" ]; then
+	exit 1
+fi
+echo $$ > "$PIDFILE"
+
 # Disable volume keys
-gconftool --set --type string "$KEYPATH/volume_up" ''
-gconftool --set --type string "$KEYPATH/volume_down" ''
-gconftool --set --type string "$KEYPATH/volume_mute" ''
+if [ "$1" = "--disable-volume-keys" ]; then
+	disable_volume_keys=1
+	shift
+	gconftool --set --type string "$KEYPATH/volume_up" ''
+	gconftool --set --type string "$KEYPATH/volume_down" ''
+	gconftool --set --type string "$KEYPATH/volume_mute" ''
+fi
 
 # Unmute everything and turn volume to full
-pacmd 'dump' | grep 'set-sink' > "$PULSESTATE"
-cat "$PULSESTATE" | grep 'set-sink-mute' | awk '{print $2;}' | \
-	while read device; do
-		pacmd "set-sink-volume $device 0x10000" > /dev/null
-		pacmd "set-sink-mute $device no" > /dev/null
-	done
+if [ "$1" = "--max-volume" ]; then
+	max_volume=1
+	shift
+	pacmd 'dump' | grep 'set-sink' > "$PULSESTATE"
+	cat "$PULSESTATE" | grep 'set-sink-mute' | awk '{print $2;}' | \
+		while read device; do
+			pacmd "set-sink-volume $device 0x10000" > /dev/null
+			pacmd "set-sink-mute $device no" > /dev/null
+		done
+fi
 
 # Run the program
-"$@"
+"$@" &> /dev/null
+
 
 # Restore volume levels and mute status
-cat "$PULSESTATE" | pacmd > /dev/null
+if [ -n "$max_volume" ]; then
+	cat "$PULSESTATE" | pacmd > /dev/null
+fi
 
 # Enable volume keys
-gconftool --set --type string "$KEYPATH/volume_up" 'XF86AudioRaiseVolume'
-gconftool --set --type string "$KEYPATH/volume_down" 'XF86AudioLowerVolume'
-gconftool --set --type string "$KEYPATH/volume_mute" 'XF86AudioMute'
+if [ -n "$disable_volume_keys" ]; then
+	gconftool --set --type string "$KEYPATH/volume_up" 'XF86AudioRaiseVolume'
+	gconftool --set --type string "$KEYPATH/volume_down" 'XF86AudioLowerVolume'
+	gconftool --set --type string "$KEYPATH/volume_mute" 'XF86AudioMute'
+fi
+
+# Cleanup so other programs can start
+rm -f "$PIDFILE"