[tuxdroid-svn] r747 - in software/gadgets/settings/trunk: . settings settings/Scripts/Python/GUI/widget

[Paul_R <c2m...@c2...>]

Author: Paul_R
Date: 2007-12-03 16:05:36 +0100 (Mon, 03 Dec 2007)
New Revision: 747

Modified:
   software/gadgets/settings/trunk/settings.tgf
   software/gadgets/settings/trunk/settings/Scripts/Python/GUI/widget/other.pyp
   software/gadgets/settings/trunk/settings/about.xml
Log:
* Added somes protections to not store the sounds if the firmwares versions are <730 for tuxaudio and <733 for tuxcore
* Added tests to wait the correct status.


Modified: software/gadgets/settings/trunk/settings/Scripts/Python/GUI/widget/other.pyp
===================================================================
--- software/gadgets/settings/trunk/settings/Scripts/Python/GUI/widget/other.pyp	2007-12-03 07:52:57 UTC (rev 746)
+++ software/gadgets/settings/trunk/settings/Scripts/Python/GUI/widget/other.pyp	2007-12-03 15:05:36 UTC (rev 747)
@@ -151,7 +151,7 @@
 #------------------------------------------------------------
 # Sound tab labels
 #------------------------------------------------------------
-    def SoundLabelUpdate(self):
+    def SoundLabelUpdate(self): 
         self.get_widget('btnSoundAdd').set_label(_me.string('btnSoundAdd'))
         self.get_widget('btnSoundClear').set_label(_me.string('btnSoundClear'))
         self.get_widget('btnSoundModify').set_label(_me.string('btnSoundModify'))
@@ -611,7 +611,7 @@
 
     #--------------------------------------------------------------------------
     # On "play" external wave file button clicked
-    #--------------------------------------------------------------------------
+    #------------------------------------tux.status.sound_record()--------------------------------------
     def on_wave_external_play_bt_clicked(self, widget, *args):
         if str(self.get_widget("soundExternalChooser").get_filename())=="None": return
         tux.sys.shell_free("aplay -D %s %s"% (soundcard, self.get_widget("soundExternalChooser").get_filename()))
@@ -796,6 +796,19 @@
             print "Sound storing : Error : file merged is too big"
             return
             
+        try:
+            ver = tux.hw.behavior_get_version()
+            if int(ver[3]) < 733:
+                self.__sound_mutex.release()
+                return 
+            ver = tux.hw.audio_get_version()
+            if int(ver[3]) < 730:
+                self.__sound_mutex.release()
+                return 
+        except:
+            self.__sound_mutex.release()
+            return
+            
         fraction = float(len(wavs.wav_paths) + 2)
         fraction = 1 / fraction
         current = fraction
@@ -806,16 +819,24 @@
         self.get_widget('progressbar1').set_fraction(current)
         current = current + fraction
         tux.cmd.sound_erase()
-        tux.sys.wait(0.1)
+        
+        tux.sys.wait(1)
+        
         while tux.status.sound_record()[0] != 0:
             tux.sys.wait(0.1)
         
+        sound_table = wavs.wav_paths
         
-        for i in range(len(wavs.wav_paths)):
+        for i in range(len(sound_table)):
             self.get_widget('progressbar1').set_fraction(current)
             self.get_widget('lblSoundState').set_text(_me.string('soundProg')+str(i+1))
             tux.cmd.sound_storing()
-            tux.sys.shell("aplay -D %s %s"%(soundcard, wavs.wav_paths[i]))
+            while tux.status.sound_record()[0] != 1:
+                tux.sys.wait(0.1)
+            tux.sys.shell("aplay -D %s %s"%(soundcard, sound_table[i]))
+            while tux.status.sound_record()[0] != 2:
+                tux.sys.wait(0.1)
+                
             tux.cmd.sound_confirm(True)
             current = current + fraction
             tux.sys.wait(0.1)

Modified: software/gadgets/settings/trunk/settings/about.xml
===================================================================
(Binary files differ)

Modified: software/gadgets/settings/trunk/settings.tgf
===================================================================
(Binary files differ)