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

refactor(playout): rename inputs config variables

This commit is contained in:
jo 2023-02-22 15:21:39 +01:00 committed by Kyle Robbertze
parent 9518db6c75
commit 9b9defe935
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -186,12 +186,12 @@ s = switch(id="schedule_noise_switch",
[({!schedule_streaming}, stream_queue), ({true}, default)] [({!schedule_streaming}, stream_queue), ({true}, default)]
) )
s = if dj_live_stream_port != 0 and dj_live_stream_mp != "" then s = if input_show_port != 0 and input_show_mount != "" then
dj_live = dj_live =
audio_to_stereo( audio_to_stereo(
input.harbor(id="live_dj_harbor", input.harbor(id="live_dj_harbor",
dj_live_stream_mp, input_show_mount,
port=dj_live_stream_port, port=input_show_port,
auth=check_dj_client, auth=check_dj_client,
max=40., max=40.,
on_connect=live_dj_connect, on_connect=live_dj_connect,
@ -208,12 +208,12 @@ else
s s
end end
s = if master_live_stream_port != 0 and master_live_stream_mp != "" then s = if input_main_port != 0 and input_main_mount != "" then
master_dj = master_dj =
audio_to_stereo( audio_to_stereo(
input.harbor(id="master_harbor", input.harbor(id="master_harbor",
master_live_stream_mp, input_main_mount,
port=master_live_stream_port, port=input_main_port,
auth=check_master_dj_client, auth=check_master_dj_client,
max=40., max=40.,
on_connect=master_dj_connect, on_connect=master_dj_connect,

8
playout/libretime_playout/liquidsoap/entrypoint.liq.j2
View File

@ -3,10 +3,10 @@
# The ignore() lines are to squash unused variable warnings # The ignore() lines are to squash unused variable warnings
# Inputs # Inputs
master_live_stream_mp = {{ config.stream.inputs.main.mount | quote }} input_main_mount = {{ config.stream.inputs.main.mount | quote }}
master_live_stream_port = {{ config.stream.inputs.main.port }} input_main_port = {{ config.stream.inputs.main.port }}
dj_live_stream_mp = {{ config.stream.inputs.show.mount | quote }} input_show_mount = {{ config.stream.inputs.show.mount | quote }}
dj_live_stream_port = {{ config.stream.inputs.show.port }} input_show_port = {{ config.stream.inputs.show.port }}
{% for output in config.stream.outputs.merged -%} {% for output in config.stream.outputs.merged -%}
# Output s{{ loop.index }} # Output s{{ loop.index }}

8
playout/tests/liquidsoap/__snapshots__/entrypoint_test.ambr
View File

@ -6,10 +6,10 @@
# The ignore() lines are to squash unused variable warnings # The ignore() lines are to squash unused variable warnings
# Inputs # Inputs
master_live_stream_mp = "main" input_main_mount = "main"
master_live_stream_port = 8001 input_main_port = 8001
dj_live_stream_mp = "show" input_show_mount = "show"
dj_live_stream_port = 8002 input_show_port = 8002
# Output s1 # Output s1
s1_enable = true s1_enable = true