minor refactor of LS code
This commit is contained in:
parent
ae503121d8
commit
6624911d2c
|
@ -199,7 +199,8 @@ def append_dj_inputs(master_harbor_input_port,
|
|||
master_harbor_input_mount_point,
|
||||
dj_harbor_input_port,
|
||||
dj_harbor_input_mount_point,
|
||||
s) =
|
||||
s,
|
||||
default) =
|
||||
if master_harbor_input_port != 0
|
||||
and master_harbor_input_mount_point != ""
|
||||
and dj_harbor_input_port != 0
|
||||
|
@ -230,10 +231,15 @@ def append_dj_inputs(master_harbor_input_port,
|
|||
|
||||
switch(id="master_dj_switch",
|
||||
track_sensitive=false,
|
||||
transitions=[transition, transition, transition],
|
||||
[({!master_dj_enabled},master_dj),
|
||||
({!live_dj_enabled},dj_live),
|
||||
({!scheduled_play_enabled}, s)])
|
||||
transitions=[transition, transition, transition, transition],
|
||||
[
|
||||
({!master_dj_enabled},master_dj),
|
||||
({!live_dj_enabled},dj_live),
|
||||
({!scheduled_play_enabled}, s),
|
||||
({true}, default),
|
||||
],
|
||||
|
||||
)
|
||||
|
||||
elsif master_harbor_input_port != 0 and master_harbor_input_mount_point != "" then
|
||||
master_dj = mksafe(
|
||||
|
@ -250,8 +256,13 @@ def append_dj_inputs(master_harbor_input_port,
|
|||
|
||||
switch(id="master_dj_switch",
|
||||
track_sensitive=false,
|
||||
transitions=[transition, transition],
|
||||
[({!master_dj_enabled},master_dj), ({!scheduled_play_enabled}, s)])
|
||||
transitions=[transition, transition, transition],
|
||||
[
|
||||
({!master_dj_enabled},master_dj),
|
||||
({!scheduled_play_enabled}, s),
|
||||
({true}, default),
|
||||
]
|
||||
)
|
||||
|
||||
elsif dj_harbor_input_port != 0 and dj_harbor_input_mount_point != "" then
|
||||
dj_live = mksafe(
|
||||
|
@ -268,22 +279,34 @@ def append_dj_inputs(master_harbor_input_port,
|
|||
|
||||
switch(id="live_dj_switch",
|
||||
track_sensitive=false,
|
||||
transitions=[transition, transition],
|
||||
[({!live_dj_enabled},dj_live), ({!scheduled_play_enabled}, s)])
|
||||
transitions=[transition, transition, transition],
|
||||
[
|
||||
({!live_dj_enabled},dj_live),
|
||||
({!scheduled_play_enabled}, s),
|
||||
({true}, default),
|
||||
]
|
||||
)
|
||||
else
|
||||
s
|
||||
switch(id="no_dj_inputs",
|
||||
track_sensitive=false,
|
||||
transitions=[transition, transition],
|
||||
[
|
||||
({!scheduled_play_enabled}, s),
|
||||
({true}, default),
|
||||
]
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
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",
|
||||
track_sensitive=false,
|
||||
transitions=[transition_default, transition],
|
||||
[s, default])
|
||||
#s = fallback(id="default_fallback",
|
||||
# track_sensitive=false,
|
||||
# transitions=[transition_default, transition],
|
||||
# [s, default])
|
||||
|
||||
# Attach a skip command to the source s:
|
||||
|
||||
|
|
Loading…
Reference in New Issue