rpms/alsa-utils/devel alsa-utils.spec,1.15,1.16 salsa.c,1.2,1.3

[fedora-cvs-commits at redhat.com]

Author: notting

Update of /cvs/dist/rpms/alsa-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14394

Modified Files:
	alsa-utils.spec salsa.c 
Log Message:
make sure 'Wave' playback channel isn't muted. Fixes sound on emu10k1.



Index: alsa-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- alsa-utils.spec	25 Apr 2005 10:39:04 -0000	1.15
+++ alsa-utils.spec	16 May 2005 20:44:56 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: 	Advanced Linux Sound Architecture (ALSA) utilities
 Name: 		alsa-utils
 Version: 	1.0.9rc2
-Release:	1
+Release:	2
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Mon May 16 2005 Bill Nottingham <notting at redhat.com> 1.0.9rc2-2
+- make sure 'Wave' playback channel isn't muted (#157850)
+
 * Mon Apr 25 2005 Martin Stransky <stransky at redhat.com> 1.0.9rc2-1
 - New upstream version
 - add %find_lang macro (#155719)


Index: salsa.c
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/devel/salsa.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- salsa.c	1 Apr 2005 22:40:40 -0000	1.2
+++ salsa.c	16 May 2005 20:44:56 -0000	1.3
@@ -133,7 +133,8 @@
 			}
 			if (snd_mixer_selem_has_playback_channel(elem, c)) {
 				if (!snd_mixer_selem_has_capture_channel(elem, c) ||
-				    !strcmp(snd_mixer_selem_id_get_name(sid),"CD")) {
+				    !strcmp(snd_mixer_selem_id_get_name(sid),"CD") ||
+				    !strcmp(snd_mixer_selem_id_get_name(sid),"Wave")) {
 					if (snd_mixer_selem_has_playback_switch(elem))
 						snd_mixer_selem_set_playback_switch(elem, c, 1);
 					if (snd_mixer_selem_has_playback_volume(elem))