[tuxdroid-svn] r394 - api/python/trunk

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

Author: remi
Date: 2007-06-18 14:30:39 +0200 (Mon, 18 Jun 2007)
New Revision: 394

Modified:
   api/python/trunk/tuxapi_class.py
   api/python/trunk/tuxapi_const.py
Log:
UPD
API wait a voice loaded ACK in "tts.speak" methode

Modified: api/python/trunk/tuxapi_class.py
===================================================================
--- api/python/trunk/tuxapi_class.py	2007-06-18 10:08:18 UTC (rev 393)
+++ api/python/trunk/tuxapi_class.py	2007-06-18 12:30:39 UTC (rev 394)
@@ -3892,6 +3892,7 @@
         self.ac_port=5500
         self.ac_address='localhost'
         self.authorized_voices_list = []
+        self.voice_loaded = False
 
     #--------------------------------------------------------------------------
     # Allow to connect the api to tuxttsdaemon automatically
@@ -4111,6 +4112,9 @@
                         self.authorized_voices_list.append(ord(voice_id)-1)
                 if self.on_voice_list != None:
                     self.on_voice_list()
+            # A voice has been loaded
+            if ord(data[1])==CMD_INFO_VOICE_OK:
+                self.voice_loaded = True
 
     #--------------------------------------------------------------------------
     # Send command to tuxttsdaemon
@@ -4293,9 +4297,19 @@
         self.send_command_to_tts(CMD_TYPE_TTS, CMD_TTS_INSERT_PLAY_SPEECH, \
                 (text_length & 0x0000FF00) >> 8, (text_length & 0x000000FF), \
                 self.my_voice, self.my_pitch)
-        self.parent.cmd.audio_channel_tts()
+        self.voice_loaded == True
         self.sock.send(text_to_send)
         counter = 0
+        while ((self.voice_loaded == False) and (counter < 300)):
+            counter = counter + 1
+            self.parent.sys.wait(0.1)
+        if counter == 300:
+            self.stop()
+            print "TTS Speak : Voice not loaded"
+            return False
+        print "Voice Loaded."
+        self.parent.cmd.audio_channel_tts()
+        counter = 0
         while ((self.sound_on == False) and (counter < 100)):
             counter = counter + 1
             self.parent.sys.wait(0.1)

Modified: api/python/trunk/tuxapi_const.py
===================================================================
--- api/python/trunk/tuxapi_const.py	2007-06-18 10:08:18 UTC (rev 393)
+++ api/python/trunk/tuxapi_const.py	2007-06-18 12:30:39 UTC (rev 394)
@@ -375,6 +375,7 @@
 CMD_INFO_TTS_PLAYER_STATE = 0x01
 CMD_INFO_SOUND_STATE = 0x02
 CMD_INFO_VOICE_LIST = 0x03
+CMD_INFO_VOICE_OK = 0x04
 # TTS INFO return
 TTS_SOUND_ON = 0x01
 TTS_SOUND_OFF = 0x02