Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
This commit is contained in:
commit
dcc9a192d1
2 changed files with 5 additions and 7 deletions
|
@ -204,9 +204,9 @@ class Application_Model_Preference
|
||||||
$fade = $out;
|
$fade = $out;
|
||||||
}
|
}
|
||||||
|
|
||||||
$fade = number_format($fade, 2);
|
$fade = number_format($fade, 1);
|
||||||
//fades need 2 leading zeros for DateTime conversion
|
//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;
|
return $fade;
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,17 +43,15 @@ just_switched = ref false
|
||||||
#web_stream = on_metadata(notify_stream, web_stream)
|
#web_stream = on_metadata(notify_stream, web_stream)
|
||||||
#output.dummy(fallible=true, 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
|
# the crossfade function controls fade in/out
|
||||||
queue = crossfade_airtime(queue)
|
queue = crossfade_airtime(queue)
|
||||||
queue = on_metadata(notify, queue)
|
queue = on_metadata(notify, queue)
|
||||||
queue = map_metadata(update=false, append_title, queue)
|
queue = map_metadata(update=false, append_title, queue)
|
||||||
output.dummy(fallible=true, 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,
|
#stream_queue = switch(id="stream_queue_switch", track_sensitive=false,
|
||||||
# transitions=[transition, transition],
|
# transitions=[transition, transition],
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue