spessasynth_lib 3.20.35 → 3.20.37

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

@@ -7,12 +7,18 @@ export class DLSSample extends BasicSample {
      * @param loopStart {number} sample data points
      * @param loopEnd {number} sample data points
      * @param data {Float32Array}
+     * @param sampleDbAttenuation {number} in db
      */
-    constructor(name: string, rate: number, pitch: number, pitchCorrection: number, loopStart: number, loopEnd: number, data: Float32Array);
+    constructor(name: string, rate: number, pitch: number, pitchCorrection: number, loopStart: number, loopEnd: number, data: Float32Array, sampleDbAttenuation: number);
     /**
      * @type {Float32Array}
      */
     sampleData: Float32Array;
+    /**
+     * in decibels of attenuation, WITHOUT EMU CORRECTION
+     * @type {number}
+     */
+    sampleDbAttenuation: number;
     getRawData(): Uint8Array;
 }
 import { BasicSample } from '../basic_soundfont/basic_sample.js';

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

@@ -10,7 +10,7 @@
  * @property {number|undefined} loopCount - the times to loop the song
  */
 export const WORKLET_PROCESSOR_NAME: "spessasynth-worklet-system";
-export const VOICE_CAP: 450;
+export const VOICE_CAP: 350;
 export const DEFAULT_PERCUSSION: 9;
 export const MIDI_CHANNEL_COUNT: 16;
 export const DEFAULT_SYNTH_MODE: "gs";

package/package.json

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

package/soundfont/dls/dls_sample.js

@@ -10,6 +10,7 @@ export class DLSSample extends BasicSample
      * @param loopStart {number} sample data points
      * @param loopEnd {number} sample data points
      * @param data {Float32Array}
+     * @param sampleDbAttenuation {number} in db
      */
     constructor(
         name,
@@ -18,7 +19,8 @@ export class DLSSample extends BasicSample
         pitchCorrection,
         loopStart,
         loopEnd,
-        data
+        data,
+        sampleDbAttenuation
     )
     {
         super(
@@ -32,6 +34,7 @@ export class DLSSample extends BasicSample
             (loopEnd - 1) * 2 // -1 sample because soundfont end is last sample and dls end is next sample
         );
         this.sampleData = data;
+        this.sampleDbAttenuation = sampleDbAttenuation;
     }
 
     getAudioData()
@@ -39,6 +42,12 @@ export class DLSSample extends BasicSample
         return this.sampleData;
     }
 
+    /**
+     * in decibels of attenuation, WITHOUT EMU CORRECTION
+     * @type {number}
+     */
+    sampleDbAttenuation;
+
     /**
      * @type {Float32Array}
      */

package/soundfont/dls/read_region.js

@@ -65,11 +65,10 @@ export function readRegion(chunk)
     );
 
     // 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)
     const dbCorrection = (gainCorrection | 0) / -655360;
-    // convert to centibels
-    const attenuation = (dbCorrection * 10) / 0.4; // make sure to apply EMU correction
 
     // skip options
     readLittleEndian(waveSampleChunk.chunkData, 4);
@@ -118,11 +117,20 @@ export function readRegion(chunk)
     readLittleEndian(waveLinkChunk.chunkData, 4);
     // sampleID
     const sampleID = readLittleEndian(waveLinkChunk.chunkData, 4);
+    /**
+     * @type {DLSSample}
+     */
     const sample = this.samples[sampleID];
     if(sample === undefined)
     {
         throw new Error("Invalid sample ID!");
     }
+
+    // this correction overrides the sample gain correction
+    const actualDbCorrection = dbCorrection || sample.sampleDbAttenuation;
+    // convert to centibels
+    const attenuation = (actualDbCorrection * 10) / 0.4; // make sure to apply EMU correction
+
     zone.setWavesample(
         attenuation, loopingMode,
         loop,

package/soundfont/dls/read_samples.js

@@ -106,6 +106,7 @@ export function readDLSSamples(waveListChunk)
         let samplePitch = 0;
         let sampleLoopStart = 0;
         let sampleLoopEnd = sampleData.length - 1;
+        let sampleDbAttenuation = 0;
 
         // read wsmp
         const wsmpChunk = waveChunks.find(c => c.header === "wsmp")
@@ -120,8 +121,10 @@ export function readDLSSamples(waveListChunk)
                 wsmpChunk.chunkData[wsmpChunk.chunkData.currentIndex++],
                 wsmpChunk.chunkData[wsmpChunk.chunkData.currentIndex++]
             );
-            // gain is handled in regions as initialAttenuation
-            readLittleEndian(wsmpChunk.chunkData, 4);
+            // gain is applied it manually here (literally multiplying the samples)
+            const gainCorrection = readLittleEndian(wsmpChunk.chunkData, 4);
+            // convert to signed and turn into decibels
+            sampleDbAttenuation = (gainCorrection | 0) / -655360;
             // no idea about ful options
             readLittleEndian(wsmpChunk.chunkData, 4);
             const loopsAmount = readLittleEndian(wsmpChunk.chunkData, 4);
@@ -162,7 +165,8 @@ export function readDLSSamples(waveListChunk)
             samplePitch,
             sampleLoopStart,
             sampleLength,
-            sampleData
+            sampleData,
+            sampleDbAttenuation
         ));
 
         sampleID++;

package/soundfont/read_sf2/generators.js

@@ -16,7 +16,7 @@ export const generatorTypes = {
     endAddrOffset: 1,                   // sample control - moves sample end point
     startloopAddrsOffset: 2,            // loop control - moves loop start point
     endloopAddrsOffset: 3,              // loop control - moves loop end point
-    startAddrsCoarseOffset: 4,          // sample control - moves sample start point in 32767 increments
+    startAddrsCoarseOffset: 4,          // sample control - moves sample start point in 32768 increments
     modLfoToPitch: 5,                   // pitch modulation - modulation lfo pitch modulation in cents
     vibLfoToPitch: 6,                   // pitch modulation - vibrato lfo pitch modulation in cents
     modEnvToPitch: 7,                   // pitch modulation - modulation envelope pitch modulation in cents
@@ -24,7 +24,7 @@ export const generatorTypes = {
     initialFilterQ: 9,                  // filter - lowpass filter resonance
     modLfoToFilterFc: 10,               // filter modulation - modulation lfo lowpass filter cutoff in cents
     modEnvToFilterFc: 11,               // filter modulation - modulation envelope lowpass filter cutoff in cents
-    endAddrsCoarseOffset: 12,           // ample control - moves sample end point in 32767 increments
+    endAddrsCoarseOffset: 12,           // ample control - moves sample end point in 32768 increments
     modLfoToVolume: 13,                 // modulation lfo - volume (tremolo), where 100 = 10dB
     unused1: 14,
     chorusEffectsSend: 15,              // effect send - how much is sent to chorus 0 - 1000
@@ -57,12 +57,12 @@ export const generatorTypes = {
     reserved1: 42,
     keyRange: 43,                       // zone - key range for which preset / instrument zone is active
     velRange: 44,                       // zone - velocity range for which preset / instrument zone is active
-    startloopAddrsCoarseOffset: 45,     // ample control - moves sample loop start point in 32767 increments
+    startloopAddrsCoarseOffset: 45,     // sample control - moves sample loop start point in 32768 increments
     keyNum: 46,                         // zone - instrument only: always use this midi number (ignore what's pressed)
     velocity: 47,                       // zone - instrument only: always use this velocity (ignore what's pressed)
     initialAttenuation: 48,             // zone - allows turning down the volume, 10 = -1dB
     reserved2: 49,
-    endloopAddrsCoarseOffset: 50,       // ample control - moves sample loop end point in 32767 increments
+    endloopAddrsCoarseOffset: 50,       // sample control - moves sample loop end point in 32768 increments
     coarseTune: 51,                     // tune - pitch offset in semitones
     fineTune: 52,                       // tune - pitch offset in cents
     sampleID: 53,                       // sample - instrument zone only: which sample to use

package/synthetizer/synthetizer.js

@@ -29,7 +29,7 @@ import { SoundfontManager } from './synth_soundfont_manager.js'
 
 export const WORKLET_PROCESSOR_NAME = "spessasynth-worklet-system";
 
-export const VOICE_CAP = 450;
+export const VOICE_CAP = 350;
 
 export const DEFAULT_PERCUSSION = 9;
 export const MIDI_CHANNEL_COUNT = 16;