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

Merge branch 'saas-dev' into saas-installer-albert

Browse source
This commit is contained in:
Albert Santoni 2015-05-22 19:09:30 -04:00
commit 6fad0a3ee6
4 changed files with 142 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

4
python_apps/pypo/liquidsoap/ls_script.liq
View file

@ -249,7 +249,6 @@ s = if dj_live_stream_port != 0 and dj_live_stream_mp != "" then
on_connect=live_dj_connect,
on_disconnect=live_dj_disconnect))
dj_live = on_metadata(notify_queue, dj_live)
ignore(output.dummy(dj_live, fallible=true))
switch(id="show_schedule_noise_switch",
@ -272,7 +271,6 @@ s = if master_live_stream_port != 0 and master_live_stream_mp != "" then
on_connect=master_dj_connect,
on_disconnect=master_dj_disconnect))
master_dj = on_metadata(notify_queue, master_dj)
ignore(output.dummy(master_dj, fallible=true))
switch(id="master_show_schedule_noise_switch",
@ -284,8 +282,6 @@ else
s
end
# Send metadata notifications when using master source
s = on_metadata(notify_queue, s)
# Attach a skip command to the source s:
#add_skip_command(s)