Merge branch 'main' into dev

flucoma · Jul 7, 2022 · 059cecd · 059cecd
2 parents 3e46bb1 + 9dd149a
commit 059cecd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/release-packaging/HelpSource/Classes/FluidDataSetWr.schelp b/release-packaging/HelpSource/Classes/FluidDataSetWr.schelp
@@ -113,6 +113,7 @@ code::
 ~ds.clear
 
 ::
+
 strong::Circular Writing::
 
 Each time link::Classes/FluidDataSetWr:: is triggered it is like the link::Classes/FluidDataSet#-setPoint:: method so if the identifier does not exist it creates it. If the identifier does it exist then it updates it with the new values.

diff --git a/test/8b-mlp-synth-control.scd b/test/8b-mlp-synth-control.scd
@@ -69,8 +69,8 @@ b = {
 	arg val = #[0,0,0,0,0,0,0,0,0,0];
 	var osc1, osc2, feed1, feed2, base1=69, base2=69, base3 = 130;
 	#feed2,feed1 = LocalIn.ar(2);
-	osc1 = MoogFF.ar(SinOsc.ar((((feed1 * val[0]) +  val[1]) * base1).midicps,mul: (val[2] * 50).dbamp).atan,(base3 - (val[3] * (FluidLoudness.kr(feed2, 1, 0, hopSize: 64)[0].clip(-120,0) + 120))).lag(128/44100).midicps, val[4] * 3.5);
-	osc2 = MoogFF.ar(SinOsc.ar((((feed2 * val[5]) +  val[6]) * base2).midicps,mul: (val[7] * 50).dbamp).atan,(base3 - (val[8] * (FluidLoudness.kr(feed1, 1, 0, hopSize: 64)[0].clip(-120,0) + 120))).lag(128/44100).midicps, val[9] * 3.5);
+	osc1 = MoogFF.ar(SinOsc.ar((((feed1 * val[0]) +  val[1]) * base1).midicps,mul: (val[2] * 50).dbamp).atan,(base3 - (val[3] * (FluidLoudness.kr(feed2,kWeighting:1,truePeak:0, hopSize: 64)[0].clip(-120,0) + 120))).lag(128/44100).midicps, val[4] * 3.5);
+	osc2 = MoogFF.ar(SinOsc.ar((((feed2 * val[5]) +  val[6]) * base2).midicps,mul: (val[7] * 50).dbamp).atan,(base3 - (val[8] * (FluidLoudness.kr(feed1,kWeighting:1,truePeak:0, hopSize: 64)[0].clip(-120,0) + 120))).lag(128/44100).midicps, val[9] * 3.5);
 	Out.ar(0,LeakDC.ar([osc1,osc2],mul: 0.1));
 	LocalOut.ar([osc1,osc2]);
 }.play;