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
airtime_mvc/application/models
python_apps/pypo

View File

@ -351,7 +351,8 @@ class Application_Model_Schedule {
if (strpos($t[2], ".")) {
$secParts = explode(".", $t[2]);
$millisecs = $secParts[1];
$millisecs = substr($millisecs, 0, 3);
$millisecs = str_pad(substr($millisecs, 0, 3),3, '0');
Logging::log("mili:".print_r($millisecs,true));
$millisecs = intval($millisecs);
$seconds = intval($secParts[0]);
} else {

View File

@ -15,6 +15,15 @@ def append_title(m) =
end
end
def crossfade(s)
#duration is automatically overwritten by metadata fields passed in
#with audio
s = fade.in(type="log", duration=0., s)
s = fade.out(type="log", duration=0., s)
fader = fun (a,b) -> add(normalize=false,[b,a])
cross(fader,s)
end
def transition(a,b) =
log("transition called...")
add(normalize=false,

View File

@ -29,6 +29,7 @@ s3_namespace = ref ''
queue = on_metadata(notify, queue)
queue = map_metadata(append_title, queue)
queue = crossfade(queue)
ignore(output.dummy(queue, fallible=true))
server.register(namespace="vars", "pypo_data", fun (s) -> begin pypo_data := s "Done" end)

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):