# HG changeset patch
# User giacomo
# Date 1176661991 25200
# Node ID 34325e9fcc60690d1824f5cb6fca9bd211c1cb7b
# Parent  b2fbf53360cf31e3d41513342ccbbe37bb8dc6cf
[svn] - alsa: on volume changes, only use channel switches if the audio card supports separated ones

diff -r b2fbf53360cf -r 34325e9fcc60 ChangeLog
--- a/ChangeLog	Sat Apr 14 22:08:50 2007 -0700
+++ b/ChangeLog	Sun Apr 15 11:33:11 2007 -0700
@@ -1,3 +1,13 @@
+2007-04-15 05:08:50 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
+  revision [2058]
+  bug fix for #897
+  - make mp3 header parsing continue even if xing header is located first.
+  - if xing header does not provide enough information to calculate average bitrate, scan_file() now calculate it from frames.
+  
+  trunk/src/madplug/decoder.c |   15 ++++++++++++---
+  1 file changed, 12 insertions(+), 3 deletions(-)
+
+
 2007-04-15 01:09:55 +0000  Tony Vroon <chainsaw@gentoo.org>
   revision [2056]
   A cast a day keeps the compiler warning at bay.
diff -r b2fbf53360cf -r 34325e9fcc60 src/alsa/audio.c
--- a/src/alsa/audio.c	Sat Apr 14 22:08:50 2007 -0700
+++ b/src/alsa/audio.c	Sun Apr 15 11:33:11 2007 -0700
@@ -540,7 +540,7 @@
 						    SND_MIXER_SCHN_FRONT_RIGHT, r);
 	}
 
-	if (snd_mixer_selem_has_playback_switch(pcm_element))
+	if (snd_mixer_selem_has_playback_switch(pcm_element) && !snd_mixer_selem_has_playback_switch_joined(pcm_element))
 	{
 		snd_mixer_selem_set_playback_switch(pcm_element,
 			SND_MIXER_SCHN_FRONT_LEFT, l != 0);