spessasynth_lib 3.25.5 → 3.25.7

package/soundfont/read_sf2/presets.js

@@ -13,11 +13,11 @@ export class Preset extends BasicPreset
     /**
      * Creates a preset
      * @param presetChunk {RiffChunk}
-     * @param defaultModulators {Modulator[]}
+     * @param sf2 {BasicSoundBank}
      */
-    constructor(presetChunk, defaultModulators)
+    constructor(presetChunk, sf2)
     {
-        super(defaultModulators);
+        super(sf2);
         this.presetName = readBytesAsString(presetChunk.chunkData, 20)
             .trim()
             .replace(/\d{3}:\d{3}/, ""); // remove those pesky "000:001"
@@ -52,10 +52,10 @@ export class Preset extends BasicPreset
  * Reads the presets
  * @param presetChunk {RiffChunk}
  * @param presetZones {PresetZone[]}
- * @param defaultModulators {Modulator[]}
+ * @param sf2 {BasicSoundBank}
  * @returns {Preset[]}
  */
-export function readPresets(presetChunk, presetZones, defaultModulators)
+export function readPresets(presetChunk, presetZones, sf2)
 {
     /**
      * @type {Preset[]}
@@ -63,7 +63,7 @@ export function readPresets(presetChunk, presetZones, defaultModulators)
     let presets = [];
     while (presetChunk.chunkData.length > presetChunk.chunkData.currentIndex)
     {
-        let preset = new Preset(presetChunk, defaultModulators);
+        let preset = new Preset(presetChunk, sf2);
         if (presets.length > 0)
         {
             let presetZonesAmount = preset.presetZoneStartIndex - presets[presets.length - 1].presetZoneStartIndex;

package/soundfont/read_sf2/samples.js

@@ -6,7 +6,7 @@ import { SpessaSynthWarn } from "../../utils/loggin.js";
 import { readBytesAsString } from "../../utils/byte_functions/string.js";
 import { BasicSample } from "../basic_soundfont/basic_sample.js";
 
-export class LoadedSample extends BasicSample
+export class SoundFontSample extends BasicSample
 {
     /**
      * Creates a sample
@@ -25,19 +25,20 @@ export class LoadedSample extends BasicSample
      * @param isDataRaw {boolean} if false, the data is decoded as float32.
      * Used for SF2Pack support
      */
-    constructor(sampleName,
-                sampleStartIndex,
-                sampleEndIndex,
-                sampleLoopStartIndex,
-                sampleLoopEndIndex,
-                sampleRate,
-                samplePitch,
-                samplePitchCorrection,
-                sampleLink,
-                sampleType,
-                smplArr,
-                sampleIndex,
-                isDataRaw
+    constructor(
+        sampleName,
+        sampleStartIndex,
+        sampleEndIndex,
+        sampleLoopStartIndex,
+        sampleLoopEndIndex,
+        sampleRate,
+        samplePitch,
+        samplePitchCorrection,
+        sampleLink,
+        sampleType,
+        smplArr,
+        sampleIndex,
+        isDataRaw
     )
     {
         super(
@@ -216,12 +217,12 @@ export class LoadedSample extends BasicSample
  * @param sampleHeadersChunk {RiffChunk}
  * @param smplChunkData {IndexedByteArray|Float32Array}
  * @param isSmplDataRaw {boolean}
- * @returns {LoadedSample[]}
+ * @returns {SoundFontSample[]}
  */
 export function readSamples(sampleHeadersChunk, smplChunkData, isSmplDataRaw = true)
 {
     /**
-     * @type {LoadedSample[]}
+     * @type {SoundFontSample[]}
      */
     let samples = [];
     let index = 0;
@@ -245,7 +246,7 @@ export function readSamples(sampleHeadersChunk, smplChunkData, isSmplDataRaw = t
  * @param sampleHeaderData {IndexedByteArray}
  * @param smplArrayData {IndexedByteArray|Float32Array}
  * @param isDataRaw {boolean} true means binary 16-bit data, false means float32
- * @returns {LoadedSample}
+ * @returns {SoundFontSample}
  */
 function readSample(index, sampleHeaderData, smplArrayData, isDataRaw)
 {
@@ -285,7 +286,7 @@ function readSample(index, sampleHeaderData, smplArrayData, isDataRaw)
     let sampleType = readLittleEndian(sampleHeaderData, 2);
     
     
-    return new LoadedSample(
+    return new SoundFontSample(
         sampleName,
         sampleStartIndex,
         sampleEndIndex,

package/soundfont/read_sf2/soundfont.js

@@ -247,9 +247,9 @@ export class SoundFont2 extends BasicSoundBank
         
         let presetZones = readPresetZones(presetZonesChunk, presetGenerators, presetModulators, this.instruments);
         
-        this.presets.push(...readPresets(presetHeadersChunk, presetZones, this.defaultModulators));
+        this.presets.push(...readPresets(presetHeadersChunk, presetZones, this));
         this.presets.sort((a, b) => (a.program - b.program) + (a.bank - b.bank));
-        // preload the first preset
+        this._parseInternal();
         SpessaSynthInfo(
             `%cParsing finished! %c"${this.soundFontInfo["INAM"]}"%c has %c${this.presets.length} %cpresets,
         %c${this.instruments.length}%c instruments and %c${this.samples.length}%c samples.`,

package/soundfont/read_sf2/zones.js

@@ -1,7 +1,6 @@
 import { readLittleEndian } from "../../utils/byte_functions/little_endian.js";
 import { IndexedByteArray } from "../../utils/indexed_array.js";
 import { RiffChunk } from "../basic_soundfont/riff_chunk.js";
-import { Instrument } from "./instruments.js";
 import { BasicInstrumentZone, BasicPresetZone } from "../basic_soundfont/basic_zones.js";
 import { Generator, generatorTypes } from "../basic_soundfont/generator.js";
 import { Modulator } from "../basic_soundfont/modulator.js";
@@ -185,7 +184,7 @@ export class PresetZone extends BasicPresetZone
     
     /**
      * grab the instrument
-     * @param instruments {Instrument[]}
+     * @param instruments {BasicInstrument[]}
      */
     getInstrument(instruments)
     {
@@ -229,7 +228,7 @@ export class PresetZone extends BasicPresetZone
  * Reads the given preset zone read
  * @param zonesChunk {RiffChunk}
  * @param presetGenerators {Generator[]}
- * @param instruments {Instrument[]}
+ * @param instruments {BasicInstrument[]}
  * @param presetModulators {Modulator[]}
  * @returns {PresetZone[]}
  */