From 5b2cf2747d68a6bff36e7a3094071d43429ba46e Mon Sep 17 00:00:00 2001
From: David Trattnig <david.trattnig@o94.at>
Date: Tue, 13 Oct 2020 15:58:51 +0200
Subject: [PATCH] Added scheduled fallback playlist source. #43
---
modules/liquidsoap/engine.liq | 2 +-
modules/liquidsoap/in_filesystem.liq | 23 +++++++----------------
2 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/modules/liquidsoap/engine.liq b/modules/liquidsoap/engine.liq
index cd083f03..d3d7efed 100644
--- a/modules/liquidsoap/engine.liq
+++ b/modules/liquidsoap/engine.liq
@@ -92,7 +92,7 @@ output_source = fallback(
id="fallback-scheduled",
track_sensitive=false,
replay_metadata=true,
- [ stripped_stream, input_fallback_scheduled])
+ [ stripped_stream, fallback_playlist])
output_source = fallback(
id="fallback-station-playlist",
diff --git a/modules/liquidsoap/in_filesystem.liq b/modules/liquidsoap/in_filesystem.liq
index 7feda267..fae0b2e0 100644
--- a/modules/liquidsoap/in_filesystem.liq
+++ b/modules/liquidsoap/in_filesystem.liq
@@ -47,7 +47,11 @@ input_filesystem_1 = on_metadata(id="in_filesystem_1", on_metadata_notification,
# FALLBACK SOURCES #
#####################################
-input_fallback_scheduled = request.equeue(id="in_fallback_scheduled")
+fallback_playlist = playlist(
+ id="playlist_fallback_scheduled",
+ "",
+ mode="normal",
+ reload_mode="watch")
station_playlist = playlist(
id="station_playlist",
@@ -64,12 +68,12 @@ station_folder = mksafe(
reload_mode="seconds"))
# Apply ReplayGain Normalization
-input_fallback_scheduled = amplify(id="in_fallback_scheduled", 1., override="replay_gain", input_fallback_scheduled)
+fallback_playlist = amplify(id="playlist_fallback_scheduled", 1., override="replay_gain", fallback_playlist)
station_playlist = amplify(id="station_playlist", 1., override="replay_gain", station_playlist)
station_folder = amplify(id="station_folder", 1., override="replay_gain", station_folder)
# Add Event Handlers
-input_fallback_scheduled = on_metadata(id="in_fallback_scheduled", on_metadata_notification, input_fallback_scheduled)
+fallback_playlist = on_metadata(id="playlist_fallback_scheduled", on_metadata_notification, fallback_playlist)
station_playlist = on_metadata(id="station_playlist", on_metadata_notification, station_playlist)
station_folder = on_metadata(id="station_folder", on_metadata_notification, station_folder)
@@ -121,19 +125,6 @@ server.register(namespace=source.id(input_filesystem_1),
end
)
-# Clear Scheduled Fallback Queue
-server.register(namespace=source.id(input_fallback_scheduled),
- description="Clear all items of the scheduled fallback queue.",
- usage="clear",
- "clear",
-
- fun (s) ->
- begin
- clear_queue(input_fallback_scheduled)
- "Clearing done."
- end
- )
-
# Seek Filesystem Queue A
server.register(namespace = source.id(input_filesystem_0),
description="seek to relative position in #{source.id(input_filesystem_0)}",
--
GitLab