Update control.

smimram · Feb 28, 2025 · f118c2b · f118c2b
1 parent 85aa840
commit f118c2b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/examples/fm_arpeggiator.ml b/examples/fm_arpeggiator.ml
@@ -10,7 +10,7 @@ let s =
   let s = Pattern.concat [[0.,8.,`Chord([72;76;79],1.)];[0.,8.,`Chord([71;72;76;79],1.)];[0.,8.,`Chord([69;72;76;79],1.)];[0.,8.,`Chord([67;71;76;79],1.)]] in
   let s = Pattern.transpose (-12) s in
   let s = Pattern.arpeggiate ~note:0.25 `Up_down s in
-  (* let d = OSC.float "/1/fader1" ~mode:`Logarithmic ~max:10000. 100. in *)
+  (* let d = OSC.float "/oscControl/fader1" ~mode:`Logarithmic ~max:10000. 100. in *)
   let d = B.cmul 100. (now ()) in
   let note ~event ~on_die () =
     let adsr = adsr ~event ~on_die () ~a:0.01 ~d:0.1 ~r:0.001 () in
@@ -28,9 +28,9 @@ let s =
   in
   (* let s = s >>= agc ~dt () in *)
   let s = s >>= stereo >>= Stereo.dephase () (-0.01) in
-  (* let kick = Instrument.kick ~dt ~vol:1. tempo >>= amp 0.7 >>= stereo in *)
-  (* Stereo.add s kick *)
-  s
+  let kick = Instrument.kick tempo >>= amp 0.7 >>= stereo in
+  Stereo.add s kick
+  (* s *)
 
 let () =
   OSC.server 10000;

diff --git a/examples/trance.ml b/examples/trance.ml
@@ -30,7 +30,7 @@ let s =
   let bass = Pattern.transpose (-24) bass in
   let bass = Instrument.play bass_note (Pattern.stream ~loop:true tempo bass) in
   let bass = B.cmul 0.08 bass in
-  (* let bass = bind3 (Filter.biquad ~dt `Low_pass) (OSC.float "/1/fader3" ~min:0.1 ~max:20. 0.5) (OSC.float "/1/fader4" ~min:1. ~max:5000. 5000.) bass in *)
+  (* let bass = bind3 (Filter.biquad ~dt `Low_pass) (OSC.float "/oscControl/fader3" ~min:0.1 ~max:20. 0.5) (OSC.float "/oscControl/fader4" ~min:1. ~max:5000. 5000.) bass in *)
   (* let bass = bass >>= stereo >>= Stereo.dephase ~dt 0.01 in *)
   let bass = bass >>= Stereo.schroeder2 () in
   let bass = let d = Note.duration tempo 0.5 in bass >>= Stereo.delay () d ~feedback:0.1 ~ping_pong:d in
@@ -47,17 +47,17 @@ let s =
     (* let fv = Stereo.freeverb () in *)
     (* bind6 *)
       (* (fun roomsize damp width wet dry -> fv ~roomsize ~damp ~width ~dry ~wet) *)
-      (* (OSC.float "/1/fader1" 0.5) *)
-      (* (OSC.float "/1/fader2" ~min:1. ~max:0. 0.5) *)
-      (* (OSC.float "/1/fader3" 1.) *)
-      (* (OSC.float "/1/fader4" 0.3) *)
-      (* (OSC.float "/1/fader5" 0.3) *)
+      (* (OSC.float "/oscControl/fader1" 0.5) *)
+      (* (OSC.float "/oscControl/fader2" ~min:1. ~max:0. 0.5) *)
+      (* (OSC.float "/oscControl/fader3" 1.) *)
+      (* (OSC.float "/oscControl/fader4" 0.3) *)
+      (* (OSC.float "/oscControl/fader5" 0.3) *)
       (* drums *)
   (* in *)
   let s = Stereo.mix [bass;drums;pad] >>= Stereo.amp 0.3 in
   s
   (* s >>= Visu.Stereo.bands ~dt ~amp:5. () *)
 
 let () =
-  OSC.server 8000;
+  OSC.server 10000;
   Output.play s