[Debian-eeepc-commits] [SCM] Maintenance of eeepc-acpi-scripts debian package branch, master, updated. 214fceaa0831795a92a3af43ed4a0bed74d8aa30

[Raphael Geissert]

The following commit has been merged in the master branch:
commit 214fceaa0831795a92a3af43ed4a0bed74d8aa30
Author: Raphael Geissert <atomo64 at gmail.com>
Date:   Tue Feb 3 19:48:12 2009 -0600

    Fix an error where not all the pswitchs would be unmuted

diff --git a/debian/eeepc-acpi-scripts.default b/debian/eeepc-acpi-scripts.default
index 8068c2b..2e1d15b 100644
--- a/debian/eeepc-acpi-scripts.default
+++ b/debian/eeepc-acpi-scripts.default
@@ -8,9 +8,14 @@ OSD_FONT='DejaVuSans 36'
 ENABLE_OSD_BRIGHTNESS='no'
 
 # Leave these empty to attempt to autoconfigure. If they don't work for you
-# lookup the following values by using amixer
+# lookup the following values by using amixer; separate multiple values with a
+# blank space and enclose all the values with quotation marks:
+# devices with pvolume capabilities:
 SOUND_LABEL=
+# pswitch capabilities:
 SOUND_SWITCH=
+# pswitch capabilities only:
+SOUND_SWITCH_EXCLUSIVE=
 
 # Set to 'yes' to display detailed information when the volup and voldown
 # hotkeys are pressed but the volume percentage of all the playback devices
diff --git a/etc/acpi/actions/volume.sh b/etc/acpi/actions/volume.sh
index a8b012a..4d4ac3c 100755
--- a/etc/acpi/actions/volume.sh
+++ b/etc/acpi/actions/volume.sh
@@ -71,13 +71,13 @@ case "$action" in
         show_muteness
         ;;
     down)
-        for label in $SOUND_LABEL; do
+        for label in $SOUND_LABEL $SOUND_SWITCH_EXCLUSIVE; do
             $AMIXER -q set $label 2%- unmute
         done
         show_volume
         ;;
     up)
-        for label in $SOUND_LABEL; do
+        for label in $SOUND_LABEL $SOUND_SWITCH_EXCLUSIVE; do
             $AMIXER -q set $label 2%+ unmute
         done
         show_volume
diff --git a/etc/acpi/lib/sound.sh b/etc/acpi/lib/sound.sh
index 440b5d0..e5a5379 100644
--- a/etc/acpi/lib/sound.sh
+++ b/etc/acpi/lib/sound.sh
@@ -11,4 +11,9 @@ configureSound() {
 			sed -r "s/^(.*'([^']+)'.*|[^']+())$/\\2/")"
     }
 
+    [ "$SOUND_SWITCH_EXCLUSIVE" ] || {
+	 SOUND_SWITCH_EXCLUSIVE="$($AMIXER | grep -B1 ': pswitch$' |
+				sed -r "s/^(.*'([^']+)'.*|[^']+())$/\\2/")"
+    }
+
 }

-- 
Maintenance of eeepc-acpi-scripts debian package