Changeset 510

Timestamp:

10/10/07 15:07:10 (1 year ago)

Author:

shans

Message:

Proper plugin layering and an example in track_test_sins

Files:

• ocaml-remix/trunk/Makefile (modified) (1 diff)
• ocaml-remix/trunk/ladspa.ml (modified) (1 diff)
• ocaml-remix/trunk/ladspa_impl.c (modified) (5 diffs)
• ocaml-remix/trunk/ladspa_raw.ml (modified) (1 diff)
• ocaml-remix/trunk/ladspa_raw.mli (modified) (1 diff)
• ocaml-remix/trunk/plugin.ml (modified) (1 diff)
• ocaml-remix/trunk/plugin.mli (modified) (1 diff)
• ocaml-remix/trunk/track_test_sins.ml (modified) (1 diff)

ocaml-remix/trunk/Makefile

@@ -1 @@
-
+.opt
-
-COMPONENTS = remix time volume sound plugin tone wave envelope transparency \

ocaml-remix/trunk/ladspa.ml

@@ -46 +46 @@
-        let out_arr = 
-              Array.init channels (fun _ -> Ladspa_raw.empty_buffer len) in
-
+ len
-        out_arr
-      )

ocaml-remix/trunk/ladspa_impl.c

@@ -176 +176 @@
-}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-  int i;
+
+  //printf("copying %d samples into %d channels\n", length, channels);
+  length *= channels;
-  
-  LADSPA_Data **data = malloc(channels * sizeof(LADSPA_Data *));
@@ -188 +192 @@
-  for (i = 0; i < channels; i++) {
-    value b = (value)Field(ml_buffers, i);
+    //printf("buffer %d is %p\n", i, Field(b, 0));
-    data[i] = (LADSPA_Data *)Field(b, 0);
-  }
-
+  
-  for (i = 0; i < length; i++) {
-    int v = Int_val(Field(ml_sound, i));
@@ -268 +274 @@
-  int size = Int_val(ml_size);
-  LADSPA_Data *data = calloc(sizeof(LADSPA_Data), size);
-
+
+
+
-  CAMLlocal1(block);
-  block = alloc(1, Abstract_tag);
@@ -286 +294 @@
-  int port = Int_val(ml_port);
-
+  //printf("connected %p to port %d\n", data, port);
+  
-  ld->connect_port(h, port, data);
-  
@@ -300 +310 @@
-  long count = Long_val(ml_count);
-
+  //printf("running for %d samples\n", count);
+  
-  ld->run(h, count);
-

ocaml-remix/trunk/ladspa_raw.ml

@@ -14 +14 @@
-external activate : plugin -> handle -> unit = "c_ex_ladspa_activate";;
-
-
+int -> 
-                                          "c_ex_ladspa_raw_sound_to_buffers";;
-

ocaml-remix/trunk/ladspa_raw.mli

@@ -15 +15 @@
-val activate : plugin -> handle -> unit;;
-
- and output buffer array
-
+, output buffer array, and length in samples
+int -> 
-
-val raw_sound_channel_to_buffer : int array -> int -> int -> buffer -> unit;;

ocaml-remix/trunk/plugin.ml

@@ -2 +2 @@
-
-let from_sound s = function _ -> s;;
+
+exception InappropriatePlugin
+
+let from_ladspa_impl ladspa setup href insound remix extent render_extent =
+  let build_handles _ = 
+    let create_f _ = 
+      let h = Ladspa_raw.instantiate ladspa (Remix.samplerate remix) in
+      Ladspa_raw.activate ladspa h;
+      setup ladspa h; h in
+    Array.init (Remix.channels remix) create_f in
+  let raw_start, raw_length = Time.extent_to_raw_time remix render_extent in
+  let handles = (match !href with
+    | None -> 
+      (
+        let h = build_handles () in
+        href := Some (h, raw_start + raw_length);
+        h
+      )
+    | Some (h, t) -> 
+      (
+        if t = raw_start 
+        then (
+          href := Some (h, t + raw_length);
+          h
+        ) else (
+          let h = build_handles () in
+          href := Some (h, raw_start + raw_length);
+          h
+        )
+      )) in
+  let ports = Ladspa_raw.port_count ladspa in
+  let rec _portdesc n = 
+    if n = ports then []
+    else (n, Ladspa_raw.port_descriptor ladspa n)::_portdesc (n + 1) in
+  let ports = _portdesc 0 in
+  let inAudioPorts = List.filter (function (a,(b,c)) -> 
+        b = Ladspa_raw.Input && c = Ladspa_raw.Audio) ports in
+  let outAudioPorts = List.filter (function (a,(b,c)) -> 
+        b = Ladspa_raw.Output && c = Ladspa_raw.Audio) ports in
+  if List.length inAudioPorts = 1 && List.length outAudioPorts = 1 then (
+    let raw_insound = insound remix extent render_extent in
+    let channels = Remix.channels remix in
+    let buffers = 
+      Array.init channels (function _ -> Ladspa_raw.empty_buffer raw_length) in
+    Ladspa_raw.raw_sound_to_buffers raw_insound buffers raw_length;
+    let outbuffers = 
+      Array.init channels (function _ -> Ladspa_raw.empty_buffer raw_length) in
+    for i = 0 to (channels - 1) do (
+      Ladspa_raw.connect_port ladspa handles.(i) (fst (List.hd inAudioPorts))
+        buffers.(i);
+      Ladspa_raw.connect_port ladspa handles.(i) (fst (List.hd outAudioPorts))
+        outbuffers.(i);
+      Ladspa_raw.run ladspa handles.(i) raw_length
+    ) done;
+    Ladspa_raw.buffers_to_raw_sound outbuffers raw_length
+  ) else raise InappropriatePlugin;;
+
+let from_ladspa ladspa setup = 
+  let href = ref None in
+  from_ladspa_impl ladspa setup href;;
+

ocaml-remix/trunk/plugin.mli

@@ -2 +2 @@
-
-val from_sound : Sound.sound -> plugin;;
+
+val from_ladspa : Ladspa_raw.plugin -> 
+      (Ladspa_raw.plugin -> Ladspa_raw.handle -> unit) -> plugin;;

ocaml-remix/trunk/track_test_sins.ml

@@ -30 +30 @@
-Layer.add_plugin layer2 a (Time.Seconds 12.0, Time.Seconds 4.0);;
-
+let set_control_value plugin handle port value = 
+  let v = Ladspa_raw.control_value_to_buffer value in
+  Ladspa_raw.connect_port plugin handle port v;;
+
+let layer3 = Layer.empty();;
+let ladspa = Ladspa_raw.open_plugin "tap_vibrato:tap_vibrato";;
+let setup_plugin plugin handle = 
+  set_control_value plugin handle 0 5.0;
+  set_control_value plugin handle 1 5.0;
+  set_control_value plugin handle 2 (-90.0);
+  set_control_value plugin handle 3 (0.0);
+  set_control_value plugin handle 4 0.0;;
+let plugin = Plugin.from_ladspa ladspa setup_plugin;;
+Layer.add_plugin layer3 plugin (Time.Seconds 2.0, Time.Seconds 7.0);;
+let trans = Transparency.linear_ramp 1.0 1.0;;
+Layer.add_transparency layer3 trans (Time.Seconds 0.0, Time.Seconds 2.0);;
+Layer.add_transparency layer3 trans (Time.Seconds 9.0, Time.Seconds 16.0);;
+
-let track = Track.empty ();;
+Track.add_layer track layer3;;
-Track.add_layer track layer1;;
-Track.add_layer track layer2;;