From 8781f775b24f609927a1f63324ece3f359a382c0 Mon Sep 17 00:00:00 2001
From: Gottfried Gaisbauer <gogo@servus.at>
Date: Thu, 24 May 2018 17:33:46 +0200
Subject: [PATCH] reenabled fallbacks

---
 modules/liquidsoap/engine.liq    | 19 +++++++++++--------
 modules/liquidsoap/fallback.liq  | 14 +++++++++-----
 modules/liquidsoap/in_stream.liq |  1 +
 modules/liquidsoap/library.liq   |  2 +-
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/modules/liquidsoap/engine.liq b/modules/liquidsoap/engine.liq
index 4a262579..62864c11 100644
--- a/modules/liquidsoap/engine.liq
+++ b/modules/liquidsoap/engine.liq
@@ -53,17 +53,20 @@ inputs = ref []
 mixer = mix(id="mixer", list.append([input_fs, input_http], !inputs))
 
 # output source with fallbacks
-stripped_stream = strip_blank(max_blank=fallback_max_blank, min_noise=fallback_min_noise, threshold=fallback_threshold, mixer)
-# ignore(fallback_max_blank)
-# ignore(fallback_min_noise)
-# ignore(fallback_threshold)
-# ignore(timeslot_fallback)
-# ignore(station_fallback)
-# ignore(show_fallback)
+stripped_stream = strip_blank(track_sensitive=false, max_blank=fallback_max_blank, min_noise=fallback_min_noise, threshold=fallback_threshold, mixer)
+#stripped_stream = strip_blank(mixer)
+#stripped_stream = mixer
+
+ignore(fallback_max_blank)
+ignore(fallback_min_noise)
+ignore(fallback_threshold)
+ignore(timeslot_fallback)
+ignore(show_fallback)
+ignore(station_fallback)
 
 # enable fallback
 # output_source = mixer
-output_source = fallback(id="fallback", track_sensitive=false, [mksafe(stripped_stream), timeslot_fallback, show_fallback, station_fallback])
+output_source = fallback(id="fallback", track_sensitive=false, [stripped_stream, timeslot_fallback, show_fallback, mksafe(station_fallback)])
 
 ##################
 # create outputs #
diff --git a/modules/liquidsoap/fallback.liq b/modules/liquidsoap/fallback.liq
index b8c234a3..beabf88b 100644
--- a/modules/liquidsoap/fallback.liq
+++ b/modules/liquidsoap/fallback.liq
@@ -116,7 +116,8 @@ def fallback_create(~skip=true, name, requestor)
   # Tell the system when a new track
   # is played
   source = on_metadata(fun (meta) ->
-    system('#{list.assoc("install_dir", ini)}/guru.py -c aura -t liquid_startup'), source)
+    system('#{list.assoc("install_dir", ini)}/guru.py --fallback-metadata-change name'),
+    source)
 
   log("channel created")
 
@@ -125,7 +126,7 @@ def fallback_create(~skip=true, name, requestor)
 end
 
 def create_dynamic_playlist(next)
-  log("next song is: #{next}")
+  log("dynamic playlist with song #{next} is created")
   request.create(list.hd(next))
 end
 
@@ -137,19 +138,22 @@ end
 
 def create_station_fallback() =
   log("requesting next song for STATION fallback")
-  result = get_process_lines('#{list.assoc("install_dir", ini)}/guru.py --get-next-file-for "station-fallback" --quiet')
+  result = get_process_lines('#{list.assoc("install_dir", ini)}/guru.py --get-next-file-for station --quiet')
+  log("next song for STATION fallback is: #{result}")
   create_dynamic_playlist(result)
 end
 
 def create_show_fallback() =
   log("requesting next song for SHOW fallback")
-  result = get_process_lines('#{list.assoc("install_dir", ini)}/guru.py --get-next-file-for "show-fallback" --quiet')
+  result = get_process_lines('#{list.assoc("install_dir", ini)}/guru.py --get-next-file-for show --quiet')
+  log("next song for SHOW fallback is: #{result}")
   create_dynamic_playlist(result)
 end
 
 def create_timeslot_fallback() =
   log("requesting next song for TIMESLOT fallback")
-  result = get_process_lines('#{list.assoc("install_dir", ini)}/guru.py --get-next-file-for "timeslot-fallback" --quiet')
+  result = get_process_lines('#{list.assoc("install_dir", ini)}/guru.py --get-next-file-for timeslot --quiet')
+  log("next song for TIMESLOT fallback is: #{result}")
   create_dynamic_playlist(result)
 end
 
diff --git a/modules/liquidsoap/in_stream.liq b/modules/liquidsoap/in_stream.liq
index 0a723b88..e1686ad0 100644
--- a/modules/liquidsoap/in_stream.liq
+++ b/modules/liquidsoap/in_stream.liq
@@ -24,5 +24,6 @@
 
 # this is overwritten as soon as a streamovertake is programmed, but liquidsoap needs it to initialize this input
 #starturl = "http://stream.fro.at/fro-128.ogg"
+#starturl = "http://trance.out.airtime.pro:8000/trance_a"
 starturl = "http://chill.out.airtime.pro:8000/chill_a"
 input_http = input.http(id="http", starturl)
\ No newline at end of file
diff --git a/modules/liquidsoap/library.liq b/modules/liquidsoap/library.liq
index 87d5f725..a8ac70e8 100644
--- a/modules/liquidsoap/library.liq
+++ b/modules/liquidsoap/library.liq
@@ -92,7 +92,7 @@ def set_input(device, name) =
         inputs := list.append([alsa_in], !inputs)
 
     elsif use_jack == true then
-        jack_in = input.jack(id=name)
+        jack_in = input.jack(id=name, clock_safe=false)
         inputs := list.append([jack_in], !inputs)
 
     else
-- 
GitLab