@grame/faustwasm 0.0.52 → 0.0.54

package/package.json

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

package/src/FaustDspGenerator.ts

@@ -397,15 +397,21 @@ export class FaustPolyDspGenerator implements IFaustPolyDspGenerator {
         name: string,
         dspCode: string,
         args: string,
+        // The ${dspCode} has to be added with wrapping new lines to make is properly formatted and compile
         effectCode = `
-adapt(1,1) = _; adapt(2,2) = _,_; adapt(1,2) = _ <: _,_; adapt(2,1) = _,_ :> _;
-adaptor(F,G) = adapt(outputs(F),inputs(G));
-dsp_code = environment{${dspCode}};
-process = adaptor(dsp_code.process, dsp_code.effect) : dsp_code.effect;`
+            adapt(1,1) = _;
+            adapt(2,2) = _,_;
+            adapt(1,2) = _ <: _,_;
+            adapt(2,1) = _,_ :> _;
+            adaptor(F,G) = adapt(outputs(F),inputs(G));
+            dsp_code = environment{
+                ${dspCode}
+            };
+            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 since 'compilePolyNode2' can be called by called by 'compilePolyNode'
+        // Compile effect, possibly failing since 'compilePolyNode2' can be called by 'compilePolyNode'
         try {
             this.effectFactory = await compiler.createPolyDSPFactory(name, effectCode, args);
         } catch (e) {

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

@@ -2457,8 +2457,11 @@ this.fAudioMixingHalf: ${this.fAudioMixingHalf}`;
         }
       }
     });
-    if (this.fInstance.effectAPI)
+    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));
       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++) {
@@ -2476,7 +2479,11 @@ this.fAudioMixingHalf: ${this.fAudioMixingHalf}`;
     return this.fInstance.voiceAPI.getNumInputs(0);
   }
   getNumOutputs() {
-    return this.fInstance.voiceAPI.getNumOutputs(0);
+    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);
   }
   static findPath(o, p) {
     if (typeof o !== "object") {
@@ -3637,10 +3644,15 @@ var _FaustPolyDspGenerator = class {
     this.effectFactory = null;
   }
   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{${dspCode}};
-process = adaptor(dsp_code.process, dsp_code.effect) : dsp_code.effect;`) {
+            adapt(1,1) = _;
+            adapt(2,2) = _,_;
+            adapt(1,2) = _ <: _,_;
+            adapt(2,1) = _,_ :> _;
+            adaptor(F,G) = adapt(outputs(F),inputs(G));
+            dsp_code = environment{
+                ${dspCode}
+            };
+            process = adaptor(dsp_code.process, dsp_code.effect) : dsp_code.effect;`) {
     this.voiceFactory = await compiler.createPolyDSPFactory(name, dspCode, args);
     if (!this.voiceFactory)
       return null;