Changeset 6693 for trunk/liquidsoap/src/stream/frame.ml

Timestamp:

06/28/09 23:03:17 (15 months ago)

Author:

smimram

Message:

Start experimenting a new idea: audio synthesis. Nothing to see for now though...

Files:

• trunk/liquidsoap/src/stream/frame.ml (modified) (4 diffs)

trunk/liquidsoap/src/stream/frame.ml

@@ -27 +27 @@
 type track_t =
   | Float_pcm_t of float_pcm_t
-  | Midi_t of Midi.header
+  | Midi_t
   | RGB_t
 
 type track =
   | Float_pcm of (float_pcm_t * float_pcm)
-  | Midi of (Midi.header * Midi.track ref)
+  | Midi of (int * Midi.event) list ref
   | RGB of RGB.t array
 
@@ -63 +63 @@
       in
         Float_pcm (f, Array.create len 0.)
-  | Midi_t h ->
-      Midi (h, ref (Midi.create_track ()))
+  | Midi_t ->
+      Midi (ref (Midi.create_track ()))
   | RGB_t ->
       RGB (Array.init
@@ -98 +98 @@
 let kind_of_track = function
   | Float_pcm (t, _) -> Float_pcm_t t
-  | Midi (h, _) -> Midi_t h
+  | Midi _ -> Midi_t
   | RGB _ -> RGB_t
 
@@ -172 +172 @@
           let c x = int_of_float (float x *. r) in
             float_blit a (c src_pos) a' (c dst_pos) (c len)
-      | Midi (_,m), Midi (h,m') -> m' := !m
+      | Midi m, Midi m' -> m' := !m (* TODO: use parameters.... *)
       | RGB src, RGB dst ->
           (* TODO: handle offsets! *)