Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

another refactor of the switches in LS

This commit is contained in:
Martin Konecny 2013-03-01 12:48:32 -05:00
parent 7e19eba7e1
commit 0f7063e8a6
1 changed files with 46 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@ set("log.file.path", log_file)
set("log.stdout", true) set("log.stdout", true)
set("server.telnet", true) set("server.telnet", true)
set("server.telnet.port", 1234) set("server.telnet.port", 1234)
set("init.daemon.pidfile.path", "/var/run/airtime-liquidsoap.pid") set("init.daemon.pidfile.path", "/var/run/airtime-liquidsoap.pid")
%include "library/pervasives.liq" %include "library/pervasives.liq"
@ -78,8 +78,8 @@ server.register(namespace="dynamic_source",
description="Enable webstream output", description="Enable webstream output",
usage='start', usage='start',
"output_start", "output_start",
fun (s) -> begin log("dynamic_source.output_start") fun (s) -> begin log("dynamic_source.output_start")
notify([("schedule_table_id", !current_dyn_id)]) notify([("schedule_table_id", !current_dyn_id)])
webstream_enabled := true "enabled" end) webstream_enabled := true "enabled" end)
server.register(namespace="dynamic_source", server.register(namespace="dynamic_source",
description="Enable webstream output", description="Enable webstream output",
@ -195,103 +195,56 @@ def check_dj_client(user,password) =
hd == "True" hd == "True"
end end
def append_dj_inputs(master_harbor_input_port, s = switch(id="schedule_noise_switch",
master_harbor_input_mount_point, track_sensitive=false,
dj_harbor_input_port, transitions=[transition_default, transition],
dj_harbor_input_mount_point, [({!scheduled_play_enabled}, stream_queue), ({true}, default)]
s) = )
if master_harbor_input_port != 0
and master_harbor_input_mount_point != ""
and dj_harbor_input_port != 0
and dj_harbor_input_mount_point != "" then
master_dj = mksafe( s = if dj_live_stream_port != 0 and dj_live_stream_mp != "" then
audio_to_stereo( dj_live = mksafe(
input.harbor(id="master_harbor", audio_to_stereo(
master_harbor_input_mount_point, input.harbor(id="live_dj_harbor",
port=master_harbor_input_port, dj_live_stream_mp,
auth=check_master_dj_client, port=dj_live_stream_port,
max=40., auth=check_dj_client,
on_connect=master_dj_connect, max=40.,
on_disconnect=master_dj_disconnect))) on_connect=live_dj_connect,
on_disconnect=live_dj_disconnect)))
dj_live = mksafe( ignore(output.dummy(dj_live, fallible=true))
audio_to_stereo(
input.harbor(id="live_dj_harbor",
dj_harbor_input_mount_point,
port=dj_harbor_input_port,
auth=check_dj_client,
max=40.,
on_connect=live_dj_connect,
on_disconnect=live_dj_disconnect)))
ignore(output.dummy(master_dj, fallible=true)) switch(id="show_schedule_noise_switch",
ignore(output.dummy(dj_live, fallible=true)) track_sensitive=false,
transitions=[transition, transition],
([transition, transition, transition], [({!live_dj_enabled}, dj_live), ({true}, s)]
[ )
({!master_dj_enabled},master_dj), else
({!live_dj_enabled},dj_live), s
({true}, s),
])
elsif master_harbor_input_port != 0 and master_harbor_input_mount_point != "" then
master_dj = mksafe(
audio_to_stereo(
input.harbor(id="master_harbor",
master_harbor_input_mount_point,
port=master_harbor_input_port,
auth=check_master_dj_client,
max=40.,
on_connect=master_dj_connect,
on_disconnect=master_dj_disconnect)))
ignore(output.dummy(master_dj, fallible=true))
([transition, transition],
[
({!master_dj_enabled},master_dj),
({true}, s),
])
elsif dj_harbor_input_port != 0 and dj_harbor_input_mount_point != "" then
dj_live = mksafe(
audio_to_stereo(
input.harbor(id="live_dj_harbor",
dj_harbor_input_mount_point,
port=dj_harbor_input_port,
auth=check_dj_client,
max=40.,
on_connect=live_dj_connect,
on_disconnect=live_dj_disconnect)))
ignore(output.dummy(dj_live, fallible=true))
([transition, transition],
[
({!live_dj_enabled},dj_live),
({true}, s),
])
else
([transition], [
({true}, s),
])
end
end end
s = switch(id="default_switch", s = if master_live_stream_port != 0 and master_live_stream_mp != "" then
track_sensitive=false, master_dj = mksafe(
transitions=[transition_default, transition], audio_to_stereo(
[({!scheduled_play_enabled}, stream_queue), ({true}, default)]) input.harbor(id="master_harbor",
master_live_stream_mp,
port=master_live_stream_port,
auth=check_master_dj_client,
max=40.,
on_connect=master_dj_connect,
on_disconnect=master_dj_disconnect)))
pair = append_dj_inputs(master_live_stream_port, master_live_stream_mp, ignore(output.dummy(master_dj, fallible=true))
dj_live_stream_port, dj_live_stream_mp, s)
switch(id="master_show_schedule_noise_switch",
track_sensitive=false,
transitions=[transition, transition],
[({!master_dj_enabled}, master_dj), ({true}, s)]
)
else
s
end
s = switch(id="master_switch",
track_sensitive=false,
transitions=fst(pair),
snd(pair)
)
# Attach a skip command to the source s: # Attach a skip command to the source s:
add_skip_command(s) add_skip_command(s)