CC-3610: Now Playing ->songs in the Now Playing do not reflect the changes affected changed END_OF_SHOW

-pypo side fixed
This commit is contained in:
Martin Konecny 2012-04-10 23:13:52 -04:00
parent bc6e911673
commit a09a31bc88
2 changed files with 15 additions and 7 deletions

View file

@ -173,6 +173,7 @@ class PypoPush(Thread):
if problem_at_iteration is not None:
self.logger.debug("Change in chain at link %s", problem_at_iteration)
self.modify_cue_point_of_first_link(current_chain)
self.push_to_liquidsoap(current_chain[problem_at_iteration:])
@ -249,11 +250,13 @@ class PypoPush(Thread):
link_start = datetime.strptime(link['start'], "%Y-%m-%d-%H-%M-%S")
diff_td = tnow - link_start
diff_sec = self.convert_timedelta_to_seconds(diff_td)
self.logger.debug("media item was supposed to start %s ago. Preparing to start..", diff_td)
original_cue_in_td = timedelta(seconds=float(link['cue_in']))
link['cue_in'] = self.convert_timedelta_to_seconds(original_cue_in_td + diff_td)
if diff_sec > 0:
self.logger.debug("media item was supposed to start %s ago. Preparing to start..", diff_sec)
original_cue_in_td = timedelta(seconds=float(link['cue_in']))
link['cue_in'] = self.convert_timedelta_to_seconds(original_cue_in_td) + diff_sec
def convert_timedelta_to_seconds(self, td):
return (td.microseconds + (td.seconds + td.days * 24 * 3600) * 10**6) / 10**6