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-28 18:54:23 -05:00
parent ae503121d8
commit 6624911d2c
1 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,7 +199,8 @@ def append_dj_inputs(master_harbor_input_port,
master_harbor_input_mount_point, master_harbor_input_mount_point,
dj_harbor_input_port, dj_harbor_input_port,
dj_harbor_input_mount_point, dj_harbor_input_mount_point,
s) = s,
default) =
if master_harbor_input_port != 0 if master_harbor_input_port != 0
and master_harbor_input_mount_point != "" and master_harbor_input_mount_point != ""
and dj_harbor_input_port != 0 and dj_harbor_input_port != 0
@ -230,10 +231,15 @@ 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, transition], transitions=[transition, transition, transition, transition],
[({!master_dj_enabled},master_dj), [
({!live_dj_enabled},dj_live), ({!master_dj_enabled},master_dj),
({!scheduled_play_enabled}, s)]) ({!live_dj_enabled},dj_live),
({!scheduled_play_enabled}, s),
({true}, default),
],
)
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(
@ -250,8 +256,13 @@ 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, transition],
[({!master_dj_enabled},master_dj), ({!scheduled_play_enabled}, s)]) [
({!master_dj_enabled},master_dj),
({!scheduled_play_enabled}, s),
({true}, default),
]
)
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(
@ -268,22 +279,34 @@ 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, transition],
[({!live_dj_enabled},dj_live), ({!scheduled_play_enabled}, s)]) [
({!live_dj_enabled},dj_live),
({!scheduled_play_enabled}, s),
({true}, default),
]
)
else else
s switch(id="no_dj_inputs",
track_sensitive=false,
transitions=[transition, transition],
[
({!scheduled_play_enabled}, s),
({true}, default),
]
)
end end
end end
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, stream_queue) dj_live_stream_port, dj_live_stream_mp, stream_queue, default)
s = fallback(id="default_fallback", #s = fallback(id="default_fallback",
track_sensitive=false, # track_sensitive=false,
transitions=[transition_default, transition], # transitions=[transition_default, transition],
[s, default]) # [s, default])
# Attach a skip command to the source s: # Attach a skip command to the source s: