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

CC-4335: Timeline: Scheduling multiple webstreams, they can not be playing smoothly

Browse source 
-fixed
This commit is contained in:
Martin Konecny 2012-08-31 18:12:11 -04:00
parent 886888a958
commit fbea75e680
3 changed files with 57 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

17
python_apps/pypo/pypopush.py
View file

@ -88,23 +88,6 @@ class PypoPush(Thread):
except ValueError, e:
self.logger.error(str(e))
if len(liquidsoap_queue_approx) == 0 and not self.current_stream_info:
#Nothing is currently being playing by Liquidsoap
if current_event_chain[0]['type'] == 'file':
#Something is scheduled but Liquidsoap is not playing anything!
#Need to schedule it immediately..this might happen if Liquidsoap crashed.
self.modify_cue_point(current_event_chain[0])
next_media_item_chain = current_event_chain
time_until_next_play = 0
#sleep for 0.2 seconds to give pypo-file time to copy.
time.sleep(0.2)
continue
if current_event_chain[0]['type'] == 'stream':
#a stream is schedule but Liquidsoap is not playing it. Need to start it.
next_media_item_chain = current_event_chain
time_until_next_play = 0
continue
#At this point we know that Liquidsoap is playing something, and that something
#is scheduled. We need to verify whether the schedule we just received matches
#what Liquidsoap is playing, and if not, correct it.