@grame/faustwasm 0.1.0 → 0.1.2

package/dist/cjs/index.d.ts

@@ -661,6 +661,7 @@ export interface IFaustPolyWebAudioNode extends IFaustPolyWebAudioDsp, AudioNode
 export type SoundfileItem = {
 	name: string;
 	url: string;
+	index: number;
 	basePtr: number;
 };
 export declare class FaustBaseWebAudioDsp implements IFaustBaseWebAudioDsp {
@@ -710,11 +711,15 @@ export declare class FaustBaseWebAudioDsp implements IFaustBaseWebAudioDsp {
 	static parseItems(items: FaustUIItem[], callback: (item: FaustUIItem) => any): void;
 	static parseItem(item: FaustUIItem, callback: (item: FaustUIItem) => any): void;
 	static splitNames(input: string): string[];
+	private extractURLsFromJSON;
 	/**
-	 *  Load a soundfile possibly containing several parts.
+	 * Load a soundfile possibly containing several parts in the DSP struct.
+	 * Soundfile pointers are located at 'index' offset, to be read in the JSON file.
+	 * The DSP struct is located at baseDSP in the wasm memory,
+	 * either a monophonic DSP, or a voice in a polyphonic context.
 	 *
 	 * @param sfReader : the soundfile reader
-	 * @param sfOffset : the offset in the wasm memory
+	 * @param baseDSP : the base DSP in the wasm memory
 	 * @param name : the name of the soundfile
 	 * @param url : the url of the soundfile
 	 */
@@ -722,8 +727,9 @@ export declare class FaustBaseWebAudioDsp implements IFaustBaseWebAudioDsp {
 	/**
 	 * Init soundfiles memory.
 	 *
-	 * Soundfile pointers are located at the beginning of the DSP struct memory (one after the other),
-	 * so that the TS scode can setup them easily.
+	 * @param allocator : the wasm memory allocator
+	 * @param sfReader : the soundfile reader
+	 * @param baseDSP : the DSP struct (either a monophonic DSP of polyphonic voice) base DSP in the wasm memory
 	*/
 	protected initSoundfileMemory(allocator: WasmAllocator, sfReader: SoundfileReader, baseDSP: number): Promise<void>;
 	protected updateOutputs(): void;

package/dist/cjs/index.js

@@ -2285,7 +2285,7 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
             }
           });
         } else if (item.type === "soundfile") {
-          this.fSoundfiles.push({ name: item.label, url: item.url, basePtr: -1 });
+          this.fSoundfiles.push({ name: item.label, url: item.url, index: item.index, basePtr: -1 });
         }
       };
     }
@@ -2314,9 +2314,20 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
       let trimmed = input.replace(/^\{|\}$/g, "");
       return trimmed.split(";").map((str) => str.length <= 2 ? "" : str.substring(1, str.length - 1));
     }
-    async loadSoundfile(sfReader, sfOffset, name, url) {
+    extractURLsFromJSON() {
+      const soundfilesEntry = this.fJSONDsp.meta.find((entry) => entry.soundfiles !== void 0);
+      if (soundfilesEntry) {
+        return soundfilesEntry.soundfiles.split(";").filter((url) => url !== "");
+      } else {
+        return [];
+      }
+    }
+    async loadSoundfile(sfReader, baseDSP, name, url) {
       console.log(`Soundfile ${name} paths: ${url}`);
+      const sfReaderURLs = this.extractURLsFromJSON();
+      console.log(`sfReaderURLs ${sfReaderURLs}`);
       const sfDirectories = ["", ".", "http://127.0.0.1:8000"];
+      sfDirectories.push(...sfReaderURLs);
       console.log(`sfDirectories ${sfDirectories}`);
       const sfPathNames = await sfReader.checkFiles(sfDirectories, FaustBaseWebAudioDsp.splitNames(url));
       console.log(`Soundfile ${name} paths: ${sfPathNames}`);
@@ -2324,16 +2335,15 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
       if (item) {
         if (item.basePtr !== -1) {
           const HEAP32 = sfReader.getHEAP32();
-          console.log(`Soundfile ${name} loaded at ${item.basePtr} in wasm memory with sfOffset ${sfOffset}`);
-          console.log(`Soundfile CACHE ${url}}`);
-          HEAP32[sfOffset >> 2] = item.basePtr;
+          console.log(`Soundfile CACHE ${url}} : ${name} loaded at ${item.basePtr} in wasm memory with index ${item.index}`);
+          HEAP32[baseDSP + item.index >> 2] = item.basePtr;
         } else {
           const soundfile = await sfReader.createSoundfile(sfPathNames, MAX_CHAN, this.fSampleSize === 8);
           if (soundfile) {
             const HEAP32 = soundfile.getHEAP32();
             item.basePtr = soundfile.getPtr();
-            console.log(`Soundfile ${name} loaded at ${item.basePtr} in wasm memory with sfOffset ${sfOffset}`);
-            HEAP32[sfOffset >> 2] = item.basePtr;
+            console.log(`Soundfile ${name} loaded at ${item.basePtr} in wasm memory with index ${item.index}`);
+            HEAP32[baseDSP + item.index >> 2] = item.basePtr;
           } else {
             console.log(`Soundfile ${name} for ${url} cannot be created !}`);
           }
@@ -2343,10 +2353,8 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
       }
     }
     async initSoundfileMemory(allocator, sfReader, baseDSP) {
-      let sfOffset = baseDSP;
       for (const { name, url } of this.fSoundfiles) {
-        await this.loadSoundfile(sfReader, sfOffset, name, url);
-        sfOffset += this.fPtrSize;
+        await this.loadSoundfile(sfReader, baseDSP, name, url);
       }
       ;
     }