Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x

This commit is contained in:
James 2012-11-22 10:15:35 -05:00
parent 4242fecd34 8cc162f7a9
commit dcc9a192d1
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
airtime_mvc/application/models/Preference.php
View File

@ -204,9 +204,9 @@ class Application_Model_Preference
$fade = $out;
}
$fade = number_format($fade, 2);
$fade = number_format($fade, 1);
//fades need 2 leading zeros for DateTime conversion
$fade = rtrim(str_pad($fade, 5, "0", STR_PAD_LEFT), "0");
$fade = str_pad($fade, 4, "0", STR_PAD_LEFT);
return $fade;
}

8
python_apps/pypo/liquidsoap_scripts/ls_script.liq
View File

@ -43,17 +43,15 @@ just_switched = ref false
#web_stream = on_metadata(notify_stream, web_stream)
#output.dummy(fallible=true, web_stream)
http = input.http_restart(id="http")
http = cross_http(http_input_id="http",http)
stream_queue = http_fallback(http_input_id="http",http=http,default=queue)
# the crossfade function controls fade in/out
queue = crossfade_airtime(queue)
queue = on_metadata(notify, queue)
queue = map_metadata(update=false, append_title, queue)
output.dummy(fallible=true, queue)
http = input.http_restart(id="http")
http = cross_http(http_input_id="http",http)
stream_queue = http_fallback(http_input_id="http",http=http,default=queue)
#stream_queue = switch(id="stream_queue_switch", track_sensitive=false,
# transitions=[transition, transition],