From 3f0a06ee2b8a65782dc8079bbfcae5c838f51929 Mon Sep 17 00:00:00 2001 From: denise Date: Wed, 13 Jun 2012 12:23:00 -0400 Subject: [PATCH] CC-3578: Stream label for scheduled shows could fall back to show or station name when no song is currently playing -done --- python_apps/pypo/liquidsoap_scripts/ls_script.liq | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/python_apps/pypo/liquidsoap_scripts/ls_script.liq b/python_apps/pypo/liquidsoap_scripts/ls_script.liq index bee16fcd9..2d4323248 100644 --- a/python_apps/pypo/liquidsoap_scripts/ls_script.liq +++ b/python_apps/pypo/liquidsoap_scripts/ls_script.liq @@ -45,7 +45,7 @@ server.register(namespace="vars", "default_dj_fade", fun (s) -> begin default_dj default = amplify(id="silence_src", 0.00001, noise()) -default = rewrite_metadata([("artist","Airtime"), ("title", s1_name)],default) +default = rewrite_metadata([("artist","Airtime"), ("title", "offline")],default) ignore(output.dummy(default, fallible=true)) master_dj_enabled = ref false @@ -134,6 +134,10 @@ def append_dj_inputs(master_harbor_input_port, master_harbor_input_mount_point, max=40., on_connect=master_dj_connect, on_disconnect=master_dj_disconnect)) dj_live = mksafe(input.harbor(id="live_dj_harbor", dj_harbor_input_mount_point, port=dj_harbor_input_port, auth=check_dj_client, max=40., on_connect=live_dj_connect, on_disconnect=live_dj_disconnect)) + + master_dj = rewrite_metadata([("artist","Airtime"), ("title", "Master Dj")],master_dj) + dj_live = rewrite_metadata([("artist","Airtime"), ("title", "Live Dj")],dj_live) + ignore(output.dummy(master_dj, fallible=true)) ignore(output.dummy(dj_live, fallible=true)) switch(id="master_dj_switch", track_sensitive=false, transitions=[transition, transition, transition], [({!master_dj_enabled},master_dj), ({!live_dj_enabled},dj_live), ({true}, s)]) @@ -141,10 +145,12 @@ def append_dj_inputs(master_harbor_input_port, master_harbor_input_mount_point, master_dj = mksafe(input.harbor(id="master_harbor", master_harbor_input_mount_point, port=master_harbor_input_port, auth=check_master_dj_client, max=40., on_connect=master_dj_connect, on_disconnect=master_dj_disconnect)) ignore(output.dummy(master_dj, fallible=true)) + master_dj = rewrite_metadata([("artist","Airtime"), ("title", "Master Dj")],master_dj) switch(id="master_dj_switch", track_sensitive=false, transitions=[transition, transition], [({!master_dj_enabled},master_dj), ({true}, s)]) elsif dj_harbor_input_port != 0 and dj_harbor_input_mount_point != "" then dj_live = mksafe(input.harbor(id="live_dj_harbor", dj_harbor_input_mount_point, port=dj_harbor_input_port, auth=check_dj_client, max=40., on_connect=live_dj_connect, on_disconnect=live_dj_disconnect)) + dj_live = rewrite_metadata([("artist","Airtime"), ("title", "Live Dj")],dj_live) ignore(output.dummy(dj_live, fallible=true)) switch(id="live_dj_switch", track_sensitive=false, transitions=[transition, transition], [({!live_dj_enabled},dj_live), ({true}, s)]) else