Changeset 6689

Timestamp:

06/25/09 10:51:20 (14 months ago)

Author:

dbaelde

Message:

Add on_noise handler to on_blank(), called when blank ends. (BTW, contrary to what I said on the mailing list, there was no technical problem with sf.net this morning. However, the testing version of libneon in Debian is broken, I had to upgrade it to unstable.)

Files:

• trunk/liquidsoap/src/operators/noblank.ml (modified) (3 diffs)

trunk/liquidsoap/src/operators/noblank.ml

@@ -54 +54 @@
 end
 
-class on_blank ~length ~threshold handler source =
+class on_blank ~length ~threshold ~on_blank ~on_noise source =
 object (self)
   inherit operator [source]
@@ -75 +75 @@
       if AFrame.is_partial ab || p0 > 0 then blank_len <- 0 else begin
         self#check_blank ab p0 ;
-        if blank_len <= length then
-          in_blank <- false
-        else
+        if blank_len <= length then begin
+          if in_blank then begin
+            ignore (Lang.apply on_noise []) ;
+            in_blank <- false
+          end
+        end else
           if not in_blank then begin
             in_blank <- true ;
-            ignore (Lang.apply handler [])
+            ignore (Lang.apply on_blank [])
           end
       end
@@ -232 +235 @@
     ~category:Lang.TrackProcessing
     ~descr:"Calls a given handler when detecting a blank."
-    (("",Lang.fun_t [] Lang.unit_t, None, None)::proto)
-    (fun p _ ->
-       let f = Lang.assoc "" 1 p in
+    (("", Lang.fun_t [] Lang.unit_t, None,
+      Some "Handler called when blank is detected.")::
+     ("on_noise",Lang.fun_t [] Lang.unit_t,
+      Some (Lang.val_cst_fun [] Lang.unit),
+      Some "Handler called when noise is detected.")::
+     proto)
+    (fun p _ ->
+       let on_blank = Lang.assoc "" 1 p in
+       let on_noise = Lang.assoc "on_noise" 1 p in
        let p = List.remove_assoc "" p in
        let length,threshold,s = extract p in
-         new on_blank ~length ~threshold f s) ;
+         new on_blank ~length ~threshold ~on_blank ~on_noise s) ;
   Lang.add_operator "skip_blank"
     ~category:Lang.TrackProcessing