spessasynth_lib 3.16.4 → 3.17.0

package/soundfont/basic_soundfont/riff_chunk.js

@@ -1,5 +1,5 @@
 import { IndexedByteArray } from '../../utils/indexed_array.js'
-import { readBytesAsUintLittleEndian, writeDword } from '../../utils/byte_functions/little_endian.js'
+import { readLittleEndian, writeDword } from '../../utils/byte_functions/little_endian.js'
 import { readBytesAsString, writeStringAsBytes } from '../../utils/byte_functions/string.js'
 
 /**
@@ -33,7 +33,7 @@ export class RiffChunk
 export function readRIFFChunk(dataArray, readData = true, forceShift = false) {
     let header = readBytesAsString(dataArray, 4)
 
-    let size = readBytesAsUintLittleEndian(dataArray, 4)
+    let size = readLittleEndian(dataArray, 4)
     let chunkData = undefined
     if (readData)
     {

package/soundfont/basic_soundfont/write_sf2/soundfont_trimmer.js

@@ -9,7 +9,7 @@ import { getUsedProgramsAndKeys } from '../../../midi_parser/used_keys_loaded.js
 
 /**
  * @param soundfont {BasicSoundFont}
- * @param mid {MIDI}
+ * @param mid {BasicMIDI}
  * @returns {Uint8Array}
  */
 export function trimSoundfont(soundfont, mid)

package/soundfont/dls/dls_preset.js

@@ -0,0 +1,25 @@
+import { BasicPreset } from '../basic_soundfont/basic_preset.js'
+
+export class DLSPreset extends BasicPreset
+{
+    /**
+     * Creates a new DLS preset
+     * @param ulBank {number} the ULONG value
+     * @param ulInstrument {number} the ULONG value
+     * @param regionsAmount {number}
+     */
+    constructor(ulBank, ulInstrument, regionsAmount)
+    {
+        super();
+        this.regionsAmount = regionsAmount;
+        this.program = ulInstrument & 127;
+        this.bank = (ulBank >> 8) & 127;
+        const isDrums = ulInstrument & (1 << 31);
+        if(isDrums)
+        {
+            console.log("DEUMS")
+        }
+        console.log(this.bank, this.program)
+
+    }
+}

package/soundfont/dls/dls_soundfont.js

@@ -0,0 +1,93 @@
+import { BasicSoundFont } from '../basic_soundfont/basic_soundfont.js'
+import { IndexedByteArray } from '../../utils/indexed_array.js'
+import { SpessaSynthGroup, SpessaSynthGroupEnd, SpessaSynthInfo } from '../../utils/loggin.js'
+import { consoleColors } from '../../utils/other.js'
+import { readRIFFChunk } from '../basic_soundfont/riff_chunk.js'
+import { readBytesAsString } from '../../utils/byte_functions/string.js'
+import { readLittleEndian } from '../../utils/byte_functions/little_endian.js'
+import { readDLSInstrumentList } from './read_instrument_list.js'
+import { readDLSInstrument } from './read_instrument.js'
+
+class DLSSoundFont extends BasicSoundFont
+{
+    /**
+     * Loads a new DLS (Downloadable sounds) soundfont
+     * @param buffer {ArrayBuffer}
+     */
+    constructor(buffer)
+    {
+        super();
+        this.dataArray = new IndexedByteArray(buffer);
+        SpessaSynthGroup("%cParsing DLS...", consoleColors.info);
+        if(!this.dataArray)
+        {
+            SpessaSynthGroupEnd();
+            throw new TypeError("No data!");
+        }
+
+        this.soundFontInfo["ifil"] = "2.1"; // always for dls
+
+        // read the main chunk
+        let firstChunk = readRIFFChunk(this.dataArray, false);
+        this.verifyHeader(firstChunk, "riff");
+        this.verifyText(readBytesAsString(this.dataArray,4).toLowerCase(), "dls ");
+
+        // read until we reach "colh"
+        let colhChunk = readRIFFChunk(this.dataArray);
+        while(colhChunk.header !== "colh")
+        {
+            colhChunk = readRIFFChunk(this.dataArray);
+        }
+        this.instrumentAmount = readLittleEndian(colhChunk.chunkData, 4);
+        SpessaSynthInfo(`%cInstruments amount: %c${this.instrumentAmount}`,
+            consoleColors.info,
+            consoleColors.recognized);
+
+        // instrument list
+        this.readDLSInstrumentList(this.dataArray);
+
+        SpessaSynthInfo(`%cParsing finished! %c"desfont"%c has %c${this.presets.length} %cpresets,
+        %c${this.instruments.length}%c instruments and %c${this.samples.length}%c samples.`,
+            consoleColors.info,
+            consoleColors.recognized,
+            consoleColors.info,
+            consoleColors.recognized,
+            consoleColors.info,
+            consoleColors.recognized,
+            consoleColors.info,
+            consoleColors.recognized,
+            consoleColors.info);
+        SpessaSynthGroupEnd();
+        throw new Error("Not implemented yet...")
+    }
+
+    /**
+     * @param chunk {RiffChunk}
+     * @param expected {string}
+     */
+    verifyHeader(chunk, expected)
+    {
+        if(chunk.header.toLowerCase() !== expected.toLowerCase())
+        {
+            SpessaSynthGroupEnd();
+            throw new SyntaxError(`Invalid DLS chunk header! Expected "${expected.toLowerCase()}" got "${chunk.header.toLowerCase()}"`);
+        }
+    }
+
+    /**
+     * @param text {string}
+     * @param expected {string}
+     */
+    verifyText(text, expected)
+    {
+        if(text.toLowerCase() !== expected.toLowerCase())
+        {
+            SpessaSynthGroupEnd();
+            throw new SyntaxError(`Invalid DLS soundfont! Expected "${expected.toLowerCase()}" got "${text.toLowerCase()}"`);
+        }
+    }
+}
+DLSSoundFont.prototype.readDLSInstrumentList = readDLSInstrumentList;
+DLSSoundFont.prototype.readDLSInstrument = readDLSInstrument;
+
+export {DLSSoundFont}

package/soundfont/dls/read_instrument.js

@@ -0,0 +1,22 @@
+import { readBytesAsString } from '../../utils/byte_functions/string.js'
+import { readLittleEndian } from '../../utils/byte_functions/little_endian.js'
+import { DLSPreset } from './dls_preset.js'
+import { readRIFFChunk } from '../basic_soundfont/riff_chunk.js'
+
+/**
+ * @this {DLSSoundFont}
+ * @param chunk {RiffChunk}
+ */
+export function readDLSInstrument(chunk)
+{
+    this.verifyHeader(chunk, "LIST");
+    this.verifyText(readBytesAsString(chunk.chunkData, 4), "ins ");
+
+    const instrumentHeader = readRIFFChunk(chunk.chunkData);
+    this.verifyHeader(instrumentHeader, "insh");
+
+    const regions = readLittleEndian(instrumentHeader.chunkData, 4);
+    const ulBank = readLittleEndian(instrumentHeader.chunkData, 4);
+    const ulInstrument = readLittleEndian(instrumentHeader.chunkData, 4);
+    this.presets.push(new DLSPreset(ulBank, ulInstrument, regions));
+}

package/soundfont/dls/read_instrument_list.js

@@ -0,0 +1,17 @@
+import { readRIFFChunk } from '../basic_soundfont/riff_chunk.js'
+import { readBytesAsString } from '../../utils/byte_functions/string.js'
+
+/**
+ * @this {DLSSoundFont}
+ * @param dataArray {IndexedByteArray}
+ */
+export function readDLSInstrumentList(dataArray)
+{
+    const instrumentListChunk = readRIFFChunk(dataArray);
+    this.verifyHeader(instrumentListChunk, "LIST");
+    this.verifyText(readBytesAsString(instrumentListChunk.chunkData, 4), "lins");
+    for(let i = 0; i < this.instrumentAmount; i++)
+    {
+        this.readDLSInstrument(readRIFFChunk(instrumentListChunk.chunkData));
+    }
+}

package/soundfont/load_soundfont.js

@@ -0,0 +1,21 @@
+import { IndexedByteArray } from '../utils/indexed_array.js'
+import { readBytesAsString } from '../utils/byte_functions/string.js'
+import { DLSSoundFont } from './dls/dls_soundfont.js'
+import { SoundFont2 } from './soundfont.js'
+
+/**
+ * Loads a soundfont file
+ * @param buffer {ArrayBuffer}
+ * @returns {BasicSoundFont}
+ */
+export function loadSoundFont(buffer)
+{
+    const check = buffer.slice(8, 12);
+    const a = new IndexedByteArray(check);
+    const id = readBytesAsString(a, 4, undefined, false).toLowerCase();
+    if(id === "dls ")
+    {
+        return new DLSSoundFont(buffer);
+    }
+    return new SoundFont2(buffer, false);
+}

package/soundfont/read_sf2/instruments.js

@@ -1,6 +1,6 @@
 import {RiffChunk} from "../basic_soundfont/riff_chunk.js";
 import {InstrumentZone} from "./zones.js";
-import {readBytesAsUintLittleEndian} from "../../utils/byte_functions/little_endian.js";
+import {readLittleEndian} from "../../utils/byte_functions/little_endian.js";
 import { readBytesAsString } from '../../utils/byte_functions/string.js'
 import { BasicInstrument } from '../basic_soundfont/basic_instrument.js'
 
@@ -19,7 +19,7 @@ export class Instrument extends BasicInstrument
     {
         super();
         this.instrumentName = readBytesAsString(instrumentChunk.chunkData, 20).trim();
-        this.instrumentZoneIndex = readBytesAsUintLittleEndian(instrumentChunk.chunkData, 2);
+        this.instrumentZoneIndex = readLittleEndian(instrumentChunk.chunkData, 2);
         this.instrumentZonesAmount = 0;
     }
 

package/soundfont/read_sf2/modulators.js

@@ -1,4 +1,4 @@
-import {signedInt16, readBytesAsUintLittleEndian} from "../../utils/byte_functions/little_endian.js";
+import {signedInt16, readLittleEndian} from "../../utils/byte_functions/little_endian.js";
 import { IndexedByteArray } from '../../utils/indexed_array.js';
 import { generatorTypes } from './generators.js'
 import { midiControllers } from '../../midi_parser/midi_message.js'
@@ -54,11 +54,11 @@ export class Modulator{
         }
         else
         {
-            this.modulatorSource = readBytesAsUintLittleEndian(dataArray, 2);
-            this.modulatorDestination = readBytesAsUintLittleEndian(dataArray, 2);
+            this.modulatorSource = readLittleEndian(dataArray, 2);
+            this.modulatorDestination = readLittleEndian(dataArray, 2);
             this.transformAmount = signedInt16(dataArray[dataArray.currentIndex++], dataArray[dataArray.currentIndex++]);
-            this.modulationSecondarySrc = readBytesAsUintLittleEndian(dataArray, 2);
-            this.transformType = readBytesAsUintLittleEndian(dataArray, 2);
+            this.modulationSecondarySrc = readLittleEndian(dataArray, 2);
+            this.transformType = readLittleEndian(dataArray, 2);
         }
 
         if(this.modulatorDestination > 58)

package/soundfont/read_sf2/presets.js

@@ -1,6 +1,6 @@
 import {RiffChunk} from "../basic_soundfont/riff_chunk.js";
 import {PresetZone} from "./zones.js";
-import {readBytesAsUintLittleEndian} from "../../utils/byte_functions/little_endian.js";
+import {readLittleEndian} from "../../utils/byte_functions/little_endian.js";
 import { readBytesAsString } from '../../utils/byte_functions/string.js'
 import { BasicPreset } from '../basic_soundfont/basic_preset.js'
 
@@ -21,14 +21,14 @@ export class Preset extends BasicPreset
             .trim()
             .replace(/\d{3}:\d{3}/, ""); // remove those pesky "000:001"
 
-        this.program = readBytesAsUintLittleEndian(presetChunk.chunkData, 2);
-        this.bank = readBytesAsUintLittleEndian(presetChunk.chunkData, 2);
-        this.presetZoneStartIndex = readBytesAsUintLittleEndian(presetChunk.chunkData, 2);
+        this.program = readLittleEndian(presetChunk.chunkData, 2);
+        this.bank = readLittleEndian(presetChunk.chunkData, 2);
+        this.presetZoneStartIndex = readLittleEndian(presetChunk.chunkData, 2);
 
         // read the dwords
-        this.library = readBytesAsUintLittleEndian(presetChunk.chunkData, 4);
-        this.genre = readBytesAsUintLittleEndian(presetChunk.chunkData, 4);
-        this.morphology = readBytesAsUintLittleEndian(presetChunk.chunkData, 4);
+        this.library = readLittleEndian(presetChunk.chunkData, 4);
+        this.genre = readLittleEndian(presetChunk.chunkData, 4);
+        this.morphology = readLittleEndian(presetChunk.chunkData, 4);
         this.presetZonesAmount = 0;
     }
 

package/soundfont/read_sf2/samples.js

@@ -1,6 +1,6 @@
 import { RiffChunk } from '../basic_soundfont/riff_chunk.js'
 import { IndexedByteArray } from '../../utils/indexed_array.js'
-import { readBytesAsUintLittleEndian, signedInt8 } from '../../utils/byte_functions/little_endian.js'
+import { readLittleEndian, signedInt8 } from '../../utils/byte_functions/little_endian.js'
 import { stbvorbis } from '../../externals/stbvorbis_sync/stbvorbis_sync.min.js'
 import { SpessaSynthWarn } from '../../utils/loggin.js'
 import { readBytesAsString } from '../../utils/byte_functions/string.js'
@@ -239,19 +239,19 @@ function readSample(index, sampleHeaderData, smplArrayData, isDataRaw) {
     let sampleName = readBytesAsString(sampleHeaderData, 20);
 
     // read the sample start index
-    let sampleStartIndex = readBytesAsUintLittleEndian(sampleHeaderData, 4) * 2;
+    let sampleStartIndex = readLittleEndian(sampleHeaderData, 4) * 2;
 
     // read the sample end index
-    let sampleEndIndex = readBytesAsUintLittleEndian(sampleHeaderData, 4) * 2;
+    let sampleEndIndex = readLittleEndian(sampleHeaderData, 4) * 2;
 
     // read the sample looping start index
-    let sampleLoopStartIndex = readBytesAsUintLittleEndian(sampleHeaderData, 4) * 2;
+    let sampleLoopStartIndex = readLittleEndian(sampleHeaderData, 4) * 2;
 
     // read the sample looping end index
-    let sampleLoopEndIndex = readBytesAsUintLittleEndian(sampleHeaderData, 4) * 2;
+    let sampleLoopEndIndex = readLittleEndian(sampleHeaderData, 4) * 2;
 
     // read the sample rate
-    let sampleRate = readBytesAsUintLittleEndian(sampleHeaderData, 4);
+    let sampleRate = readLittleEndian(sampleHeaderData, 4);
 
     // read the original sample pitch
     let samplePitch = sampleHeaderData[sampleHeaderData.currentIndex++];
@@ -266,8 +266,8 @@ function readSample(index, sampleHeaderData, smplArrayData, isDataRaw) {
 
 
     // read the link to the other channel
-    let sampleLink = readBytesAsUintLittleEndian(sampleHeaderData, 2);
-    let sampleType = readBytesAsUintLittleEndian(sampleHeaderData, 2);
+    let sampleLink = readLittleEndian(sampleHeaderData, 2);
+    let sampleType = readLittleEndian(sampleHeaderData, 2);
 
 
 

package/soundfont/read_sf2/zones.js

@@ -1,4 +1,4 @@
-import {readBytesAsUintLittleEndian} from "../../utils/byte_functions/little_endian.js";
+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 {Generator, generatorTypes} from "./generators.js";
@@ -20,8 +20,8 @@ export class InstrumentZone extends BasicInstrumentZone
     constructor(dataArray)
     {
         super();
-        this.generatorZoneStartIndex = readBytesAsUintLittleEndian(dataArray, 2);
-        this.modulatorZoneStartIndex = readBytesAsUintLittleEndian(dataArray, 2);
+        this.generatorZoneStartIndex = readLittleEndian(dataArray, 2);
+        this.modulatorZoneStartIndex = readLittleEndian(dataArray, 2);
         this.modulatorZoneSize = 0;
         this.generatorZoneSize = 0;
         this.isGlobal = true;
@@ -146,8 +146,8 @@ export class PresetZone extends BasicPresetZone
     constructor(dataArray)
     {
         super();
-        this.generatorZoneStartIndex = readBytesAsUintLittleEndian(dataArray, 2);
-        this.modulatorZoneStartIndex = readBytesAsUintLittleEndian(dataArray, 2);
+        this.generatorZoneStartIndex = readLittleEndian(dataArray, 2);
+        this.modulatorZoneStartIndex = readLittleEndian(dataArray, 2);
         this.modulatorZoneSize = 0;
         this.generatorZoneSize = 0;
         this.isGlobal = true;

package/soundfont/soundfont.js

@@ -1,6 +1,6 @@
 import { IndexedByteArray } from '../utils/indexed_array.js'
 import {readSamples} from "./read_sf2/samples.js";
-import { readBytesAsUintLittleEndian } from '../utils/byte_functions/little_endian.js'
+import { readLittleEndian } from '../utils/byte_functions/little_endian.js'
 import { readGenerators, Generator } from './read_sf2/generators.js'
 import {readInstrumentZones, InstrumentZone, readPresetZones} from "./read_sf2/zones.js";
 import { readPresets } from "./read_sf2/presets.js";
@@ -23,10 +23,15 @@ export class SoundFont2 extends BasicSoundFont
     /**
      * Initializes a new SoundFont2 Parser and parses the given data array
      * @param arrayBuffer {ArrayBuffer}
+     * @param warnDeprecated {boolean}
      */
-    constructor(arrayBuffer)
+    constructor(arrayBuffer, warnDeprecated = true)
     {
         super();
+        if(warnDeprecated)
+        {
+            console.warn("Using the constructor directly is deprecated. Use loadSoundFont instead.");
+        }
         this.dataArray = new IndexedByteArray(arrayBuffer);
         SpessaSynthGroup("%cParsing SoundFont...", consoleColors.info);
         if(!this.dataArray)
@@ -66,7 +71,7 @@ export class SoundFont2 extends BasicSoundFont
             {
                 case  "ifil":
                 case "iver":
-                    text = `${readBytesAsUintLittleEndian(chunk.chunkData, 2)}.${readBytesAsUintLittleEndian(chunk.chunkData, 2)}`;
+                    text = `${readLittleEndian(chunk.chunkData, 2)}.${readLittleEndian(chunk.chunkData, 2)}`;
                     break;
 
                 case "icmt":

package/synthetizer/synthetizer.js

@@ -21,7 +21,7 @@ import { SoundfontManager } from './synth_soundfont_manager.js'
 
 /**
  * @typedef {Object} StartRenderingDataConfig
- * @property {MIDI} parsedMIDI - the MIDI to render
+ * @property {BasicMIDI} parsedMIDI - the MIDI to render
  * @property {SynthesizerSnapshot} snapshot - the snapshot to apply
  * @property {boolean|undefined} oneOutput - if synth should use one output with 32 channels (2 audio channels for each midi channel). this disables chorus and reverb.
  */