Changeset 6716

Timestamp:

07/02/09 13:37:13 (14 months ago)

Author:

smimram

Message:

Warning for non-existent channels + more modular code.

Location:

trunk/liquidsoap/src

Files:

• Makefile (modified) (2 diffs)
• formats/midiformat.ml (modified) (1 diff)
• operators/midi_routing.ml (modified) (2 diffs)
• stream/midi.ml (modified) (1 diff)
• synth/synth_op.ml (modified) (1 diff)
• tools/mutils.ml (copied) (copied from trunk/liquidsoap/src/tools/sutils.ml) (1 diff)

trunk/liquidsoap/src/Makefile

@@ -158 +158 @@
         lang/lang_types.ml lang/lang_values.ml \
         lang/lang_lexer.ml lang/lang_parser.ml lang/lang_pp.ml lang/lang.ml \
-        tools/harbor.ml tools/ioRing.ml tools/file_decoder.ml \
+        tools/harbor.ml tools/ioRing.ml tools/file_decoder.ml tools/mutils.ml \
         $(video_converters) $(audio_converters) \
         $(ogg_utils) $(protocols) $(sources) $(operators) $(outputs) $(io) \
@@ -183 +183 @@
         decoder.ml request.ml outputs/output.ml \
         lang/lang.ml tools/server.ml \
-        tools/tutils.ml tools/sutils.ml \
+        tools/tutils.ml tools/sutils.ml tools/mutils.ml \
         tools/ringbuffer.ml \
         tools/doc.ml tools/wav.ml \

trunk/liquidsoap/src/formats/midiformat.ml

@@ -290 +290 @@
     (* Convert delta-times in delta-liquidsoap-ticks. *)
     let track =
-      let tpq =
-        match division with
-          | Midi.Ticks_per_quarter tpq -> tpq
-          | _ -> assert false
-      in
-      let tpq = Int64.of_int tpq in
-      let tempo = ref (Int64.of_int 125000) in
-      let tps = Int64.of_int (Fmt.ticks_per_second ()) in
-      let ten = Int64.of_int 1000000 in
+      let tempo = ref 125000 in
         List.map
           (fun (d,(c,e)) ->
-             (* These computations sometimes overflow on 32 bits. *)
-             let d = Int64.of_int d in
-             let d =
-               let ( * ) = Int64.mul in
-               let ( / ) = Int64.div in
-                 (((d * !tempo) / tpq) * tps) / ten
-             in
-             let d = Int64.to_int d in
+             let d = Mutils.ticks_of_delta division !tempo d in
                (
                  match e with
                    | Midi.Tempo t ->
-                       tempo := Int64.of_int t
+                       tempo := t
                    | _ -> ()
                );

trunk/liquidsoap/src/operators/midi_routing.ml

@@ -70 +70 @@
     (fun p _ ->
        let f v = List.assoc v p in
-       let out = Lang.to_int (f "track_out") in
+       let out = Mutils.to_chan (f "track_out") in
        let src = Lang.to_source (f "") in
          new merge src out)
@@ -84 +84 @@
     (fun p _ ->
        (* let f v = List.assoc v p in *)
-       let t = List.map Lang.to_int (Lang.to_list (Lang.assoc "" 1 p)) in
+       let t = List.map Mutils.to_chan (Lang.to_list (Lang.assoc "" 1 p)) in
        let src = Lang.to_source (Lang.assoc "" 2 p) in
          new remove src t)

trunk/liquidsoap/src/stream/midi.ml

@@ -48 +48 @@
   | Custom of string
 
-type header =
-    {
-      division : division
-    }
-
 type track = (int * event) list
 
 let create_track () = []
-
-(* TODO: !Fmt.ticks_per_second *)
-let ticks_per_second = 44100
-
-let ticks_of_delta division tempo delta =
-  match division with
-    | Ticks_per_quarter t ->
-        (delta * 4 * 60 * ticks_per_second) / (t * tempo)
-    | SMPTE (fps,res) ->
-        (delta * ticks_per_second) / (fps * res)
-
-let take ticks track = ()

trunk/liquidsoap/src/synth/synth_op.ml

@@ -86 +86 @@
     (fun p _ ->
        let f v = List.assoc v p in
-       let chan = Lang.to_int (f "channel") in
+       let chan = Mutils.to_chan (f "channel") in
        let volume = Lang.to_float (f "volume") in
        let adsr =

trunk/liquidsoap/src/tools/mutils.ml

@@ -21 +21 @@
  *****************************************************************************)
 
-let lin_of_dB x = 10. ** (x /. 20.)
+(** Convert a value into a channel number, checking that it actually exists. *)
+let to_chan v =
+  let n = Lang.to_int v in
+    if n >= Fmt.midi_channels () then
+      raise (Lang.Invalid_value (v, "channel number too big (try increasing lang.midi.channels)"))
+    else
+      n
 
-let dB_of_lin x = 20. *. log x /. log 10.
-
-let clip x = min 1. (max (-.1.) x)
+(** Convert delta-times to ticks. *)
+let ticks_of_delta division tempo delta =
+  match division with
+    | Midi.Ticks_per_quarter tpq ->
+        (* These computations sometimes overflow on 32 bits. *)
+        let tpq = Int64.of_int tpq in
+        let tempo = Int64.of_int tempo in
+        let tps = Int64.of_int (Fmt.ticks_per_second ()) in
+        let ten = Int64.of_int 1000000 in
+        let delta = Int64.of_int delta in
+        let ( * ) = Int64.mul in
+        let ( / ) = Int64.div in
+          Int64.to_int ((((delta * tempo) / tpq) * tps) / ten)
+    | Midi.SMPTE (fps,res) ->
+        (delta * Fmt.ticks_per_second ()) / (fps * res)