CC-3566: Preferences->"Fade In" is not respected when Show starts

- millisecond value of fade was sent wrong from php side.
- crossfade() call was removed and it was causing fade in/out not working.
This commit is contained in:
James 2012-04-11 11:03:13 -04:00
parent bc6e911673
commit f82aef2a85
4 changed files with 13 additions and 2 deletions

View file

@ -426,7 +426,7 @@ class PypoPush(Thread):
self.telnet_lock.release()
def create_liquidsoap_annotation(self, media):
return 'annotate:media_id="%s",liq_fade_in="%s",liq_fade_out="%s",liq_cue_in="%s",liq_cue_out="%s",schedule_table_id="%s":%s' \
return 'annotate:media_id="%s",liq_start_next="0",liq_fade_in="%s",liq_fade_out="%s",liq_cue_in="%s",liq_cue_out="%s",schedule_table_id="%s":%s' \
% (media['id'], float(media['fade_in'])/1000, float(media['fade_out'])/1000, float(media['cue_in']), float(media['cue_out']), media['row_id'], media['dst'])
def run(self):