spessasynth_lib 3.22.13 → 3.23.0

package/soundfont/basic_soundfont/write_dls/wvpl.js

@@ -0,0 +1,32 @@
+import { writeDLSSample } from "./wave.js";
+import { writeRIFFOddSize } from "../riff_chunk.js";
+import { combineArrays } from "../../../utils/indexed_array.js";
+
+/**
+ * @this {BasicSoundFont}
+ * @returns {{data: IndexedByteArray, indexes: number[] }}
+ */
+export function writeWavePool()
+{
+    let currentIndex = 0;
+    const offsets = [];
+    /**
+     * @type {IndexedByteArray[]}
+     */
+    const samples = this.samples.map(s =>
+    {
+        const out = writeDLSSample(s);
+        offsets.push(currentIndex);
+        currentIndex += out.length;
+        return out;
+    });
+    return {
+        data: writeRIFFOddSize(
+            "wvpl",
+            combineArrays(samples),
+            false,
+            true
+        ),
+        indexes: offsets
+    };
+}

package/soundfont/basic_soundfont/write_sf2/igen.js

@@ -23,19 +23,19 @@ export function getIGEN()
                 g.generatorType !== generatorTypes.velRange
             );
             // add sample and ranges if needed
-            // unshift vel then key ( to make key first)     and instrument is last
+            // unshift vel then key ( to make key first) and instrument is last
             if (z.velRange.max !== 127 || z.velRange.min !== 0)
             {
                 z.generators.unshift({
                     generatorType: generatorTypes.velRange,
-                    generatorValue: z.velRange.max << 8 | z.velRange.min
+                    generatorValue: z.velRange.max << 8 | Math.max(z.velRange.min, 0)
                 });
             }
             if (z.keyRange.max !== 127 || z.keyRange.min !== 0)
             {
                 z.generators.unshift({
                     generatorType: generatorTypes.keyRange,
-                    generatorValue: z.keyRange.max << 8 | z.keyRange.min
+                    generatorValue: z.keyRange.max << 8 | Math.max(z.keyRange.min, 0)
                 });
             }
             if (!z.isGlobal)

package/soundfont/basic_soundfont/write_sf2/pgen.js

@@ -28,14 +28,14 @@ export function getPGEN()
             {
                 z.generators.unshift({
                     generatorType: generatorTypes.velRange,
-                    generatorValue: z.velRange.max << 8 | z.velRange.min
+                    generatorValue: z.velRange.max << 8 | Math.max(z.velRange.min, 0)
                 });
             }
             if (z.keyRange.max !== 127 || z.keyRange.min !== 0)
             {
                 z.generators.unshift({
                     generatorType: generatorTypes.keyRange,
-                    generatorValue: z.keyRange.max << 8 | z.keyRange.min
+                    generatorValue: z.keyRange.max << 8 | Math.max(z.keyRange.min, 0)
                 });
             }
             if (!z.isGlobal)

package/soundfont/dls/articulator_converter.js

@@ -5,6 +5,7 @@ import { DLSDestinations } from "./dls_destinations.js";
 
 import { generatorTypes } from "../basic_soundfont/generator.js";
 import { consoleColors } from "../../utils/other.js";
+import { SpessaSynthWarn } from "../../utils/loggin.js";
 
 /**
  * @param source {number}
@@ -147,26 +148,32 @@ function checkForSpecialDLSCombo(source, destination)
 {
     if (source === DLSSources.vibratoLfo && destination === DLSDestinations.pitch)
     {
+        // vibrato lfo to pitch
         return generatorTypes.vibLfoToPitch;
     }
     else if (source === DLSSources.modLfo && destination === DLSDestinations.pitch)
     {
+        // mod lfo to pitch
         return generatorTypes.modLfoToPitch;
     }
     else if (source === DLSSources.modLfo && destination === DLSDestinations.filterCutoff)
     {
+        // mod lfo to filter
         return generatorTypes.modLfoToFilterFc;
     }
     else if (source === DLSSources.modLfo && destination === DLSDestinations.gain)
     {
+        // mod lfo to volume
         return generatorTypes.modLfoToVolume;
     }
     else if (source === DLSSources.modEnv && destination === DLSDestinations.filterCutoff)
     {
+        // mod envelope to filter
         return generatorTypes.modEnvToFilterFc;
     }
     else if (source === DLSSources.modEnv && destination === DLSDestinations.pitch)
     {
+        // mod envelope to pitch
         return generatorTypes.modEnvToPitch;
     }
     else
@@ -253,6 +260,7 @@ export function getSF2ModulatorFromArticulator(
         if (sf2GenDestination === undefined)
         {
             // cannot be a valid modulator
+            SpessaSynthWarn(`Invalid destination: ${destination}`);
             return undefined;
         }
         /**
@@ -268,6 +276,7 @@ export function getSF2ModulatorFromArticulator(
         if (sf2Source === undefined)
         {
             // cannot be a valid modulator
+            SpessaSynthWarn(`Invalid source: ${source}`);
             return undefined;
         }
     }
@@ -282,6 +291,7 @@ export function getSF2ModulatorFromArticulator(
     if (sf2SecondSource === undefined)
     {
         // cannot be a valid modulator
+        SpessaSynthWarn(`Invalid control: ${control}`);
         return undefined;
     }
     

package/soundfont/dls/dls_sample.js

@@ -41,7 +41,7 @@ export class DLSSample extends BasicSample
             0,
             1,
             loopStart,
-            loopEnd - 1 // -1 sample because soundfont end is last sample and dls end is next sample
+            loopEnd
         );
         this.sampleData = data;
         this.sampleDbAttenuation = sampleDbAttenuation;
@@ -65,7 +65,7 @@ export class DLSSample extends BasicSample
         const uint8 = new Uint8Array(this.sampleData.length * 2);
         for (let i = 0; i < this.sampleData.length; i++)
         {
-            const sample = Math.floor(this.sampleData[i] * 32767);
+            const sample = Math.floor(this.sampleData[i] * 32768);
             uint8[i * 2] = sample & 0xFF; // lower byte
             uint8[i * 2 + 1] = (sample >> 8) & 0xFF; // upper byte
         }

package/soundfont/dls/dls_soundfont.js

@@ -63,13 +63,14 @@ class DLSSoundFont extends BasicSoundFont
                 this.soundFontInfo[infoPart.header] = readBytesAsString(infoPart.chunkData, infoPart.size);
             }
         }
-        this.soundFontInfo["ICMT"] = (this.soundFontInfo["ICMT"] || "(No description)") + "\nConverted from DLS to SF2 with SpessaSynth";
+        this.soundFontInfo["ICMT"] = this.soundFontInfo["ICMT"] || "(No description)";
         if (this.soundFontInfo["ISBJ"])
         {
             // merge it
             this.soundFontInfo["ICMT"] += "\n" + this.soundFontInfo["ISBJ"];
             delete this.soundFontInfo["ISBJ"];
         }
+        this.soundFontInfo["ICMT"] += "\nConverted from DLS to SF2 with SpessaSynth";
         
         for (const [info, value] of Object.entries(this.soundFontInfo))
         {

package/soundfont/dls/dls_zone.js

@@ -55,28 +55,31 @@ export class DLSZone extends BasicInstrumentZone
         }
         
         // correct loop if needed
-        const diffStart = loop.start - sample.sampleLoopStartIndex;
-        const diffEnd = loop.end - sample.sampleLoopEndIndex;
-        if (diffStart !== 0)
+        if (loopingMode !== 0)
         {
-            const fine = diffStart % 32768;
-            this.generators.push(new Generator(generatorTypes.startloopAddrsOffset, fine));
-            // coarse generator uses 32768 samples per step
-            const coarse = Math.trunc(diffStart / 32768);
-            if (coarse !== 0)
+            const diffStart = loop.start - sample.sampleLoopStartIndex;
+            const diffEnd = loop.end - sample.sampleLoopEndIndex;
+            if (diffStart !== 0)
             {
-                this.generators.push(new Generator(generatorTypes.startloopAddrsCoarseOffset, coarse));
+                const fine = diffStart % 32768;
+                this.generators.push(new Generator(generatorTypes.startloopAddrsOffset, fine));
+                // coarse generator uses 32768 samples per step
+                const coarse = Math.trunc(diffStart / 32768);
+                if (coarse !== 0)
+                {
+                    this.generators.push(new Generator(generatorTypes.startloopAddrsCoarseOffset, coarse));
+                }
             }
-        }
-        if (diffEnd !== 0)
-        {
-            const fine = diffEnd % 32768;
-            this.generators.push(new Generator(generatorTypes.endloopAddrsOffset, fine));
-            // coarse generator uses 32768 samples per step
-            const coarse = Math.trunc(diffEnd / 32768);
-            if (coarse !== 0)
+            if (diffEnd !== 0)
             {
-                this.generators.push(new Generator(generatorTypes.endloopAddrsCoarseOffset, coarse));
+                const fine = diffEnd % 32768;
+                this.generators.push(new Generator(generatorTypes.endloopAddrsOffset, fine));
+                // coarse generator uses 32768 samples per step
+                const coarse = Math.trunc(diffEnd / 32768);
+                if (coarse !== 0)
+                {
+                    this.generators.push(new Generator(generatorTypes.endloopAddrsCoarseOffset, coarse));
+                }
             }
         }
         // correct key if needed

package/soundfont/dls/read_articulation.js

@@ -84,18 +84,20 @@ export function readArticulation(chunk, disableVibrato)
                     generator = new Generator(generatorTypes.attackVolEnv, value);
                     break;
                 case DLSDestinations.volEnvHold:
-                    generator = new Generator(generatorTypes.holdVolEnv, value);
+                    // do not validate because keyNumToSomething
+                    generator = new Generator(generatorTypes.holdVolEnv, value, false);
                     break;
                 case DLSDestinations.volEnvDecay:
-                    generator = new Generator(generatorTypes.decayVolEnv, value);
+                    // do not validate because keyNumToSomething
+                    generator = new Generator(generatorTypes.decayVolEnv, value, false);
                     break;
                 case DLSDestinations.volEnvRelease:
                     generator = new Generator(generatorTypes.releaseVolEnv, value);
                     break;
                 case DLSDestinations.volEnvSustain:
                     // gain seems to be (1000 - value) / 10 = sustain dB
-                    const sustainDb = (1000 - value) / 10;
-                    generator = new Generator(generatorTypes.sustainVolEnv, sustainDb * 10);
+                    const sustainCb = 1000 - value;
+                    generator = new Generator(generatorTypes.sustainVolEnv, sustainCb);
                     break;
                 
                 // mod env
@@ -106,10 +108,12 @@ export function readArticulation(chunk, disableVibrato)
                     generator = new Generator(generatorTypes.attackModEnv, value);
                     break;
                 case DLSDestinations.modEnvHold:
-                    generator = new Generator(generatorTypes.holdModEnv, value);
+                    // do not validate because keyNumToSomething
+                    generator = new Generator(generatorTypes.holdModEnv, value, false);
                     break;
                 case DLSDestinations.modEnvDecay:
-                    generator = new Generator(generatorTypes.decayModEnv, value);
+                    // do not validate because keyNumToSomething
+                    generator = new Generator(generatorTypes.decayModEnv, value, false);
                     break;
                 case DLSDestinations.modEnvRelease:
                     generator = new Generator(generatorTypes.releaseModEnv, value);
@@ -181,6 +185,14 @@ export function readArticulation(chunk, disableVibrato)
                 {
                     generators.push(new Generator(generatorTypes.modEnvToFilterFc, value));
                 }
+                else
+                    // scale tuning (key number to pitch)
+                if (source === DLSSources.keyNum && destination === DLSDestinations.pitch)
+                {
+                    // this is just a soundfont generator, but the amount must be changed
+                    // 12800 means the regular scale (100)
+                    generators.push(new Generator(generatorTypes.scaleTuning, value / 128));
+                }
                 else
                     // key to vol env hold
                 if (source === DLSSources.keyNum && destination === DLSDestinations.volEnvHold)
@@ -289,30 +301,6 @@ export function readArticulation(chunk, disableVibrato)
         }
     }
     
-    // override reverb and chorus with 1000 instead of 200 (if not overriden)
-    // reverb
-    if (modulators.find(m => m.modulatorDestination === generatorTypes.reverbEffectsSend) === undefined)
-    {
-        modulators.push(new Modulator({
-            srcEnum: 0x00DB,
-            dest: generatorTypes.reverbEffectsSend,
-            amt: 1000,
-            secSrcEnum: 0x0,
-            transform: 0
-        }));
-    }
-    // chorus
-    if (modulators.find(m => m.modulatorDestination === generatorTypes.chorusEffectsSend) === undefined)
-    {
-        modulators.push(new Modulator({
-            srcEnum: 0x00DD,
-            dest: generatorTypes.chorusEffectsSend,
-            amt: 1000,
-            secSrcEnum: 0x0,
-            transform: 0
-        }));
-    }
-    
     // it seems that dls 1 does not have vibrato lfo, so we shall disable it
     if (disableVibrato)
     {

package/soundfont/dls/read_instrument.js

@@ -5,6 +5,8 @@ import { findRIFFListType, readRIFFChunk } from "../basic_soundfont/riff_chunk.j
 import { SpessaSynthGroup, SpessaSynthGroupEnd } from "../../utils/loggin.js";
 import { BasicInstrumentZone } from "../basic_soundfont/basic_zones.js";
 import { consoleColors } from "../../utils/other.js";
+import { generatorLimits, generatorTypes } from "../basic_soundfont/generator.js";
+import { Modulator } from "../basic_soundfont/modulator.js";
 
 /**
  * @this {DLSSoundFont}
@@ -73,7 +75,35 @@ export function readDLSInstrument(chunk)
     // read articulators
     const globalLart = findRIFFListType(chunks, "lart");
     const globalLar2 = findRIFFListType(chunks, "lar2");
-    this.readLart(globalLart, globalLar2, globalZone);
+    if (globalLar2 !== undefined || globalLart !== undefined)
+    {
+        this.readLart(globalLart, globalLar2, globalZone);
+    }
+    // remove generators with default values
+    globalZone.generators = globalZone.generators.filter(g => g.generatorValue !== generatorLimits[g.generatorType].def);
+    // override reverb and chorus with 1000 instead of 200 (if not overriden)
+    // reverb
+    if (globalZone.modulators.find(m => m.modulatorDestination === generatorTypes.reverbEffectsSend) === undefined)
+    {
+        globalZone.modulators.push(new Modulator({
+            srcEnum: 0x00DB,
+            dest: generatorTypes.reverbEffectsSend,
+            amt: 1000,
+            secSrcEnum: 0x0,
+            transform: 0
+        }));
+    }
+    // chorus
+    if (globalZone.modulators.find(m => m.modulatorDestination === generatorTypes.chorusEffectsSend) === undefined)
+    {
+        globalZone.modulators.push(new Modulator({
+            srcEnum: 0x00DD,
+            dest: generatorTypes.chorusEffectsSend,
+            amt: 1000,
+            secSrcEnum: 0x0,
+            transform: 0
+        }));
+    }
     preset.DLSInstrument.instrumentZones.push(globalZone);
     
     // read regions

package/soundfont/dls/read_region.js

@@ -64,10 +64,6 @@ export function readRegion(chunk)
         waveSampleChunk.chunkData[waveSampleChunk.chunkData.currentIndex++]
     );
     
-    const pitchCorrectionSemitones = Math.trunc(pitchCorrection / 100);
-    originalKey += pitchCorrectionSemitones;
-    pitchCorrection -= pitchCorrectionSemitones * 100;
-    
     // gain correction:  Each unit of gain represents 1/655360 dB
     // it is set after linking the sample
     const gainCorrection = readLittleEndian(waveSampleChunk.chunkData, 4);

package/soundfont/dls/read_samples.js

@@ -179,6 +179,22 @@ export function readDLSSamples(waveListChunk)
             
         }
         
+        // read sample name
+        const waveInfo = findRIFFListType(waveChunks, "INFO");
+        let sampleName = `Unnamed ${sampleID}`;
+        if (waveInfo)
+        {
+            let infoChunk = readRIFFChunk(waveInfo.chunkData);
+            while (infoChunk.header !== "INAM" && waveInfo.chunkData.currentIndex < waveInfo.chunkData.length)
+            {
+                infoChunk = readRIFFChunk(waveInfo.chunkData);
+            }
+            if (infoChunk.header === "INAM")
+            {
+                sampleName = readBytesAsString(infoChunk.chunkData, infoChunk.size).trim();
+            }
+        }
+        
         // sane defaults
         let sampleKey = 60;
         let samplePitch = 0;
@@ -227,22 +243,6 @@ export function readDLSSamples(waveListChunk)
             SpessaSynthWarn("No wsmp chunk in wave... using sane defaults.");
         }
         
-        // read sample name
-        const waveInfo = findRIFFListType(waveChunks, "INFO");
-        let sampleName = `Unnamed ${sampleID}`;
-        if (waveInfo)
-        {
-            let infoChunk = readRIFFChunk(waveInfo.chunkData);
-            while (infoChunk.header !== "INAM" && waveInfo.chunkData.currentIndex < waveInfo.chunkData.length)
-            {
-                infoChunk = readRIFFChunk(waveInfo.chunkData);
-            }
-            if (infoChunk.header === "INAM")
-            {
-                sampleName = readBytesAsString(infoChunk.chunkData, infoChunk.size).trim();
-            }
-        }
-        
         if (failed)
         {
             console.error(`Failed to load '${sampleName}': Unsupported format: (${waveFormat})`);
@@ -254,7 +254,7 @@ export function readDLSSamples(waveListChunk)
             sampleKey,
             samplePitch,
             sampleLoopStart,
-            sampleData.length,
+            sampleLoopEnd,
             sampleData,
             sampleDbAttenuation
         ));

package/synthetizer/key_modifier_manager.js

@@ -41,7 +41,7 @@ export class KeyModifierManager
      */
     addModifier(channel, midiNote, options)
     {
-        const velocity = options?.velocity || -1;
+        const velocity = options?.velocity ?? -1;
         const program = options?.patch?.program ?? -1;
         const bank = options?.patch?.bank ?? -1;
         this._sendToWorklet(