Changeset 6706

Timestamp:

07/01/09 13:01:24 (14 months ago)

Author:

smimram

Message:

Operators for manipulating midi channels.

Location:

trunk/liquidsoap/src

Files:

• Makefile (modified) (1 diff)
• lang/lang.ml (modified) (2 diffs)
• lang/lang.mli (modified) (1 diff)
• operators/midi_routing.ml (copied) (copied from trunk/liquidsoap/src/operators/id.ml) (2 diffs)

trunk/liquidsoap/src/Makefile

@@ -88 +88 @@
         operators/time_wrap.ml operators/lag.ml \
         operators/video_effects.ml operators/video_fade.ml \
-        operators/fork.ml
+        operators/fork.ml operators/midi_routing.ml
 #       operators/pipe.ml
 

trunk/liquidsoap/src/lang/lang.ml

@@ -79 +79 @@
 type category =
   | Input | Output
-  | TrackProcessing | SoundProcessing | VideoProcessing
+  | TrackProcessing | SoundProcessing | VideoProcessing | MIDIProcessing
   | Visualization | SoundSynthesis
 
@@ -88 +88 @@
   | SoundProcessing -> "Sound Processing"
   | VideoProcessing -> "Video Processing"
+  | MIDIProcessing -> "MIDI Processing"
   | SoundSynthesis -> "Sound Synthesis"
   | Visualization -> "Visualization"

trunk/liquidsoap/src/lang/lang.mli

@@ -86 +86 @@
   | SoundProcessing (** Operations on sound (e.g. compression, etc.). *)
   | VideoProcessing (** Operations on video. *)
+  | MIDIProcessing (** Operations on MIDI. *)
   | Visualization (** Visializations of the sound. *)
   | SoundSynthesis (** Synthesis. *)

trunk/liquidsoap/src/operators/midi_routing.ml

@@ -23 +23 @@
 open Source
 
-class id (source:source) =
+class virtual base (source:source) =
 object (self)
   inherit operator [source] as super
@@ -34 +34 @@
 
   method abort_track = source#abort_track
+end
 
-  method private get_frame buf = source#get buf
+class merge (source:source) out =
+object (self)
+  inherit base (source)
+
+  method private get_frame buf =
+    source#get buf;
+    let m = MFrame.tracks buf in
+      for c = 0 to Array.length m - 1 do
+        m.(out) := !(m.(c)) @ !(m.(out));
+        if c <> out then m.(c) := []
+      done;
+      m.(out) := List.sort (fun (t1, _) (t2, _) -> t1 - t2) !(m.(out))
+end
+
+class remove (source:source) t =
+object (self)
+  inherit base (source)
+
+  method private get_frame buf =
+    source#get buf;
+    let m = MFrame.tracks buf in
+      List.iter (fun c -> m.(c) := []) t
 end
 
 let () =
-  Lang.add_operator "id"
-    ["", Lang.source_t, None, None]
-    ~category:Lang.SoundProcessing
-    ~descr:"Identity: does not do anything."
-    ~flags:[Lang.Hidden]
+  Lang.add_operator "midi.merge_all"
+    [
+      "track_out", Lang.int_t, Some (Lang.int 0), Some "Destination track.";
+      "", Lang.source_t, None, None
+    ]
+    ~category:Lang.MIDIProcessing
+    ~descr:"Merge all MIDI tracks in one."
     (fun p _ ->
        let f v = List.assoc v p in
+       let out = Lang.to_int (f "track_out") in
        let src = Lang.to_source (f "") in
-         new id src)
+         new merge src out)
+
+let () =
+  Lang.add_operator "midi.remove"
+    [
+      "", Lang.list_t Lang.int_t, None, Some "Tracks to remove.";
+      "", Lang.source_t, None, None
+    ]
+    ~category:Lang.MIDIProcessing
+    ~descr:"Remove MIDI tracks."
+    (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 src = Lang.to_source (Lang.assoc "" 2 p) in
+         new remove src t)