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

[Darren Salt]

The following commit has been merged in the master branch:
commit 4b5e792f15b562d3f6317f96f5a5cd21fe28325d
Author: Darren Salt <linux at youmustbejoking.demon.co.uk>
Date:   Sat Feb 7 14:59:50 2009 +0000

    Add audio control blacklisting.
    
    The first blacklisted string is "Mic", needed for ALC662.

diff --git a/etc/acpi/lib/eeepc-amixer-blacklist b/etc/acpi/lib/eeepc-amixer-blacklist
new file mode 100644
index 0000000..ff939ea
--- /dev/null
+++ b/etc/acpi/lib/eeepc-amixer-blacklist
@@ -0,0 +1 @@
+Mic
diff --git a/etc/acpi/lib/sound.sh b/etc/acpi/lib/sound.sh
index 399b519..f4e9896 100644
--- a/etc/acpi/lib/sound.sh
+++ b/etc/acpi/lib/sound.sh
@@ -1,9 +1,14 @@
+# Parse amixer output for a regexp (first parameter).
+# Some controls are blacklisted; for this, we use a set of fixed strings in
+# /etc/acpi/lib/eeepc-amixer-blacklist. (No wildcards or regexps.)
 configureSoundFilter() {
   $AMIXER |
   grep -B1 "$1" |
-  sed -r "s/^(.*'([^']+)'.*|[^']+())$/\\2/; /^$/ d"
+  sed -r "s/^(.*'([^']+)'.*|[^']+())$/\\2/; /^$/ d" |
+  grep -ivFf /etc/acpi/lib/eeepc-amixer-blacklist
 }
 
+# Defaults
 configureSound() {
 
     [ "$SOUND_LABEL" ] || {

-- 
Maintenance of eeepc-acpi-scripts debian package