Changeset 6707

Timestamp:

07/01/09 14:15:47 (9 months ago)

Author:

smimram

Message:

synth.all.

Location:

trunk/liquidsoap/src

Files:

• formats/midiformat.ml (modified) (3 diffs)
• synth/synth.ml (modified) (1 diff)
• synth/synth_op.ml (modified) (4 diffs)
• visualization/midimeter.ml (modified) (1 diff)

trunk/liquidsoap/src/formats/midiformat.ml

@@ -310 +310 @@
     (* Filling function. *)
     let track = ref track in
+    let warn_channels = ref true in
     let fill buf =
       let m = MFrame.tracks buf in
@@ -319 +320 @@
         while !track <> [] && !offset_in_buf < buflen do
           let d,(c,e) = List.hd !track in
-            (* Printf.printf "delta: %d\n%!" d; *)
             offset_in_buf := !offset_in_buf + d;
             if !offset_in_buf < buflen then
@@ -330 +330 @@
                           | Midi.Note_on _
                           | Midi.Note_off _ ->
-                              (* Printf.printf "EVENT (chan %d)!\n%!" c; *)
-                              m.(c) := !(m.(c))@[!offset_in_buf, e]
+                              (
+                                try
+                                  m.(c) := !(m.(c))@[!offset_in_buf, e]
+                                with
+                                  | Invalid_argument _ ->
+                                      if !warn_channels then
+                                        (
+                                          log#f 3 "Event on channel %d will be ignored, increase frame.midi.channels (this message is displayed only once)." c;
+                                          warn_channels := false
+                                        )
+                              )
                           | _ -> () (* TODO *)
                       )

trunk/liquidsoap/src/synth/synth.ml

@@ -46 +46 @@
   method note_on n v =
     (* Limit the number of notes for now. TODO: parameter *)
-    if List.length notes > 16 then notes <- List.rev (List.tl (List.rev notes));
+    (* if List.length notes > 16 then notes <- List.rev (List.tl (List.rev notes)); *)
     notes <- (n, ref (self#note_init n v))::notes
 

trunk/liquidsoap/src/synth/synth_op.ml

@@ -34 +34 @@
   method remaining = source#remaining
 
-  method is_ready =
-    source#is_ready
+  method is_ready = source#is_ready
 
   method abort_track = source#abort_track
@@ -44 +43 @@
     let evs = !evs in
     source#get buf;
+    if blankify then AFrame.blankify buf offset (AFrame.size buf - offset);
     let b = AFrame.get_float_pcm buf in
     let position = AFrame.position buf in
@@ -69 +69 @@
     [
       "channel", Lang.int_t, Some (Lang.int 0), Some "MIDI channel to handle.";
-      "volume", Lang.float_t, Some (Lang.float 0.3), Some "Volume.";
+      "volume", Lang.float_t, Some (Lang.float 0.3), Some "Initial volume.";
       "", Lang.source_t, None, None
     ]
@@ -79 +79 @@
        let volume = Lang.to_float (f "volume") in
        let src = Lang.to_source (f "") in
-         new synth (obj ()) src chan volume)
+         new synth (obj ()) src chan volume);
+  Lang.add_operator ("synth.all." ^ name)
+    [
+      "", Lang.source_t, None, None
+    ]
+    ~category:Lang.SoundSynthesis
+    ~descr:(descr ^ " It creates one synthesizer for each channel.")
+    (fun p _ ->
+       let f v = List.assoc v p in
+       let src = Lang.to_source (f "") in
+       let synths = Array.init (Fmt.midi_channels ()) (fun c -> 1, new synth (obj ()) src c 1.) in
+       let synths = Array.to_list synths in
+         new Add.add ~renorm:false synths
+           (fun _ -> ())
+           (fun _ buf tmp -> RGB.add buf tmp)
+    )
 
-let () = register (fun () -> (new Synth.sine :> Synth.synth)) "sine" "Sine synthesiser."
-let () = register (fun () -> (new Synth.square :> Synth.synth)) "square" "Square synthesiser."
-let () = register (fun () -> (new Synth.saw :> Synth.synth)) "saw" "Saw synthesiser."
+let () = register (fun () -> (new Synth.sine :> Synth.synth)) "sine" "Sine synthesizer."
+let () = register (fun () -> (new Synth.square :> Synth.synth)) "square" "Square synthesizer."
+let () = register (fun () -> (new Synth.saw :> Synth.synth)) "saw" "Saw synthesizer."

trunk/liquidsoap/src/visualization/midimeter.ml

@@ -46 +46 @@
                  | _ -> "???"
              in
-               Printf.printf "%d: %s.\n%!" c s
+               Printf.printf "%02d: %s.\n%!" c s
           ) !(m.(c))
       done