spessasynth_lib 3.24.18 → 3.24.22

package/midi_parser/basic_midi.js

@@ -96,6 +96,8 @@ export class BasicMIDI extends MIDISequenceData
         this.midiPorts = [];
         this.midiPortChannelOffsets = [];
         
+        this.keyRange = { max: 0, min: 127 };
+        
         /**
          * Will be joined with "\n" to form the final string
          * @type {string[]}

package/midi_parser/midi_message.js

@@ -204,7 +204,7 @@ export const midiControllers = {
     legatoFootswitch: 68,
     hold2Pedal: 69,
     soundVariation: 70,
-    timbreHarmonicContent: 71,
+    filterResonance: 71,
     releaseTime: 72,
     attackTime: 73,
     brightness: 74,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spessasynth_lib",
-  "version": "3.24.18",
+  "version": "3.24.22",
   "description": "MIDI and SoundFont2/DLS library with no compromises",
   "browser": "index.js",
   "type": "module",

package/soundfont/basic_soundfont/basic_preset.js

@@ -93,6 +93,7 @@ export class BasicPreset
         this.presetZones.splice(index, 1);
     }
     
+    // noinspection JSUnusedGlobalSymbols
     /**
      * Preloads all samples (async)
      */
@@ -210,7 +211,7 @@ export class BasicPreset
         
         presetZonesInRange.forEach(zone =>
         {
-            // global zone is already taken into account earlier
+            // the global zone is already taken into account earlier
             if (zone.instrument.instrumentZones.length < 1)
             {
                 return;
@@ -288,7 +289,8 @@ export class BasicPreset
                         m => Modulator.isIdentical(mod, m));
                     if (identicalInstrumentModulator !== -1)
                     {
-                        // sum the amounts (this makes a new modulator because otherwise it would overwrite the one in the soundfont!!!
+                        // sum the amounts
+                        // (this makes a new modulator because otherwise it would overwrite the one in the soundfont!
                         finalModulatorList[identicalInstrumentModulator] = finalModulatorList[identicalInstrumentModulator].sumTransform(
                             mod);
                     }

package/soundfont/basic_soundfont/basic_sample.js

@@ -63,12 +63,12 @@ export class BasicSample
          */
         this.sampleType = sampleType;
         /**
-         * Relative to start of the sample in sample points
+         * Relative to the start of the sample in sample points
          * @type {number}
          */
         this.sampleLoopStartIndex = loopStart;
         /**
-         * Relative to start of the sample in sample points
+         * Relative to the start of the sample in sample points
          * @type {number}
          */
         this.sampleLoopEndIndex = loopEnd;

package/soundfont/basic_soundfont/modulator.js

@@ -121,7 +121,7 @@ export class Modulator
     }
     
     /**
-     * Sums transform and creates a NEW modulator
+     * Sum transform and create a NEW modulator
      * @param modulator {Modulator}
      * @returns {Modulator}
      */
@@ -279,6 +279,21 @@ const customModulators = [
         transform: 0
     }),
     
+    // cc 73 (attack time) to volEnv attack
+    new Modulator({
+        srcEnum: getModSourceEnum(
+            modulatorCurveTypes.convex,
+            1,
+            0,
+            1,
+            midiControllers.attackTime
+        ), // linear forward bipolar cc 72
+        dest: generatorTypes.attackVolEnv,
+        amt: 6000,
+        secSrcEnum: 0x0, // no controller
+        transform: 0
+    }),
+    
     // cc 72 (release time) to volEnv release
     new Modulator({
         srcEnum: getModSourceEnum(
@@ -289,7 +304,7 @@ const customModulators = [
             midiControllers.releaseTime
         ), // linear forward bipolar cc 72
         dest: generatorTypes.releaseVolEnv,
-        amt: 1200,
+        amt: 3600,
         secSrcEnum: 0x0, // no controller
         transform: 0
     }),
@@ -309,14 +324,14 @@ const customModulators = [
         transform: 0
     }),
     
-    // cc 71 (filter q) to filterq
+    // cc 71 (filter Q) to filter Q
     new Modulator({
         srcEnum: getModSourceEnum(
             modulatorCurveTypes.linear,
             1,
             0,
             1,
-            midiControllers.timbreHarmonicContent
+            midiControllers.filterResonance
         ), // linear forwards bipolar cc 74
         dest: generatorTypes.initialFilterQ,
         amt: 250,

package/soundfont/dls/articulator_converter.js

@@ -136,7 +136,7 @@ function getSF2GeneratorFromDLS(destination, amount)
         case DLSDestinations.reverbSend:
             return generatorTypes.reverbEffectsSend;
         
-        // lfos
+        // lfo
         case DLSDestinations.modLfoFreq:
             return generatorTypes.freqModLFO;
         case DLSDestinations.modLfoDelay:
@@ -319,8 +319,9 @@ export function getSF2ModulatorFromArticulator(
     if (isSourceNoController)
     {
         // we force it into this state because before it was some strange value,
-        // like vibrato lfo bipolar for example
-        // since we turn it into NoController -> vibLfoToPitch the result is the same and bipolar concontroller is technically 0
+        // like vibrato lfo bipolar, for example,
+        // since we turn it into NoController -> vibLfoToPitch,
+        // the result is the same and bipolar controller is technically 0
         sourceEnumFinal = 0x0;
     }
     else
@@ -328,7 +329,7 @@ export function getSF2ModulatorFromArticulator(
         // output transform is ignored as it's not a thing in sfont format
         // unless the curve type of source is linear, then output is copied
         const outputTransform = transform & 0b1111;
-        // source curve type maps to desfont curve type in section 2.10, table 9
+        // source curve type maps to a desfont curve type in section 2.10, table 9
         let sourceTransform = (transform >> 10) & 0b1111;
         if (sourceTransform === modulatorCurveTypes.linear && outputTransform !== modulatorCurveTypes.linear)
         {
@@ -341,7 +342,7 @@ export function getSF2ModulatorFromArticulator(
         {
             // if the value is negative, the source shall be negative!
             // why?
-            // Idk, it makes it work with ROCK.RMI and NOKIA_S30.dls
+            // IDK, it makes it work with ROCK.RMI and NOKIA_S30.dls
             if (value < 0)
             {
                 sourceIsNegative = 1;
@@ -356,6 +357,14 @@ export function getSF2ModulatorFromArticulator(
         );
     }
     
+    // a corrupted rendition of gm.dls was found under
+    // https://sembiance.com/fileFormatSamples/audio/downloadableSoundBank/
+    // which specifies a whopping -32,768 decibels of attenuation
+    if (destinationGenerator === generatorTypes.initialAttenuation)
+    {
+        newValue = Math.max(960, Math.min(0, newValue));
+    }
+    
     const secSourceTransform = (transform >> 4) & 0b1111;
     const secSourceIsBipolar = (transform >> 8) & 1;
     const secSourceIsNegative = transform >> 9 & 1;

package/soundfont/dls/dls_zone.js

@@ -82,7 +82,7 @@ export class DLSZone extends BasicInstrumentZone
                 }
             }
         }
-        // correct key if needed
+        // correct the key if needed
         if (sampleKey !== sample.samplePitch)
         {
             this.generators.push(new Generator(generatorTypes.overridingRootKey, sampleKey));

package/soundfont/dls/read_articulation.js

@@ -76,7 +76,7 @@ export function readArticulation(chunk, disableVibrato)
                     generator = new Generator(generatorTypes.delayVibLFO, value);
                     break;
                 
-                // vol env: all times are timecents like sf2
+                // vol. env: all times are timecents like sf2
                 case DLSDestinations.volEnvDelay:
                     generator = new Generator(generatorTypes.delayVolEnv, value);
                     break;
@@ -144,7 +144,7 @@ export function readArticulation(chunk, disableVibrato)
             }
         }
         else
-            // if not, modulator??
+            // if not, modulator?
         {
             let isGenerator = true;
             // a few special cases which are generators:
@@ -190,7 +190,7 @@ export function readArticulation(chunk, disableVibrato)
                 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)
+                    // 12,800 means the regular scale (100)
                     generators.push(new Generator(generatorTypes.scaleTuning, value / 128));
                 }
                 else

package/soundfont/dls/read_region.js

@@ -25,11 +25,23 @@ export function readRegion(chunk)
     // region header
     const regionHeader = regionChunks.find(c => c.header === "rgnh");
     // key range
-    const keyMin = readLittleEndian(regionHeader.chunkData, 2);
-    const keyMax = readLittleEndian(regionHeader.chunkData, 2);
+    let keyMin = readLittleEndian(regionHeader.chunkData, 2);
+    let keyMax = readLittleEndian(regionHeader.chunkData, 2);
     // vel range
-    const velMin = readLittleEndian(regionHeader.chunkData, 2);
-    const velMax = readLittleEndian(regionHeader.chunkData, 2);
+    let velMin = readLittleEndian(regionHeader.chunkData, 2);
+    let velMax = readLittleEndian(regionHeader.chunkData, 2);
+    
+    // a fix for not cool files
+    if (velMin === 0 && velMax === 0)
+    {
+        velMax = 127;
+        velMin = 0;
+    }
+    if (keyMin === 0 && keyMax === 0)
+    {
+        keyMax = 127;
+        keyMin = 0;
+    }
     
     const zone = new DLSZone(
         { min: keyMin, max: keyMax },
@@ -51,7 +63,7 @@ export function readRegion(chunk)
     const lar2 = findRIFFListType(regionChunks, "lar2");
     this.readLart(lart, lar2, zone);
     
-    // wsmpl: wave sample chunk
+    // wsmp: wave sample chunk
     zone.isGlobal = false;
     const waveSampleChunk = regionChunks.find(c => c.header === "wsmp");
     // cbSize
@@ -64,7 +76,7 @@ export function readRegion(chunk)
         waveSampleChunk.chunkData[waveSampleChunk.chunkData.currentIndex++]
     );
     
-    // gain correction:  Each unit of gain represents 1/655360 dB
+    // gain correction: Each unit of gain represents 1/655360 dB
     // it is set after linking the sample
     const gainCorrection = readLittleEndian(waveSampleChunk.chunkData, 4);
     // convert to signed and turn into attenuation (invert)
@@ -87,7 +99,7 @@ export function readRegion(chunk)
         // ignore cbSize
         readLittleEndian(waveSampleChunk.chunkData, 4);
         // loop type: loop normally or loop until release (like soundfont)
-        const loopType = readLittleEndian(waveSampleChunk.chunkData, 4); // why is it long???
+        const loopType = readLittleEndian(waveSampleChunk.chunkData, 4); // why is it long?
         if (loopType === 0)
         {
             loopingMode = 1;
@@ -105,13 +117,13 @@ export function readRegion(chunk)
     const waveLinkChunk = regionChunks.find(c => c.header === "wlnk");
     if (waveLinkChunk === undefined)
     {
-        // no wave link = no sample. What? Why is it even here then????
+        // No wave link means no sample. What? Why is it even here then?
         return undefined;
     }
     
     // flags
     readLittleEndian(waveLinkChunk.chunkData, 2);
-    // phasse group
+    // phase group
     readLittleEndian(waveLinkChunk.chunkData, 2);
     // channel
     readLittleEndian(waveLinkChunk.chunkData, 4);

package/soundfont/read_sf2/samples.js

@@ -65,7 +65,7 @@ export class LoadedSample extends BasicSample
             // correct loop points
             this.sampleLoopStartIndex += this.sampleStartIndex / 2;
             this.sampleLoopEndIndex += this.sampleStartIndex / 2;
-            this.sampleLength = 99999999; // set to 999999 before we decode it
+            this.sampleLength = 99999999; // set to 999,999 before we decode it
         }
         this.isDataRaw = isDataRaw;
     }
@@ -121,6 +121,10 @@ export class LoadedSample extends BasicSample
              */
             const vorbis = stbvorbis.decode(buff.buffer);
             this.sampleData = vorbis.data[0];
+            if (this.sampleData === undefined)
+            {
+                SpessaSynthWarn(`Error decoding sample ${this.sampleName}: Vorbis decode returned undefined.`);
+            }
         }
         catch (e)
         {
@@ -138,10 +142,10 @@ export class LoadedSample extends BasicSample
     {
         if (!this.isSampleLoaded)
         {
-            // start loading data if not loaded
+            // start loading data if it is not loaded
             if (this.sampleLength < 1)
             {
-                // eos, do not do anything
+                SpessaSynthWarn(`Invalid sample ${this.sampleName}! Invalid length: ${this.sampleLength}`);
                 return new Float32Array(1);
             }
             
@@ -240,7 +244,7 @@ export function readSamples(sampleHeadersChunk, smplChunkData, isSmplDataRaw = t
  * @param index {number}
  * @param sampleHeaderData {IndexedByteArray}
  * @param smplArrayData {IndexedByteArray|Float32Array}
- * @param isDataRaw {boolean} true means binary 16 bit data, false means float32
+ * @param isDataRaw {boolean} true means binary 16-bit data, false means float32
  * @returns {LoadedSample}
  */
 function readSample(index, sampleHeaderData, smplArrayData, isDataRaw)
@@ -272,7 +276,7 @@ function readSample(index, sampleHeaderData, smplArrayData, isDataRaw)
         samplePitch = 60;
     }
     
-    // readt the sample pitch correction
+    // read the sample pitch correction
     let samplePitchCorrection = signedInt8(sampleHeaderData[sampleHeaderData.currentIndex++]);
     
     

package/synthetizer/synth_soundfont_manager.js

@@ -61,7 +61,7 @@ export class SoundfontManager
             throw new Error("Cannot overwrite the existing soundfont. Use soundfontManager.delete(id) instead.");
         }
         this._sendToWorklet(WorkletSoundfontManagerMessageType.addNewSoundFont, [soundfontBuffer, id, bankOffset]);
-        await new Promise(r => this.synth.resolveWhenReady = r);
+        await new Promise(r => this.synth._resolveWhenReady = r);
         this.soundfontList.push({
             id: id,
             bankOffset: bankOffset
@@ -106,6 +106,6 @@ export class SoundfontManager
     async reloadManager(newBuffer)
     {
         this._sendToWorklet(WorkletSoundfontManagerMessageType.reloadSoundFont, newBuffer);
-        await new Promise(r => this.synth.resolveWhenReady = r);
+        await new Promise(r => this.synth._resolveWhenReady = r);
     }
 }

package/synthetizer/synthetizer.js

@@ -42,6 +42,51 @@ export const DEFAULT_SYNTH_MODE = "gs";
 
 export class Synthetizer
 {
+    
+    /**
+     * Allows setting up custom event listeners for the synthesizer
+     * @type {EventHandler}
+     */
+    eventHandler = new EventHandler();
+    
+    /**
+     * Synthesizer's parent AudioContext instance
+     * @type {BaseAudioContext}
+     */
+    context;
+    
+    /**
+     * Synthesizer's output node
+     * @type {AudioNode}
+     */
+    targetNode;
+    /**
+     * @type {boolean}
+     * @private
+     */
+    _destroyed = false;
+    
+    /**
+     * the new channels will have their audio sent to the moduled output by this constant.
+     * what does that mean?
+     * e.g., if outputsAmount is 16, then channel's 16 audio data will be sent to channel 0
+     * @type {number}
+     * @private
+     */
+    _outputsAmount = MIDI_CHANNEL_COUNT;
+    
+    /**
+     * The current number of MIDI channels the synthesizer has
+     * @type {number}
+     */
+    channelsAmount = this._outputsAmount;
+    
+    /**
+     * Synth's current channel properties
+     * @type {ChannelProperty[]}
+     */
+    channelProperties = [];
+    
     /**
      * Creates a new instance of the SpessaSynth synthesizer.
      * @param targetNode {AudioNode}
@@ -63,57 +108,23 @@ export class Synthetizer
         const oneOutputMode = startRenderingData?.oneOutput === true;
         
         /**
-         * Allows setting up custom event listeners for the synthesizer
-         * @type {EventHandler}
-         */
-        this.eventHandler = new EventHandler();
-        
-        this._voiceCap = VOICE_CAP;
-        this._destroyed = false;
-        
-        /**
-         * the new channels will have their audio sent to the moduled output by this constant.
-         * what does that mean? e.g., if outputsAmount is 16, then channel's 16 audio data will be sent to channel 0
-         * @type {number}
          * @private
-         */
-        this._outputsAmount = MIDI_CHANNEL_COUNT;
-        
-        /**
-         * the number of midi channels
-         * @type {number}
-         */
-        this.channelsAmount = this._outputsAmount;
-        
-        /**
          * @type {function}
          */
-        this.resolveWhenReady = undefined;
+        this._resolveWhenReady = undefined;
         
         /**
          * Indicates if the synth is fully ready
          * @type {Promise<void>}
          */
-        this.isReady = new Promise(resolve => this.resolveWhenReady = resolve);
+        this.isReady = new Promise(resolve => this._resolveWhenReady = resolve);
         
         
-        /**
-         * individual channel voices amount
-         * @type {ChannelProperty[]}
-         */
-        this.channelProperties = [];
         for (let i = 0; i < this.channelsAmount; i++)
         {
             this.addNewChannel(false);
         }
         this.channelProperties[DEFAULT_PERCUSSION].isDrum = true;
-        this._voicesAmount = 0;
-        
-        /**
-         * For Black MIDI's - forces release time to 50 ms
-         * @type {boolean}
-         */
-        this._highPerformanceMode = false;
         
         // create a worklet processor
         let processorChannelCount = Array(this._outputsAmount + 2).fill(2);
@@ -245,24 +256,26 @@ export class Synthetizer
     }
     
     /**
-     * The maximum number of voices allowed at once.
-     * @returns {number}
+     * current voice amount
+     * @type {number}
+     * @private
      */
-    get voiceCap()
-    {
-        return this._voiceCap;
-    }
+    _voicesAmount = 0;
     
     /**
-     * The maximum number of voices allowed at once.
-     * @param value {number}
+     * @returns {number} the current number of voices playing.
      */
-    set voiceCap(value)
+    get voicesAmount()
     {
-        this._setMasterParam(masterParameterType.voicesCap, value);
-        this._voiceCap = value;
+        return this._voicesAmount;
     }
     
+    /**
+     * For Black MIDI's - forces release time to 50 ms
+     * @type {boolean}
+     */
+    _highPerformanceMode = false;
+    
     get highPerformanceMode()
     {
         return this._highPerformanceMode;
@@ -282,19 +295,36 @@ export class Synthetizer
     }
     
     /**
-     * @returns {number} the audioContext's current time.
+     * @type {number}
+     * @private
      */
-    get currentTime()
+    _voiceCap = VOICE_CAP;
+    
+    /**
+     * The maximum number of voices allowed at once.
+     * @returns {number}
+     */
+    get voiceCap()
     {
-        return this.context.currentTime;
+        return this._voiceCap;
     }
     
     /**
-     * @returns {number} the current number of voices playing.
+     * The maximum number of voices allowed at once.
+     * @param value {number}
      */
-    get voicesAmount()
+    set voiceCap(value)
     {
-        return this._voicesAmount;
+        this._setMasterParam(masterParameterType.voicesCap, value);
+        this._voiceCap = value;
+    }
+    
+    /**
+     * @returns {number} the audioContext's current time.
+     */
+    get currentTime()
+    {
+        return this.context.currentTime;
     }
     
     /**
@@ -377,7 +407,7 @@ export class Synthetizer
                 break;
             
             case returnMessageType.ready:
-                this.resolveWhenReady();
+                this._resolveWhenReady();
                 break;
             
             case returnMessageType.soundfontError:
@@ -420,7 +450,8 @@ export class Synthetizer
             pitchBend: 0,
             pitchBendRangeSemitones: 0,
             isMuted: false,
-            isDrum: false
+            isDrum: false,
+            transposition: 0
         });
         if (!postMessage)
         {