spessasynth_lib 3.20.40 → 3.20.42

package/@types/soundfont/basic_soundfont/basic_sample.d.ts

@@ -42,12 +42,12 @@ export class BasicSample {
      */
     sampleType: number;
     /**
-     * Relative to start of the sample, bytes assuming 16 bit
+     * Relative to start of the sample in sample points
      * @type {number}
      */
     sampleLoopStartIndex: number;
     /**
-     * Relative to start of the sample, in bytes assuming 16 bit
+     * Relative to start of the sample in sample points
      * @type {number}
      */
     sampleLoopEndIndex: number;

package/package.json

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

package/soundfont/basic_soundfont/basic_sample.js

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

package/soundfont/basic_soundfont/write_sf2/shdr.js

@@ -23,8 +23,8 @@ export function getSHDR(smplStartOffsets, smplEndOffsets)
         const dwEnd = smplEndOffsets[index];
         writeDword(shdrData, dwEnd);
         // loop is stored as relative in sample points, change it to absolute sample points here
-        let loopStart = sample.sampleLoopStartIndex / 2 + dwStart;
-        let loopEnd = sample.sampleLoopEndIndex / 2 + dwStart;
+        let loopStart = sample.sampleLoopStartIndex + dwStart;
+        let loopEnd = sample.sampleLoopEndIndex + dwStart;
         if(sample.isCompressed)
         {
             // https://github.com/FluidSynth/fluidsynth/wiki/SoundFont3Format

package/soundfont/dls/dls_sample.js

@@ -30,8 +30,8 @@ export class DLSSample extends BasicSample
             pitchCorrection,
             0,
             1,
-            loopStart * 2,
-            (loopEnd - 1) * 2 // -1 sample because soundfont end is last sample and dls end is next sample
+            loopStart,
+            loopEnd - 1 // -1 sample because soundfont end is last sample and dls end is next sample
         );
         this.sampleData = data;
         this.sampleDbAttenuation = sampleDbAttenuation;

package/soundfont/dls/dls_zone.js

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

package/soundfont/read_sf2/samples.js

@@ -47,8 +47,8 @@ export class LoadedSample extends BasicSample
             samplePitchCorrection,
             sampleLink,
             sampleType,
-            sampleLoopStartIndex - sampleStartIndex,
-            sampleLoopEndIndex - sampleStartIndex
+            sampleLoopStartIndex - (sampleStartIndex / 2),
+            sampleLoopEndIndex - (sampleStartIndex / 2)
             );
         this.sampleName = sampleName
         // in bytes
@@ -245,10 +245,10 @@ function readSample(index, sampleHeaderData, smplArrayData, isDataRaw) {
     let sampleEndIndex = readLittleEndian(sampleHeaderData, 4) * 2;
 
     // read the sample looping start index
-    let sampleLoopStartIndex = readLittleEndian(sampleHeaderData, 4) * 2;
+    let sampleLoopStartIndex = readLittleEndian(sampleHeaderData, 4);
 
     // read the sample looping end index
-    let sampleLoopEndIndex = readLittleEndian(sampleHeaderData, 4) * 2;
+    let sampleLoopEndIndex = readLittleEndian(sampleHeaderData, 4);
 
     // read the sample rate
     let sampleRate = readLittleEndian(sampleHeaderData, 4);