spessasynth_lib 3.23.3 → 3.23.8

package/soundfont/basic_soundfont/write_dls/wave.js

@@ -2,7 +2,7 @@ import { combineArrays, IndexedByteArray } from "../../../utils/indexed_array.js
 import { writeDword, writeWord } from "../../../utils/byte_functions/little_endian.js";
 import { writeRIFFOddSize } from "../riff_chunk.js";
 import { writeWavesample } from "./wsmp.js";
-import { getStringBytes } from "../../../utils/byte_functions/string.js";
+import { getStringBytesZero } from "../../../utils/byte_functions/string.js";
 import { SpessaSynthInfo } from "../../../utils/loggin.js";
 import { consoleColors } from "../../../utils/other.js";
 
@@ -23,6 +23,11 @@ export function writeDLSSample(sample)
         "fmt ",
         fmtData
     );
+    let loop = 1;
+    if (sample.sampleLoopStartIndex + Math.abs(sample.getAudioData().length - sample.sampleLoopEndIndex) < 2)
+    {
+        loop = 0;
+    }
     const wsmp = writeWavesample(
         sample,
         sample.samplePitch,
@@ -30,7 +35,7 @@ export function writeDLSSample(sample)
         0,
         sample.sampleLoopStartIndex,
         sample.sampleLoopEndIndex,
-        1
+        loop
     );
     const audio = sample.getAudioData();
     let data;
@@ -60,7 +65,7 @@ export function writeDLSSample(sample)
     
     const inam = writeRIFFOddSize(
         "INAM",
-        getStringBytes(sample.sampleName)
+        getStringBytesZero(sample.sampleName)
     );
     const info = writeRIFFOddSize(
         "INFO",

package/soundfont/basic_soundfont/write_dls/write_dls.js

@@ -2,7 +2,7 @@ import { writeRIFFOddSize } from "../riff_chunk.js";
 import { writeDword } from "../../../utils/byte_functions/little_endian.js";
 import { combineArrays, IndexedByteArray } from "../../../utils/indexed_array.js";
 import { writeLins } from "./lins.js";
-import { getStringBytes, writeStringAsBytes } from "../../../utils/byte_functions/string.js";
+import { getStringBytesZero, writeStringAsBytes } from "../../../utils/byte_functions/string.js";
 import { writeWavePool } from "./wvpl.js";
 import { SpessaSynthGroupCollapsed, SpessaSynthGroupEnd, SpessaSynthInfo } from "../../../utils/loggin.js";
 import { consoleColors } from "../../../utils/other.js";
@@ -80,7 +80,8 @@ export function writeDLS()
         infos.push(
             writeRIFFOddSize(
                 info,
-                getStringBytes(data)
+                getStringBytesZero(data),
+                true
             )
         );
     }

package/soundfont/basic_soundfont/write_dls/wsmp.js

@@ -37,8 +37,8 @@ export function writeWavesample(
     // gain correction:  Each unit of gain represents 1/655360 dB
     const lGain = Math.floor(attenuationCb * -65536);
     writeDword(wsmpData, lGain);
-    // fulOptions
-    writeDword(wsmpData, 0);
+    // fulOptions: has to be 2 according to all DLS files I have
+    writeDword(wsmpData, 2);
     
     const loopSize = loopEnd - loopStart;
     let ulLoopType = 0;

package/soundfont/dls/articulator_converter.js

@@ -188,13 +188,15 @@ function checkForSpecialDLSCombo(source, destination)
  * @param destination {number}
  * @param value {number}
  * @param transform {number}
+ * @param msg {string}
  */
-function modulatorConverterDebug(
+export function modulatorConverterDebug(
     source,
     control,
     destination,
     value,
-    transform
+    transform,
+    msg = "Attempting to convert the following DLS Articulator to SF2 Modulator:"
 )
 {
     const type = Object.keys(DLSDestinations).find(k => DLSDestinations[k] === destination);
@@ -204,7 +206,7 @@ function modulatorConverterDebug(
     const srcString = srcType ? srcType : source.toString(16);
     const ctrlString = ctrlType ? ctrlType : control.toString(16);
     console.debug(
-        `%cAttempting to convert the following DLS Articulator to SF2 Modulator:
+        `%c${msg}
         Source: %c${srcString}%c
         Control: %c${ctrlString}%c
         Destination: %c${typeString}%c
@@ -240,6 +242,13 @@ export function getSF2ModulatorFromArticulator(
     value
 )
 {
+    // modulatorConverterDebug(
+    //     source,
+    //     control,
+    //     destination,
+    //     value,
+    //     transform
+    // );
     // check for special combinations
     const specialDestination = checkForSpecialDLSCombo(source, destination);
     /**
@@ -320,13 +329,6 @@ export function getSF2ModulatorFromArticulator(
         // special case: for attenuation, invert source (dls gain is the opposite of sf2 attenuation)
         if (destinationGenerator === generatorTypes.initialAttenuation)
         {
-            // modulatorConverterDebug(
-            //     source,
-            //     control,
-            //     destination,
-            //     value,
-            //     transform
-            // );
             // if the value is negative, the source shall be negative!
             // why?
             // Idk, it makes it work with ROCK.RMI and NOKIA_S30.dls

package/soundfont/dls/dls_sample.js

@@ -62,13 +62,14 @@ export class DLSSample extends BasicSample
             }
             return this.compressedData;
         }
-        const uint8 = new Uint8Array(this.sampleData.length * 2);
-        for (let i = 0; i < this.sampleData.length; i++)
-        {
-            const sample = Math.floor(this.sampleData[i] * 32768);
-            uint8[i * 2] = sample & 0xFF; // lower byte
-            uint8[i * 2 + 1] = (sample >> 8) & 0xFF; // upper byte
-        }
-        return uint8;
+        return super.getRawData();
+        // const uint8 = new Uint8Array(this.sampleData.length * 2);
+        // for (let i = 0; i < this.sampleData.length; i++)
+        // {
+        //     const sample = Math.floor(this.sampleData[i] * 32768);
+        //     uint8[i * 2] = sample & 0xFF; // lower byte
+        //     uint8[i * 2 + 1] = (sample >> 8) & 0xFF; // upper byte
+        // }
+        // return uint8;
     }
 }

package/soundfont/dls/dls_sources.js

@@ -1,3 +1,6 @@
+import { Modulator } from "../basic_soundfont/modulator.js";
+import { generatorTypes } from "../basic_soundfont/generator.js";
+
 /**
  * @enum {number}
  */
@@ -23,4 +26,36 @@ export const DLSSources = {
     pitchWheelRange: 0x100,
     fineTune: 0x101,
     coarseTune: 0x102
-};
+};
+
+export const DEFAULT_DLS_REVERB = new Modulator({
+    srcEnum: 0x00DB,
+    dest: generatorTypes.reverbEffectsSend,
+    amt: 1000,
+    secSrcEnum: 0x0,
+    transform: 0
+});
+
+export const DEFAULT_DLS_CHORUS = new Modulator({
+    srcEnum: 0x00DD,
+    dest: generatorTypes.chorusEffectsSend,
+    amt: 1000,
+    secSrcEnum: 0x0,
+    transform: 0
+});
+
+export const DLS_1_NO_VIBRATO_MOD = new Modulator({
+    srcEnum: 0x0081,
+    dest: generatorTypes.vibLfoToPitch,
+    amt: 0,
+    secSrcEnum: 0x0,
+    transform: 0
+});
+
+export const DLS_1_NO_VIBRATO_PRESSURE = new Modulator({
+    srcEnum: 0x000D,
+    dest: generatorTypes.vibLfoToPitch,
+    amt: 0,
+    secSrcEnum: 0x0,
+    transform: 0
+});

package/soundfont/dls/read_articulation.js

@@ -1,6 +1,6 @@
 import { readLittleEndian } from "../../utils/byte_functions/little_endian.js";
 import { DLSDestinations } from "./dls_destinations.js";
-import { DLSSources } from "./dls_sources.js";
+import { DLS_1_NO_VIBRATO_MOD, DLS_1_NO_VIBRATO_PRESSURE, DLSSources } from "./dls_sources.js";
 import { getSF2ModulatorFromArticulator } from "./articulator_converter.js";
 import { SpessaSynthInfo, SpessaSynthWarn } from "../../utils/loggin.js";
 import { consoleColors } from "../../utils/other.js";
@@ -306,21 +306,9 @@ export function readArticulation(chunk, disableVibrato)
     {
         modulators.push(
             // mod to vib
-            new Modulator({
-                srcEnum: 0x0081,
-                dest: generatorTypes.vibLfoToPitch,
-                amt: 0,
-                secSrcEnum: 0x0,
-                transform: 0
-            }),
+            Modulator.copy(DLS_1_NO_VIBRATO_MOD),
             // press to vib
-            new Modulator({
-                srcEnum: 0x000D,
-                dest: generatorTypes.vibLfoToPitch,
-                amt: 0,
-                secSrcEnum: 0x0,
-                transform: 0
-            })
+            Modulator.copy(DLS_1_NO_VIBRATO_PRESSURE)
         );
     }
     

package/soundfont/dls/read_instrument.js

@@ -7,6 +7,7 @@ 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";
+import { DEFAULT_DLS_CHORUS, DEFAULT_DLS_REVERB } from "./dls_sources.js";
 
 /**
  * @this {DLSSoundFont}
@@ -85,24 +86,12 @@ export function readDLSInstrument(chunk)
     // 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
-        }));
+        globalZone.modulators.push(Modulator.copy(DEFAULT_DLS_REVERB));
     }
     // 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
-        }));
+        globalZone.modulators.push(Modulator.copy(DEFAULT_DLS_CHORUS));
     }
     preset.DLSInstrument.instrumentZones.push(globalZone);
     

package/synthetizer/synth_event_handler.js

@@ -119,6 +119,12 @@ export class EventHandler
             "allcontrollerreset": {},
             "soundfonterror": {}
         };
+        
+        /**
+         * Set to 0 to disabled, otherwise in seconds
+         * @type {number}
+         */
+        this.timeDelay = 0;
     }
     
     /**
@@ -151,7 +157,38 @@ export class EventHandler
     {
         if (this.events[name])
         {
-            Object.values(this.events[name]).forEach(ev => ev(eventData));
+            if (this.timeDelay > 0)
+            {
+                setTimeout(() =>
+                {
+                    Object.values(this.events[name]).forEach(ev =>
+                    {
+                        try
+                        {
+                            ev(eventData);
+                        }
+                        catch (e)
+                        {
+                            console.error(`Error while executing an event callback for ${name}:`, e);
+                        }
+                    });
+                }, this.timeDelay * 1000);
+            }
+            else
+            {
+                Object.values(this.events[name]).forEach(ev =>
+                    {
+                        try
+                        {
+                            ev(eventData);
+                        }
+                        catch (e)
+                        {
+                            console.error(`Error while executing an event callback for ${name}:`, e);
+                        }
+                    }
+                );
+            }
         }
     }
 }