@grame/faustwasm 0.0.54 → 0.0.55

package/package.json

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

package/src/FaustDspGenerator.ts

@@ -395,25 +395,34 @@ export class FaustPolyDspGenerator implements IFaustPolyDspGenerator {
     async compile(
         compiler: IFaustCompiler,
         name: string,
-        dspCode: string,
+        dspCodeAux: string,
         args: string,
-        // The ${dspCode} has to be added with wrapping new lines to make is properly formatted and compile
+        // The ${dspCodeAux} string 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{
-                ${dspCode}
+                ${dspCodeAux}
             };
-            process = adaptor(dsp_code.process, dsp_code.effect) : dsp_code.effect;`
-    ) {
+            process = dsp_code.process : adaptor(dsp_code.process, dsp_code.effect);`;
+
         this.voiceFactory = await compiler.createPolyDSPFactory(name, dspCode, args);
         if (!this.voiceFactory) return null;
-        // Compile effect, possibly failing since 'compilePolyNode2' can be called by 'compilePolyNode'
+        // Compile effect, possibly failing
         try {
-            this.effectFactory = await compiler.createPolyDSPFactory(name, effectCode, args);
+            // Effect is processing same buffers for input and output, so has to use -inpl option
+            this.effectFactory = await compiler.createPolyDSPFactory(name, effectCode, args + " -inpl");
         } catch (e) {
             console.warn(e);
         }

package/test/bug.dsp

@@ -0,0 +1,18 @@
+declare options "[midi:on][nvoices:12]";
+import("stdfaust.lib");
+freq = hslider("freq",200,50,1000,0.01);
+gain = hslider("gain",0.5,0,1,0.01);
+gate = button("gate");
+envelope = en.adsr(0.01,0.01,0.8,0.1,gate)*gain;
+
+process = os.sawtooth(freq)*envelope, os.sawtooth(freq*1.5)*envelope;
+
+//process = os.sawtooth(freq)*envelope;
+
+cross = _,_ <: !,_,_,! :> _,_;
+
+//effect = _*0.01,_ : cross;
+
+effect = _;
+
+//effect = cross;

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, dspCode: string, args: string, effectCode?: string): Promise<this | null>;
+	compile(compiler: IFaustCompiler, name: string, dspCodeAux: 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

@@ -2457,11 +2457,8 @@ this.fAudioMixingHalf: ${this.fAudioMixingHalf}`;
         }
       }
     });
-    if (this.fInstance.effectAPI) {
-      console.log("effectAPI.getNumInputs() = %d", this.fInstance.effectAPI.getNumInputs(this.fEffect));
-      console.log("effectAPI.getNumOutputs() = %d", this.fInstance.effectAPI.getNumOutputs(this.fEffect));
+    if (this.fInstance.effectAPI)
       this.fInstance.effectAPI.compute(this.fEffect, this.fBufferSize, this.fAudioOutputs, this.fAudioOutputs);
-    }
     this.updateOutputs();
     if (output !== void 0) {
       for (let chan = 0; chan < Math.min(this.getNumOutputs(), output.length); chan++) {
@@ -2479,11 +2476,7 @@ this.fAudioMixingHalf: ${this.fAudioMixingHalf}`;
     return this.fInstance.voiceAPI.getNumInputs(0);
   }
   getNumOutputs() {
-    if (this.fInstance.effectAPI) {
-      console.log("effectAPI.getNumOutputs() = %d", this.fInstance.effectAPI.getNumOutputs(this.fEffect));
-      console.log("VOICE.getNumOutputs() = %d", this.fInstance.voiceAPI.getNumOutputs(0));
-    }
-    return this.fInstance.effectAPI ? this.fInstance.effectAPI.getNumOutputs(this.fEffect) : this.fInstance.voiceAPI.getNumOutputs(0);
+    return this.fInstance.voiceAPI.getNumOutputs(0);
   }
   static findPath(o, p) {
     if (typeof o !== "object") {
@@ -3643,21 +3636,26 @@ var _FaustPolyDspGenerator = class {
     this.voiceFactory = null;
     this.effectFactory = null;
   }
-  async compile(compiler, name, dspCode, args, effectCode = `
+  async compile(compiler, name, dspCodeAux, args, effectCode = `
+            dsp_code = environment{
+                ${dspCodeAux}
+            };
+            process = dsp_code.effect;`) {
+    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{
-                ${dspCode}
+                ${dspCodeAux}
             };
-            process = adaptor(dsp_code.process, dsp_code.effect) : dsp_code.effect;`) {
+            process = dsp_code.process : adaptor(dsp_code.process, 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);
+      this.effectFactory = await compiler.createPolyDSPFactory(name, effectCode, args + " -inpl");
     } catch (e) {
       console.warn(e);
     }