Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor refactor of LS code

This commit is contained in:
Martin Konecny 2013-02-27 17:48:10 -05:00
parent fbaba59dca
commit b3ecb477be
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
python_apps/pypo/liquidsoap_scripts/ls_script.liq
View File

@ -33,8 +33,6 @@ s2_namespace = ref ''
s3_namespace = ref '' s3_namespace = ref ''
just_switched = ref false just_switched = ref false
#stream_harbor_pass = list.hd(get_process_lines('pwgen -s -N 1 -n 20'))
%include "ls_lib.liq" %include "ls_lib.liq"
queue = audio_to_stereo(id="queue_src", request.equeue(id="queue", length=0.5)) queue = audio_to_stereo(id="queue_src", request.equeue(id="queue", length=0.5))
@ -235,7 +233,7 @@ def append_dj_inputs(master_harbor_input_port,
transitions=[transition, transition, transition], transitions=[transition, transition, transition],
[({!master_dj_enabled},master_dj), [({!master_dj_enabled},master_dj),
({!live_dj_enabled},dj_live), ({!live_dj_enabled},dj_live),
({true}, s)]) ({!scheduled_play_enabled}, s)])
elsif master_harbor_input_port != 0 and master_harbor_input_mount_point != "" then elsif master_harbor_input_port != 0 and master_harbor_input_mount_point != "" then
master_dj = mksafe( master_dj = mksafe(
@ -253,7 +251,7 @@ def append_dj_inputs(master_harbor_input_port,
switch(id="master_dj_switch", switch(id="master_dj_switch",
track_sensitive=false, track_sensitive=false,
transitions=[transition, transition], transitions=[transition, transition],
[({!master_dj_enabled},master_dj), ({true}, s)]) [({!master_dj_enabled},master_dj), ({!scheduled_play_enabled}, s)])
elsif dj_harbor_input_port != 0 and dj_harbor_input_mount_point != "" then elsif dj_harbor_input_port != 0 and dj_harbor_input_mount_point != "" then
dj_live = mksafe( dj_live = mksafe(
@ -271,18 +269,21 @@ def append_dj_inputs(master_harbor_input_port,
switch(id="live_dj_switch", switch(id="live_dj_switch",
track_sensitive=false, track_sensitive=false,
transitions=[transition, transition], transitions=[transition, transition],
[({!live_dj_enabled},dj_live), ({true}, s)]) [({!live_dj_enabled},dj_live), ({!scheduled_play_enabled}, s)])
else else
s s
end end
end end
s = switch(id="default_switch", track_sensitive=false,
transitions=[transition_default, transition],
[({!scheduled_play_enabled}, stream_queue),({true},default)])
s = append_dj_inputs(master_live_stream_port, master_live_stream_mp, s = append_dj_inputs(master_live_stream_port, master_live_stream_mp,
dj_live_stream_port, dj_live_stream_mp, s) dj_live_stream_port, dj_live_stream_mp, stream_queue)
s = fallback(id="default_fallback",
track_sensitive=false,
transitions=[transition_default, transition],
[s, default])
# Attach a skip command to the source s: # Attach a skip command to the source s: