Changeset 501

Timestamp:

08/22/07 22:37:57 (1 year ago)

Author:

shans

Message:

raw ladspa wrappers implemented and working (at least for simple test)

Files:

• ocaml-remix/trunk/Makefile (modified) (2 diffs)
• ocaml-remix/trunk/ladspa_impl.c (modified) (1 diff)
• ocaml-remix/trunk/ladspa_raw.ml (added)
• ocaml-remix/trunk/ladspa_raw.mli (added)
• ocaml-remix/trunk/ladspa_test.ml (modified) (1 diff)
• ocaml-remix/trunk/sound.ml (modified) (1 diff)
• ocaml-remix/trunk/sound.mli (modified) (1 diff)

ocaml-remix/trunk/Makefile

@@ -24 +24 @@
-        ocamlc -I +camlp4 camlp4lib.cma -pp camlp4of pa_operators.ml
-
-
+_raw
-        ocamlc -c $(OCAMLCARGS) $(INTERFACES) $(SOURCES)
-
+_raw
-
-
+_raw
-        ocamlopt -c $(OCAMLOPTARGS) $(INTERFACES) $(SOURCES)
-
+_raw
-
-oss.cma: oss.mli oss.ml oss_impl.c
@@ -38 +38 @@
-        ocamlopt oss_impl.c oss.mli oss.ml -a -o oss.cmxa
-
-
-
+
+
+
-
-
-
+
+
+
-
-%.bin: remix.cma %.ml

ocaml-remix/trunk/ladspa_impl.c

@@ -137 +137 @@
-
-}
+
+CAMLprim c_ex_ladspa_instantiate(value ml_desc, value ml_samplerate) {
+
+  CAMLparam2(ml_desc, ml_samplerate);
+
+  LADSPA_Descriptor *ld = (LADSPA_Descriptor *)Field(ml_desc, 0);
+  long samplerate = Long_val(ml_samplerate);
+
+  LADSPA_Handle h = ld->instantiate(ld, samplerate);
+
+  CAMLlocal1(block);
+  block = alloc(1, Abstract_tag);
+  Field(block, 0) = (value)h;
+  CAMLreturn(block);
+
+}
+
+CAMLprim c_ex_ladspa_activate(value ml_desc, value ml_handle) {
+
+  CAMLparam2(ml_desc, ml_handle);
+
+  LADSPA_Descriptor *ld = (LADSPA_Descriptor *)Field(ml_desc, 0);
+  LADSPA_Handle h = (LADSPA_Handle)Field(ml_handle, 0);
+
+  if (ld->activate != NULL) {
+    ld->activate(h);
+  }
+
+  CAMLreturn(Val_unit);
+  
+}
+
+value make_arr_entry(LADSPA_Data *d) {
+  CAMLlocal1(block);
+  block = alloc(1, Abstract_tag);
+  Field(block, 0) = (value)d;
+  return block;
+}
+
+CAMLprim c_ex_ladspa_raw_sound_to_buffers(value ml_sound, value ml_channels) {
+
+  CAMLparam1(ml_sound);
+
+  int length = Wosize_val(ml_sound);
+  int channels = Int_val(ml_channels);
+  int i;
+  
+  LADSPA_Data **data = malloc((channels + 1) * sizeof(LADSPA_Data *));
+  
+  for (i = 0; i < channels; i++) {
+    data[i] = malloc(length/channels * sizeof(LADSPA_Data));
+  }
+
+  data[channels] = NULL;
+  
+  for (i = 0; i < length; i++) {
+    int v = Int_val(Field(ml_sound, i));
+    data[i % channels][i / channels] = v / (float)0x7FFF;
+  }
+
+  CAMLlocal1(block);
+  block = alloc_array((value (*)(char const *))make_arr_entry, 
+                        (char const **)data);
+  free(data);
+  CAMLreturn(block);
+}
+
+CAMLprim c_ex_ladspa_buffers_to_raw_sound(value ml_buffers, value ml_size) {
+
+  CAMLparam2(ml_buffers, ml_size);
+  
+  int channels = Wosize_val(ml_buffers);
+  long size = Long_val(ml_size);
+  LADSPA_Data **data = malloc(channels * sizeof(LADSPA_Data *));
+  int i, j, k;
+
+  for (i = 0; i < channels; i++) {
+    value b = (value)Field(ml_buffers, i);
+    data[i] = (LADSPA_Data *)Field(b, 0);
+  }
+
+  CAMLlocal1(block);
+  block = caml_alloc(size * channels, 0);
+  k = 0;
+  for (i = 0; i < size; i++) {
+    for (j = 0; j < channels; j++) {
+      Field(block, k) = (short)(data[j][i] * 0x7FFF);
+      k++;
+    }
+  }
+
+  free(data);
+  
+  CAMLreturn(block);
+}
+
+CAMLprim c_ex_ladspa_control_value_to_buffer(value ml_value) {
+
+  CAMLparam1(ml_value);
+  
+  LADSPA_Data *data = malloc(sizeof(LADSPA_Data));
+  *data = (float)(Double_val(ml_value));
+
+  CAMLlocal1(block);
+  block = alloc(1, Abstract_tag);
+  Field(block, 0) = (value)data;
+  CAMLreturn(block);
+}
+
+CAMLprim c_ex_ladspa_empty_buffer(value ml_size) {
+
+  CAMLparam1(ml_size);
+  
+  int size = Int_val(ml_size);
+  LADSPA_Data *data = malloc(sizeof(LADSPA_Data) * size);
+  
+  CAMLlocal1(block);
+  block = alloc(1, Abstract_tag);
+  Field(block, 0) = (value)data;
+  CAMLreturn(block);
+}
+
+CAMLprim c_ex_ladspa_connect_port(value ml_desc, value ml_handle,
+                                          value ml_port, value ml_data) {
+
+  CAMLparam4(ml_desc, ml_handle, ml_port, ml_data);
+
+  LADSPA_Descriptor *ld = (LADSPA_Descriptor *)Field(ml_desc, 0);
+  LADSPA_Handle h = (LADSPA_Handle)Field(ml_handle, 0);
+  LADSPA_Data *data = (LADSPA_Data *)Field(ml_data, 0);
+  
+  int port = Int_val(ml_port);
+ 
+  ld->connect_port(h, port, data);
+  
+  CAMLreturn(Val_unit);
+  
+}
+
+CAMLprim c_ex_ladspa_run(value ml_desc, value ml_handle, value ml_count) {
+
+  CAMLparam3(ml_desc, ml_handle, ml_count);
+
+  LADSPA_Descriptor *ld = (LADSPA_Descriptor *)Field(ml_desc, 0);
+  LADSPA_Handle h = (LADSPA_Handle)Field(ml_handle, 0);
+  long count = Long_val(ml_count);
+
+  ld->run(h, count);
+
+  CAMLreturn(Val_unit);
+  
+}
+
+CAMLprim c_ex_ladspa_run_adding(value ml_desc, value ml_handle, value ml_count) 
+{
+
+  CAMLparam3(ml_desc, ml_handle, ml_count);
+
+  LADSPA_Descriptor *ld = (LADSPA_Descriptor *)Field(ml_desc, 0);
+  LADSPA_Handle h = (LADSPA_Handle)Field(ml_handle, 0);
+  long count = Long_val(ml_count);
+
+  ld->run_adding(h, count);
+
+  CAMLreturn(Val_unit);
+}

ocaml-remix/trunk/ladspa_test.ml

@@ -1 @@
-d1 = Ladspa
+p = Ladspa_raw
-
-.port_count d1
+_raw.port_count p
-
-Printf.printf "there are %d ports\n" n_ports;;
-
-for i = 0 to (n_ports - 1) do
-.port_descriptor d1
+_raw.port_descriptor p
-  Printf.printf "port %d has direction %s and type %s\n" i 
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

ocaml-remix/trunk/sound.ml

@@ -43 +43 @@
-  Oss.sound_close dev;;
-
+let raw_preview remix sound = 
+  let dev = Oss.sound_open () in
+  Oss.sound_set_parms dev (Remix.channels remix) (Remix.samplerate remix);
+  Oss.sound_write dev sound;
+  Oss.sound_close dev;;

ocaml-remix/trunk/sound.mli

@@ -9 +9 @@
-
-val preview : Remix.remix -> sound -> Time.extent -> Time.extent -> unit;;
+
+val raw_preview : Remix.remix -> raw_sound -> unit;;