spessasynth_lib 3.23.8 → 3.23.12

package/soundfont/basic_soundfont/generator.js

@@ -17,13 +17,13 @@ export const generatorTypes = {
     modEnvToFilterFc: 11,               // filter modulation - modulation envelope lowpass filter cutoff in cents
     endAddrsCoarseOffset: 12,           // ample control - moves sample end point in 32768 increments
     modLfoToVolume: 13,                 // modulation lfo - volume (tremolo), where 100 = 10dB
-    unused1: 14,
+    unused1: 14,                        // unused
     chorusEffectsSend: 15,              // effect send - how much is sent to chorus 0 - 1000
     reverbEffectsSend: 16,              // effect send - how much is sent to reverb 0 - 1000
     pan: 17,                            // panning - where -500 = left, 0 = center, 500 = right
-    unused2: 18,
-    unused3: 19,
-    unused4: 20,
+    unused2: 18,                        // unused
+    unused3: 19,                        // unused
+    unused4: 20,                        // unused
     delayModLFO: 21,                    // mod lfo - delay for mod lfo to start from zero (weird scale)
     freqModLFO: 22,                     // mod lfo - frequency of mod lfo, 0 = 8.176Hz, unit: f => 1200log2(f/8.176)
     delayVibLFO: 23,                    // vib lfo - delay for vibrato lfo to start from zero (weird scale)
@@ -45,24 +45,24 @@ export const generatorTypes = {
     keyNumToVolEnvHold: 39,             // vol env - key number to volume envelope hold
     keyNumToVolEnvDecay: 40,            // vol env - key number to volume envelope decay
     instrument: 41,                     // zone - instrument index to use for preset zone
-    reserved1: 42,
+    reserved1: 42,                      // reserved
     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,     // 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,
+    reserved2: 49,                      // reserved
     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
     sampleModes: 54,                    // sample - 0 = no loop, 1 = loop, 2 = reserved, 3 = loop and play till end in release phase
-    reserved3: 55,
+    reserved3: 55,                      // reserved
     scaleTuning: 56,                    // sample - the degree to which MIDI key number influences pitch, 100 = default
     exclusiveClass: 57,                 // sample - = cut = choke group
     overridingRootKey: 58,              // sample - can override the sample's original pitch
-    unused5: 59,
+    unused5: 59,                        // unused
     endOper: 60                         // end marker
 };
 /**

package/soundfont/basic_soundfont/modulator.js

@@ -187,7 +187,7 @@ export function getModSourceEnum(curveType, polarity, direction, isCC, index)
     return (curveType << 10) | (polarity << 9) | (direction << 8) | (isCC << 7) | index;
 }
 
-export const defaultModulators = [
+const soundFontModulators = [
     // vel to attenuation
     new Modulator({
         srcEnum: getModSourceEnum(
@@ -250,8 +250,10 @@ export const defaultModulators = [
     new Modulator({ srcEnum: 0x00DB, dest: generatorTypes.reverbEffectsSend, amt: 200, secSrcEnum: 0x0, transform: 0 }),
     
     // chorus effects to send
-    new Modulator({ srcEnum: 0x00DD, dest: generatorTypes.chorusEffectsSend, amt: 200, secSrcEnum: 0x0, transform: 0 }),
-    
+    new Modulator({ srcEnum: 0x00DD, dest: generatorTypes.chorusEffectsSend, amt: 200, secSrcEnum: 0x0, transform: 0 })
+];
+
+const customModulators = [
     // custom modulators heck yeah
     // poly pressure to vibrato
     new Modulator({
@@ -321,4 +323,6 @@ export const defaultModulators = [
         secSrcEnum: 0x0, // no controller
         transform: 0
     })
-];
+];
+
+export const defaultModulators = soundFontModulators.concat(customModulators);

package/soundfont/basic_soundfont/write_dls/art2.js

@@ -39,16 +39,36 @@ const invalidGeneratorTypes = new Set([
  */
 export function writeArticulator(zone)
 {
-    /**
-     * @returns {number}
-     */
+    
+    
+    // envelope generators are limited to 40 seconds
+    // in timecents, this is 1200 * log2(10) = 6386
+    
+    for (let i = 0; i < zone.generators.length; i++)
+    {
+        const g = zone.generators[i];
+        if (
+            g.generatorType === generatorTypes.delayVolEnv ||
+            g.generatorType === generatorTypes.attackVolEnv ||
+            g.generatorType === generatorTypes.holdVolEnv ||
+            g.generatorType === generatorTypes.decayVolEnv ||
+            g.generatorType === generatorTypes.releaseVolEnv ||
+            g.generatorType === generatorTypes.delayModEnv ||
+            g.generatorType === generatorTypes.attackModEnv ||
+            g.generatorType === generatorTypes.holdModEnv ||
+            g.generatorType === generatorTypes.decayModEnv
+        )
+        {
+            zone.generators[i] = new Generator(g.generatorType, Math.min(g.generatorValue, 6386), false);
+        }
+    }
+    
     
     // read_articulation.js:
     // according to viena and another strange (with modulators) rendition of gm.dls in sf2,
     // it shall be divided by -128
     // and a strange correction needs to be applied to the real value:
     // real + (60 / 128) * scale
-    
     // we invert this here
     for (let i = 0; i < zone.generators.length; i++)
     {

package/soundfont/basic_soundfont/write_sf2/sdta.js

@@ -24,11 +24,14 @@ export function getSDTA(smplStartOffsets, smplEndOffsets, compress, quality, vor
         }
         const r = s.getRawData();
         SpessaSynthInfo(
-            `%cEncoded sample %c${i}. ${s.sampleName}%c of %c${this.samples.length}`,
+            `%cEncoded sample %c${i}. ${s.sampleName}%c of %c${this.samples.length}%c. Compressed: %c${s.isCompressed}%c.`,
             consoleColors.info,
             consoleColors.recognized,
             consoleColors.info,
-            consoleColors.recognized
+            consoleColors.recognized,
+            consoleColors.info,
+            s.isCompressed ? consoleColors.recognized : consoleColors.unrecognized,
+            consoleColors.info
         );
         return r;
     });

package/soundfont/dls/articulator_converter.js

@@ -135,6 +135,16 @@ function getSF2GeneratorFromDLS(destination, amount)
             return generatorTypes.chorusEffectsSend;
         case DLSDestinations.reverbSend:
             return generatorTypes.reverbEffectsSend;
+        
+        // lfos
+        case DLSDestinations.modLfoFreq:
+            return generatorTypes.freqModLFO;
+        case DLSDestinations.modLfoDelay:
+            return generatorTypes.delayModLFO;
+        case DLSDestinations.vibLfoFreq:
+            return generatorTypes.freqVibLFO;
+        case DLSDestinations.vibLfoDelay:
+            return generatorTypes.delayVibLFO;
     }
 }
 

package/soundfont/dls/dls_destinations.js

@@ -3,36 +3,36 @@
  * @enum {number}
  */
 export const DLSDestinations = {
-    none: 0x0,
-    gain: 0x1,
-    reserved: 0x2,
-    pitch: 0x3,
-    pan: 0x4,
-    keyNum: 0x5,
+    none: 0x0,                  // no destination
+    gain: 0x1,                  // linear gain
+    reserved: 0x2,              // reserved
+    pitch: 0x3,                 // pitch in cents
+    pan: 0x4,                   // pan 10ths of a percent
+    keyNum: 0x5,                // MIDI key number
     // nuh uh, the channel controllers are not supported!!!!
-    chorusSend: 0x80,
-    reverbSend: 0x81,
+    chorusSend: 0x80,           // chorus send 10ths of a percent
+    reverbSend: 0x81,           // reverb send 10ths of a percent
     
-    modLfoFreq: 0x104,
-    modLfoDelay: 0x105,
+    modLfoFreq: 0x104,          // modulation LFO frequency
+    modLfoDelay: 0x105,         // modulation LFO delay
     
-    vibLfoFreq: 0x114,
-    vibLfoDelay: 0x115,
+    vibLfoFreq: 0x114,          // vibrato LFO frequency
+    vibLfoDelay: 0x115,         // vibrato LFO delay
     
-    volEnvAttack: 0x206,
-    volEnvDecay: 0x207,
-    volEnvRelease: 0x209,
-    volEnvSustain: 0x20a,
-    volEnvDelay: 0x20b,
-    volEnvHold: 0x20c,
+    volEnvAttack: 0x206,        // volume envelope attack
+    volEnvDecay: 0x207,         // volume envelope decay
+    volEnvRelease: 0x209,       // volume envelope release
+    volEnvSustain: 0x20a,       // volume envelope sustain
+    volEnvDelay: 0x20b,         // volume envelope delay
+    volEnvHold: 0x20c,          // volume envelope hold
     
-    modEnvAttack: 0x30a,
-    modEnvDecay: 0x30b,
-    modEnvRelease: 0x30d,
-    modEnvSustain: 0x30e,
-    modEnvDelay: 0x30f,
-    modEnvHold: 0x310,
+    modEnvAttack: 0x30a,        // modulation envelope attack
+    modEnvDecay: 0x30b,         // modulation envelope decay
+    modEnvRelease: 0x30d,       // modulation envelope release
+    modEnvSustain: 0x30e,       // modulation envelope sustain
+    modEnvDelay: 0x30f,         // modulation envelope delay
+    modEnvHold: 0x310,          // modulation envelope hold
     
-    filterCutoff: 0x500,
-    filterQ: 0x501
+    filterCutoff: 0x500,        // low pass filter cutoff frequency
+    filterQ: 0x501              // low pass filter resonance
 };

package/soundfont/read_sf2/samples.js

@@ -72,7 +72,7 @@ export class LoadedSample extends BasicSample
     
     /**
      * Get raw data, whether it's compressed or not as we simply write it to the file
-     * @return {Uint8Array}
+     * @return {Uint8Array} either s16 or vorbis data
      */
     getRawData()
     {
@@ -90,7 +90,8 @@ export class LoadedSample extends BasicSample
         {
             if (!this.isDataRaw)
             {
-                throw new Error("Writing SF2Pack samples is not supported.");
+                // encode the f32 into s16 manually
+                super.getRawData();
             }
             const dataStartIndex = smplArr.currentIndex;
             return smplArr.slice(dataStartIndex + this.sampleStartIndex, dataStartIndex + this.sampleEndIndex);
@@ -123,7 +124,9 @@ export class LoadedSample extends BasicSample
         }
         catch (e)
         {
-            throw new Error(`Ogg Vorbis decode error: ${e}`);
+            // do not error out, fill with silence
+            SpessaSynthWarn(`Error decoding sample ${this.sampleName}: ${e}`);
+            this.sampleData = new Float32Array(this.sampleLoopEndIndex + 1);
         }
     }