This commit is contained in:
bkfox
2015-12-22 18:16:07 +01:00
parent 9cc6c2e248
commit 3e038c4c16
8 changed files with 195 additions and 108 deletions

View File

@ -106,15 +106,15 @@
</header>
<div class="sources">
{% with source=controller.master %}
{% include 'aircox_liquidsoap/source.html' %}
{% include 'aircox/liquidsoap/source.html' %}
{% endwith %}
{% with source=controller.dealer %}
{% include 'aircox_liquidsoap/source.html' %}
{% include 'aircox/liquidsoap/source.html' %}
{% endwith %}
{% for source in controller.streams.values %}
{% include 'aircox_liquidsoap/source.html' %}
{% include 'aircox/liquidsoap/source.html' %}
{% endfor %}
</div>
<div class="next">

View File

@ -4,7 +4,8 @@
def interactive_source (id, s) = \
def handler(m) = \
file = string.escape(m['filename']) \
system('{{ log_script }} -s "#{id}" -p "#{file}" -c "liquidsoap: play" &') \
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)
@ -65,7 +66,7 @@ set("{{ key|safe }}", {{ value|safe }}) \
{% if controller.station.fallback %}
single("{{ controller.station.fallback }}"), \
{% else %}
blank(), \
blank(duration=0.1), \
{% endif %}
]) \
) \