From 11abb8f70c5b1ba610abccefab44284ec9c97140 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 4 Oct 2010 16:06:48 +0200
Subject: [PATCH] alsa-utils: enable support to handle more then one
 sounddevice with soundconfig script, unmute all IEC958 channels on an second
 soundchip too, provides better ION2 support

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/audio/alsa-utils/scripts/soundconfig | 111 ++++++++++--------
 1 file changed, 59 insertions(+), 52 deletions(-)

diff --git a/packages/audio/alsa-utils/scripts/soundconfig b/packages/audio/alsa-utils/scripts/soundconfig
index 02a33df88b..9d30bf945d 100755
--- a/packages/audio/alsa-utils/scripts/soundconfig
+++ b/packages/audio/alsa-utils/scripts/soundconfig
@@ -23,9 +23,9 @@
 # setup alsa (especially the mixer config)
 
 mixer() {
-  parm=${3:-on}
-  amixer sset "$1" "$2" $parm >/dev/null 2>&1
-  amixer sset "$1" $parm >/dev/null 2>&1
+  parm=${4:-on}
+  amixer -c "$1" sset "$2" "$3" $parm >/dev/null 2>&1
+  amixer -c "$1" sset "$2" $parm >/dev/null 2>&1
 }
 
 (
@@ -40,84 +40,91 @@ if [ -f $HOME/.config/sound.conf ]; then
 else
 
 # set common mixer params
-  mixer Master 100%
-  mixer Front 100%
-  mixer PCM 100%
-  mixer Synth 100%
+  mixer 0 Master 100%
+  mixer 0 Front 100%
+  mixer 0 PCM 100%
+  mixer 0 Synth 100%
 
 # mute CD, since using digital audio instead
-  mixer CD 0% mute
+  mixer 0 CD 0% mute
 
 # Only unmute Line and Aux if they are possibly used.
-  mixer Line 100%
-  mixer Aux 100%
+  mixer 0 Line 100%
+  mixer 0 Aux 100%
 
 # mute mic
-  mixer Mic 0% mute
+  mixer 0 Mic 0% mute
 
 # ESS 1969 chipset has 2 PCM channels
-  mixer PCM,1 100%
+  mixer 0 PCM,1 100%
 
 # Trident/YMFPCI/emu10k1
-  mixer Wave 100%
-  mixer Music 100%
-  mixer AC97 100%
-  mixer Surround 90%
-  mixer 'Surround Digital' 90%
-  mixer 'Wave Surround' 90%
-  mixer 'Duplicate Front' 90%
-  mixer 'Sigmatel 4-Speaker Stereo' 90%
+  mixer 0 Wave 100%
+  mixer 0 Music 100%
+  mixer 0 AC97 100%
+  mixer 0 Surround 90%
+  mixer 0 'Surround Digital' 90%
+  mixer 0 'Wave Surround' 90%
+  mixer 0 'Duplicate Front' 90%
+  mixer 0 'Sigmatel 4-Speaker Stereo' 90%
 
 # CS4237B chipset:
-  mixer 'Master Digital' 100%
+  mixer 0 'Master Digital' 100%
 
 # DRC
-  mixer 'Dynamic Range Compression' 90%
+  mixer 0 'Dynamic Range Compression' 90%
 
 # Envy24 chips with analog outs
-  mixer DAC 100%
-  mixer DAC,0 100%
-  mixer DAC,1 100%
+  mixer 0 DAC 100%
+  mixer 0 DAC,0 100%
+  mixer 0 DAC,1 100%
 
 # some notebooks use headphone instead of master
-  mixer Headphone 100%
-  mixer Speaker 100%
-  mixer 'Internal Speaker' 0% mute
-  mixer Playback 100%
+  mixer 0 Headphone 100%
+  mixer 0 Speaker 100%
+  mixer 0 'Internal Speaker' 0% mute
+  mixer 0 Playback 100%
 
-  mixer Center 100%
-  mixer LFE 100%
-  mixer Center/LFE 100%
+  mixer 0 Center 100%
+  mixer 0 LFE 100%
+  mixer 0 Center/LFE 100%
 
 # Intel P4P800-MX  (Ubuntu bug #5813)
-  mixer 'Master Playback Switch' on
+  mixer 0 'Master Playback Switch' on
 
 # set digital output mixer params
-  mixer 'IEC958' 100% on
-  mixer 'IEC958 Output' 100%
-  mixer 'IEC958 Coaxial' 100%
-  mixer 'IEC958 LiveDrive' 100%
-  mixer 'IEC958 Optical Raw' 100%
-  mixer 'SPDIF Out' 100%
-  mixer 'SPDIF Front' 100%
-  mixer 'SPDIF Rear' 100%
-  mixer 'SPDIF Center/LFE' 100%
-  mixer 'Master Digital' 100%
+  mixer 0 'IEC958' 100% on
+  mixer 0 'IEC958 Output' 100%
+  mixer 0 'IEC958 Coaxial' 100%
+  mixer 0 'IEC958 LiveDrive' 100%
+  mixer 0 'IEC958 Optical Raw' 100%
+  mixer 0 'SPDIF Out' 100%
+  mixer 0 'SPDIF Front' 100%
+  mixer 0 'SPDIF Rear' 100%
+  mixer 0 'SPDIF Center/LFE' 100%
+  mixer 0 'Master Digital' 100%
 
-  mixer 'Analog Front' 100%
-  mixer 'Analog Rear' 100%
-  mixer 'Analog Center/LFE' 100%
+  mixer 0 'Analog Front' 100%
+  mixer 0 'Analog Rear' 100%
+  mixer 0 'Analog Center/LFE' 100%
 
 # ASRock ION 330 (and perhaps others) has 2 IEC958 channels
-  mixer IEC958,0 on
-  mixer IEC958,1 on
+  mixer 0 IEC958,0 on
+  mixer 0 IEC958,1 on
+
+# some ION2 has much more IEC958 channels ...
+  mixer 0 IEC958,2 on
+  mixer 0 IEC958,3 on
+
+# ... or "simply" more soundchips
+  mixer 1 IEC958,0 on
+  mixer 1 IEC958,1 on
+  mixer 1 IEC958,2 on
+  mixer 1 IEC958,3 on
 
-# some ION2 has much more IEC958 channels
-  mixer IEC958,2 on
-  mixer IEC958,3 on
 
 # ASRock ION 330 has Master Front set to 0
-  mixer 'Master Front' 100%
+  mixer 0 'Master Front' 100%
 
 fi