Skip to content
Snippets Groups Projects
Commit 7115e3b6 authored by David Trattnig's avatar David Trattnig
Browse files

Skip previous station fb after scheduled fb. #43

parent adbe74d6
No related branches found
No related tags found
No related merge requests found
...@@ -66,6 +66,15 @@ end ...@@ -66,6 +66,15 @@ end
# ROUTING # # ROUTING #
##################################### #####################################
# When some regular playout is happening and it is returned to the fallback,
# we don't want to resume the previous fallback track:
def on_track_change(s) =
source.skip(station_playlist)
source.skip(station_folder)
end
mixer = mix(id="mixer", mixer = mix(id="mixer",
list.append( list.append(
[ [
...@@ -89,13 +98,6 @@ stripped_stream = strip_blank( ...@@ -89,13 +98,6 @@ stripped_stream = strip_blank(
mixer mixer
) )
# When some regular playout is happening and it is returned to the fallback,
# we don't want to resume the previous fallback track:
def on_track_change(s) =
source.skip(station_playlist)
source.skip(station_folder)
end
stripped_stream = on_track(on_track_change, stripped_stream) stripped_stream = on_track(on_track_change, stripped_stream)
fallback_one = fallback( fallback_one = fallback(
...@@ -104,6 +106,8 @@ fallback_one = fallback( ...@@ -104,6 +106,8 @@ fallback_one = fallback(
replay_metadata=true, replay_metadata=true,
[ stripped_stream, stripped_fallback_mixer]) [ stripped_stream, stripped_fallback_mixer])
fallback_one = on_track(on_track_change, fallback_one)
fallback_two = fallback( fallback_two = fallback(
id="fallback-station-playlist", id="fallback-station-playlist",
track_sensitive=false, track_sensitive=false,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment