Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'devel' into CC-733

This commit is contained in:
Naomi Aro 2012-03-09 11:28:57 +01:00
parent c66b55ec17 b58e948825
commit 3bec576ad3
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
python_apps/pypo/pypopush.py
View File

@ -104,6 +104,7 @@ class PypoPush(Thread):
track, so let's push it now so that Liquidsoap can start playing track, so let's push it now so that Liquidsoap can start playing
it immediately after (and prepare crossfades if need be). it immediately after (and prepare crossfades if need be).
""" """
self.logger.debug("Push track immediately.")
self.telnet_to_liquidsoap(media_item) self.telnet_to_liquidsoap(media_item)
self.last_end_time = media_item["end"] self.last_end_time = media_item["end"]
else: else:
@ -111,11 +112,13 @@ class PypoPush(Thread):
this media item does not start right after a current playing track. this media item does not start right after a current playing track.
We need to sleep, and then wake up when this track starts. We need to sleep, and then wake up when this track starts.
""" """
self.logger.debug("sleep until track start.")
self.sleep_until_start(media_item) self.sleep_until_start(media_item)
self.telnet_to_liquidsoap(media_item) self.telnet_to_liquidsoap(media_item)
self.last_end_time = media_item["end"] self.last_end_time = media_item["end"]
except Exception, e: except Exception, e:
self.logger.error('Pypo Push Exception: %s', e)
return False return False
return True return True