From 1891a1137381f5b09884081b68a8d21441e03415 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Fri, 3 Aug 2012 18:45:22 -0400 Subject: [PATCH] CC-1665: Scheduled stream rebroadcasting and recording -Step 1 to make Liquidsoap send back web stream metadata to UI --- python_apps/pypo/liquidsoap_scripts/ls_lib.liq | 5 +++++ python_apps/pypo/liquidsoap_scripts/ls_script.liq | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/python_apps/pypo/liquidsoap_scripts/ls_lib.liq b/python_apps/pypo/liquidsoap_scripts/ls_lib.liq index 6930abfc4..c007cd504 100644 --- a/python_apps/pypo/liquidsoap_scripts/ls_lib.liq +++ b/python_apps/pypo/liquidsoap_scripts/ls_lib.liq @@ -3,6 +3,11 @@ def notify(m) system("/usr/lib/airtime/pypo/bin/liquidsoap_scripts/notify.sh --data='#{!pypo_data}' --media-id=#{m['schedule_table_id']} &") end +def notify_stream(m) + log("/usr/lib/airtime/pypo/bin/liquidsoap_scripts/notify.sh --stream --uri=#{base64.encode(m['uri'])} --title=#{base64.encode(m['title'])} &") + #system("/usr/lib/airtime/pypo/bin/liquidsoap_scripts/notify.sh --stream --uri=#{base64.encode(m['uri'])} --title=#{base64.encode(m['title'])} &") +end + # A function applied to each metadata chunk def append_title(m) = log("Using stream_format #{!stream_metadata_type}") diff --git a/python_apps/pypo/liquidsoap_scripts/ls_script.liq b/python_apps/pypo/liquidsoap_scripts/ls_script.liq index c5e52b646..2009d62bf 100644 --- a/python_apps/pypo/liquidsoap_scripts/ls_script.liq +++ b/python_apps/pypo/liquidsoap_scripts/ls_script.liq @@ -20,7 +20,6 @@ queue = amplify(1., override="replay_gain", queue) set("harbor.bind_addr", "0.0.0.0") #TODO: Need to create a randomized password for every instance -web_stream = input.harbor("test-harbor",port=8999,password="hackme") current_dyn_id = ref '' pypo_data = ref '0' @@ -39,6 +38,9 @@ just_switched = ref false %include "ls_lib.liq" +web_stream = input.harbor("test-harbor",port=8999,password="hackme") +web_stream = on_metadata(notify_stream, web_stream) + queue = on_metadata(notify, queue) queue = map_metadata(append_title, queue) # the crossfade function controls fade in/out