Author: remi
Date: 2008-09-17 10:05:35 +0200 (Wed, 17 Sep 2008)
New Revision: 1862
Modified:
software_suite_v2/tuxware/pytuxisalive/trunk/src/tuxisalive/api/TuxAPIFlippers.py
software_suite_v2/tuxware/pytuxisalive/trunk/src/tuxisalive/api/TuxAPIMouthEyes.py
software_suite_v2/tuxware/pytuxisalive/trunk/src/tuxisalive/api/TuxAPISoundFlash.py
software_suite_v2/tuxware/pytuxisalive/trunk/src/tuxisalive/api/TuxAPISpinning.py
software_suite_v2/tuxware/pytuxisalive/trunk/src/tuxisalive/api/TuxAPITTS.py
software_suite_v2/tuxware/pytuxisalive/trunk/src/tuxisalive/api/TuxAPIWav.py
Log:
* updated synchronous commands to asynchronous when the client level is ANONYME
Modified:
software_suite_v2/tuxware/pytuxisalive/trunk/src/tuxisalive/api/TuxAPIFlippers.py
===================================================================
---
software_suite_v2/tuxware/pytuxisalive/trunk/src/tuxisalive/api/TuxAPIFlippers.py
2008-09-17 07:39:14 UTC (rev 1861)
+++
software_suite_v2/tuxware/pytuxisalive/trunk/src/tuxisalive/api/TuxAPIFlippers.py
2008-09-17 08:05:35 UTC (rev 1862)
@@ -125,6 +125,8 @@
return False
timeout = count * 1.0
ret = self.onAsync(count, finalState, speed)
+ if self.__parent.server.getClientLevel() == CLIENT_LEVEL_ANONYME:
+ return ret
if ret:
ret = self.waitMovingOff(timeout)
return ret
@@ -170,6 +172,8 @@
return False
timeout = 2.0 * duration
ret = self.onDuringAsync(duration, finalState, speed)
+ if self.__parent.server.getClientLevel() == CLIENT_LEVEL_ANONYME:
+ return ret
if ret:
ret = self.waitMovingOff(timeout)
return ret
Modified:
software_suite_v2/tuxware/pytuxisalive/trunk/src/tuxisalive/api/TuxAPIMouthEyes.py
===================================================================
---
software_suite_v2/tuxware/pytuxisalive/trunk/src/tuxisalive/api/TuxAPIMouthEyes.py
2008-09-17 07:39:14 UTC (rev 1861)
+++
software_suite_v2/tuxware/pytuxisalive/trunk/src/tuxisalive/api/TuxAPIMouthEyes.py
2008-09-17 08:05:35 UTC (rev 1862)
@@ -104,6 +104,8 @@
return False
timeout = count * 1.0
ret = self.onAsync(count, finalState)
+ if self.__parent.server.getClientLevel() == CLIENT_LEVEL_ANONYME:
+ return ret
if ret:
ret = self.waitMovingOff(timeout)
return ret
@@ -143,6 +145,8 @@
return False
timeout = 2.0 * duration
ret = self.onDuringAsync(duration, finalState)
+ if self.__parent.server.getClientLevel() == CLIENT_LEVEL_ANONYME:
+ return ret
if ret:
ret = self.waitMovingOff(timeout)
return ret
Modified:
software_suite_v2/tuxware/pytuxisalive/trunk/src/tuxisalive/api/TuxAPISoundFlash.py
===================================================================
---
software_suite_v2/tuxware/pytuxisalive/trunk/src/tuxisalive/api/TuxAPISoundFlash.py
2008-09-17 07:39:14 UTC (rev 1861)
+++
software_suite_v2/tuxware/pytuxisalive/trunk/src/tuxisalive/api/TuxAPISoundFlash.py
2008-09-17 08:05:35 UTC (rev 1862)
@@ -69,6 +69,8 @@
@return: the success of the command.
"""
if self.playAsync(track, volume):
+ if self.__parent.server.getClientLevel() == CLIENT_LEVEL_ANONYME:
+ return True
trackName = "TRACK_%.3d" % track
self.__eventHandlers.waitCondition(ST_NAME_AUDIO_FLASH_PLAY,
(trackName, None), 0.2)
value, delay =
self.__parent.status.requestOne(ST_NAME_AUDIO_FLASH_PLAY)
Modified:
software_suite_v2/tuxware/pytuxisalive/trunk/src/tuxisalive/api/TuxAPISpinning.py
===================================================================
---
software_suite_v2/tuxware/pytuxisalive/trunk/src/tuxisalive/api/TuxAPISpinning.py
2008-09-17 07:39:14 UTC (rev 1861)
+++
software_suite_v2/tuxware/pytuxisalive/trunk/src/tuxisalive/api/TuxAPISpinning.py
2008-09-17 08:05:35 UTC (rev 1862)
@@ -127,6 +127,8 @@
timeout = turns * 5.0
ret = self.leftOnAsync(turns, speed)
+ if self.__parent.server.getClientLevel() == CLIENT_LEVEL_ANONYME:
+ return ret
if ret:
ret = self.waitLeftMovingOff(timeout)
return ret
@@ -142,6 +144,8 @@
timeout = turns * 5.0
ret = self.rightOnAsync(turns, speed)
+ if self.__parent.server.getClientLevel() == CLIENT_LEVEL_ANONYME:
+ return ret
if ret:
ret = self.waitRightMovingOff(timeout)
return ret
@@ -191,6 +195,8 @@
timeout = duration * 2.0
ret = self.leftOnDuringAsync(duration, speed)
+ if self.__parent.server.getClientLevel() == CLIENT_LEVEL_ANONYME:
+ return ret
if ret:
ret = self.waitLeftMovingOff(timeout)
return ret
@@ -206,6 +212,8 @@
timeout = duration * 2.0
ret = self.rightOnDuringAsync(duration, speed)
+ if self.__parent.server.getClientLevel() == CLIENT_LEVEL_ANONYME:
+ return ret
if ret:
ret = self.waitRightMovingOff(timeout)
return ret
Modified:
software_suite_v2/tuxware/pytuxisalive/trunk/src/tuxisalive/api/TuxAPITTS.py
===================================================================
---
software_suite_v2/tuxware/pytuxisalive/trunk/src/tuxisalive/api/TuxAPITTS.py
2008-09-17 07:39:14 UTC (rev 1861)
+++
software_suite_v2/tuxware/pytuxisalive/trunk/src/tuxisalive/api/TuxAPITTS.py
2008-09-17 08:05:35 UTC (rev 1862)
@@ -152,6 +152,8 @@
ret = self.__cmdSimpleResult(cmd)
if not ret:
return False
+ if self.__parent.server.getClientLevel() == CLIENT_LEVEL_ANONYME:
+ return ret
# Wait the speak status
ret = self.__eventHandlers.waitCondition(ST_NAME_SPEAK_STATUS, (None,
None), 5.0)
if not ret:
@@ -204,6 +206,8 @@
@return: the success of the command.
"""
if self.speakAsync(text, locutor, pitch):
+ if self.__parent.server.getClientLevel() == CLIENT_LEVEL_ANONYME:
+ return True
self.__eventHandlers.waitCondition(ST_NAME_TTS_SOUND_STATE, ("ON",
None), 1.0)
value, delay =
self.__parent.status.requestOne(ST_NAME_TTS_SOUND_STATE)
if value == "ON":
Modified:
software_suite_v2/tuxware/pytuxisalive/trunk/src/tuxisalive/api/TuxAPIWav.py
===================================================================
---
software_suite_v2/tuxware/pytuxisalive/trunk/src/tuxisalive/api/TuxAPIWav.py
2008-09-17 07:39:14 UTC (rev 1861)
+++
software_suite_v2/tuxware/pytuxisalive/trunk/src/tuxisalive/api/TuxAPIWav.py
2008-09-17 08:05:35 UTC (rev 1862)
@@ -75,6 +75,9 @@
if not self.playAsync(waveFile, begin, end):
return False
+ if self.__parent.server.getClientLevel() == CLIENT_LEVEL_ANONYME:
+ return True
+
ret = self.__eventHandlers.waitCondition(ST_NAME_WAV_CHANNEL_START,
(None, None), 1.0)
if not ret:
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
