rpms/system-config-soundcard/devel system-config-soundcard-1.2.17-save.patch, NONE, 1.1 system-config-soundcard.spec, 1.35, 1.36
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Mar 10 13:18:43 UTC 2006
Author: stransky
Update of /cvs/dist/rpms/system-config-soundcard/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3482
Modified Files:
system-config-soundcard.spec
Added Files:
system-config-soundcard-1.2.17-save.patch
Log Message:
fixed kudzu logging and saving settings during firstboot
system-config-soundcard-1.2.17-save.patch:
soundcard.py | 32 +++++++++++++++++++++++++-------
soundcardBackend.py | 5 -----
system-config-soundcard.logger | 1 +
3 files changed, 26 insertions(+), 12 deletions(-)
--- NEW FILE system-config-soundcard-1.2.17-save.patch ---
--- system-config-soundcard-1.2.17/src/soundcard.py.sv 2006-03-10 14:15:59.000000000 +0100
+++ system-config-soundcard-1.2.17/src/soundcard.py 2006-03-10 14:18:12.000000000 +0100
@@ -89,6 +89,9 @@
if self.doDebug:
print "Kudzu detected %d cards" % len(self.cardList)
+ # first-boot flag - for saving settings
+ self.firstboot = True
+
# Last slide in notebook
self.last_slide = False
@@ -407,34 +410,47 @@
self.primarySubDeviceOptionMenu.show()
def cancelClicked(self, *args):
- self.apply(False)
+ self.apply(False,False,True)
gtk.main_quit()
def okayClicked(self, *args):
- self.apply(True)
+ self.apply(True,True,True)
gtk.main_quit()
def changeDefaultCard(self, *args):
self.soundcardBackend.setDefaultCard(self.primaryDeviceOptionMenu.get_history())
self.soundcardBackend.setDefaultDevice(0)
+ if self.firstboot:
+ self.apply(True, False, False)
self.refreshDeviceList()
def changeDefaultDevice(self, *args):
self.soundcardBackend.setDefaultDevice(self.subdevices[self.primarySubDeviceOptionMenu.get_history()][0])
+ if self.firstboot:
+ self.apply(True, False, False)
def changeHW(self, widget, data=None):
self.soundcardBackend.setHardwareDevice(widget.get_active())
+ if self.firstboot:
+ self.apply(True, False, False)
def changeDynKeys(self, widget, data=None):
self.soundcardBackend.setDynamicKeys(widget.get_active())
+ if self.firstboot:
+ self.apply(False, True, False)
- def apply(self, save_config):
+ def apply(self, save_config, save_dyn_keys, end_application):
if self.doDebug:
return
+
if save_config:
- self.soundcardBackend.writeConfig()
+ self.soundcardBackend.writeConfig()
+ if save_dyn_keys:
self.soundcardBackend.reconfigureDynamicKeys()
+ if end_application:
+ self.mainWindow.destroy()
+
# pageNum = self.notebook.get_current_page()
# page = self.notebook.get_nth_page(pageNum)
# if page:
@@ -442,8 +458,6 @@
# selectedItem = self.getSelectedCard()
## if selectedItem != None:
## self.writeUnloadReload(selectedItem, module)
-
- self.mainWindow.destroy()
def playLabelSet(self, state):
if state:
@@ -511,7 +525,7 @@
else:
self.soundcardBackend.setVolume()
- def launch(self):
+ def launch(self):
self.mainVBox = gtk.VBox()
self.internalVBox = gtk.VBox(False, 10)
self.internalVBox.set_border_width(10)
@@ -529,6 +543,10 @@
return self.mainVBox, eventBox
def stand_alone(self):
+
+ print "Running from command-line..."
+ self.firstboot = False
+
self.mainWindow = gtk.Dialog()
self.mainWindow.vbox.set_spacing(5)
self.mainWindow.connect("destroy", self.destroy)
--- system-config-soundcard-1.2.17/src/soundcardBackend.py.sv 2006-03-10 14:15:59.000000000 +0100
+++ system-config-soundcard-1.2.17/src/soundcardBackend.py 2006-03-10 14:15:59.000000000 +0100
@@ -156,11 +156,6 @@
list = kudzu.probe(kudzu.CLASS_AUDIO, kudzu.BUS_PCI | kudzu.BUS_MACIO,
kudzu.PROBE_ALL)
- print "----------- Kudzu -------------"
- for card in list:
- print card
- print "----------- **** -------------"
-
for card in list:
#Let's go through the list of cards. If the driver is 'unknown',
#don't put the card in the list.
--- system-config-soundcard-1.2.17/src/system-config-soundcard.logger.sv 2006-03-08 12:30:02.000000000 +0100
+++ system-config-soundcard-1.2.17/src/system-config-soundcard.logger 2006-03-10 14:15:59.000000000 +0100
@@ -14,3 +14,4 @@
echo -e "------- rpm -q alsa-utils --------\n`rpm -q alsa-utils`\n" >> $LOG_FILE 2>&1
echo -e "------- /proc/asound/modules --------\n`cat /proc/asound/modules`\n" >> $LOG_FILE 2>&1
echo -e "------- /proc/asound/pcm --------\n`cat /proc/asound/pcm`\n" >> $LOG_FILE 2>&1
+echo -e "------- /etc/sysconfig/hwconf --------\n`cat /etc/sysconfig/hwconf`\n" >> $LOG_FILE 2>&1
Index: system-config-soundcard.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- system-config-soundcard.spec 8 Mar 2006 16:15:37 -0000 1.35
+++ system-config-soundcard.spec 10 Mar 2006 13:18:39 -0000 1.36
@@ -1,7 +1,7 @@
Summary: A graphical interface for detecting and configuring soundcards
Name: system-config-soundcard
Version: 1.2.17
-Release: 2
+Release: 3
URL: http://fedora.redhat.com/projects/config-tools/redhat-config-soundcard.html
License: GPL
ExclusiveOS: Linux
@@ -11,6 +11,7 @@
Source0: %{name}-%{version}.tar.bz2
Patch0: system-config-soundcard-1.2.17-switch.patch
Patch1: system-config-soundcard-1.2.17-ok-button.patch
+Patch2: system-config-soundcard-1.2.17-save.patch
BuildRequires: desktop-file-utils
BuildRequires: gettext
ExcludeArch: s390 s390x
@@ -33,6 +34,7 @@
%setup -q
%patch -p1
%patch1 -p1
+%patch2 -p1 -b .sv
%build
make
@@ -88,6 +90,9 @@
%ghost /root/scsound.log
%changelog
+* Wed Mar 10 2006 Martin Stransky <stransky at redhat.com> 1.2.17-3
+- fixed kudzu logging and saving settings during firstboot
+
* Wed Mar 08 2006 Martin Stransky <stransky at redhat.com> 1.2.17-2
- added "ok" button for save configuration
- gui fix
More information about the fedora-cvs-commits
mailing list