Merge branch 'ryerson-history'
This commit is contained in:
commit
a554c6f72c
200 changed files with 41773 additions and 5480 deletions
|
@ -41,9 +41,9 @@ source_id = ref 0
|
|||
|
||||
def create_source()
|
||||
l = request.equeue(id="s#{!source_id}", length=0.5)
|
||||
l = cue_cut(l)
|
||||
|
||||
l = audio_to_stereo(id="queue_src", l)
|
||||
l = cue_cut(l)
|
||||
l = amplify(1., override="replay_gain", l)
|
||||
|
||||
# the crossfade function controls fade in/out
|
||||
|
@ -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))
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue