Merge branch 'libsndfile'

[Faustine.git] / interpretor / beam.ml

diff --git a/interpretor/beam.ml b/interpretor/beam.ml
index 7726e95..bec7ed0 100644 (file)
--- a/interpretor/beam.ml
+++ b/interpretor/beam.ml
@@ -70,40 +70,39 @@ class beam : signal_type array -> beam_type =
          let signal_at = fun (t : time) -> fun (s : signal_type) -> s#at t in
          Array.map (signal_at t) self#get
 
          let signal_at = fun (t : time) -> fun (s : signal_type) -> s#at t in
          Array.map (signal_at t) self#get
 

-      method output : int -> value_type array array = 
+      method output : int -> data = 

          fun (length_max : int) ->
            let transpose : 'a array array -> 'a array array = 
              fun matrix ->
                let get_element = fun i -> fun array -> array.(i) in
                let get_column = fun m -> fun i -> Array.map (get_element i) m in
                Array.init self#width (get_column matrix) in
          fun (length_max : int) ->
            let transpose : 'a array array -> 'a array array = 
              fun matrix ->
                let get_element = fun i -> fun array -> array.(i) in
                let get_column = fun m -> fun i -> Array.map (get_element i) m in
                Array.init self#width (get_column matrix) in

-            let value_init = new value Error in
+           let value2float = fun (v : value_type) -> v#to_float_array in
+            let init = [|0.|] in

            let container = Array.make length_max 
            let container = Array.make length_max 

-               (Array.make self#width value_init) in
+               (Array.make self#width init) in

            let index = ref 0 in
 
            try
              while !index < length_max do
            let index = ref 0 in
 
            try
              while !index < length_max do

-               container.(!index) <- self#at !index;
+               container.(!index) <- Array.map value2float (self#at !index);

                incr index;
              done;
              transpose container
                incr index;
              done;
              transpose container

-           with x ->

 
 

-             let error_message = 
+           with x ->

                match x with
                match x with

-               | Convert_Error s -> "Convert_Error: " ^ s
-               | Basic_operation s -> "Basic_operation: " ^ s
-               | Signal_operation s -> "Signal_operation: " ^ s
-               | Beam_matching s -> "Beam_Matching_Error: " ^ s
-               | _ -> "Compute finished."
-             in
-             let () = print_string error_message in
-             transpose (Array.sub container 0 !index)
-
-      method frequency : int array = 
-       let each_rate : signal -> int = 
-         fun (s : signal) -> s#frequency in
+               | Invalid_argument s -> 
+                   transpose (Array.sub container 0 !index)
+               | _ -> raise x
+
+      method frequency : rate_type array = 
+       let each_rate : signal -> rate = 
+         fun (s : signal) -> 
+           let rate = s#frequency in
+           if rate#num > 0 then rate
+           else if rate#num = 0 then new rate 44100 1
+           else raise (Beam_matching "frequency error.") in    

        Array.map each_rate self#get 
 
     end
        Array.map each_rate self#get 
 
     end