mediapc-utils: simplify volume control

diff --git a/fix-gnome-volume b/fix-gnome-volume
deleted file mode 100755 (executable)
index 389ffc7..0000000
--- a/fix-gnome-volume
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-gsettings set org.gnome.settings-daemon.plugins.media-keys volume-mute 'XF86AudioMute'
-gsettings set org.gnome.settings-daemon.plugins.media-keys volume-down 'XF86AudioLowerVolume'
-gsettings set org.gnome.settings-daemon.plugins.media-keys volume-up 'XF86AudioRaiseVolume'

diff --git a/fix-gnome-volume.desktop b/fix-gnome-volume.desktop
deleted file mode 100644 (file)
index 6e8adbc..0000000
--- a/fix-gnome-volume.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=0.9.4
-Type=Application
-Name=Fix Gnome volume
-Comment=
-Exec=/home/tv-user/dev/jamesstuff/mediapc-utils/fix-gnome-volume
-StartupNotify=false
-Terminal=false
-Hidden=false
-

diff --git a/mediawrap b/mediawrap
index eab634f8165a7c8ddfaad5eded1ada5291485b72..312072ad53af6d57d15402b4d99b47b001e769c3 100755 (executable)
--- a/mediawrap
+++ b/mediawrap
@@ -1,70 +1,17 @@
 #!/bin/bash
 
 LOCKFILE="$HOME/.mediawrap.lock"
-PULSESTATE="$HOME/.pulseaudio.state"
 
 (
 if ! flock -w 10 -x 200; then
     echo "Failed to get a lock!"
     exit 1
 fi
-echo "got lock"
-
-# Unmute everything and turn volume to full
-if [ "$1" = "--max-volume" ]; then
-    echo "max volume"
-    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
-
-# Switch volume keys to F8/F9/F10 with xmodmap
-if [ "$1" = "--pause-gnome-volume" ]; then
-    echo "disable gnome volume"
-    pause_gnome_volume=1
-    shift
-    gsettings set org.gnome.settings-daemon.plugins.media-keys volume-mute ''
-    gsettings set org.gnome.settings-daemon.plugins.media-keys volume-down ''
-    gsettings set org.gnome.settings-daemon.plugins.media-keys volume-up ''
-fi
-
-# Stop XFCE4 volume control
-if [ "$1" = "--pause-xfce4-volumed" ]; then
-    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
-fi
 
 # Run the program
 "$@" &> /dev/null
 
 
-# Restore volume levels and mute status
-if [ -n "$max_volume" ]; then
-    cat "$PULSESTATE" | pacmd > /dev/null
-fi
-
-# Restore volume keys
-if [ -n "$pause_gnome_volume" ]; then
-    gsettings set org.gnome.settings-daemon.plugins.media-keys volume-mute 'XF86AudioMute'
-    gsettings set org.gnome.settings-daemon.plugins.media-keys volume-down 'XF86AudioLowerVolume'
-    gsettings set org.gnome.settings-daemon.plugins.media-keys volume-up 'XF86AudioRaiseVolume'
-fi
-
-# Restore volume keys
-if [ -n "$pause_xfce4_volumed" ]; then
-    "$pause_xfce4_volumed"
-fi
-
 ) 200>"$LOCKFILE"
 
 # Cleanup so other programs can start