From 196fc1ddf8d6a41fb4576c4ae34186fe12d7ef4c Mon Sep 17 00:00:00 2001 From: jo Date: Fri, 24 Feb 2023 15:07:23 +0100 Subject: [PATCH] fix(playout): use explicit ids for liquidsoap components --- .../libretime_playout/liquidsoap/1.4/ls_lib.liq | 14 ++++++++++---- .../libretime_playout/liquidsoap/1.4/ls_script.liq | 14 +++++++------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/playout/libretime_playout/liquidsoap/1.4/ls_lib.liq b/playout/libretime_playout/liquidsoap/1.4/ls_lib.liq index 8758906db..36bfc4857 100644 --- a/playout/libretime_playout/liquidsoap/1.4/ls_lib.liq +++ b/playout/libretime_playout/liquidsoap/1.4/ls_lib.liq @@ -112,7 +112,9 @@ def output_to(output_type, type, bitrate, host, port, pass, mount_point, url, de if user == "" then user_ref := "source" end - output_mono = output.icecast(host = host, + output_mono = output.icecast( + id = "icecast:stream_#{stream}", + host = host, port = port, password = pass, 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_connect = on_connect) - output_stereo = output.icecast(host = host, + output_stereo = output.icecast( + id = "icecast:stream_#{stream}", + host = host, port = port, password = pass, mount = mount_point, @@ -161,7 +165,8 @@ def output_to(output_type, type, bitrate, host, port, pass, mount_point, url, de user_ref := "source" end - output_mono = output.shoutcast(id = "shoutcast_stream_#{stream}", + output_mono = output.shoutcast( + id = "shoutcast:stream_#{stream}", host = host, port = port, 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_connect = on_connect) - output_stereo = output.shoutcast(id = "shoutcast_stream_#{stream}", + output_stereo = output.shoutcast( + id = "shoutcast:stream_#{stream}", host = host, port = port, password = pass, diff --git a/playout/libretime_playout/liquidsoap/1.4/ls_script.liq b/playout/libretime_playout/liquidsoap/1.4/ls_script.liq index a3608078e..860713de6 100644 --- a/playout/libretime_playout/liquidsoap/1.4/ls_script.liq +++ b/playout/libretime_playout/liquidsoap/1.4/ls_script.liq @@ -57,7 +57,7 @@ http = input.http_restart(id="http") http = cross_http(http_input_id="http",http) output.dummy(fallible=true, http) 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)) @@ -92,7 +92,7 @@ def map_message_offline(m) = [("title", message_offline())] 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)) input_main_streaming = ref false @@ -142,7 +142,7 @@ def make_input_auth_handler(source_name) auth_handler end -s = switch(id="schedule_noise_switch", +s = switch(id="switch:blank+schedule", track_sensitive=false, transitions=[transition_default, transition], [({!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 input_show_source = audio_to_stereo( - input.harbor(id="input_show_harbor", + input.harbor(id="harbor:input_show", input_show_mount, port=input_show_port, 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)) - switch(id="show_schedule_noise_switch", + switch(id="switch:blank+schedule+show", track_sensitive=false, transitions=[transition, transition], [({!input_show_streaming}, input_show_source), ({true}, s)] @@ -173,7 +173,7 @@ end s = if input_main_port != 0 and input_main_mount != "" then input_main_source = audio_to_stereo( - input.harbor(id="input_main_harbor", + input.harbor(id="harbor:input_main", input_main_mount, port=input_main_port, 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)) - switch(id="main_show_schedule_noise_switch", + switch(id="switch:blank+schedule+show+main", track_sensitive=false, transitions=[transition, transition], [({!input_main_streaming}, input_main_source), ({true}, s)]