spessasynth_lib 3.23.0 → 3.23.2

package/@types/soundfont/basic_soundfont/write_dls/rgn2.d.ts

@@ -1,7 +1,8 @@
 /**
  * @param zone {BasicInstrumentZone}
+ * @param globalZone {BasicInstrumentZone}
  * @this {BasicSoundFont}
  * @returns {IndexedByteArray}
  */
-export function writeDLSRegion(this: BasicSoundFont, zone: BasicInstrumentZone): IndexedByteArray;
+export function writeDLSRegion(this: BasicSoundFont, zone: BasicInstrumentZone, globalZone: BasicInstrumentZone): IndexedByteArray;
 import { IndexedByteArray } from "../../../utils/indexed_array.js";

package/README.md

@@ -105,7 +105,7 @@ document.getElementById("button").onclick = async () =>
   - **Variable compression quality:** You choose between file size and quality!
   - **Compression preserving:** Avoid decompressing and recompressing uncompressed samples for minimal quality loss!
 
-#### Read and play DLS Level 1 or 2 files
+#### Read and write DLS Level 1 or 2 files
   - Read DLS (DownLoadable Sounds) files as SF2 files!
   - **Works like a normal soundfont:** *Saving it as sf2 is still [just one function!](https://github.com/spessasus/SpessaSynth/wiki/SoundFont2-Class#write)*
   - Converts articulators to both **modulators** and **generators**!
@@ -113,6 +113,7 @@ document.getElementById("button").onclick = async () =>
   - **Covers special generator cases:** *such as modLfoToPitch*!
   - **Correct volume:** *looking at you, Viena and gm.sf2!*
   - Support built right into the synthesizer!
+  - **Convert SF2 to DLS:** [with limitations](https://github.com/spessasus/SpessaSynth/wiki/DLS-Conversion-Problem);
 
 ### Export MIDI as WAV
   - Save the MIDI file as WAV audio!

package/package.json

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

package/soundfont/basic_soundfont/basic_zone.js

@@ -58,7 +58,7 @@ export class BasicZone
      */
     getGeneratorValue(generatorType, notFoundValue)
     {
-        return this.generators.find(g => g.generatorType === generatorType)?.generatorValue || notFoundValue;
+        return this.generators.find(g => g.generatorType === generatorType)?.generatorValue ?? notFoundValue;
     }
 }
 

package/soundfont/basic_soundfont/write_dls/ins.js

@@ -70,7 +70,7 @@ export function writeIns(preset)
     {
         if (!z.isGlobal)
         {
-            arrs.push(writeDLSRegion.apply(this, [z]));
+            arrs.push(writeDLSRegion.apply(this, [z, globalZone]));
         }
         return arrs;
     }, []));

package/soundfont/basic_soundfont/write_dls/rgn2.js

@@ -7,10 +7,11 @@ import { writeArticulator } from "./art2.js";
 
 /**
  * @param zone {BasicInstrumentZone}
+ * @param globalZone {BasicInstrumentZone}
  * @this {BasicSoundFont}
  * @returns {IndexedByteArray}
  */
-export function writeDLSRegion(zone)
+export function writeDLSRegion(zone, globalZone)
 {
     // region header
     const rgnhData = new IndexedByteArray(14);
@@ -32,10 +33,24 @@ export function writeDLSRegion(zone)
         rgnhData
     );
     
+    let rootKey = zone.getGeneratorValue(generatorTypes.overridingRootKey, zone.sample.samplePitch);
+    
+    // a lot of soundfonts like to set scaletuning to 0 in drums and keep the key at 60
+    // since we implement scaletuning via a dls articulator and fluid doesn't support these,
+    // change the root key here
+    const scaleTuning = zone.getGeneratorValue(
+        generatorTypes.scaleTuning,
+        globalZone.getGeneratorValue(generatorTypes.scaleTuning, 100)
+    );
+    if (scaleTuning === 0 && zone.keyRange.max - zone.keyRange.min === 0)
+    {
+        rootKey = zone.keyRange.min;
+    }
+    
     // wavesample (Wsmp)
     const wsmp = writeWavesample(
         zone.sample,
-        zone.getGeneratorValue(generatorTypes.overridingRootKey, zone.sample.samplePitch),
+        rootKey,
         zone.getGeneratorValue(
             generatorTypes.fineTune,
             0

package/soundfont/basic_soundfont/write_dls/wave.js

@@ -32,17 +32,31 @@ export function writeDLSSample(sample)
         sample.sampleLoopEndIndex,
         1
     );
-    
     const audio = sample.getAudioData();
-    const data16 = new Int16Array(audio.length);
-    for (let i = 0; i < audio.length; i++)
+    let data;
+    // if sample is compressed, getRawData cannot be used
+    if (sample.isCompressed)
     {
-        data16[i] = audio[i] * 32768;
+        const data16 = new Int16Array(audio.length);
+        
+        for (let i = 0; i < audio.length; i++)
+        {
+            data16[i] = audio[i] * 32768;
+        }
+        
+        
+        data = writeRIFFOddSize(
+            "data",
+            new IndexedByteArray(data16.buffer)
+        );
+    }
+    else
+    {
+        data = writeRIFFOddSize(
+            "data",
+            sample.getRawData()
+        );
     }
-    const data = writeRIFFOddSize(
-        "data",
-        new IndexedByteArray(data16.buffer)
-    );
     
     const inam = writeRIFFOddSize(
         "INAM",

package/soundfont/basic_soundfont/write_dls/write_dls.js

@@ -47,7 +47,7 @@ export function writeDLS()
     SpessaSynthGroupEnd();
     
     // write ptbl
-    const ptblData = new IndexedByteArray(8 + 8 * ptblOffsets.length);
+    const ptblData = new IndexedByteArray(8 + 4 * ptblOffsets.length);
     writeDword(ptblData, 8);
     writeDword(ptblData, ptblOffsets.length);
     for (const offset of ptblOffsets)

package/soundfont/basic_soundfont/write_dls/wsmp.js

@@ -2,6 +2,8 @@ import { writeDword, writeWord } from "../../../utils/byte_functions/little_endi
 import { IndexedByteArray } from "../../../utils/indexed_array.js";
 import { writeRIFFOddSize } from "../riff_chunk.js";
 
+const WSMP_SIZE = 20;
+
 /**
  * @param sample {BasicSample}
  * @param rootKey {number}
@@ -21,9 +23,9 @@ export function writeWavesample(
     loopEnd,
     loopingMode)
 {
-// fixed size because always one loop
-    const wsmpData = new IndexedByteArray(36);
-    writeDword(wsmpData, 20); // cbSize
+    let loopCount = loopingMode === 0 ? 0 : 1;
+    const wsmpData = new IndexedByteArray(WSMP_SIZE + loopCount * 16);
+    writeDword(wsmpData, WSMP_SIZE); // cbSize
     // usUnityNote (apply root pitch here)
     writeWord(wsmpData, rootKey);
     // sFineTune
@@ -39,7 +41,6 @@ export function writeWavesample(
     writeDword(wsmpData, 0);
     
     const loopSize = loopEnd - loopStart;
-    let loopCount = 1;
     let ulLoopType = 0;
     switch (loopingMode)
     {
@@ -63,10 +64,13 @@ export function writeWavesample(
     
     // cSampleLoops
     writeDword(wsmpData, loopCount);
-    writeDword(wsmpData, 16); // cbSize
-    writeDword(wsmpData, ulLoopType);
-    writeDword(wsmpData, loopStart);
-    writeDword(wsmpData, loopSize);
+    if (loopCount === 1)
+    {
+        writeDword(wsmpData, 16); // cbSize
+        writeDword(wsmpData, ulLoopType);
+        writeDword(wsmpData, loopStart);
+        writeDword(wsmpData, loopSize);
+    }
     return writeRIFFOddSize(
         "wsmp",
         wsmpData