Changeset 6696

Timestamp:

06/29/09 16:17:17 (14 months ago)

Author:

smimram

Message:

Square synth.

Location:

trunk/liquidsoap/src/synth

Files:

• keyboard_sdl.ml (modified) (1 diff)
• synth.ml (modified) (1 diff)
• synth_op.ml (modified) (1 diff)

trunk/liquidsoap/src/synth/keyboard_sdl.ml

@@ -70 +70 @@
                   let c = Sdlkey.char_of_key k.Sdlevent.keysym in
                   let n = note_of_char c in
-                    Printf.printf "Playing note %d.\n%!" n;
+                    (* Printf.printf "Playing note %d.\n%!" n; *)
                     ans := (0,Midi.Note_on (n, velocity))::!ans
               | Some (Sdlevent.KEYUP k) ->
                   let c = Sdlkey.char_of_key k.Sdlevent.keysym in
                   let n = note_of_char c in
-                    Printf.printf "Stopping note %d.\n%!" n;
+                    (* Printf.printf "Stopping note %d.\n%!" n; *)
                     ans := (0,Midi.Note_off (n, velocity))::!ans
               | _ -> ()

trunk/liquidsoap/src/synth/synth.ml

@@ -64 +64 @@
 end
 
-type sine_gs = unit
-type sine_ns =
+type simple_gs = unit
+(* Period is 1. *)
+type simple_ns =
     {
-      sine_phase : float;
-      sine_freq : float;
-      sine_ampl : float;
+      simple_phase : float;
+      simple_freq : float;
+      simple_ampl : float;
     }
 
-class sine =
+class simple f =
 object (self)
-  inherit [sine_gs, sine_ns] base
+  inherit [simple_gs, simple_ns] base
 
   method state_init = ()
 
-  method note_init n v = { sine_phase = (*Random.float (2. *. pi)*) 0.; sine_freq = freq_of_note n; sine_ampl = v }
+  method note_init n v = { simple_phase = (*Random.float 1.*) 0.; simple_freq = freq_of_note n; simple_ampl = v }
 
   method synth_note_mono gs ns freq buf ofs len =
-    let phase i = ns.sine_phase +. float i /. freq *. ns.sine_freq *. 2. *. pi in
+    let phase i = ns.simple_phase +. float i /. freq *. ns.simple_freq in
       for i = ofs to ofs + len - 1 do
-        buf.(i) <- buf.(i) +. ns.sine_ampl *. sin (phase i)
+        buf.(i) <- buf.(i) +. ns.simple_ampl *. f (phase i)
       done;
-      gs, { ns with sine_phase = phase len }
+      gs, { ns with simple_phase = fst (modf (phase len)) }
 end
+
+class sine = object inherit simple (fun x -> sin (x *. 2. *. pi)) end
+
+class square = object inherit simple (fun x -> let x = fst (modf x) in if x < 0.5 then 1. else -1.) end

trunk/liquidsoap/src/synth/synth_op.ml

@@ -71 +71 @@
        let src = Lang.to_source (f "") in
          new synth (new Synth.sine :> Synth.synth) src 0)
+
+let () =
+  Lang.add_operator "synth.square"
+    [ "", Lang.source_t, None, None ]
+    ~category:Lang.SoundSynthesis
+    ~descr:"Square synthesiser."
+    (fun p _ ->
+       let f v = List.assoc v p in
+       let src = Lang.to_source (f "") in
+         new synth (new Synth.square :> Synth.synth) src 0)