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

another refactor of LS source

This commit is contained in:
Martin Konecny 2013-03-01 11:44:11 -05:00
parent 6624911d2c
commit 7e19eba7e1
1 changed files with 24 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,8 +199,7 @@ def append_dj_inputs(master_harbor_input_port,
master_harbor_input_mount_point,
dj_harbor_input_port,
dj_harbor_input_mount_point,
s,
default) =
s) =
if master_harbor_input_port != 0
and master_harbor_input_mount_point != ""
and dj_harbor_input_port != 0
@ -229,17 +228,12 @@ def append_dj_inputs(master_harbor_input_port,
ignore(output.dummy(master_dj, fallible=true))
ignore(output.dummy(dj_live, fallible=true))
switch(id="master_dj_switch",
track_sensitive=false,
transitions=[transition, transition, transition, transition],
([transition, transition, transition],
[
({!master_dj_enabled},master_dj),
({!live_dj_enabled},dj_live),
({!scheduled_play_enabled}, s),
({true}, default),
],
)
({true}, s),
])
elsif master_harbor_input_port != 0 and master_harbor_input_mount_point != "" then
master_dj = mksafe(
@ -254,15 +248,11 @@ def append_dj_inputs(master_harbor_input_port,
ignore(output.dummy(master_dj, fallible=true))
switch(id="master_dj_switch",
track_sensitive=false,
transitions=[transition, transition, transition],
([transition, transition],
[
({!master_dj_enabled},master_dj),
({!scheduled_play_enabled}, s),
({true}, default),
]
)
({true}, s),
])
elsif dj_harbor_input_port != 0 and dj_harbor_input_mount_point != "" then
dj_live = mksafe(
@ -277,39 +267,33 @@ def append_dj_inputs(master_harbor_input_port,
ignore(output.dummy(dj_live, fallible=true))
switch(id="live_dj_switch",
track_sensitive=false,
transitions=[transition, transition, transition],
([transition, transition],
[
({!live_dj_enabled},dj_live),
({!scheduled_play_enabled}, s),
({true}, default),
]
)
({true}, s),
])
else
switch(id="no_dj_inputs",
track_sensitive=false,
transitions=[transition, transition],
[
({!scheduled_play_enabled}, s),
({true}, default),
]
)
([transition], [
({true}, s),
])
end
end
s = switch(id="default_switch",
track_sensitive=false,
transitions=[transition_default, transition],
[({!scheduled_play_enabled}, stream_queue), ({true}, default)])
pair = append_dj_inputs(master_live_stream_port, master_live_stream_mp,
dj_live_stream_port, dj_live_stream_mp, s)
s = append_dj_inputs(master_live_stream_port, master_live_stream_mp,
dj_live_stream_port, dj_live_stream_mp, stream_queue, default)
#s = fallback(id="default_fallback",
# track_sensitive=false,
# transitions=[transition_default, transition],
# [s, default])
s = switch(id="master_switch",
track_sensitive=false,
transitions=fst(pair),
snd(pair)
)
# Attach a skip command to the source s:
add_skip_command(s)
server.register(namespace="streams",