@grame/faustwasm 0.2.1 → 0.2.2

package/package.json

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

package/src/FaustDspGenerator.ts

@@ -87,12 +87,14 @@ export interface IFaustMonoDspGenerator extends GeneratorSupportingSoundfiles {
      * @param sampleRate - the sample rate in Hz
      * @param bufferSize - the buffer size in frames
      * @param factory - default is the compiled factory
+     * @param context - if this exists, will be used to fetch soundfiles online
      * @returns the compiled processor or 'null' if failure
      */
     createOfflineProcessor(
         sampleRate: number,
         bufferSize: number,
-        factory?: LooseFaustDspFactory
+        factory?: LooseFaustDspFactory,
+        context?: BaseAudioContext
     ): Promise<IFaustMonoOfflineProcessor | null>;
 
     /**
@@ -166,6 +168,7 @@ export interface IFaustPolyDspGenerator extends GeneratorSupportingSoundfiles {
      * @param voiceFactory - the Faust factory for voices, either obtained with a compiler (createDSPFactory) or loaded from files (loadDSPFactory)
      * @param mixerModule - the wasm Mixer module (loaded from 'mixer32.wasm' or 'mixer64.wasm' files)
      * @param effectFactory - the Faust factory for the effect, either obtained with a compiler (createDSPFactory) or loaded from files (loadDSPFactory)
+     * @param context - if this exists, will be used to fetch soundfiles online
      * @returns the compiled processor or 'null' if failure
      */
     createOfflineProcessor(
@@ -175,7 +178,7 @@ export interface IFaustPolyDspGenerator extends GeneratorSupportingSoundfiles {
         voiceFactory?: LooseFaustDspFactory,
         mixerModule?: WebAssembly.Module,
         effectFactory?: LooseFaustDspFactory | null,
-        processorName?: string
+        context?: BaseAudioContext
     ): Promise<IFaustPolyOfflineProcessor | null>;
 
     /**
@@ -422,13 +425,15 @@ const dependencies = {
     async createOfflineProcessor(
         sampleRate: number,
         bufferSize: number,
-        factory = this.factory as LooseFaustDspFactory
+        factory = this.factory as LooseFaustDspFactory,
+        context?: BaseAudioContext
     ) {
         if (!factory) throw new Error("Code is not compiled, please define the factory or call `await this.compile()` first.");
 
         const meta = JSON.parse(factory.json);
         const instance = await FaustWasmInstantiator.createAsyncMonoDSPInstance(factory);
         const sampleSize = meta.compile_options.match("-double") ? 8 : 4;
+        if (context) factory.soundfiles = await SoundfileReader.loadSoundfiles(meta, factory.soundfiles || {}, context);
         const monoDsp = new FaustMonoWebAudioDsp(instance, sampleRate, sampleSize, bufferSize, factory.soundfiles);
         return new FaustMonoOfflineProcessor(monoDsp, bufferSize);
     }
@@ -675,7 +680,8 @@ const dependencies = {
         voices: number,
         voiceFactory = this.voiceFactory as LooseFaustDspFactory,
         mixerModule = this.mixerModule,
-        effectFactory = this.effectFactory as LooseFaustDspFactory | null
+        effectFactory = this.effectFactory as LooseFaustDspFactory | null,
+        context?: BaseAudioContext
     ) {
         if (!voiceFactory) throw new Error("Code is not compiled, please define the factory or call `await this.compile()` first.");
 
@@ -683,6 +689,10 @@ const dependencies = {
         const effectMeta = effectFactory ? JSON.parse(effectFactory.json) : undefined;
         const instance = await FaustWasmInstantiator.createAsyncPolyDSPInstance(voiceFactory, mixerModule, voices, effectFactory || undefined);
         const sampleSize = voiceMeta.compile_options.match("-double") ? 8 : 4;
+        if (context) {
+            voiceFactory.soundfiles = await SoundfileReader.loadSoundfiles(voiceMeta, voiceFactory.soundfiles || {}, context);
+            if (effectFactory) effectFactory.soundfiles = await SoundfileReader.loadSoundfiles(effectMeta, effectFactory.soundfiles || {}, context);
+        }
         const soundfiles = { ...effectFactory?.soundfiles, ...voiceFactory.soundfiles };
         const polyDsp = new FaustPolyWebAudioDsp(instance, sampleRate, sampleSize, bufferSize, soundfiles);
         return new FaustPolyOfflineProcessor(polyDsp, bufferSize);

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

@@ -1393,9 +1393,10 @@ export interface IFaustMonoDspGenerator extends GeneratorSupportingSoundfiles {
 	 * @param sampleRate - the sample rate in Hz
 	 * @param bufferSize - the buffer size in frames
 	 * @param factory - default is the compiled factory
+	 * @param context - if this exists, will be used to fetch soundfiles online
 	 * @returns the compiled processor or 'null' if failure
 	 */
-	createOfflineProcessor(sampleRate: number, bufferSize: number, factory?: LooseFaustDspFactory): Promise<IFaustMonoOfflineProcessor | null>;
+	createOfflineProcessor(sampleRate: number, bufferSize: number, factory?: LooseFaustDspFactory, context?: BaseAudioContext): Promise<IFaustMonoOfflineProcessor | null>;
 	/**
 	 * Get DSP JSON description with its UI and metadata as object.
 	 *
@@ -1452,9 +1453,10 @@ export interface IFaustPolyDspGenerator extends GeneratorSupportingSoundfiles {
 	 * @param voiceFactory - the Faust factory for voices, either obtained with a compiler (createDSPFactory) or loaded from files (loadDSPFactory)
 	 * @param mixerModule - the wasm Mixer module (loaded from 'mixer32.wasm' or 'mixer64.wasm' files)
 	 * @param effectFactory - the Faust factory for the effect, either obtained with a compiler (createDSPFactory) or loaded from files (loadDSPFactory)
+	 * @param context - if this exists, will be used to fetch soundfiles online
 	 * @returns the compiled processor or 'null' if failure
 	 */
-	createOfflineProcessor(sampleRate: number, bufferSize: number, voices: number, voiceFactory?: LooseFaustDspFactory, mixerModule?: WebAssembly.Module, effectFactory?: LooseFaustDspFactory | null, processorName?: string): Promise<IFaustPolyOfflineProcessor | null>;
+	createOfflineProcessor(sampleRate: number, bufferSize: number, voices: number, voiceFactory?: LooseFaustDspFactory, mixerModule?: WebAssembly.Module, effectFactory?: LooseFaustDspFactory | null, context?: BaseAudioContext): Promise<IFaustPolyOfflineProcessor | null>;
 	/**
 	 * Get DSP JSON description with its UI and metadata as object.
 	 *
@@ -1489,7 +1491,7 @@ export declare class FaustMonoDspGenerator implements IFaustMonoDspGenerator {
 		prototype: AudioWorkletProcessor;
 		parameterDescriptors: AudioParamDescriptor[];
 	}>;
-	createOfflineProcessor(sampleRate: number, bufferSize: number, factory?: LooseFaustDspFactory): Promise<FaustMonoOfflineProcessor>;
+	createOfflineProcessor(sampleRate: number, bufferSize: number, factory?: LooseFaustDspFactory, context?: BaseAudioContext): Promise<FaustMonoOfflineProcessor>;
 	getMeta(): any;
 	getJSON(): string;
 	getUI(): any;
@@ -1511,7 +1513,7 @@ export declare class FaustPolyDspGenerator implements IFaustPolyDspGenerator {
 		prototype: AudioWorkletProcessor;
 		parameterDescriptors: AudioParamDescriptor[];
 	}>;
-	createOfflineProcessor(sampleRate: number, bufferSize: number, voices: number, voiceFactory?: LooseFaustDspFactory, mixerModule?: WebAssembly.Module, effectFactory?: LooseFaustDspFactory | null): Promise<FaustPolyOfflineProcessor>;
+	createOfflineProcessor(sampleRate: number, bufferSize: number, voices: number, voiceFactory?: LooseFaustDspFactory, mixerModule?: WebAssembly.Module, effectFactory?: LooseFaustDspFactory | null, context?: BaseAudioContext): Promise<FaustPolyOfflineProcessor>;
 	getMeta(): FaustDspMeta;
 	getJSON(): string;
 	getUI(): FaustUIDescriptor;

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

@@ -3715,12 +3715,14 @@ const dependencies = {
       throw e;
     }
   }
-  async createOfflineProcessor(sampleRate, bufferSize, factory = this.factory) {
+  async createOfflineProcessor(sampleRate, bufferSize, factory = this.factory, context) {
     if (!factory)
       throw new Error("Code is not compiled, please define the factory or call `await this.compile()` first.");
     const meta = JSON.parse(factory.json);
     const instance = await FaustWasmInstantiator_default.createAsyncMonoDSPInstance(factory);
     const sampleSize = meta.compile_options.match("-double") ? 8 : 4;
+    if (context)
+      factory.soundfiles = await SoundfileReader_default.loadSoundfiles(meta, factory.soundfiles || {}, context);
     const monoDsp = new FaustMonoWebAudioDsp(instance, sampleRate, sampleSize, bufferSize, factory.soundfiles);
     return new FaustMonoOfflineProcessor(monoDsp, bufferSize);
   }
@@ -3922,13 +3924,18 @@ const dependencies = {
       throw e;
     }
   }
-  async createOfflineProcessor(sampleRate, bufferSize, voices, voiceFactory = this.voiceFactory, mixerModule = this.mixerModule, effectFactory = this.effectFactory) {
+  async createOfflineProcessor(sampleRate, bufferSize, voices, voiceFactory = this.voiceFactory, mixerModule = this.mixerModule, effectFactory = this.effectFactory, context) {
     if (!voiceFactory)
       throw new Error("Code is not compiled, please define the factory or call `await this.compile()` first.");
     const voiceMeta = JSON.parse(voiceFactory.json);
     const effectMeta = effectFactory ? JSON.parse(effectFactory.json) : void 0;
     const instance = await FaustWasmInstantiator_default.createAsyncPolyDSPInstance(voiceFactory, mixerModule, voices, effectFactory || void 0);
     const sampleSize = voiceMeta.compile_options.match("-double") ? 8 : 4;
+    if (context) {
+      voiceFactory.soundfiles = await SoundfileReader_default.loadSoundfiles(voiceMeta, voiceFactory.soundfiles || {}, context);
+      if (effectFactory)
+        effectFactory.soundfiles = await SoundfileReader_default.loadSoundfiles(effectMeta, effectFactory.soundfiles || {}, context);
+    }
     const soundfiles = { ...effectFactory == null ? void 0 : effectFactory.soundfiles, ...voiceFactory.soundfiles };
     const polyDsp = new FaustPolyWebAudioDsp(instance, sampleRate, sampleSize, bufferSize, soundfiles);
     return new FaustPolyOfflineProcessor(polyDsp, bufferSize);