Changeset 6682

Timestamp:

06/21/09 14:14:14 (15 months ago)

Author:

metamorph68

Message:

* Make format parameter a global parameter for icecast-based outputs.

For the notice: icecast 2.3.1 does not seem to consider that streams
with content-type audio/ogg contain ogg data.. This patch should sets
the default to application/ogg.

* Also moved protocol parameter parsing to the main icecast. This

parameter was not honored in ogg-based shout outputs, though it
should always be http in this case.

* Expanded commit description :)

Location:

trunk/liquidsoap/src/outputs

Files:

• external_encoded_shout.ml (modified) (5 diffs)
• icecast2.ml (modified) (4 diffs)
• lame_encoded_shout.ml (modified) (3 diffs)
• ogg_output_shout.ml (modified) (2 diffs)

trunk/liquidsoap/src/outputs/external_encoded_shout.ml

@@ -27 +27 @@
 
 let proto =
-  (Icecast2.proto ~no_mount ~no_name) @ External_encoded.proto @
+  (Icecast2.proto ~no_mount ~no_name ~format:"mp3") @ External_encoded.proto @
   [ "start", Lang.bool_t, Some (Lang.bool true),
     Some "Start output threads on operator initialization." ;
@@ -38 +38 @@
     "icy_metadata", Lang.bool_t, Some (Lang.bool true),
     Some "Send new metadata using the ICY protocol.";
-    "format", Lang.string_t, Some (Lang.string "mp3"), 
-    Some "Content-type (mime) for the format. \
-          \"mp3\" is a short-hand for mpeg audio, \"ogg\" for ogg data.";
     "", Lang.source_t, None, None ]
 
@@ -73 +70 @@
   let mount = s "mount" in
   let name = s "name" in
-  let format = 
-    match s "format" with
-      | "mp3" -> Cry.mpeg
-      | "ogg" -> Cry.ogg_application
-      | s -> Cry.content_type_of_string s
-  in
   let name =
     if name = no_name then
@@ -93 +84 @@
     if mount = no_mount then name else mount
   in
-  let protocol =
-    let v = List.assoc "protocol" p in
-      match Lang.to_string v with
-        | "http" -> Cry.Http
-        | "icy" -> Cry.Icy
-        | _ ->
-            raise (Lang.Invalid_value
-                     (v, "valid values are 'http' (icecast) "^
-                      "and 'icy' (shoutcast)"))
-  in
   let icecast_info =
     {
@@ -115 +96 @@
   inherit Output.encoded ~autostart ~name:mount ~kind:"output.icecast" source
   inherit
-    Icecast2.output ~format ~protocol
-      ~icecast_info ~mount ~name ~source p as icecast
+    Icecast2.output ~icecast_info ~mount ~name ~source p as icecast
   inherit
     External_encoded.base ~restart_on_new_track ~restart_on_crash 

trunk/liquidsoap/src/outputs/icecast2.ml

@@ -35 +35 @@
 let no_multicast = "no_multicast"
 
-let proto ~no_mount ~no_name =
+let proto ~no_mount ~no_name ~format =
   [ "restart", Lang.bool_t, Some (Lang.bool false),
     Some "Restart output after a failure. By default, liquidsoap will stop \
@@ -60 +60 @@
     "headers", Lang.list_t (Lang.product_t Lang.string_t Lang.string_t),
     Some (Lang.list []), Some "Additional headers." ;
+    "format", Lang.string_t, Some (Lang.string format),
+    Some "Content-type (mime) for the format. \
+          \"mp3\" is a short-hand for mpeg audio, \"ogg\" for ogg data.";
     "dumpfile", Lang.string_t, Some (Lang.string ""), 
     Some "Dump stream to file, for debugging purpose. Disabled if empty."
@@ -70 +73 @@
   * value for these depends on the format of the stream (ogg/mp3). *)
 class virtual output
-  ?(format=Cry.ogg_audio) ?(protocol=Cry.Http) 
   ~name ~mount ~source ~icecast_info p =
 
@@ -76 +78 @@
     let s v = e Lang.to_string v in
 
+    let format =
+     match s "format" with
+       | "mp3" -> Cry.mpeg
+       | "ogg" -> Cry.ogg_application
+       | s -> Cry.content_type_of_string s
+    in
+    let protocol =
+      let v = List.assoc "protocol" p in
+        match Lang.to_string v with
+          | "http" -> Cry.Http
+          | "icy" -> Cry.Icy
+          | _ ->
+              raise (Lang.Invalid_value
+                       (v, "valid values are 'http' (icecast) "^
+                        "and 'icy' (shoutcast)"))
+    in
     let restart = e Lang.to_bool "restart" in
     let restart_delay = float_of_int (e Lang.to_int "restart_delay") in

trunk/liquidsoap/src/outputs/lame_encoded_shout.ml

@@ -29 +29 @@
 
 let proto =
-  (Icecast2.proto ~no_mount ~no_name) @
+  (Icecast2.proto ~no_mount ~no_name ~format:"mp3") @
   [ "samplerate", Lang.int_t, Some (Lang.int 44100), None;
     "bitrate", Lang.int_t, Some (Lang.int 128), None;
@@ -67 +67 @@
     if mount = no_mount then name else mount
   in
-  let protocol =
-    let v = List.assoc "protocol" p in
-      match Lang.to_string v with
-        | "http" -> Cry.Http
-        | "icy" -> Cry.Icy
-        | _ ->
-            raise (Lang.Invalid_value
-                     (v, "valid values are 'http' (icecast) \
-                          and 'icy' (shoutcast)"))
-  in
   let channels =
     if not stereo then 1 else Fmt.channels ()
@@ -91 +81 @@
 object (self)
   inherit Output.encoded ~autostart ~name:mount ~kind:"output.icecast" source
-  inherit
-    Icecast2.output ~format:Cry.mpeg ~protocol
-      ~icecast_info ~mount ~name ~source p as icecast
+  inherit Icecast2.output ~icecast_info ~mount ~name ~source p as icecast
   inherit base ~quality ~bitrate ~stereo ~samplerate as base
 

trunk/liquidsoap/src/outputs/ogg_output_shout.ml

@@ -27 +27 @@
 
 let proto =
-  (Icecast2.proto ~no_mount ~no_name) @
+  (Icecast2.proto ~no_mount ~no_name ~format:"ogg") @
   [ "start", Lang.bool_t, Some (Lang.bool true),
     Some "Start output threads on operator initialization." ;
@@ -58 +58 @@
 
 object (self)
-  inherit
-    Output.encoded ~autostart ~name:mount ~kind:"output.icecast" source
-  inherit Icecast2.output 
+  inherit Output.encoded ~autostart ~name:mount ~kind:"output.icecast" source
+  inherit Icecast2.output
     ~mount ~name ~icecast_info 
     ~source p as icecast