CC-3367: Display in Now Playing whether Live DJ stream and Live Master stream

are connected and give user the ability to block those streams

- added stream source switch interface
- backend code
This commit is contained in:
James 2012-03-08 17:42:38 -05:00
parent d4a387e113
commit f193047a1c
19 changed files with 383 additions and 38 deletions

View file

@ -15,6 +15,31 @@ def append_title(m) =
end
end
default_dj_fade_in = ref 5.
default_dj_fade_out = ref 5.
def transition(a,b) =
log("transition called...")
add(normalize=false,
[ sequence([ blank(duration=2.),
fade.initial(duration=!default_dj_fade_in, b) ]),
fade.final(duration=!default_dj_fade_out, a) ])
end
def transition_to_live(a,b) =
log("transition called...")
#add(normalize=false,
# [fade.initial(duration=5.,type="log", b),fade.final(duration=5.,type="log",a)])
smooth_add(delay=10., normal=a, special=b)
end
def transition_from_live(a,b) =
log("transition called...")
#add(normalize=false,
# [fade.initial(duration=5.,type="log", b),fade.final(duration=5.,type="log",a)])
smooth_add(delay=10., normal=b, special=a)
end
def crossfade(s)
#duration is automatically overwritten by metadata fields passed in
#with audio