spessasynth_lib 3.20.0 → 3.20.2

package/@types/index.d.ts

@@ -2,6 +2,7 @@ import { Sequencer } from './sequencer/sequencer.js';
 import { Synthetizer } from './synthetizer/synthetizer.js';
 import { DEFAULT_PERCUSSION } from './synthetizer/synthetizer.js';
 import { VOICE_CAP } from './synthetizer/synthetizer.js';
+import { BasicSoundFont } from "./soundfont/basic_soundfont/basic_soundfont.js";
 import { loadSoundFont } from "./soundfont/load_soundfont.js";
 import { trimSoundfont } from "./soundfont/basic_soundfont/write_sf2/soundfont_trimmer.js";
 import { modulatorSources } from "./soundfont/read_sf2/modulators.js";
@@ -33,4 +34,4 @@ import { readBytesAsUintBigEndian } from './utils/byte_functions/big_endian.js';
 import { NON_CC_INDEX_OFFSET } from './synthetizer/worklet_system/worklet_utilities/worklet_processor_channel.js';
 import { ALL_CHANNELS_OR_DIFFERENT_ACTION } from './synthetizer/worklet_system/message_protocol/worklet_message.js';
 import { WORKLET_URL_ABSOLUTE } from './synthetizer/worklet_url.js';
-export { Sequencer, Synthetizer, DEFAULT_PERCUSSION, VOICE_CAP, loadSoundFont, trimSoundfont, modulatorSources, encodeVorbis, MIDI, MIDIBuilder, IndexedByteArray, writeMIDIFile, writeRMIDI, applySnapshotToMIDI, modifyMIDI, audioBufferToWav, SpessaSynthLogging, SpessaSynthGroup, SpessaSynthTable, SpessaSynthGroupEnd, SpessaSynthInfo, SpessaSynthWarn, SpessaSynthGroupCollapsed, midiControllers, messageTypes, MIDIDeviceHandler, WebMidiLinkHandler, arrayToHexString, consoleColors, formatTitle, formatTime, readBytesAsUintBigEndian, NON_CC_INDEX_OFFSET, ALL_CHANNELS_OR_DIFFERENT_ACTION, WORKLET_URL_ABSOLUTE };
+export { Sequencer, Synthetizer, DEFAULT_PERCUSSION, VOICE_CAP, BasicSoundFont, loadSoundFont, trimSoundfont, modulatorSources, encodeVorbis, MIDI, MIDIBuilder, IndexedByteArray, writeMIDIFile, writeRMIDI, applySnapshotToMIDI, modifyMIDI, audioBufferToWav, SpessaSynthLogging, SpessaSynthGroup, SpessaSynthTable, SpessaSynthGroupEnd, SpessaSynthInfo, SpessaSynthWarn, SpessaSynthGroupCollapsed, midiControllers, messageTypes, MIDIDeviceHandler, WebMidiLinkHandler, arrayToHexString, consoleColors, formatTitle, formatTime, readBytesAsUintBigEndian, NON_CC_INDEX_OFFSET, ALL_CHANNELS_OR_DIFFERENT_ACTION, WORKLET_URL_ABSOLUTE };

package/@types/soundfont/{soundfont.d.ts → read_sf2/soundfont.d.ts}

@@ -11,7 +11,7 @@ export class SoundFont2 extends BasicSoundFont {
     constructor(arrayBuffer: ArrayBuffer, warnDeprecated?: boolean);
     dataArray: IndexedByteArray;
     sampleDataStartIndex: number;
-    instruments: import("./read_sf2/instruments.js").Instrument[];
+    instruments: import("./instruments.js").Instrument[];
     /**
      * @param chunk {RiffChunk}
      * @param expected {string}
@@ -23,6 +23,6 @@ export class SoundFont2 extends BasicSoundFont {
      */
     verifyText(text: string, expected: string): void;
 }
-import { BasicSoundFont } from './basic_soundfont/basic_soundfont.js';
-import { IndexedByteArray } from '../utils/indexed_array.js';
-import { RiffChunk } from './basic_soundfont/riff_chunk.js';
+import { BasicSoundFont } from '../basic_soundfont/basic_soundfont.js';
+import { IndexedByteArray } from '../../utils/indexed_array.js';
+import { RiffChunk } from '../basic_soundfont/riff_chunk.js';

package/README.md

@@ -76,7 +76,7 @@ document.getElementById("button").onclick = async () => {
 - **Easy MIDI editing:** Use [helper functions](https://github.com/spessasus/SpessaSynth/wiki/Writing-MIDI-Files#modifymidi) to modify the song to your needs!
 - **Loop detection:** Automatically detects loops in MIDIs (e.g., from _Touhou Project_)
 - **First note detection:** Skip unnecessary silence at the start by jumping to the first note!
-- **[Write MIDI files from scratch](https://github.com/spessasus/SpessaSynth/wiki/Creating-MIDI-Files.md)**
+- **[Write MIDI files from scratch](https://github.com/spessasus/SpessaSynth/wiki/Creating-MIDI-Files)**
 - **Easy saving:** Save with just [one function!](https://github.com/spessasus/SpessaSynth/wiki/Writing-MIDI-Files#writemidifile)
 
 #### Read and write [RMID files with embedded SF2 soundfonts](https://github.com/spessasus/sf2-rmidi-specification#readme)

package/external_midi/web_midi_link.js

@@ -13,7 +13,8 @@ export class WebMidiLinkHandler
     /**
      * @param synth {Synthetizer} the synth to play to
      */
-    constructor(synth) {
+    constructor(synth)
+    {
 
         window.addEventListener("message", msg => {
             if(typeof  msg.data !== "string")

package/index.js

@@ -1,5 +1,6 @@
 // Import modules
 import { loadSoundFont } from "./soundfont/load_soundfont.js";
+import { BasicSoundFont } from "./soundfont/basic_soundfont/basic_soundfont.js";
 import { MIDI } from './midi_parser/midi_loader.js';
 import { MIDIBuilder } from "./midi_parser/midi_builder.js";
 import { Synthetizer, VOICE_CAP, DEFAULT_PERCUSSION } from './synthetizer/synthetizer.js';
@@ -39,6 +40,7 @@ export {
     VOICE_CAP,
 
     // SoundFont
+    BasicSoundFont,
     loadSoundFont,
     trimSoundfont,
     modulatorSources,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "spessasynth_lib",
-  "version": "3.20.0",
-  "description": "No compromise MIDI and SoundFont2 Synthesizer library",
+  "version": "3.20.2",
+  "description": "MIDI and SoundFont2 or DLS Synthesizer library with no compromises",
   "browser": "index.js",
   "types": "@types/index.d.ts",
   "type": "module",
@@ -18,7 +18,10 @@
     "synth",
     "sf2",
     "sf3",
+    "dls",
+    "dls-to-sf2",
     "midi",
+    "rmi",
     "midi-player",
     "web-audio-api",
     "web-midi-api",

package/soundfont/dls/dls_sample.js

@@ -46,6 +46,14 @@ export class DLSSample extends BasicSample
 
     getRawData()
     {
+        if(this.isCompressed)
+        {
+            if (!this.compressedData)
+            {
+                throw new Error("Compressed but no data??")
+            }
+            return this.compressedData;
+        }
         const uint8 = new Uint8Array(this.sampleData.length * 2);
         for (let i = 0; i < this.sampleData.length; i++)
         {

package/soundfont/dls/dls_zone.js

@@ -46,7 +46,8 @@ export class DLSZone extends BasicInstrumentZone
         {
             const fine = diffStart % 32768;
             this.generators.push(new Generator(generatorTypes.startloopAddrsOffset, fine));
-            const coarse = Math.round(diffStart / 32768);
+            // coarse generator uses 32768 samples per step
+            const coarse = (diffStart - fine) / 32768;
             if(coarse !== 0)
             {
                 this.generators.push(new Generator(generatorTypes.startloopAddrsCoarseOffset, fine));
@@ -56,7 +57,8 @@ export class DLSZone extends BasicInstrumentZone
         {
             const fine = diffEnd % 32768;
             this.generators.push(new Generator(generatorTypes.endloopAddrsOffset, fine));
-            const coarse = Math.round(diffEnd / 32768);
+            // coarse generator uses 32768 samples per step
+            const coarse = (diffEnd - fine) / 32768;
             if(coarse !== 0)
             {
                 this.generators.push(new Generator(generatorTypes.endloopAddrsCoarseOffset, fine));

package/soundfont/dls/read_articulation.js

@@ -76,8 +76,14 @@ export function readArticulation(chunk, disableVibrato)
         const control = readLittleEndian(artData, 2);
         const destination = readLittleEndian(artData, 2);
         const transform = readLittleEndian(artData, 2);
-        const value = readLittleEndian(artData, 4) >> 16; // convert it to 16 bit as soundfont uses that
+        const scale = readLittleEndian(artData, 4) | 0;
+        const value = scale >> 16; // convert it to 16 bit as soundfont uses that
 
+        // if(destination === DLSDestinations.volEnvDecay)
+        // {
+        //     console.log(scale, value)
+        // }
+        //modulatorConverterDebug(source, control, destination, value, transform);
         // interpret this somehow...
         // if source and control are both zero, it's a generator
         if(source === 0 && control === 0 && transform === 0)
@@ -224,26 +230,57 @@ export function readArticulation(chunk, disableVibrato)
                 // key to vol env hold
                 if(source === DLSSources.keyNum && destination === DLSDestinations.volEnvHold)
                 {
-                    // according to viena and another strange (with modulators) rendition of gm.dls in sf2, this is how it should be done???
-                    generators.push(new Generator(generatorTypes.keyNumToVolEnvHold, value / -127));
+                    // according to viena and another strange (with modulators) rendition of gm.dls in sf2,
+                    // it shall be divided by -128
+                    // and a strange correction needs to be applied to the real value:
+                    // real + (60 / 128) * scale
+                    generators.push(new Generator(generatorTypes.keyNumToVolEnvHold, value / -128));
+                    const correction = Math.round((60 / 128) * value);
+                    generators.forEach(g => {
+                        if(g.generatorType === generatorTypes.holdVolEnv) g.generatorValue += correction;
+                    });
                 }
                 else
                 // key to vol env decay
                 if(source === DLSSources.keyNum && destination === DLSDestinations.volEnvDecay)
                 {
-                    generators.push(new Generator(generatorTypes.keyNumToVolEnvDecay, value / -127));
+                    // according to viena and another strange (with modulators) rendition of gm.dls in sf2,
+                    // it shall be divided by -128
+                    // and a strange correction needs to be applied to the real value:
+                    // real + (60 / 128) * scale
+                    generators.push(new Generator(generatorTypes.keyNumToVolEnvDecay, value / -128));
+                    const correction = Math.round((60 / 128) * value);
+                    generators.forEach(g => {
+                        if(g.generatorType === generatorTypes.decayVolEnv) g.generatorValue += correction;
+                    });
                 }
                 else
                 // key to mod env hold
                 if(source === DLSSources.keyNum && destination === DLSDestinations.modEnvHold)
                 {
-                    generators.push(new Generator(generatorTypes.keyNumToModEnvHold, value / -127));
+                    // according to viena and another strange (with modulators) rendition of gm.dls in sf2,
+                    // it shall be divided by -128
+                    // and a strange correction needs to be applied to the real value:
+                    // real + (60 / 128) * scale
+                    generators.push(new Generator(generatorTypes.keyNumToModEnvHold, value / -128));
+                    const correction = Math.round((60 / 128) * value);
+                    generators.forEach(g => {
+                        if(g.generatorType === generatorTypes.holdModEnv) g.generatorValue += correction;
+                    });
                 }
                 else
                 // key to mod env decay
                 if(source === DLSSources.keyNum && destination === DLSDestinations.modEnvDecay)
                 {
-                    generators.push(new Generator(generatorTypes.keyNumToModEnvDecay, value / -127));
+                    // according to viena and another strange (with modulators) rendition of gm.dls in sf2,
+                    // it shall be divided by -128
+                    // and a strange correction needs to be applied to the real value:
+                    // real + (60 / 128) * scale
+                    generators.push(new Generator(generatorTypes.keyNumToModEnvDecay, value / -128));
+                    const correction = Math.round((60 / 128) * value);
+                    generators.forEach(g => {
+                        if(g.generatorType === generatorTypes.decayModEnv) g.generatorValue += correction;
+                    });
                 }
                 else
                 {

package/soundfont/load_soundfont.js

@@ -1,7 +1,7 @@
 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'
+import { SoundFont2 } from './read_sf2/soundfont.js'
 
 /**
  * Loads a soundfont file

package/soundfont/{soundfont.js → read_sf2/soundfont.js}

@@ -1,17 +1,17 @@
-import { IndexedByteArray } from '../utils/indexed_array.js'
-import {readSamples} from "./read_sf2/samples.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";
-import {readInstruments} from "./read_sf2/instruments.js";
-import {readModulators, Modulator} from "./read_sf2/modulators.js";
-import { readRIFFChunk, RiffChunk } from './basic_soundfont/riff_chunk.js'
-import { consoleColors } from '../utils/other.js'
-import { SpessaSynthGroup, SpessaSynthGroupEnd, SpessaSynthInfo } from '../utils/loggin.js'
-import { readBytesAsString } from '../utils/byte_functions/string.js'
-import { stbvorbis } from "../externals/stbvorbis_sync/stbvorbis_sync.min.js";
-import { BasicSoundFont } from './basic_soundfont/basic_soundfont.js'
+import { IndexedByteArray } from '../../utils/indexed_array.js'
+import { readSamples } from "./samples.js";
+import { readLittleEndian } from '../../utils/byte_functions/little_endian.js'
+import { readGenerators, Generator } from './generators.js'
+import { readInstrumentZones, InstrumentZone, readPresetZones } from "./zones.js";
+import { readPresets } from "./presets.js";
+import { readInstruments } from "./instruments.js";
+import { readModulators, Modulator } from "./modulators.js";
+import { readRIFFChunk, RiffChunk } from '../basic_soundfont/riff_chunk.js'
+import { consoleColors } from '../../utils/other.js'
+import { SpessaSynthGroup, SpessaSynthGroupEnd, SpessaSynthInfo } from '../../utils/loggin.js'
+import { readBytesAsString } from '../../utils/byte_functions/string.js'
+import { stbvorbis } from "../../externals/stbvorbis_sync/stbvorbis_sync.min.js";
+import { BasicSoundFont } from '../basic_soundfont/basic_soundfont.js'
 
 /**
  * soundfont.js