spessasynth_lib 3.23.0 → 3.23.3

package/@types/soundfont/basic_soundfont/basic_soundfont.d.ts

@@ -20,7 +20,7 @@ export class BasicSoundFont {
      * @type {Object<string, string|IndexedByteArray>}
      */
     soundFontInfo: {
-        [x: string]: string | IndexedByteArray;
+        [x: string]: any;
     };
     /**
      * The soundfont's presets

package/@types/soundfont/basic_soundfont/write_dls/rgn2.d.ts

@@ -1,7 +1,8 @@
 /**
  * @param zone {BasicInstrumentZone}
+ * @param globalZone {BasicInstrumentZone}
  * @this {BasicSoundFont}
  * @returns {IndexedByteArray}
  */
-export function writeDLSRegion(this: BasicSoundFont, zone: BasicInstrumentZone): IndexedByteArray;
+export function writeDLSRegion(this: BasicSoundFont, zone: BasicInstrumentZone, globalZone: BasicInstrumentZone): IndexedByteArray;
 import { IndexedByteArray } from "../../../utils/indexed_array.js";

package/@types/soundfont/dls/dls_sample.d.ts

@@ -19,6 +19,6 @@ export class DLSSample extends BasicSample {
      * @type {Float32Array}
      */
     sampleData: Float32Array;
-    getRawData(): Uint8Array;
+    getRawData(): Uint8Array<ArrayBuffer>;
 }
 import { BasicSample } from "../basic_soundfont/basic_sample.js";

package/@types/soundfont/read_sf2/samples.d.ts

@@ -30,8 +30,8 @@ export class LoadedSample extends BasicSample {
     isSampleLoaded: boolean;
     sampleID: number;
     sampleLength: number;
-    sampleDataArray: Float32Array | IndexedByteArray;
-    sampleData: Float32Array;
+    sampleDataArray: Float32Array<ArrayBuffer> | IndexedByteArray;
+    sampleData: Float32Array<ArrayBuffer>;
     isDataRaw: boolean;
     /**
      * Get raw data, whether it's compressed or not as we simply write it to the file

package/@types/synthetizer/key_modifier_manager.d.ts

@@ -4,6 +4,12 @@ export class KeyModifierManager {
      */
     constructor(synth: Synthetizer);
     synth: Synthetizer;
+    /**
+     * The velocity override mappings for MIDI keys
+     * @type {KeyModifier[][]}
+     * @private
+     */
+    private _keyModifiers;
     /**
      * @private
      * @param type {workletKeyModifierMessageType}
@@ -29,6 +35,13 @@ export class KeyModifierManager {
             program: number;
         } | undefined;
     }): void;
+    /**
+     * Gets a key modifier
+     * @param channel {number} the channel affected. Usually 0-15
+     * @param midiNote {number} the MIDI note to change. 0-127
+     * @returns {KeyModifier|undefined}
+     */
+    getModifier(channel: number, midiNote: number): KeyModifier | undefined;
     /**
      * Deletes a key modifier
      * @param channel {number} the channel affected. Usually 0-15
@@ -40,3 +53,4 @@ export class KeyModifierManager {
      */
     clearModifiers(): void;
 }
+import { KeyModifier } from "./worklet_system/worklet_methods/worklet_key_modifier.js";

package/@types/synthetizer/worklet_system/worklet_utilities/controller_tables.d.ts

@@ -1,6 +1,6 @@
 export const NON_CC_INDEX_OFFSET: 128;
 export const CONTROLLER_TABLE_SIZE: 147;
-export const resetArray: Int16Array;
+export const resetArray: Int16Array<ArrayBuffer>;
 export function setResetValue(i: any, v: any): number;
 export namespace customControllers {
     let channelTuning: number;
@@ -10,7 +10,7 @@ export namespace customControllers {
     let channelTuningSemitones: number;
 }
 export const CUSTOM_CONTROLLER_TABLE_SIZE: number;
-export const customResetArray: Float32Array;
+export const customResetArray: Float32Array<ArrayBuffer>;
 export type dataEntryStates = number;
 export namespace dataEntryStates {
     let Idle: number;

package/@types/utils/indexed_array.d.ts

@@ -7,7 +7,7 @@ export function combineArrays(arrs: (IndexedByteArray | Uint8Array)[]): IndexedB
  * indexed_array.js
  * purpose: exteds Uint8Array with a currentIndex property
  */
-export class IndexedByteArray extends Uint8Array {
+export class IndexedByteArray extends Uint8Array<ArrayBuffer> {
     /**
      * Creates a new instance of an Uint8Array with a currentIndex property
      * @param args {any} same as for Uint8Array

package/README.md

@@ -105,7 +105,7 @@ document.getElementById("button").onclick = async () =>
   - **Variable compression quality:** You choose between file size and quality!
   - **Compression preserving:** Avoid decompressing and recompressing uncompressed samples for minimal quality loss!
 
-#### Read and play DLS Level 1 or 2 files
+#### Read and write DLS Level 1 or 2 files
   - Read DLS (DownLoadable Sounds) files as SF2 files!
   - **Works like a normal soundfont:** *Saving it as sf2 is still [just one function!](https://github.com/spessasus/SpessaSynth/wiki/SoundFont2-Class#write)*
   - Converts articulators to both **modulators** and **generators**!
@@ -113,6 +113,7 @@ document.getElementById("button").onclick = async () =>
   - **Covers special generator cases:** *such as modLfoToPitch*!
   - **Correct volume:** *looking at you, Viena and gm.sf2!*
   - Support built right into the synthesizer!
+  - **Convert SF2 to DLS:** [with limitations](https://github.com/spessasus/SpessaSynth/wiki/DLS-Conversion-Problem);
 
 ### Export MIDI as WAV
   - Save the MIDI file as WAV audio!

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spessasynth_lib",
-  "version": "3.23.0",
+  "version": "3.23.3",
   "description": "MIDI and SoundFont2/DLS library with no compromises",
   "browser": "index.js",
   "types": "@types/index.d.ts",

package/soundfont/basic_soundfont/basic_zone.js

@@ -58,7 +58,7 @@ export class BasicZone
      */
     getGeneratorValue(generatorType, notFoundValue)
     {
-        return this.generators.find(g => g.generatorType === generatorType)?.generatorValue || notFoundValue;
+        return this.generators.find(g => g.generatorType === generatorType)?.generatorValue ?? notFoundValue;
     }
 }
 

package/soundfont/basic_soundfont/write_dls/ins.js

@@ -70,7 +70,7 @@ export function writeIns(preset)
     {
         if (!z.isGlobal)
         {
-            arrs.push(writeDLSRegion.apply(this, [z]));
+            arrs.push(writeDLSRegion.apply(this, [z, globalZone]));
         }
         return arrs;
     }, []));

package/soundfont/basic_soundfont/write_dls/rgn2.js

@@ -7,10 +7,11 @@ import { writeArticulator } from "./art2.js";
 
 /**
  * @param zone {BasicInstrumentZone}
+ * @param globalZone {BasicInstrumentZone}
  * @this {BasicSoundFont}
  * @returns {IndexedByteArray}
  */
-export function writeDLSRegion(zone)
+export function writeDLSRegion(zone, globalZone)
 {
     // region header
     const rgnhData = new IndexedByteArray(14);
@@ -32,10 +33,24 @@ export function writeDLSRegion(zone)
         rgnhData
     );
     
+    let rootKey = zone.getGeneratorValue(generatorTypes.overridingRootKey, zone.sample.samplePitch);
+    
+    // a lot of soundfonts like to set scaletuning to 0 in drums and keep the key at 60
+    // since we implement scaletuning via a dls articulator and fluid doesn't support these,
+    // change the root key here
+    const scaleTuning = zone.getGeneratorValue(
+        generatorTypes.scaleTuning,
+        globalZone.getGeneratorValue(generatorTypes.scaleTuning, 100)
+    );
+    if (scaleTuning === 0 && zone.keyRange.max - zone.keyRange.min === 0)
+    {
+        rootKey = zone.keyRange.min;
+    }
+    
     // wavesample (Wsmp)
     const wsmp = writeWavesample(
         zone.sample,
-        zone.getGeneratorValue(generatorTypes.overridingRootKey, zone.sample.samplePitch),
+        rootKey,
         zone.getGeneratorValue(
             generatorTypes.fineTune,
             0

package/soundfont/basic_soundfont/write_dls/wave.js

@@ -32,17 +32,31 @@ export function writeDLSSample(sample)
         sample.sampleLoopEndIndex,
         1
     );
-    
     const audio = sample.getAudioData();
-    const data16 = new Int16Array(audio.length);
-    for (let i = 0; i < audio.length; i++)
+    let data;
+    // if sample is compressed, getRawData cannot be used
+    if (sample.isCompressed)
     {
-        data16[i] = audio[i] * 32768;
+        const data16 = new Int16Array(audio.length);
+        
+        for (let i = 0; i < audio.length; i++)
+        {
+            data16[i] = audio[i] * 32768;
+        }
+        
+        
+        data = writeRIFFOddSize(
+            "data",
+            new IndexedByteArray(data16.buffer)
+        );
+    }
+    else
+    {
+        data = writeRIFFOddSize(
+            "data",
+            sample.getRawData()
+        );
     }
-    const data = writeRIFFOddSize(
-        "data",
-        new IndexedByteArray(data16.buffer)
-    );
     
     const inam = writeRIFFOddSize(
         "INAM",

package/soundfont/basic_soundfont/write_dls/write_dls.js

@@ -47,7 +47,7 @@ export function writeDLS()
     SpessaSynthGroupEnd();
     
     // write ptbl
-    const ptblData = new IndexedByteArray(8 + 8 * ptblOffsets.length);
+    const ptblData = new IndexedByteArray(8 + 4 * ptblOffsets.length);
     writeDword(ptblData, 8);
     writeDword(ptblData, ptblOffsets.length);
     for (const offset of ptblOffsets)

package/soundfont/basic_soundfont/write_dls/wsmp.js

@@ -2,6 +2,8 @@ import { writeDword, writeWord } from "../../../utils/byte_functions/little_endi
 import { IndexedByteArray } from "../../../utils/indexed_array.js";
 import { writeRIFFOddSize } from "../riff_chunk.js";
 
+const WSMP_SIZE = 20;
+
 /**
  * @param sample {BasicSample}
  * @param rootKey {number}
@@ -21,9 +23,9 @@ export function writeWavesample(
     loopEnd,
     loopingMode)
 {
-// fixed size because always one loop
-    const wsmpData = new IndexedByteArray(36);
-    writeDword(wsmpData, 20); // cbSize
+    let loopCount = loopingMode === 0 ? 0 : 1;
+    const wsmpData = new IndexedByteArray(WSMP_SIZE + loopCount * 16);
+    writeDword(wsmpData, WSMP_SIZE); // cbSize
     // usUnityNote (apply root pitch here)
     writeWord(wsmpData, rootKey);
     // sFineTune
@@ -39,7 +41,6 @@ export function writeWavesample(
     writeDword(wsmpData, 0);
     
     const loopSize = loopEnd - loopStart;
-    let loopCount = 1;
     let ulLoopType = 0;
     switch (loopingMode)
     {
@@ -63,10 +64,13 @@ export function writeWavesample(
     
     // cSampleLoops
     writeDword(wsmpData, loopCount);
-    writeDword(wsmpData, 16); // cbSize
-    writeDword(wsmpData, ulLoopType);
-    writeDword(wsmpData, loopStart);
-    writeDword(wsmpData, loopSize);
+    if (loopCount === 1)
+    {
+        writeDword(wsmpData, 16); // cbSize
+        writeDword(wsmpData, ulLoopType);
+        writeDword(wsmpData, loopStart);
+        writeDword(wsmpData, loopSize);
+    }
     return writeRIFFOddSize(
         "wsmp",
         wsmpData

package/synthetizer/key_modifier_manager.js

@@ -9,6 +9,12 @@ export class KeyModifierManager
     constructor(synth)
     {
         this.synth = synth;
+        /**
+         * The velocity override mappings for MIDI keys
+         * @type {KeyModifier[][]}
+         * @private
+         */
+        this._keyModifiers = [];
     }
     
     /**
@@ -44,12 +50,29 @@ export class KeyModifierManager
         const velocity = options?.velocity ?? -1;
         const program = options?.patch?.program ?? -1;
         const bank = options?.patch?.bank ?? -1;
+        const mod = new KeyModifier(velocity, bank, program);
+        if (this._keyModifiers[channel] === undefined)
+        {
+            this._keyModifiers[channel] = [];
+        }
+        this._keyModifiers[channel][midiNote] = mod;
         this._sendToWorklet(
             workletKeyModifierMessageType.addMapping,
-            [channel, midiNote, new KeyModifier(velocity, bank, program)]
+            [channel, midiNote, mod]
         );
     }
     
+    /**
+     * Gets a key modifier
+     * @param channel {number} the channel affected. Usually 0-15
+     * @param midiNote {number} the MIDI note to change. 0-127
+     * @returns {KeyModifier|undefined}
+     */
+    getModifier(channel, midiNote)
+    {
+        return this._keyModifiers?.[channel]?.[midiNote];
+    }
+    
     /**
      * Deletes a key modifier
      * @param channel {number} the channel affected. Usually 0-15
@@ -61,6 +84,11 @@ export class KeyModifierManager
             workletKeyModifierMessageType.deleteMapping,
             [channel, midiNote]
         );
+        if (this._keyModifiers[channel]?.[midiNote] === undefined)
+        {
+            return;
+        }
+        this._keyModifiers[channel][midiNote] = undefined;
     }
     
     /**
@@ -69,5 +97,6 @@ export class KeyModifierManager
     clearModifiers()
     {
         this._sendToWorklet(workletKeyModifierMessageType.clearMappings, undefined);
+        this._keyModifiers = [];
     }
 }