@grame/faustwasm 0.1.0 → 0.1.2

package/package.json

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

package/src/FaustWebAudioDsp.ts

@@ -687,6 +687,7 @@ export interface IFaustPolyWebAudioNode extends IFaustPolyWebAudioDsp, AudioNode
 type SoundfileItem = {
     name: string;      // Name of the soundfile
     url: string;       // URL of the soundfile
+    index: number;     // Index in the DSP struct 
     basePtr: number;   // Base pointer in wasm memory
 };
 
@@ -791,7 +792,7 @@ export class FaustBaseWebAudioDsp implements IFaustBaseWebAudioDsp {
                     }
                 });
             } 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 });
             }
         }
     }
@@ -830,21 +831,38 @@ export class FaustBaseWebAudioDsp implements IFaustBaseWebAudioDsp {
         // Split the string into an array of strings and remove first and last characters
         return trimmed.split(";").map(str => str.length <= 2 ? '' : str.substring(1, str.length - 1));
     }
+
+    private extractURLsFromJSON(): string[] {
+        // Find the entry with the "soundfiles" key
+        const soundfilesEntry = this.fJSONDsp.meta.find(entry => entry.soundfiles !== undefined);
+        // If the entry is found, split the string by semicolon to get the URLs
+        if (soundfilesEntry) {
+            return soundfilesEntry.soundfiles.split(';').filter(url => url !== '');
+        } else {
+            return [];
+        }
+    }
+
     /**
-     *  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
      */
-    private async loadSoundfile(sfReader: SoundfileReader, sfOffset: number, name: string, url: string): Promise<void> {
+    private async loadSoundfile(sfReader: SoundfileReader, baseDSP: number, name: string, url: string): Promise<void> {
 
         console.log(`Soundfile ${name} paths: ${url}`);
 
-        // Add standard directories to look for soundfiles
-        const sfDirectories: string[] = ["", ".", "http://127.0.0.1:8000"];
+        const sfReaderURLs = this.extractURLsFromJSON();
+        console.log(`sfReaderURLs ${sfReaderURLs}`);
 
+        const sfDirectories: string[] = ["", ".", "http://127.0.0.1:8000"];
+        sfDirectories.push(...sfReaderURLs);
         console.log(`sfDirectories ${sfDirectories}`);
 
         // Check if the soundfile exists in the given directories and return the real path
@@ -856,30 +874,31 @@ export class FaustBaseWebAudioDsp implements IFaustBaseWebAudioDsp {
         if (item) {
             // Use the cached Soundfile
             if (item.basePtr !== -1) {
+
                 // Update HEAP32 after soundfile creation
                 const HEAP32 = sfReader.getHEAP32();
 
                 // Fill the soundfile structure in wasm memory, sounfiles are at the beginning of the DSP memory
-                console.log(`Soundfile ${name} loaded at ${item.basePtr} in wasm memory with sfOffset ${sfOffset}`);
-                console.log(`Soundfile CACHE ${url}}`);
+                console.log(`Soundfile CACHE ${url}} : ${name} loaded at ${item.basePtr} in wasm memory with index ${item.index}`);
+
+                // Soundfile is located at 'index' in the DSP struct, to be added with baseDSP in the wasm memory
+                HEAP32[(baseDSP + item.index) >> 2] = item.basePtr;
 
-                HEAP32[sfOffset >> 2] = item.basePtr;
             } else {
 
                 // Create the soundfiles
                 const soundfile = await sfReader.createSoundfile(sfPathNames, MAX_CHAN, this.fSampleSize === 8);
                 if (soundfile) {
 
-                    //soundfile.displayMemory("After createSoundfile");
-
                     // Update HEAP32 after soundfile creation
                     const HEAP32 = soundfile.getHEAP32();
 
-                    // Fill the soundfile structure in wasm memory, sounfiles are at the beginning of the DSP memory
+                    // Get the soundfile pointer in wasm memory
                     item.basePtr = soundfile.getPtr();
-                    console.log(`Soundfile ${name} loaded at ${item.basePtr} in wasm memory with sfOffset ${sfOffset}`);
+                    console.log(`Soundfile ${name} loaded at ${item.basePtr} in wasm memory with index ${item.index}`);
 
-                    HEAP32[sfOffset >> 2] = item.basePtr;
+                    // Soundfile is located at 'index' in the DSP struct, to be added with baseDSP in the wasm memory
+                    HEAP32[(baseDSP + item.index) >> 2] = item.basePtr;
 
                 } else {
                     console.log(`Soundfile ${name} for ${url} cannot be created !}`);
@@ -893,15 +912,14 @@ export 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 async initSoundfileMemory(allocator: WasmAllocator, sfReader: SoundfileReader, baseDSP: number): Promise<void> {
         // Create and fill the soundfile structure
-        let sfOffset: number = 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);
         };
     }
 

package/test/faustlive-wasm/faustwasm/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/test/faustlive-wasm/faustwasm/index.js

@@ -2277,7 +2277,7 @@ var FaustBaseWebAudioDsp = class {
           }
         });
       } 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 });
       }
     };
   }
@@ -2306,9 +2306,20 @@ var FaustBaseWebAudioDsp = class {
     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}`);
@@ -2316,16 +2327,15 @@ var FaustBaseWebAudioDsp = class {
     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 !}`);
         }
@@ -2335,10 +2345,8 @@ var FaustBaseWebAudioDsp = class {
     }
   }
   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);
     }
     ;
   }