Changeset 7166

Timestamp:

02/12/10 19:09:24 (7 months ago)

Author:

dbaelde

Message:

Allow for media requests with kind (0,0,0), by flagging explicitly raw
requests as such. The "dummy" kind (0,0,0) is still used at the Lang level.
I didn't force the distinction using phantom types as before, it didn't
seem too important -- I hope I'm not missing anything important here.

Location:

trunk/liquidsoap/src

Files:

• lang/lang.ml (modified) (1 diff)
• request.ml (modified) (5 diffs)
• request.mli (modified) (1 diff)
• sources/request_source.ml (modified) (1 diff)

trunk/liquidsoap/src/lang/lang.ml

@@ -216 +216 @@
 
 let request r =
-  mk (request_t (kind_type_of_frame_kind (Request.kind r))) (Request r)
+  let kind =
+    match Request.kind r with
+      | Some k -> k
+      | None -> let z = Frame.Zero in {Frame.audio=z;video=z;midi=z}
+  in
+    mk (request_t (kind_type_of_frame_kind kind)) (Request r)
 
 let val_fun p ~ret_t f =

trunk/liquidsoap/src/request.ml

@@ -187 +187 @@
 type status = Idle | Resolving | Ready | Playing | Destroyed
 
-(** Each request has a kind, telling how it might be used.
-  * Non-trivial kinds are for "media requests", audio or video files.
-  * For other, "raw requests", we use the following empty kind. *)
-let raw_kind =
-  { Frame.
-      audio = Frame.Zero ;
-      video = Frame.Zero ;
-      midi  = Frame.Zero }
-
 type t = {
   id : int ;
   initial_uri : string ;
-  kind : Frame.content_kind ;
+  kind : Frame.content_kind option ; (* No kind for raw requests *)
   persistent : bool ;
 
@@ -338 +329 @@
     | No_indicator -> ()
   in
-    if t.kind <> raw_kind then check_decodable t.kind
+    match t.kind with None -> () | Some k -> check_decodable k
 
 let push_indicators t l =
@@ -356 +347 @@
   t.indicators <> [] &&
   Sys.file_exists (peek_indicator t).string &&
-  ( t.decoder <> None || t.kind = raw_kind )
+  ( t.decoder <> None || t.kind = None )
 
 (** [get_filename request] returns
@@ -414 +405 @@
       | None -> ()
     end ;
-    if t.kind <> raw_kind then
-      replace "kind" (Frame.string_of_content_kind t.kind) ;
+    begin match t.kind with
+      | None -> ()
+      | Some k ->
+          replace "kind" (Frame.string_of_content_kind k)
+    end ;
     replace "status"
       (match t.status with
@@ -486 +480 @@
     t
 
-let create_raw = create ~kind:raw_kind
+let create_raw = create ~kind:None
+let create ~kind = create ~kind:(Some kind)
 
 let on_air t =

trunk/liquidsoap/src/request.mli

@@ -52 +52 @@
   t
 
-val kind : t -> Frame.content_kind
+(** Return the kind of a media request, None for raw requests. *)
+val kind : t -> Frame.content_kind option
 
 (** Destroying of a requests causes its file to be deleted if it's a temporary

trunk/liquidsoap/src/sources/request_source.ml

@@ -76 +76 @@
           false
       | Some req when Request.is_ready req ->
-          assert (Frame.kind_sub_kind (Request.kind req) kind) ;
+          assert (Frame.kind_sub_kind
+                    (Utils.get_some (Request.kind req))
+                    kind) ;
           (* [Request.is_ready] ensures that we can get a filename from
            * the request, and it can be decoded. *)