X-Git-Url: https://scm.cri.mines-paristech.fr/git/Faustine.git/blobdiff_plain/c0ac16bdf3099698bb61bb8183f047381a6c713e..9fdfd04e29fcefdb9120a4d9467827ceaf8dfaa0:/interpretor/beam.ml?ds=sidebyside

diff --git a/interpretor/beam.ml b/interpretor/beam.ml
index b66ac2b..bec7ed0 100644
--- a/interpretor/beam.ml
+++ b/interpretor/beam.ml
@@ -70,7 +70,7 @@ 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
 
-      method output : int -> float array array array = 
+      method output : int -> data = 
 	  fun (length_max : int) ->
 	    let transpose : 'a array array -> 'a array array = 
 	      fun matrix ->
@@ -96,12 +96,12 @@ class beam : signal_type array -> beam_type =
 		    transpose (Array.sub container 0 !index)
 		| _ -> raise x
 
-      method frequency : int array = 
-	let each_rate : signal -> int = 
+      method frequency : rate_type array = 
+	let each_rate : signal -> rate = 
 	  fun (s : signal) -> 
 	    let rate = s#frequency in
-	    if rate > 0 then rate
-	    else if rate = 0 then 44100
+	    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