spessasynth_core 3.26.25 → 3.26.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spessasynth_core",
-  "version": "3.26.25",
+  "version": "3.26.26",
   "description": "MIDI and SoundFont2/DLS library with no compromises",
   "main": "index.js",
   "type": "module",

package/src/soundfont/basic_soundfont/basic_sample.js

@@ -66,8 +66,8 @@ export class BasicSample
     linkedSample;
     
     /**
-     * The type of the sample, it can indicate an SF3 sample
-     * @type {sampleTypes|number}
+     * The type of the sample
+     * @type {sampleTypes}
      */
     sampleType;
     
@@ -84,7 +84,7 @@ export class BasicSample
     sampleLoopEndIndex;
     
     /**
-     * Indicates if the sample is compressed
+     * Indicates if the sample is compressed using vorbis SF3
      * @type {boolean}
      */
     isCompressed;
@@ -132,7 +132,7 @@ export class BasicSample
         this.samplePitchCorrection = samplePitchCorrection;
         this.sampleLoopStartIndex = loopStart;
         this.sampleLoopEndIndex = loopEnd;
-        this.setSampleType(sampleType);
+        this.sampleType = sampleType;
     }
     
     /**
@@ -141,10 +141,9 @@ export class BasicSample
      */
     get isLinked()
     {
-        return !this.isCompressed &&
-            (this.sampleType === sampleTypes.rightSample ||
-                this.sampleType === sampleTypes.leftSample ||
-                this.sampleType === sampleTypes.linkedSample);
+        return this.sampleType === sampleTypes.rightSample ||
+            this.sampleType === sampleTypes.leftSample ||
+            this.sampleType === sampleTypes.linkedSample;
     }
     
     /**
@@ -229,8 +228,6 @@ export class BasicSample
     setSampleType(type)
     {
         this.sampleType = type;
-        // https://github.com/FluidSynth/fluidsynth/wiki/SoundFont3Format
-        this.isCompressed = (type & 0x10) > 0;
         if (!this.isLinked)
         {
             // unlink the other sample
@@ -242,9 +239,9 @@ export class BasicSample
             
             this.linkedSample = undefined;
         }
-        if ((type & 0x8000) > 0 && this.linkedSample)
+        if ((type & 0x8000) > 0)
         {
-            throw new Error("ROM samples cannot be linked.");
+            throw new Error("ROM samples are not supported.");
         }
         
     }
@@ -261,15 +258,11 @@ export class BasicSample
     // noinspection JSUnusedGlobalSymbols
     /**
      * Links a stereo sample
-     * @param sample {BasicSample}
-     * @param type {sampleTypes}
+     * @param sample {BasicSample} the sample to link to
+     * @param type {sampleTypes} either left, right or linked
      */
     setLinkedSample(sample, type)
     {
-        if (this.isCompressed)
-        {
-            throw new Error("Cannot link a compressed sample.");
-        }
         this.linkedSample = sample;
         sample.linkedSample = this;
         if (type === sampleTypes.leftSample)

package/src/soundfont/basic_soundfont/write_sf2/shdr.js

@@ -2,6 +2,7 @@ import { IndexedByteArray } from "../../../utils/indexed_array.js";
 import { writeStringAsBytes } from "../../../utils/byte_functions/string.js";
 import { writeDword, writeWord } from "../../../utils/byte_functions/little_endian.js";
 import { RiffChunk, writeRIFFChunk } from "../riff_chunk.js";
+import { SF3_BIT_FLIT } from "../../read_sf2/samples.js";
 
 /**
  * @this {BasicSoundBank}
@@ -42,8 +43,13 @@ export function getSHDR(smplStartOffsets, smplEndOffsets)
         // sample link
         const sampleLinkIndex = this.samples.indexOf(sample.linkedSample);
         writeWord(shdrData, Math.max(0, sampleLinkIndex));
-        // sample type: write raw because we simply copy compressed samples
-        writeWord(shdrData, sample.sampleType);
+        // sample type: add byte if compressed
+        let type = sample.sampleType;
+        if (sample.isCompressed)
+        {
+            type |= SF3_BIT_FLIT;
+        }
+        writeWord(shdrData, type);
     });
     
     // write EOS and zero everything else

package/src/soundfont/read_sf2/samples.js

@@ -6,6 +6,8 @@ import { SpessaSynthWarn } from "../../utils/loggin.js";
 import { readBytesAsString } from "../../utils/byte_functions/string.js";
 import { BasicSample } from "../basic_soundfont/basic_sample.js";
 
+export const SF3_BIT_FLIT = 0x10;
+
 export class SoundFontSample extends BasicSample
 {
     /**
@@ -47,6 +49,11 @@ export class SoundFontSample extends BasicSample
         isDataRaw
     )
     {
+        // read sf3
+        // https://github.com/FluidSynth/fluidsynth/wiki/SoundFont3Format
+        const compressed = (sampleType & SF3_BIT_FLIT) > 0;
+        // remove the compression flag
+        sampleType &= ~SF3_BIT_FLIT;
         super(
             sampleName,
             sampleRate,
@@ -56,6 +63,7 @@ export class SoundFontSample extends BasicSample
             sampleLoopStartIndex - (sampleStartIndex / 2),
             sampleLoopEndIndex - (sampleStartIndex / 2)
         );
+        this.isCompressed = compressed;
         this.sampleName = sampleName;
         // in bytes
         this.sampleStartIndex = sampleStartIndex;
@@ -82,7 +90,7 @@ export class SoundFontSample extends BasicSample
      */
     getLinkedSample(samplesArray)
     {
-        if (this.isCompressed || this.linkedSample || !this.isLinked)
+        if (this.linkedSample || !this.isLinked)
         {
             return;
         }