Changeset 6704

Timestamp:

06/30/09 22:59:55 (14 months ago)

Author:

dbaelde

Message:

Treat missing metadata as empty metadata. This sounds more reasonable, so much
that I didn't make it optional using an "insert_missing" parameter as in some
other operators. Previously, it would cause prepending to be disabled on
tracks without metadata.

Files:

• trunk/liquidsoap/src/operators/prepend.ml (modified) (1 diff)

trunk/liquidsoap/src/operators/prepend.ml

@@ -41 +41 @@
             if AFrame.is_partial peek then
               AFrame.add_break buf (AFrame.position buf)
-            else begin
-              match AFrame.get_metadata peek peekpos with
-                | Some m when
-                  Utils.hashtbl_get m "liq_prepend" <> Some "false" ->
-                    let prepend =
-                      Lang.to_source
-                        (Lang.apply f ["",Lang.metadata m])
-                    in
-                      self#register prepend ;
-                      if not prepend#is_ready then begin
-                        self#log#f 3
-                          "Candidate to prepending not ready. Abort!" ;
-                        state <- `Buffer peek ;
-                        self#unregister prepend
-                      end else begin
-                        state <- `Prepend (prepend,peek)
-                      end ;
-                      self#get_frame buf
-                | _ ->
+            else
+              let inhibit,lang_m =
+                match AFrame.get_metadata peek peekpos with
+                  | Some m ->
+                      (Utils.hashtbl_get m "liq_prepend" = Some "false"),
+                      Lang.metadata m
+                  | None -> false, Lang.list []
+              in
+                if inhibit then begin
+                    self#log#f 4 "Prepending disabled from metadata (\"liq_prepend\"=\"false\")." ;
                     state <- `Buffer peek ;
                     self#get_frame buf
-            end
+                end else
+                  let prepend = Lang.to_source (Lang.apply f ["",lang_m]) in
+                    self#register prepend ;
+                    if not prepend#is_ready then begin
+                      self#log#f 3
+                        "Candidate to prepending not ready. Abort!" ;
+                      state <- `Buffer peek ;
+                      self#unregister prepend
+                    end else begin
+                      state <- `Prepend (prepend,peek)
+                    end ;
+                    self#get_frame buf
       | `Buffer peek ->
           let p = AFrame.position buf in