diff options
author | Walter Bender <walter@sugarlabs.org> | 2010-11-20 23:00:44 (GMT) |
---|---|---|
committer | Walter Bender <walter@sugarlabs.org> | 2010-11-20 23:00:44 (GMT) |
commit | f29d04be5f95dc179b6169c2e378ab9be9800986 (patch) | |
tree | c1ed1214ec20b05bbc3d5b751ee9c9e6617297cb /TurtleArt/talogo.py | |
parent | 48f34de0fc207737d7e4614a5e5e7f4d721ea566 (diff) |
worked around regession with Sensor blocks caused by some unneeded configuration in gplay inherited from Jukebox
Diffstat (limited to 'TurtleArt/talogo.py')
-rw-r--r-- | TurtleArt/talogo.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/TurtleArt/talogo.py b/TurtleArt/talogo.py index 44a4ad6..01948a9 100644 --- a/TurtleArt/talogo.py +++ b/TurtleArt/talogo.py @@ -40,7 +40,7 @@ except ImportError: from taconstants import TAB_LAYER, BLACK, WHITE, \ DEFAULT_SCALE, ICON_SIZE, BLOCK_NAMES, CONSTANTS, SENSOR_DC_NO_BIAS, \ SENSOR_DC_BIAS, XO1, XO15 -from tagplay import play_audio, play_movie_from_file, stop_media +from tagplay import play_audio_from_file, play_movie_from_file, stop_media from tajail import myfunc, myfunc_import from tautils import get_pixbuf_from_journal, convert, \ text_media_type, round_int, chr_to_ord, \ @@ -1303,11 +1303,11 @@ class LogoCode: if audio[6:] != "None": try: dsobject = datastore.get(audio[6:]) - play_audio(self, dsobject.file_path) + play_audio_from_file(self, dsobject.file_path) except IOError: _logger.debug("Couldn't open id: %s" % (str(audio[6:]))) else: - play_audio(self, audio[6:]) + play_audio_from_file(self, audio[6:]) def _play_video(self, video): """ Movie file from Journal """ |