fix errors, update a bit how liquidsoap part work and so on

This commit is contained in:
bkfox
2016-05-16 18:43:36 +02:00
parent 032bd6c56d
commit 29d0929a0c
5 changed files with 264 additions and 277 deletions

View File

@ -31,7 +31,7 @@ set("{{ key|safe }}", {{ value|safe }}) \
at(interactive.bool('{{ source.id }}_on', false), \
interactive_source('{{ source.id }}', playlist.once( \
reload_mode='watch', \
"{{ source.path }}", \
"{{ source.playlist.path }}", \
)) \
), \
{% endif %}
@ -41,17 +41,21 @@ set("{{ key|safe }}", {{ value|safe }}) \
interactive_source("{{ controller.id }}_streams", rotate([ \
{% for source in controller.streams.values %}
{% with info=source.stream_info %}
{% if info.delay %}
delay({{ info.delay }}., stream("{{ source.id }}", "{{ source.path }}")), \
{% elif info.begin and info.end %}
at({ {{info.begin}}-{{info.end}} }, stream("{{ source.id }}", "{{ source.path }}")), \
{% endif %}
{% with path=source.playlist.path %}
{% if info.delay %}
delay({{ info.delay }}., stream("{{ source.id }}", "{{ path }}")), \
{% elif info.begin and info.end %}
at({ {{info.begin}}-{{info.end}} }, stream("{{ source.id }}", "{{ path }}")), \
{% endif %}
{% endwith %}
{% endwith %}
{% endfor %}
{% for source in controller.streams.values %}
{% if not source.stream_info %}
{% with path=source.playlist.path %}
stream("{{ source.id }}", "{{ source.path }}"), \
{% endwith %}
{% endif %}
{% endfor %}
])), \