Changeset 6694

Timestamp:

06/29/09 10:53:47 (9 months ago)

Author:

smimram

Message:

Small progress...

Location:

trunk/liquidsoap/src

Files:

• Makefile (modified) (1 diff)
• fmt.ml (modified) (2 diffs)
• fmt.mli (modified) (1 diff)
• stream/frame.ml (modified) (1 diff)
• stream/mFrame.ml (modified) (1 diff)
• stream/mFrame.mli (modified) (1 diff)
• stream/midi.ml (modified) (1 diff)
• synth/keyboard.ml (modified) (5 diffs)
• synth/synth.ml (added)

trunk/liquidsoap/src/Makefile

@@ -146 +146 @@
         visualization/video_volume.ml
 
-synth = synth/keyboard.ml
+synth = synth/synth.ml \
+        synth/keyboard.ml
 
 liquidsoap_sources= $(tools) SVN.ml audio_converter.ml $(stream) \

trunk/liquidsoap/src/fmt.ml

@@ -67 +67 @@
     "Video frames per second"
 
+let conf_midi =
+  Conf.void ~p:(conf#plug "midi") "MIDI parameters"
+      ~comments:[
+        "Parameters for MIDI in liquidsoap."
+      ]
+let conf_midi_channels =
+  Conf.int ~p:(conf_midi#plug "channels") ~d:0
+    "MIDI channels"
+
 (* Global time speed. *)
 let samples_per_second () = conf_samplerate#get
@@ -103 +112 @@
 
 let video_channels () = conf_video_channels#get
+
+let midi_channels () = conf_midi_channels#get

trunk/liquidsoap/src/fmt.mli

@@ -73 +73 @@
 val video_width : unit -> int
 val video_height : unit -> int
+
+
+val midi_channels : unit -> int

trunk/liquidsoap/src/stream/frame.ml

@@ -90 +90 @@
     Array.init (Fmt.video_channels ()) (fun _ -> RGB_t)
   in
+  let midi =
+    Array.init (Fmt.midi_channels ()) (fun _ -> Midi_t)
+  in
     create
-      (Array.append audio video)
+      (Array.append (Array.append audio video) midi)
       (Fmt.ticks_per_second ())
       (Fmt.ticks_per_frame ())

trunk/liquidsoap/src/stream/mFrame.ml

@@ -1 +1 @@
 include Frame
+
+let tracks f =
+  let tracks = Array.to_list (Frame.get_tracks f) in
+  let ans =
+    List.fold_left
+      (fun l t ->
+         match t with
+           | Midi m -> m::l
+           | _ -> l
+      ) [] tracks in
+    Array.of_list ans
+
+let set_events f e = ()

trunk/liquidsoap/src/stream/mFrame.mli

@@ -19 +19 @@
 val set_metadata     : t -> int -> metadata -> unit
 val get_metadata     : t -> int -> metadata option
+
+val tracks : t -> (int * Midi.event) list ref array

trunk/liquidsoap/src/stream/midi.ml

@@ -27 +27 @@
 type event =
   | Note_off of int * float
-  | Note_on of int * float (** Note on: note number (A4 = 91), velocity (between 0 and 1). *)
+  | Note_on of int * float (** Note on: note number (A4 = 69), velocity (between 0 and 1). *)
   | Aftertouch of int * float
   | Control_change of int * int

trunk/liquidsoap/src/synth/keyboard.ml

@@ -21 +21 @@
  *****************************************************************************)
 
+let knotes = [|'a'; '?'; 'z'; '"'; 'e'; 'r'; '('; 't'; '-'; 'y'; '?'; 'u'; 'i'; '?'; 'o'; '?'; 'p'|]
+
+let array_index a x =
+  let ans = ref None in
+    for i = 0 to Array.length knotes - 1 do
+      if knotes.(i) = x then ans := Some i
+    done;
+    match !ans with
+      | Some i -> i
+      | None -> raise Not_found
+
+let note_of_char c =
+  array_index knotes c + 94
+
 class keyboard =
 object (self)
@@ -34 +48 @@
   val ev_m = Mutex.create ()
 
-  method add_event (e:Midi.event) =
+  method add_event (t:int) (e:Midi.event) =
     Mutex.lock ev_m;
-    ev <- (0,e)::ev;
+    ev <- (t,e)::ev;
     Mutex.unlock ev_m
 
@@ -49 +63 @@
     let _ =
       Tutils.create
-        (fun () -> ()
+        (fun () ->
+           while true do
+             let c = input_char stdin in
+               try
+                 Printf.printf "\nPlaying note %d.\n%!" (note_of_char c);
+                 self#add_event 0 (Midi.Note_on (note_of_char c, 0.8))
+               with
+                 | Not_found -> ()
+           done
         ) () "Virtual keyboard"
     in
@@ -59 +81 @@
   method get_frame frame =
     assert (0 = MFrame.position frame);
-    MFrame.add_break frame (MFrame.size frame)
+    let m = MFrame.tracks frame in
+    let t = self#get_events in
+      for c = 0 to Array.length m - 1 do
+        m.(c) := t
+      done;
+      MFrame.add_break frame (MFrame.size frame)
 end
 
@@ -67 +94 @@
     ]
     ~category:Lang.Input
-    ~flags:[Lang.Experimental]
+    ~flags:[Lang.Hidden; Lang.Experimental]
     ~descr:"Play notes from the keyboard."
     (fun p _ ->
-       let e f v = f (List.assoc v p) in
+       (* let e f v = f (List.assoc v p) in *)
          ((new keyboard):>Source.source)
     )