From 9b9defe93501e26de1e7f1c655e854137dcb53ec Mon Sep 17 00:00:00 2001
From: jo <ljonas@riseup.net>
Date: Wed, 22 Feb 2023 15:21:39 +0100
Subject: [PATCH] refactor(playout): rename inputs config variables

---
 .../libretime_playout/liquidsoap/1.4/ls_script.liq   | 12 ++++++------
 .../libretime_playout/liquidsoap/entrypoint.liq.j2   |  8 ++++----
 .../liquidsoap/__snapshots__/entrypoint_test.ambr    |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/playout/libretime_playout/liquidsoap/1.4/ls_script.liq b/playout/libretime_playout/liquidsoap/1.4/ls_script.liq
index a6ccc69c7..38a409cc7 100644
--- a/playout/libretime_playout/liquidsoap/1.4/ls_script.liq
+++ b/playout/libretime_playout/liquidsoap/1.4/ls_script.liq
@@ -186,12 +186,12 @@ s = switch(id="schedule_noise_switch",
             [({!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 =
         audio_to_stereo(
             input.harbor(id="live_dj_harbor",
-                dj_live_stream_mp,
-                port=dj_live_stream_port,
+                input_show_mount,
+                port=input_show_port,
                 auth=check_dj_client,
                 max=40.,
                 on_connect=live_dj_connect,
@@ -208,12 +208,12 @@ else
     s
 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 =
         audio_to_stereo(
             input.harbor(id="master_harbor",
-                master_live_stream_mp,
-                port=master_live_stream_port,
+                input_main_mount,
+                port=input_main_port,
                 auth=check_master_dj_client,
                 max=40.,
                 on_connect=master_dj_connect,
diff --git a/playout/libretime_playout/liquidsoap/entrypoint.liq.j2 b/playout/libretime_playout/liquidsoap/entrypoint.liq.j2
index 9167f71ee..d756cf931 100644
--- a/playout/libretime_playout/liquidsoap/entrypoint.liq.j2
+++ b/playout/libretime_playout/liquidsoap/entrypoint.liq.j2
@@ -3,10 +3,10 @@
 # The ignore() lines are to squash unused variable warnings
 
 # Inputs
-master_live_stream_mp = {{ config.stream.inputs.main.mount | quote }}
-master_live_stream_port = {{ config.stream.inputs.main.port }}
-dj_live_stream_mp = {{ config.stream.inputs.show.mount | quote }}
-dj_live_stream_port = {{ config.stream.inputs.show.port }}
+input_main_mount = {{ config.stream.inputs.main.mount | quote }}
+input_main_port = {{ config.stream.inputs.main.port }}
+input_show_mount = {{ config.stream.inputs.show.mount | quote }}
+input_show_port = {{ config.stream.inputs.show.port }}
 
 {% for output in config.stream.outputs.merged -%}
 # Output s{{ loop.index }}
diff --git a/playout/tests/liquidsoap/__snapshots__/entrypoint_test.ambr b/playout/tests/liquidsoap/__snapshots__/entrypoint_test.ambr
index f7f5d8702..05d1814eb 100644
--- a/playout/tests/liquidsoap/__snapshots__/entrypoint_test.ambr
+++ b/playout/tests/liquidsoap/__snapshots__/entrypoint_test.ambr
@@ -6,10 +6,10 @@
   # The ignore() lines are to squash unused variable warnings
   
   # Inputs
-  master_live_stream_mp = "main"
-  master_live_stream_port = 8001
-  dj_live_stream_mp = "show"
-  dj_live_stream_port = 8002
+  input_main_mount = "main"
+  input_main_port = 8001
+  input_show_mount = "show"
+  input_show_port = 8002
   
   # Output s1
   s1_enable = true