spessasynth_core 3.27.4 → 3.27.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spessasynth_core",
-  "version": "3.27.4",
+  "version": "3.27.6",
   "description": "MIDI and SoundFont2/DLS library with no compromises",
   "main": "index.js",
   "type": "module",

package/src/midi/basic_midi.js

@@ -41,7 +41,7 @@ class BasicMIDI extends MIDISequenceData
     isDLSRMIDI = false;
     
     /**
-     * Copies a MIDI
+     * Copies a MIDI (tracks are shallowly copied!)
      * @param mid {BasicMIDI}
      * @returns {BasicMIDI}
      */
@@ -51,9 +51,27 @@ class BasicMIDI extends MIDISequenceData
         m._copyFromSequence(mid);
         
         m.isDLSRMIDI = mid.isDLSRMIDI;
-        m.embeddedSoundFont = mid.embeddedSoundFont ? mid.embeddedSoundFont.slice(0) : undefined; // Deep copy
+        m.embeddedSoundFont = mid?.embeddedSoundFont ? mid.embeddedSoundFont : undefined; // Shallow copy
         m.tracks = mid.tracks.map(track => [...track]); // Shallow copy of each track array
-        
+        return m;
+    }
+    
+    /**
+     * Copies a MIDI with deep copy
+     * @param mid {BasicMIDI}
+     * @returns {BasicMIDI}
+     */
+    static copyFromDeep(mid)
+    {
+        const m = new BasicMIDI();
+        m._copyFromSequence(mid);
+        m.isDLSRMIDI = mid.isDLSRMIDI;
+        m.embeddedSoundFont = mid.embeddedSoundFont ? mid.embeddedSoundFont.slice(0) : undefined; // Deep copy
+        m.tracks = mid.tracks.map(track => track.map(event => new MIDIMessage(
+            event.ticks,
+            event.messageStatusByte,
+            event.messageData
+        ))); // Deep copy
         return m;
     }
     
@@ -217,7 +235,6 @@ class BasicMIDI extends MIDISequenceData
                             copyrightComponents.push(readBytesAsString(
                                 e.messageData,
                                 e.messageData.length,
-                                undefined,
                                 false
                             ));
                             e.messageData.currentIndex = 0;
@@ -466,7 +483,7 @@ class BasicMIDI extends MIDISequenceData
                     {
                         this.rawMidiName = name.messageData;
                         name.messageData.currentIndex = 0;
-                        this.midiName = readBytesAsString(name.messageData, name.messageData.length, undefined, false);
+                        this.midiName = readBytesAsString(name.messageData, name.messageData.length, false);
                     }
                 }
             }
@@ -478,7 +495,7 @@ class BasicMIDI extends MIDISequenceData
                 {
                     this.rawMidiName = name.messageData;
                     name.messageData.currentIndex = 0;
-                    this.midiName = readBytesAsString(name.messageData, name.messageData.length, undefined, false);
+                    this.midiName = readBytesAsString(name.messageData, name.messageData.length, false);
                 }
             }
         }

package/src/midi/midi_loader.js

@@ -45,7 +45,7 @@ class MIDI extends BasicMIDI
             // possibly an RMID file (https://github.com/spessasus/sf2-rmidi-specification#readme)
             // skip size
             binaryData.currentIndex += 8;
-            const rmid = readBytesAsString(binaryData, 4, undefined, false);
+            const rmid = readBytesAsString(binaryData, 4, false);
             if (rmid !== "RMID")
             {
                 SpessaSynthGroupEnd();
@@ -101,18 +101,15 @@ class MIDI extends BasicMIDI
                             this.copyright = readBytesAsString(
                                 this.RMIDInfo["ICOP"],
                                 this.RMIDInfo["ICOP"].length,
-                                undefined,
                                 false
                             ).replaceAll("\n", " ");
                         }
                         if (this.RMIDInfo["INAM"])
                         {
                             this.rawMidiName = this.RMIDInfo[RMIDINFOChunks.name];
-                            // noinspection JSCheckFunctionSignatures
                             this.midiName = readBytesAsString(
-                                this.rawMidiName,
+                                /** @type {IndexedByteArray}*/this.rawMidiName,
                                 this.rawMidiName.length,
-                                undefined,
                                 false
                             ).replaceAll("\n", " ");
                         }

package/src/midi/midi_sequence.js

@@ -1,3 +1,5 @@
+import { IndexedByteArray } from "../utils/indexed_array.js";
+
 /**
  * This is the base type for MIDI files. It contains all the "metadata" and information.
  * It extends to:
@@ -133,7 +135,7 @@ class MIDISequenceData
      * The RMID (Resource-Interchangeable MIDI) info data, if the file is RMID formatted.
      * Otherwise, this field is undefined.
      * Chunk type (e.g. "INAM"): Chunk data as a binary array.
-     * @type {Object<string, IndexedByteArray>}
+     * @type {Record<string, IndexedByteArray>}
      */
     RMIDInfo = {};
     
@@ -217,7 +219,11 @@ class MIDISequenceData
         // copying objects
         this.loop = { ...sequence.loop };
         this.keyRange = { ...sequence.keyRange };
-        this.RMIDInfo = { ...sequence.RMIDInfo };
+        this.RMIDInfo = {};
+        for (const [key, value] of Object.entries(sequence.RMIDInfo))
+        {
+            this.RMIDInfo[key] = new IndexedByteArray(value);
+        }
     }
 }
 

package/src/midi/midi_tools/midi_editor.js

@@ -180,7 +180,7 @@ export function modifyMIDI(
     const midiPorts = midi.midiPorts.slice();
     /**
      * midi port: channel offset
-     * @type {Object<number, number>}
+     * @type {Record<number, number>}
      */
     const midiPortChannelOffsets = {};
     let midiPortChannelOffset = 0;

package/src/midi/midi_tools/rmidi_writer.js

@@ -48,7 +48,7 @@ const DEFAULT_COPYRIGHT = "Created using SpessaSynth";
  */
 
 /**
- * Writes an RMIDI file
+ * Writes an RMIDI file. Note that this method modifies the MIDI file in-place.
  * @this {BasicMIDI}
  * @param soundfontBinary {Uint8Array}
  * @param soundfont {BasicSoundBank}

package/src/midi/midi_tools/used_keys_loaded.js

@@ -10,7 +10,7 @@ import { SoundFontManager } from "../../synthetizer/audio_engine/engine_componen
  * Gets the used programs and keys for this MIDI file with a given sound bank
  * @this {BasicMIDI}
  * @param soundfont {SoundFontManager|BasicSoundBank} - the sound bank
- * @returns {Object<string, Set<string>>} Object<bank:program, Set<key-velocity>>
+ * @returns {Record<string, Set<string>>} Record<bank:program, Set<key-velocity>>
  */
 export function getUsedProgramsAndKeys(soundfont)
 {
@@ -81,7 +81,7 @@ export function getUsedProgramsAndKeys(soundfont)
     /**
      * find all programs used and key-velocity combos in them
      * bank:program each has a set of midiNote-velocity
-     * @type {Object<string, Set<string>>}
+     * @type {Record<string, Set<string>>}
      */
     const usedProgramsAndKeys = {};
     

package/src/midi/xmf_loader.js

@@ -90,7 +90,7 @@ class XMFNode
     metadataLength;
     
     /**
-     * @type {Object<string, any>}
+     * @type {Record<string, any>}
      */
     metadata = {};
     

package/src/sequencer/sequencer_engine.js

@@ -111,8 +111,8 @@ class SpessaSynthSequencer
     midiPortChannelOffset = 0;
     /**
      * stored as:
-     * Object<midi port, channel offset>
-     * @type {Object<number, number>}
+     * Record<midi port, channel offset>
+     * @type {Record<number, number>}
      */
     midiPortChannelOffsets = {};
     

package/src/sequencer/song_control.js

@@ -147,7 +147,7 @@ export function loadNewSongList(midiBuffers, autoPlay = true)
      * parse the MIDIs (only the array buffers, MIDI is unchanged)
      * @type {BasicMIDI[]}
      */
-    this.songs = midiBuffers.map(m => BasicMIDI.copyFrom(m));
+    this.songs = midiBuffers;
     if (this.songs.length < 1)
     {
         return;

package/src/soundfont/basic_soundfont/basic_soundbank.js

@@ -32,7 +32,7 @@ class BasicSoundBank
     
     /**
      * Soundfont's info stored as name: value. ifil and iver are stored as string representation of float (e.g., 2.1)
-     * @type {Object<string, string|IndexedByteArray>}
+     * @type {Record<string, string|IndexedByteArray>}
      */
     soundFontInfo = {};
     
@@ -77,7 +77,7 @@ class BasicSoundBank
     
     /**
      * Creates a new basic soundfont template (or copies)
-     * @param data {undefined|{presets: BasicPreset[], info: Object<string, string>}}
+     * @param data {undefined|{presets: BasicPreset[], info: Record<string, string>}}
      */
     constructor(data = undefined)
     {

package/src/soundfont/basic_soundfont/modulator.js

@@ -34,6 +34,20 @@ export const modulatorCurveTypes = {
     switch: 3
 };
 
+
+export function getModSourceEnum(curveType, polarity, direction, isCC, index)
+{
+    return (curveType << 10) | (polarity << 9) | (direction << 8) | (isCC << 7) | index;
+}
+
+const defaultResonantModSource = getModSourceEnum(
+    modulatorCurveTypes.linear,
+    1,
+    0,
+    1,
+    midiControllers.filterResonance
+); // linear forwards bipolar cc 74
+
 export class Modulator
 {
     /**
@@ -70,6 +84,7 @@ export class Modulator
      * - still can be disabled if the soundfont has its own modulator curve
      * - this fixes the very low amount of reverb by default and doesn't break soundfonts
      * @type {boolean}
+     * @readonly
      */
     isEffectModulator = false;
     
@@ -77,8 +92,9 @@ export class Modulator
      * The default resonant modulator does not affect the filter gain.
      * Neither XG nor GS responded to cc #74 in that way.
      * @type {boolean}
+     * @readonly
      */
-    isDefaultResonanceModulator = false;
+    isDefaultResonantModulator = false;
     
     /**
      * 1 if the source is bipolar (min is -1, max is 1)
@@ -158,6 +174,7 @@ export class Modulator
      * @param amount {number}
      * @param transformType {0|2}
      * @param isEffectModulator {boolean}
+     * @param isDefaultResonantModulator {boolean}
      */
     constructor(sourceIndex,
                 sourceCurveType,
@@ -172,7 +189,8 @@ export class Modulator
                 destination,
                 amount,
                 transformType,
-                isEffectModulator = false)
+                isEffectModulator = false,
+                isDefaultResonantModulator = false)
     {
         this.sourcePolarity = sourcePolarity;
         this.sourceDirection = sourceDirection;
@@ -190,6 +208,7 @@ export class Modulator
         this.transformAmount = amount;
         this.transformType = transformType;
         this.isEffectModulator = isEffectModulator;
+        this.isDefaultResonantModulator = isDefaultResonantModulator;
         
         
         if (this.modulatorDestination > MAX_GENERATOR)
@@ -205,7 +224,7 @@ export class Modulator
      */
     static copy(modulator)
     {
-        const m = new Modulator(
+        return new Modulator(
             modulator.sourceIndex,
             modulator.sourceCurveType,
             modulator.sourceUsesCC,
@@ -219,10 +238,9 @@ export class Modulator
             modulator.modulatorDestination,
             modulator.transformAmount,
             modulator.transformType,
-            modulator.isEffectModulator
+            modulator.isEffectModulator,
+            modulator.isDefaultResonantModulator
         );
-        m.isDefaultResonanceModulator = modulator.isDefaultResonanceModulator;
-        return m;
     }
     
     /**
@@ -322,7 +340,7 @@ export class Modulator
      */
     sumTransform(modulator)
     {
-        const m = new Modulator(
+        return new Modulator(
             this.sourceIndex,
             this.sourceCurveType,
             this.sourceUsesCC,
@@ -336,10 +354,9 @@ export class Modulator
             this.modulatorDestination,
             this.transformAmount + modulator.transformAmount,
             this.transformType,
-            this.isEffectModulator
+            this.isEffectModulator,
+            this.isDefaultResonantModulator
         );
-        m.isDefaultResonanceModulator = modulator.isDefaultResonanceModulator;
-        return m;
     }
 }
 
@@ -396,16 +413,19 @@ export class DecodedModulator extends Modulator
                 this.modulatorDestination === generatorTypes.reverbEffectsSend
                 || this.modulatorDestination === generatorTypes.chorusEffectsSend
             );
+        
+        
+        this.isDefaultResonantModulator = (
+            sourceEnum === defaultResonantModSource
+            && secondarySourceEnum === 0x0
+            && this.modulatorDestination === generatorTypes.initialFilterQ
+        );
     }
 }
 
 export const DEFAULT_ATTENUATION_MOD_AMOUNT = 960;
 export const DEFAULT_ATTENUATION_MOD_CURVE_TYPE = modulatorCurveTypes.concave;
 
-export function getModSourceEnum(curveType, polarity, direction, isCC, index)
-{
-    return (curveType << 10) | (polarity << 9) | (direction << 8) | (isCC << 7) | index;
-}
 
 const soundFontModulators = [
     // vel to attenuation
@@ -542,26 +562,18 @@ const customModulators = [
         generatorTypes.initialFilterFc,
         6000,
         0
+    ),
+    
+    // cc 71 (filter Q) to filter Q (default resonant modulator)
+    new DecodedModulator(
+        defaultResonantModSource,
+        0x0, // no controller
+        generatorTypes.initialFilterQ,
+        250,
+        0
     )
 
 ];
-// cc 71 (filter Q) to filter Q
-const resonanceModulator = new DecodedModulator(
-    getModSourceEnum(
-        modulatorCurveTypes.linear,
-        1,
-        0,
-        1,
-        midiControllers.filterResonance
-    ), // linear forwards bipolar cc 74
-    0x0, // no controller
-    generatorTypes.initialFilterQ,
-    250,
-    0
-);
-
-resonanceModulator.isDefaultResonanceModulator = true;
-customModulators.push(resonanceModulator);
 
 /**
  * @type {Modulator[]}

package/src/soundfont/basic_soundfont/write_dls/combine_zones.js

@@ -234,7 +234,7 @@ export function combineZones(preset, globalize = true)
                 continue;
             }
             /**
-             * @type {Object<string, number>}
+             * @type {Record<string, number>}
              */
             let occurencesForValues = {};
             const defaultForChecked = generatorLimits[checkedType]?.def || 0;

package/src/soundfont/load_soundfont.js

@@ -12,7 +12,7 @@ export function loadSoundFont(buffer)
 {
     const check = buffer.slice(8, 12);
     const a = new IndexedByteArray(check);
-    const id = readBytesAsString(a, 4, undefined, false).toLowerCase();
+    const id = readBytesAsString(a, 4, false).toLowerCase();
     if (id === "dls ")
     {
         return new DLSSoundFont(buffer);

package/src/soundfont/read_sf2/soundfont.js

@@ -101,7 +101,7 @@ export class SoundFont2 extends BasicSoundBank
                     break;
                 
                 case "icmt":
-                    text = readBytesAsString(chunk.chunkData, chunk.chunkData.length, undefined, false);
+                    text = readBytesAsString(chunk.chunkData, chunk.chunkData.length, false);
                     this.soundFontInfo[chunk.header] = text;
                     break;
                 

package/src/synthetizer/audio_engine/engine_components/compute_modulator.js

@@ -114,7 +114,7 @@ export function computeModulator(controllerTable, modulator, voice)
     }
     
     // resonant modulator: take its value and ensure that it won't change the final gain
-    if (modulator.isDefaultResonanceModulator)
+    if (modulator.isDefaultResonantModulator)
     {
         // half the gain, negates the filter
         voice.resonanceOffset = Math.max(0, computedValue / 2);

package/src/synthetizer/audio_engine/engine_components/soundfont_manager.js

@@ -33,7 +33,7 @@ export class SoundFontManager
     {
         /**
          * <"bank-program", "presetName">
-         * @type {Object<string, string>}
+         * @type {Record<string, string>}
          */
         const presetList = {};
         // gather the presets in reverse and replace if necessary

package/src/utils/byte_functions/string.js

@@ -3,50 +3,39 @@ import { IndexedByteArray } from "../indexed_array.js";
 /**
  * @param dataArray {IndexedByteArray}
  * @param bytes {number}
- * @param encoding {string} the textElement encoding
  * @param trimEnd {boolean} if we should trim once we reach an invalid byte
  * @returns {string}
  */
-export function readBytesAsString(dataArray, bytes, encoding = undefined, trimEnd = true)
+export function readBytesAsString(dataArray, bytes, trimEnd = true)
 {
-    if (!encoding)
+    let finished = false;
+    let string = "";
+    for (let i = 0; i < bytes; i++)
     {
-        let finished = false;
-        let string = "";
-        for (let i = 0; i < bytes; i++)
+        let byte = dataArray[dataArray.currentIndex++];
+        if (finished)
         {
-            let byte = dataArray[dataArray.currentIndex++];
-            if (finished)
+            continue;
+        }
+        if ((byte < 32 || byte > 127) && byte !== 10) // 10 is "\n"
+        {
+            if (trimEnd)
             {
+                finished = true;
                 continue;
             }
-            if ((byte < 32 || byte > 127) && byte !== 10) // 10 is "\n"
+            else
             {
-                if (trimEnd)
+                if (byte === 0)
                 {
                     finished = true;
                     continue;
                 }
-                else
-                {
-                    if (byte === 0)
-                    {
-                        finished = true;
-                        continue;
-                    }
-                }
             }
-            string += String.fromCharCode(byte);
         }
-        return string;
-    }
-    else
-    {
-        let byteBuffer = dataArray.slice(dataArray.currentIndex, dataArray.currentIndex + bytes);
-        dataArray.currentIndex += bytes;
-        let decoder = new TextDecoder(encoding.replace(/[^\x20-\x7E]/g, ""));
-        return decoder.decode(byteBuffer.buffer);
+        string += String.fromCharCode(byte);
     }
+    return string;
 }
 
 /**