[Debian-eeepc-commits] [SCM] Maintenance of eeepc-acpi-scripts debian package branch, master, updated. 1.1.0-beta.1-12-g39afa73

[Darren Salt]

The following commit has been merged in the master branch:
commit 39afa73c2a380b104c60570432e60abdb1e15f51
Author: Darren Salt <linux at youmustbejoking.demon.co.uk>
Date:   Thu May 28 13:23:35 2009 +0100

    In case of unmuting due to volume level change, unmute everything.

diff --git a/debian/changelog b/debian/changelog
index ff7417f..dc4ba03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ eeepc-acpi-scripts (1.1.1) unstable; urgency=low
   * Alter the audio control blacklisting to allow for controls for which
     (for example) muting only should be allowed.
   * Add "Beep" to the audio control blacklist, but only for volume control.
+  * Make sure that, if some controls is unmuted due to volume level change,
+    all other relevant controls are unmuted.
 
   [ Raphael Geissert ]
   * Allow fine-grained control over the lid-closing action.
diff --git a/etc/acpi/actions/volume.sh b/etc/acpi/actions/volume.sh
index 8d382f3..0e2c804 100755
--- a/etc/acpi/actions/volume.sh
+++ b/etc/acpi/actions/volume.sh
@@ -76,12 +76,20 @@ case "$action" in
         for label in $SOUND_LABEL $SOUND_SWITCH_EXCLUSIVE; do
             $AMIXER -q set $label "$SOUND_VOLUME_STEP"- unmute
         done
+        # in case something was unmuted, make sure everything else is
+        for label in $SOUND_SWITCH; do
+            $AMIXER -q set $label unmute
+        done
         show_volume
         ;;
     up)
         for label in $SOUND_LABEL $SOUND_SWITCH_EXCLUSIVE; do
             $AMIXER -q set $label "$SOUND_VOLUME_STEP"+ unmute
         done
+        # in case something was unmuted, make sure everything else is
+        for label in $SOUND_SWITCH; do
+            $AMIXER -q set $label unmute
+        done
         show_volume
         ;;
     *)

-- 
Maintenance of eeepc-acpi-scripts debian package