rpms/system-config-soundcard/devel system-config-soundcard-2.0.6-hwdevice.patch, NONE, 1.1 system-config-soundcard.spec, 1.60, 1.61

[Martin Stransky (stransky)]

Author: stransky

Update of /cvs/pkgs/rpms/system-config-soundcard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15860

Modified Files:
	system-config-soundcard.spec 
Added Files:
	system-config-soundcard-2.0.6-hwdevice.patch 
Log Message:
fixed hardware device configuration

system-config-soundcard-2.0.6-hwdevice.patch:

--- NEW FILE system-config-soundcard-2.0.6-hwdevice.patch ---
diff -up system-config-soundcard-2.0.6/src/soundcardBackend.py.old system-config-soundcard-2.0.6/src/soundcardBackend.py
--- system-config-soundcard-2.0.6/src/soundcardBackend.py.old	2007-09-26 09:56:42.000000000 +0200
+++ system-config-soundcard-2.0.6/src/soundcardBackend.py	2007-09-26 10:00:44.000000000 +0200
@@ -219,8 +219,8 @@ class soundConfiguration:
             if self.hardware_device:            
                 lines.append("#HWCONF\n")
                 lines.append("#DEV %d\n" % device)
-                lines.append("pcm.!default { type plughw card %d device %d }\n" % (index, device))
-                lines.append("ctl.!default { type plughw card %d }\n" % index)
+                lines.append("pcm.!default { type plug slave {  pcm \"hw:%d,%d\" }}\n" % (index, device))
+                lines.append("ctl.!default { type hw card %d }\n" % index)
             else:
                 lines.append("#SWCONF\n")
                 lines.append("#DEV %d\n" % device)


Index: system-config-soundcard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- system-config-soundcard.spec	25 Sep 2007 15:20:15 -0000	1.60
+++ system-config-soundcard.spec	26 Sep 2007 08:10:13 -0000	1.61
@@ -1,7 +1,7 @@
 Summary: A graphical interface for detecting and configuring soundcards
 Name: system-config-soundcard
 Version: 2.0.6
-Release: 9%{dist}
+Release: 10%{dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/soundcard
 License: GPL
 ExclusiveOS: Linux
@@ -15,6 +15,7 @@
 Patch3: system-config-soundcard-2.0.6-usb-hack.patch
 Patch4: system-config-soundcard-2.0.6-desktop.patch
 Patch5: system-config-soundcard-2.0.6-reset.patch
+Patch6: system-config-soundcard-2.0.6-hwdevice.patch
 BuildRequires: desktop-file-utils
 BuildRequires: gettext, intltool
 ExcludeArch: s390 s390x
@@ -42,7 +43,8 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1 -b .res
+%patch5 -p1
+%patch6 -p1 -b .hw
 
 %build
 make
@@ -92,6 +94,9 @@
 %ghost /root/scsound.log
 
 %changelog
+* Tue Sep 26 2007 Martin Stransky <stransky at redhat.com> - 2.0.6-10
+- fixed hardware device configuration
+
 * Tue Sep 25 2007 Martin Stransky <stransky at redhat.com> - 2.0.6-9
 - fixed #291691 - Sound card not working gives a window with 
   invalid instructions on first boot