Fix append

src/core/operators/dyn_op.ml

@@ -36,14 +36,26 @@ class dyn ~init ~track_sensitive ~infallible ~resurection_time ~self_sync f =
     val proposed = Atomic.make None
     method propose s = Atomic.set proposed (Some s)
 
+    method private no_source =
+      if infallible then
+        Lang.raise_error ~pos:[]
+          ~message:
+            (Printf.sprintf
+               "Infallible source.dynamic %s was not able to prepare a source \
+                in time! Make sure to eithe define infallible sources in the \
+                source's dynamic function or mark the source as fallible.."
+               self#id)
+          "failure";
+      None
+
     method private prepare s =
       Typing.(s#frame_type <: self#frame_type);
       Clock.unify ~pos:self#pos s#clock self#clock;
       s#wake_up;
       (match Atomic.exchange source (Some s) with
         | Some s -> s#sleep
         | None -> ());
-      if s#is_ready then Some s else None
+      if s#is_ready then Some s else self#no_source
 
     method private get_next reselect =
       self#mutexify
@@ -66,13 +78,14 @@ class dyn ~init ~track_sensitive ~infallible ~resurection_time ~self_sync f =
                                      | v -> v)
                                  s ->
                             Some s
-                        | _ -> None)
+                        | _ -> self#no_source)
                   | Some s -> self#prepare s))
         ()
 
     method private get_source ~reselect () =
       match (Atomic.get source, reselect) with
-        | None, _ | _, `Force -> self#get_next reselect
+        | None, _ | _, `Force | Some _, `After_position _ ->
+            self#get_next reselect
         | Some s, _ when self#can_reselect ~reselect s -> Some s
         | Some _, _ when Unix.gettimeofday () -. last_select < resurection_time
           ->

src/libs/source.liq

@@ -194,13 +194,14 @@ def append(~id=null("append"), ~insert_missing=true, ~merge=false, s, f) =
     p = pending()
     pending := null()
     last_meta := null()
+
     if
       null.defined(p)
     then
       p = null.get(p)
       sequence(merge=merge, [p, s])
     else
-      s
+      null()
     end
   end
 

tests/regression/append-merge.liq

@@ -0,0 +1,30 @@
+music = chop(every=1., metadata=[("source", "s1")], sine(amplitude=0.1, 440.))
+
+def next(_) =
+  s = sine(amplitude=0.1, duration=.5, 880.)
+  metadata.map(insert_missing=true, fun (_) -> [("source", "s2")], s)
+end
+
+s = append(merge=true, music, next)
+
+count_s1 = ref(0)
+count_s2 = ref(0)
+
+s.on_metadata(
+  fun (m) ->
+    begin
+      s = m["source"]
+      if
+        s == "s1"
+      then
+        ref.incr(count_s1)
+      elsif s == "s2" then ref.incr(count_s2)
+      end
+
+      if count_s1() > 2 and count_s2() > 2 then test.pass() end
+    end
+)
+
+s.on_track(fun (m) -> if m["source"] == "s2" then test.fail() end)
+
+output.dummy(s)

tests/regression/append.liq

@@ -0,0 +1,26 @@
+music = chop(every=1., metadata=[("source", "s1")], sine(amplitude=0.1, 440.))
+
+def next(_) =
+  s = sine(amplitude=0.1, duration=.5, 880.)
+  metadata.map(insert_missing=true, fun (_) -> [("source", "s2")], s)
+end
+
+s = append(music, next)
+
+count_s1 = ref(0)
+count_s2 = ref(0)
+
+s.on_metadata(fun (m) -> begin
+  s = m["source"]
+  if s == "s1" then
+    ref.incr(count_s1)
+  elsif s == "s2" then
+    ref.incr(count_s2)
+  end
+
+  if count_s1() > 2 and count_s2() > 2 then
+    test.pass()
+  end
+end)
+
+output.dummy(s)

tests/regression/dune.inc

@@ -815,6 +815,38 @@
   (:run_test ../run_test.exe))
  (action (run %{run_test} LS503.liq liquidsoap %{test_liq} LS503.liq)))
 
+(rule
+ (alias citest)
+ (package liquidsoap)
+ (deps
+  append-merge.liq
+  ../media/all_media_files
+  ../../src/bin/liquidsoap.exe
+  ../streams/file1.png
+  ../streams/file1.mp3
+  ./theora-test.mp4
+  (package liquidsoap)
+  (source_tree ../../src/libs)
+  (:test_liq ../test.liq)
+  (:run_test ../run_test.exe))
+ (action (run %{run_test} append-merge.liq liquidsoap %{test_liq} append-merge.liq)))
+
+(rule
+ (alias citest)
+ (package liquidsoap)
+ (deps
+  append.liq
+  ../media/all_media_files
+  ../../src/bin/liquidsoap.exe
+  ../streams/file1.png
+  ../streams/file1.mp3
+  ./theora-test.mp4
+  (package liquidsoap)
+  (source_tree ../../src/libs)
+  (:test_liq ../test.liq)
+  (:run_test ../run_test.exe))
+ (action (run %{run_test} append.liq liquidsoap %{test_liq} append.liq)))
+
 (rule
  (alias citest)
  (package liquidsoap)