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

Merge branch '2.4.x' into 2.4.x-saas

Browse source
This commit is contained in:
Naomi Aro 2013-09-02 15:46:25 -04:00
commit 60bf334aeb
35 changed files with 2310 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

10
python_apps/pypo/liquidsoap_scripts/ls_script.liq
View file

@ -238,8 +238,7 @@ s = switch(id="schedule_noise_switch",
)
s = if dj_live_stream_port != 0 and dj_live_stream_mp != "" then
dj_live = mksafe(
id="dj_live_mksafe",
dj_live =
audio_to_stereo(
input.harbor(id="live_dj_harbor",
dj_live_stream_mp,
@ -247,7 +246,7 @@ s = if dj_live_stream_port != 0 and dj_live_stream_mp != "" then
auth=check_dj_client,
max=40.,
on_connect=live_dj_connect,
on_disconnect=live_dj_disconnect)))
on_disconnect=live_dj_disconnect))
ignore(output.dummy(dj_live, fallible=true))
@ -261,8 +260,7 @@ else
end
s = if master_live_stream_port != 0 and master_live_stream_mp != "" then
master_dj = mksafe(
id="master_dj_mksafe",
master_dj =
audio_to_stereo(
input.harbor(id="master_harbor",
master_live_stream_mp,
@ -270,7 +268,7 @@ s = if master_live_stream_port != 0 and master_live_stream_mp != "" then
auth=check_master_dj_client,
max=40.,
on_connect=master_dj_connect,
on_disconnect=master_dj_disconnect)))
on_disconnect=master_dj_disconnect))
ignore(output.dummy(master_dj, fallible=true))