spessasynth_lib 3.20.22 → 3.20.24

package/@types/soundfont/dls/dls_zone.d.ts

@@ -13,10 +13,11 @@ export class DLSZone extends BasicInstrumentZone {
      * @param sampleKey {number}
      * @param sample {BasicSample}
      * @param sampleID {number}
+     * @param samplePitchCorrection {number} cents
      */
     setWavesample(attenuationCb: number, loopingMode: number, loop: {
         start: number;
         end: number;
-    }, sampleKey: number, sample: BasicSample, sampleID: number): void;
+    }, sampleKey: number, sample: BasicSample, sampleID: number, samplePitchCorrection: number): void;
 }
 import { BasicInstrumentZone } from '../basic_soundfont/basic_zones.js';

package/@types/synthetizer/synthetizer.d.ts

@@ -156,7 +156,7 @@ export class Synthetizer {
      * @param audioNodes {AudioNode[]}
      */
     connectIndividualOutputs(audioNodes: AudioNode[]): void;
-    lockAndResetChannelVibrato(): void;
+    disableGSNRPparams(): void;
     /**
      * A message for debugging
      */

package/@types/synthetizer/worklet_system/worklet_utilities/worklet_processor_channel.d.ts

@@ -19,7 +19,7 @@
  * @property {boolean} lockPreset - indicates whether the program on the channel is locked
  * @property {boolean} presetUsesOverride - indcates if the channel uses a preset from the override soundfont.
  *
- * @property {boolean} lockVibrato - indicates whether the custom vibrato is locked
+ * @property {boolean} lockGSNRPNParams - indicates whether the GS NRPN parameters are enabled
  * @property {Object} channelVibrato - vibrato settings for the channel
  * @property {number} channelVibrato.depth - depth of the vibrato effect (cents)
  * @property {number} channelVibrato.delay - delay before the vibrato effect starts (seconds)
@@ -119,9 +119,9 @@ export type WorkletProcessorChannel = {
      */
     presetUsesOverride: boolean;
     /**
-     * - indicates whether the custom vibrato is locked
+     * - indicates whether the GS NRPN parameters are enabled
      */
-    lockVibrato: boolean;
+    lockGSNRPNParams: boolean;
     /**
      * - vibrato settings for the channel
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spessasynth_lib",
-  "version": "3.20.22",
+  "version": "3.20.24",
   "description": "MIDI and SoundFont2 or DLS Synthesizer library with no compromises",
   "browser": "index.js",
   "types": "@types/index.d.ts",

package/soundfont/dls/dls_zone.js

@@ -22,6 +22,7 @@ export class DLSZone extends BasicInstrumentZone
      * @param sampleKey {number}
      * @param sample {BasicSample}
      * @param sampleID {number}
+     * @param samplePitchCorrection {number} cents
      */
     setWavesample(
         attenuationCb,
@@ -30,6 +31,7 @@ export class DLSZone extends BasicInstrumentZone
         sampleKey,
         sample,
         sampleID,
+        samplePitchCorrection,
     )
     {
         if(loopingMode !== 0)
@@ -39,6 +41,18 @@ export class DLSZone extends BasicInstrumentZone
         this.generators.push(new Generator(generatorTypes.initialAttenuation, attenuationCb));
         this.isGlobal = false;
 
+        // correct tuning if needed
+        const coarseTune = Math.trunc(samplePitchCorrection / 100);
+        if(coarseTune !== 0)
+        {
+            this.generators.push(new Generator(generatorTypes.coarseTune, coarseTune));
+        }
+        const fineTune = samplePitchCorrection - (coarseTune * 100);
+        if(fineTune !== 0)
+        {
+            this.generators.push(new Generator(generatorTypes.fineTune, fineTune));
+        }
+
         // correct loop if needed
         const diffStart = loop.start - (sample.sampleLoopStartIndex / 2);
         const diffEnd = loop.end - (sample.sampleLoopEndIndex / 2);

package/soundfont/dls/read_region.js

@@ -1,4 +1,4 @@
-import { readLittleEndian } from '../../utils/byte_functions/little_endian.js'
+import { readLittleEndian, signedInt16 } from '../../utils/byte_functions/little_endian.js'
 import { findRIFFListType, readRIFFChunk } from '../basic_soundfont/riff_chunk.js'
 import { Generator, generatorTypes } from '../read_sf2/generators.js'
 import { DLSZone } from './dls_zone.js'
@@ -57,8 +57,12 @@ export function readRegion(chunk)
     // cbSize
     readLittleEndian(waveSampleChunk.chunkData, 4);
     const originalKey = readLittleEndian(waveSampleChunk.chunkData, 2);
-    // pitch correction is read from the wave wsmpl chunk
-    readLittleEndian(waveSampleChunk.chunkData, 2);
+
+    // sFineTune
+    const pitchCorrection = signedInt16(
+        waveSampleChunk.chunkData[waveSampleChunk.chunkData.currentIndex++],
+        waveSampleChunk.chunkData[waveSampleChunk.chunkData.currentIndex++]
+    );
 
     // gain correction:  Each unit of gain represents 1/655360 dB
     const gainCorrection = readLittleEndian(waveSampleChunk.chunkData, 4);
@@ -124,6 +128,7 @@ export function readRegion(chunk)
         loop,
         originalKey,
         sample,
-        sampleID);
+        sampleID,
+        pitchCorrection);
     return zone;
 }

package/synthetizer/synthetizer.js

@@ -401,9 +401,9 @@ export class Synthetizer {
     }
 
     /*
-     * Prevents any further changes to the vibrato via NRPN messages and sets it to disabled
+     * Disables the GS NRPN parameters like vibrato or drum key tuning
      */
-    lockAndResetChannelVibrato()
+    disableGSNRPparams()
     {
         // rate -1 disables, see worklet_message.js line 9
         // channel -1 is all