@grame/faustwasm 0.0.55 → 0.0.57

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grame/faustwasm",
-  "version": "0.0.55",
+  "version": "0.0.57",
   "description": "WebAssembly version of Faust Compiler",
   "main": "dist/cjs/index.js",
   "types": "dist/esm/index.d.ts",

package/src/FaustDspGenerator.ts

@@ -395,34 +395,25 @@ export class FaustPolyDspGenerator implements IFaustPolyDspGenerator {
     async compile(
         compiler: IFaustCompiler,
         name: string,
-        dspCodeAux: string,
+        dspCode: string,
         args: string,
-        // The ${dspCodeAux} string has to be added with wrapping new lines to make it properly formatted and ready to compile 
+        // The ${dspCode} has to be added with wrapping new lines to make it properly formatted and ready to compile
         effectCode = `
-            dsp_code = environment{
-                ${dspCodeAux}
-            };
-            process = dsp_code.effect;`
-    ) {
-        // Since the effect is going to process the voice outputs "in-place", 
-        // the voice output number has to be the same as the effect input number
-        const dspCode = `
             adapt(1,1) = _;
             adapt(2,2) = _,_;
             adapt(1,2) = _ <: _,_;
             adapt(2,1) = _,_ :> _;
             adaptor(F,G) = adapt(outputs(F),inputs(G));
             dsp_code = environment{
-                ${dspCodeAux}
+                ${dspCode}
             };
-            process = dsp_code.process : adaptor(dsp_code.process, dsp_code.effect);`;
-
+            process = adaptor(dsp_code.process, dsp_code.effect) : dsp_code.effect;`
+    ) {
         this.voiceFactory = await compiler.createPolyDSPFactory(name, dspCode, args);
         if (!this.voiceFactory) return null;
         // Compile effect, possibly failing
         try {
-            // Effect is processing same buffers for input and output, so has to use -inpl option
-            this.effectFactory = await compiler.createPolyDSPFactory(name, effectCode, args + " -inpl");
+            this.effectFactory = await compiler.createPolyDSPFactory(name, effectCode, args);
         } catch (e) {
             console.warn(e);
         }

package/test/Sinusoide.dsp

@@ -0,0 +1,60 @@
+declare name "Sinusoide";
+declare author "Developpement Grame - CNCM par Elodie Rabibisoa et Romain Constant.";
+
+import ("stdfaust.lib");
+
+process = mode_switch : os.osc * 0.333 * volume <: sinus_reverb,_ : dry_wet <: limiter :>_ * on_off;
+
+on_off = checkbox("[1]ON / OFF");
+freq_slide = vslider("Slide [unit:Hz][acc:0 0 -10 0 10][hidden:1]", freq(5), freq(0), freq(10), 0.001) : si.smooth(0.998);
+freq_scale = vslider("Radio [unit:Hz][acc:0 0 -10 0 10][hidden:1]", 1, 0, (N-1), 1);
+volume = hslider("Volume [hidden:1][acc:1 0 -9 0 10]", 0.35, 0, 0.7, 0.001):si.smooth(0.991):min(1):max(0);
+
+// Default mode = slide (0)
+toggle_mode = checkbox("[0]SLIDE / SCALE");
+mode_switch = select2(toggle_mode, freq_slide, scale);
+
+//----------------- Frequencies --------------------//
+N = 11;
+scale = par(i, N, freq(i) * choice(i)) :>_;
+choice(n) = abs(freq_scale - n) < 0.5;
+
+freq(0) = 523.5;
+freq(1) = 587.3;
+freq(2) = 622.3;
+freq(3) = 784;
+freq(4) = 830.6;
+freq(5) = 1046.5;
+freq(6) = 1174.7;
+freq(7) = 1244.5;
+freq(8) = 1568;
+freq(9) = 1661.2;
+freq(10) = 2093;
+
+//----------------- Limiter -----------------------//
+limiter(x,y) = x*coeff,y*coeff
+with {
+    epsilon = 1/(44100*1.0);
+    peak = max(abs(x),abs(y)) : max ~ -(epsilon);
+    coeff = 1.0/max(1.0,peak);
+};
+
+//------------------ Reverb ----------------------//
+sinus_reverb = _<: instrReverb :>_;
+
+instrReverb = _,_ <: *(reverbGain),*(reverbGain),*(1 - reverbGain),*(1 - reverbGain) :
+re.zita_rev1_stereo(rdel,f1,f2,t60dc,t60m,fsmax),_,_ <: _,!,_,!,!,_,!,_ : +,+
+with {
+   reverbGain = 0.4;
+   roomSize = 2;
+   rdel = 20;
+   f1 = 200;
+   f2 = 6000;
+   t60dc = roomSize*3;
+   t60m = roomSize*2;
+   fsmax = 48000;
+};
+
+dry_wet(x,y) = (x*c) + (y*(1-c)) with {
+    c = vslider("[1] Dry/Wet Mix [hidden:1][style:knob]", 1,0,1.0,0.01) : si.smoo;
+};

package/test/faustlive-wasm/faustwasm/index.d.ts

@@ -1278,7 +1278,7 @@ export declare class FaustPolyDspGenerator implements IFaustPolyDspGenerator {
 	mixerBuffer: Uint8Array;
 	mixerModule: WebAssembly.Module;
 	constructor();
-	compile(compiler: IFaustCompiler, name: string, dspCodeAux: string, args: string, effectCode?: string): Promise<this | null>;
+	compile(compiler: IFaustCompiler, name: string, dspCode: string, args: string, effectCode?: string): Promise<this | null>;
 	createNode<SP extends boolean = false>(context: BaseAudioContext, voices: number, name?: string, voiceFactory?: LooseFaustDspFactory, mixerModule?: WebAssembly.Module, effectFactory?: LooseFaustDspFactory | null, sp?: SP, bufferSize?: number, processorName?: string): Promise<SP extends true ? FaustPolyScriptProcessorNode | null : FaustPolyAudioWorkletNode | null>;
 	createAudioWorkletProcessor(name?: string, voiceFactory?: LooseFaustDspFactory, effectFactory?: LooseFaustDspFactory | null, processorName?: string): Promise<{
 		new (options: AudioWorkletNodeOptions): AudioWorkletProcessor;

package/test/faustlive-wasm/faustwasm/index.js

@@ -3636,26 +3636,21 @@ var _FaustPolyDspGenerator = class {
     this.voiceFactory = null;
     this.effectFactory = null;
   }
-  async compile(compiler, name, dspCodeAux, args, effectCode = `
-            dsp_code = environment{
-                ${dspCodeAux}
-            };
-            process = dsp_code.effect;`) {
-    const dspCode = `
+  async compile(compiler, name, dspCode, args, effectCode = `
             adapt(1,1) = _;
             adapt(2,2) = _,_;
             adapt(1,2) = _ <: _,_;
             adapt(2,1) = _,_ :> _;
             adaptor(F,G) = adapt(outputs(F),inputs(G));
             dsp_code = environment{
-                ${dspCodeAux}
+                ${dspCode}
             };
-            process = dsp_code.process : adaptor(dsp_code.process, dsp_code.effect);`;
+            process = adaptor(dsp_code.process, dsp_code.effect) : dsp_code.effect;`) {
     this.voiceFactory = await compiler.createPolyDSPFactory(name, dspCode, args);
     if (!this.voiceFactory)
       return null;
     try {
-      this.effectFactory = await compiler.createPolyDSPFactory(name, effectCode, args + " -inpl");
+      this.effectFactory = await compiler.createPolyDSPFactory(name, effectCode, args);
     } catch (e) {
       console.warn(e);
     }