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

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

Author: remi
Date: 2008-01-24 13:41:06 +0100 (Thu, 24 Jan 2008)
New Revision: 876

Modified:
   api/python/trunk/tux.py
   api/python/trunk/tuxapi_class.py
Log:
UPD: tts and wav objects are now binded to the new OSL library. (software/tuxosl)

Modified: api/python/trunk/tux.py
===================================================================
--- api/python/trunk/tux.py	2008-01-24 12:06:48 UTC (rev 875)
+++ api/python/trunk/tux.py	2008-01-24 12:41:06 UTC (rev 876)
@@ -23,7 +23,6 @@
 tux=tuxapi_class.TUXTCPCommunicator()
 wavs=tuxapi_wav_merger.WavMerger(tux)
 tux.daemon.connect()
-tux.tts.connect()
 tux.daemon.set_my_client_name("Py Client")
 tux.print_warnings=True
 tux.daemon.auto_connect(True)

Modified: api/python/trunk/tuxapi_class.py
===================================================================
--- api/python/trunk/tuxapi_class.py	2008-01-24 12:06:48 UTC (rev 875)
+++ api/python/trunk/tuxapi_class.py	2008-01-24 12:41:06 UTC (rev 876)
@@ -34,6 +34,9 @@
 import math
 from tuxapi_const import *
 from copy import deepcopy
+sys.path.append("/opt/tuxdroid/apps/tuxosl")
+from tux_osl_const import *
+from tux_osl_api import TuxOSLAPI
 
 #==============================================================================
 # Constants
@@ -181,10 +184,11 @@
         self.sdaemon=self.daemon
         self.status=TUXStatus(self)
         self.hw=TUXhw(self)
-        self.tts=TUXtts(self)
+        self.__osl = TuxOSLAPI(self)
+        self.tts=self.__osl.tts
+        self.wav=self.__osl.wav
         self.misc=TUXmisc(self)
         self.monitoring = TUXmonitoring(self)
-        self.wav = TUXwav(self)
         self.micro = TUXmicro(self)
         self._switches = []
         self.api_version = api_version
@@ -194,9 +198,6 @@
         t.setName('daemon._loop_auto_connect')
         t.start()
         self.main_thread_list.append(t)
-        t=threading.Thread(target=self.tts._loop_auto_connect)
-        t.setName('tts._loop_auto_connect')
-        t.start()
         self.main_thread_list.append(t)
 
     #--------------------------------------------------------------------------
@@ -210,7 +211,6 @@
         self.tts.disconnect()
         self.tts.destroy()
         self.daemon._tcp_threads_join()
-        self.tts._tcp_threads_join()
         self.micro.destroy()
         self.wav.destroy()
         self.exit_flag=True