@grame/faustwasm 0.0.55 → 0.0.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grame/faustwasm",
-  "version": "0.0.55",
+  "version": "0.0.56",
   "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/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);
     }