ctactic/aircox-radiocampus
1
0
Fork 0
forked from rc/aircox
Code Issues 10 Pull Requests Activity

roll back to older logging method (we don't wan't to run logging on liquidsoap's main thread. Move monitoring in appropriate file

Browse Source
This commit is contained in:
bkfox
2015-12-23 12:40:57 +01:00
parent 3e038c4c16
commit 2445690da3
3 changed files with 145 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
liquidsoap/templates/aircox/liquidsoap/station.liq
View File

@ -2,21 +2,15 @@
{# - controller: controller used to generate the current file #}
{# - settings: global settings #}
def interactive_source (id, s) = \
def handler(m) = \
file = string.escape(m['filename']) \
system('echo {{ log_script }} -s "#{id}" -p \"#{file}\" -c "liquidsoap: play" &') \
system('{{ log_script }} -s "#{id}" -p \"#{file}\" -c "liquidsoap: play" &') \
end \
\
s = on_track(id=id, handler, s)
# s = store_metadata(id=id, size=1, s) \
s = store_metadata(id=id, size=1, s) \
add_skip_command(s) \
s \
end \
\
def stream (id, file) = \
s = playlist(id = '#{id}_playlist', mode = "random", \
reload_mode='watch', file) \
#s = playlist(id = '#{id}_playlist', mode = "random", \
# file) \
s = playlist(id = '#{id}_playlist', mode = "random", file)
interactive_source(id, s) \
end \
\
@ -66,7 +60,7 @@ set("{{ key|safe }}", {{ value|safe }}) \
{% if controller.station.fallback %}
single("{{ controller.station.fallback }}"), \
{% else %}
blank(duration=0.1), \
blank(id="scheize_blank", duration=0.1), \
{% endif %}
]) \
) \