spessasynth_lib 3.20.1 → 3.20.3

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/midi_parser/midi_loader.js

@@ -123,7 +123,6 @@ class MIDI extends BasicMIDI
 
             if(DLSRMID)
             {
-                console.log(DLSRMID)
                 // assume bank offset of 0 by default. If we find any bank selects, then the offset is 1.
                 this.bankOffset = 0;
             }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "spessasynth_lib",
-  "version": "3.20.1",
-  "description": "No compromise MIDI and SoundFont2 Synthesizer library",
+  "version": "3.20.3",
+  "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/sequencer/worklet_sequencer/play.js

@@ -264,10 +264,8 @@ export function play(resetTime = false)
     }
     if(!this.sendMIDIMessages)
     {
-        const time = this.currentTime;
         this.playingNotes.forEach(n => {
-            const timeOffset = n.startTime - time;
-            this.synth.noteOn(n.channel, n.midiNote, n.velocity, false, true, currentTime + timeOffset);
+            this.synth.noteOn(n.channel, n.midiNote, n.velocity, false, true);
         });
     }
     this.setProcessHandler();

package/sequencer/worklet_sequencer/process_event.js

@@ -36,8 +36,7 @@ export function _processEvent(event, trackIndex)
                 this.playingNotes.push({
                     midiNote: event.messageData[0],
                     channel: statusByteData.channel,
-                    velocity: velocity,
-                    startTime: this.currentTime
+                    velocity: velocity
                 });
             }
             else

package/sequencer/worklet_sequencer/worklet_sequencer.js

@@ -60,8 +60,7 @@ class WorkletSequencer
          * @type {{
          *     midiNote: number,
          *     channel: number,
-         *     velocity: number,
-         *     startTime: number
+         *     velocity: number
          * }[]}
          */
         this.playingNotes = [];

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