Changeset 6713

Timestamp:

07/01/09 18:35:34 (9 months ago)

Author:

smimram

Message:

Fix for 32-bit archs.

Location:

trunk/liquidsoap/src

Files:

• formats/midiformat.ml (modified) (1 diff)
• operators/flanger.ml (modified) (5 diffs)
• synth/synth.ml (modified) (1 diff)

trunk/liquidsoap/src/formats/midiformat.ml

@@ -295 +295 @@
           | _ -> assert false
       in
-      let tempo = ref 125000 in
+      let tpq = Int64.of_int tpq in
+      let tempo = ref (Int64.of_int 125000) in
+      let tps = Int64.of_int (Fmt.ticks_per_second ()) in
+      let ten = Int64.of_int 1000000 in
         List.map
           (fun (d,(c,e)) ->
-             let d = (d * !tempo / tpq) * Fmt.ticks_per_second () / 1000000 in
+             (* These computations sometimes overflow on 32 bits. *)
+             let d = Int64.of_int d in
+             let d =
+               let ( * ) = Int64.mul in
+               let ( / ) = Int64.div in
+                 (((d * !tempo) / tpq) * tps) / ten
+             in
+             let d = Int64.to_int d in
                (
                  match e with
                    | Midi.Tempo t ->
-                       tempo := t
+                       tempo := Int64.of_int t
                    | _ -> ()
                );

trunk/liquidsoap/src/operators/flanger.ml

@@ -25 +25 @@
 let pi = acos (-1.)
 
-class flanger (source:source) delay freq feedback =
+class flanger (source:source) delay freq feedback phase =
   let past_len = Fmt.samples_of_seconds delay in
 object (self)
@@ -53 +53 @@
       in
         for i = offset to position - 1 do
-          let delay =
-            (past_pos + past_len +
-             Fmt.samples_of_seconds (delay *. (1. -. cos omega) /. 2.))
-            mod past_len
-          in
-            for c = 0 to Array.length b - 1 do
+          for c = 0 to Array.length b - 1 do
+            let delay =
+              (past_pos + past_len +
+               Fmt.samples_of_seconds (delay *. (1. -. cos (omega +. float c *. phase ())) /. 2.))
+              mod past_len
+            in
               past.(c).(past_pos) <- b.(c).(i);
               b.(c).(i) <- (b.(c).(i) +. past.(c).(delay) *. feedback)
@@ -64 +64 @@
             done;
           omega <- omega +. d_omega;
+          while omega > 2. *. pi do omega <- omega -. 2. *. pi done;
           past_pos <- (past_pos + 1) mod past_len
         done
@@ -70 +71 @@
 let () =
   Lang.add_operator "flanger"
-    [ "delay", Lang.float_t, Some (Lang.float 0.001), Some "Delay in seconds.";
+    [
+      "delay", Lang.float_t, Some (Lang.float 0.001), Some "Delay in seconds.";
       "freq",
       Lang.float_getter_t 1,
@@ -77 +79 @@
       Lang.float_getter_t 2,
       Some (Lang.float (0.)), Some "Feedback coefficient in dB.";
-      "", Lang.source_t, None, None ]
+      "phase", Lang.float_getter_t 3, Some (Lang.float 1.), Some "Phasse difference between channels in radians.";
+      "", Lang.source_t, None, None
+    ]
     ~category:Lang.SoundProcessing
     ~descr:"Flanger effect."
     (fun p _ ->
        let f v = List.assoc v p in
-       let duration, freq, feedback, src =
+       let duration, freq, feedback, phase, src =
          Lang.to_float (f "delay"),
          Lang.to_float_getter (f "freq"),
          Lang.to_float_getter (f "feedback"),
+         Lang.to_float_getter (f "phase"),
          Lang.to_source (f "")
        in
        let feedback = fun () -> Sutils.lin_of_dB (feedback ()) in
-         new flanger src duration freq feedback)
+         new flanger src duration freq feedback phase)

trunk/liquidsoap/src/synth/synth.ml

@@ -1 @@
-let pi = 3.1416
+let pi = acos (-1.)
 
 let freq_of_note n = 440. *. (2. ** ((float n -. 69.) /. 12.))