Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(playout): use explicit ids for liquidsoap components

This commit is contained in:
jo 2023-02-24 15:07:23 +01:00 committed by Kyle Robbertze
parent 8155eb1a22
commit 196fc1ddf8
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
playout/libretime_playout/liquidsoap/1.4/ls_lib.liq
View File

@ -112,7 +112,9 @@ def output_to(output_type, type, bitrate, host, port, pass, mount_point, url, de
if user == "" then if user == "" then
user_ref := "source" user_ref := "source"
end end
output_mono = output.icecast(host = host, output_mono = output.icecast(
id = "icecast:stream_#{stream}",
host = host,
port = port, port = port,
password = pass, password = pass,
mount = mount_point, mount = mount_point,
@ -125,7 +127,9 @@ def output_to(output_type, type, bitrate, host, port, pass, mount_point, url, de
on_error = on_error, on_error = on_error,
on_connect = on_connect) on_connect = on_connect)
output_stereo = output.icecast(host = host, output_stereo = output.icecast(
id = "icecast:stream_#{stream}",
host = host,
port = port, port = port,
password = pass, password = pass,
mount = mount_point, mount = mount_point,
@ -161,7 +165,8 @@ def output_to(output_type, type, bitrate, host, port, pass, mount_point, url, de
user_ref := "source" user_ref := "source"
end end
output_mono = output.shoutcast(id = "shoutcast_stream_#{stream}", output_mono = output.shoutcast(
id = "shoutcast:stream_#{stream}",
host = host, host = host,
port = port, port = port,
password = pass, password = pass,
@ -173,7 +178,8 @@ def output_to(output_type, type, bitrate, host, port, pass, mount_point, url, de
on_error = on_error, on_error = on_error,
on_connect = on_connect) on_connect = on_connect)
output_stereo = output.shoutcast(id = "shoutcast_stream_#{stream}", output_stereo = output.shoutcast(
id = "shoutcast:stream_#{stream}",
host = host, host = host,
port = port, port = port,
password = pass, password = pass,

14
playout/libretime_playout/liquidsoap/1.4/ls_script.liq
View File

@ -57,7 +57,7 @@ http = input.http_restart(id="http")
http = cross_http(http_input_id="http",http) http = cross_http(http_input_id="http",http)
output.dummy(fallible=true, http) output.dummy(fallible=true, http)
stream_queue = http_fallback(http_input_id="http", http=http, default=queue) stream_queue = http_fallback(http_input_id="http", http=http, default=queue)
stream_queue = map_metadata(update=false, append_title, stream_queue) stream_queue = map_metadata(id="map_metadata:schedule", update=false, append_title, stream_queue)
ignore(output.dummy(stream_queue, fallible=true)) ignore(output.dummy(stream_queue, fallible=true))
@ -92,7 +92,7 @@ def map_message_offline(m) =
[("title", message_offline())] [("title", message_offline())]
end end
default = map_metadata(map_message_offline, default) default = map_metadata(id="map_metadata:offline", map_message_offline, default)
ignore(output.dummy(default, fallible=true)) ignore(output.dummy(default, fallible=true))
input_main_streaming = ref false input_main_streaming = ref false
@ -142,7 +142,7 @@ def make_input_auth_handler(source_name)
auth_handler auth_handler
end end
s = switch(id="schedule_noise_switch", s = switch(id="switch:blank+schedule",
track_sensitive=false, track_sensitive=false,
transitions=[transition_default, transition], transitions=[transition_default, transition],
[({!schedule_streaming}, stream_queue), ({true}, default)] [({!schedule_streaming}, stream_queue), ({true}, default)]
@ -151,7 +151,7 @@ s = switch(id="schedule_noise_switch",
s = if input_show_port != 0 and input_show_mount != "" then s = if input_show_port != 0 and input_show_mount != "" then
input_show_source = input_show_source =
audio_to_stereo( audio_to_stereo(
input.harbor(id="input_show_harbor", input.harbor(id="harbor:input_show",
input_show_mount, input_show_mount,
port=input_show_port, port=input_show_port,
auth=make_input_auth_handler("dj"), auth=make_input_auth_handler("dj"),
@ -161,7 +161,7 @@ s = if input_show_port != 0 and input_show_mount != "" then
ignore(output.dummy(input_show_source, fallible=true)) ignore(output.dummy(input_show_source, fallible=true))
switch(id="show_schedule_noise_switch", switch(id="switch:blank+schedule+show",
track_sensitive=false, track_sensitive=false,
transitions=[transition, transition], transitions=[transition, transition],
[({!input_show_streaming}, input_show_source), ({true}, s)] [({!input_show_streaming}, input_show_source), ({true}, s)]
@ -173,7 +173,7 @@ end
s = if input_main_port != 0 and input_main_mount != "" then s = if input_main_port != 0 and input_main_mount != "" then
input_main_source = input_main_source =
audio_to_stereo( audio_to_stereo(
input.harbor(id="input_main_harbor", input.harbor(id="harbor:input_main",
input_main_mount, input_main_mount,
port=input_main_port, port=input_main_port,
auth=make_input_auth_handler("master"), auth=make_input_auth_handler("master"),
@ -183,7 +183,7 @@ s = if input_main_port != 0 and input_main_mount != "" then
ignore(output.dummy(input_main_source, fallible=true)) ignore(output.dummy(input_main_source, fallible=true))
switch(id="main_show_schedule_noise_switch", switch(id="switch:blank+schedule+show+main",
track_sensitive=false, track_sensitive=false,
transitions=[transition, transition], transitions=[transition, transition],
[({!input_main_streaming}, input_main_source), ({true}, s)] [({!input_main_streaming}, input_main_source), ({true}, s)]