spessasynth_core 3.26.12 → 3.26.14

package/README.md

@@ -5,6 +5,12 @@
 
 **A powerful SF2/DLS/MIDI JavaScript library. It works with any modern JS environment that supports WebAssembly.**
 
+It allows you to:
+- Play MIDI files using SF2/SF3/DLS files
+- Write MIDI files
+- Write SF2/SF3 files
+- Convert DLS to SF2 (and back!)
+- [and more!](https://github.com/spessasus/spessasynth_core?tab=readme-ov-file#current-features)
 > **TIP:**
 > Looking for an easy-to-use WebAudioAPI browser wrapper? Try [spessasynth_lib](https://github.com/spessasus/spessasynth_lib)!
 

package/index.js

@@ -23,8 +23,8 @@ import { BasicSample } from "./src/soundfont/basic_soundfont/basic_sample.js";
 import { BasicInstrumentZone, BasicPresetZone } from "./src/soundfont/basic_soundfont/basic_zones.js";
 import { BasicInstrument } from "./src/soundfont/basic_soundfont/basic_instrument.js";
 import { BasicPreset } from "./src/soundfont/basic_soundfont/basic_preset.js";
-import { Generator } from "./src/soundfont/basic_soundfont/generator.js";
-import { Modulator, modulatorSources } from "./src/soundfont/basic_soundfont/modulator.js";
+import { Generator, generatorTypes } from "./src/soundfont/basic_soundfont/generator.js";
+import { Modulator, modulatorCurveTypes, modulatorSources } from "./src/soundfont/basic_soundfont/modulator.js";
 import { loadSoundFont } from "./src/soundfont/load_soundfont.js";
 
 import { MIDI } from "./src/midi/midi_loader.js";
@@ -49,7 +49,8 @@ import { readBytesAsString } from "./src/utils/byte_functions/string.js";
 import { readVariableLengthQuantity } from "./src/utils/byte_functions/variable_length_quantity.js";
 import { consoleColors } from "./src/utils/other.js";
 import { inflateSync } from "./src/externals/fflate/fflate.min.js";
-
+import { DLSDestinations } from "./src/soundfont/dls/dls_destinations.js";
+import { DLSSources } from "./src/soundfont/dls/dls_sources.js";
 // you shouldn't use these...
 const SpessaSynthCoreUtils = {
     consoleColors,
@@ -64,6 +65,7 @@ const SpessaSynthCoreUtils = {
     inflateSync
 };
 
+// see All-NPN-Exports.md in the wiki
 export {
     // synth and seq
     SpessaSynthSequencer,
@@ -71,6 +73,7 @@ export {
     SynthesizerSnapshot,
     ChannelSnapshot,
     KeyModifier,
+    
     masterParameterType,
     channelConfiguration,
     interpolationTypes,
@@ -92,7 +95,13 @@ export {
     BasicPresetZone,
     Generator,
     Modulator,
+    
     modulatorSources,
+    modulatorCurveTypes,
+    generatorTypes,
+    DLSSources,
+    DLSDestinations,
+    
     
     // MIDI
     MIDI,
@@ -100,13 +109,14 @@ export {
     BasicMIDI,
     MIDIBuilder,
     MIDIMessage,
+    
     RMIDINFOChunks,
+    midiControllers,
+    messageTypes,
     
     // utils
     IndexedByteArray,
     audioToWav,
     SpessaSynthLogging,
-    midiControllers,
-    messageTypes,
     SpessaSynthCoreUtils
 };

package/package.json

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

package/src/soundfont/basic_soundfont/generator.js

@@ -70,11 +70,12 @@ export const generatorTypes = {
     vibLfoToFilterFc: 62
 };
 export const GENERATORS_AMOUNT = Object.keys(generatorTypes).length;
+export const MAX_GENERATOR = Math.max(...Object.values(generatorTypes));
 
 /**
  * @type {{min: number, max: number, def: number}[]}
  */
-export const generatorLimits = [];
+const generatorLimits = [];
 // offsets
 generatorLimits[generatorTypes.startAddrsOffset] = { min: 0, max: 32768, def: 0 };
 generatorLimits[generatorTypes.endAddrOffset] = { min: -32768, max: 32768, def: 0 };
@@ -148,6 +149,8 @@ generatorLimits[generatorTypes.exclusiveClass] = { min: 0, max: 99999, def: 0 };
 generatorLimits[generatorTypes.overridingRootKey] = { min: 0 - 1, max: 127, def: -1 };
 generatorLimits[generatorTypes.sampleModes] = { min: 0, max: 3, def: 0 };
 
+export { generatorLimits };
+
 export class Generator
 {
     /**

package/src/soundfont/basic_soundfont/modulator.js

@@ -1,4 +1,4 @@
-import { generatorTypes } from "./generator.js";
+import { generatorTypes, MAX_GENERATOR } from "./generator.js";
 import { midiControllers } from "../../midi/midi_message.js";
 
 /**
@@ -79,7 +79,7 @@ export class Modulator
         this.transformType = transformType;
         
         
-        if (this.modulatorDestination > 58)
+        if (this.modulatorDestination > MAX_GENERATOR)
         {
             this.modulatorDestination = generatorTypes.INVALID; // flag as invalid (for linked ones)
         }

package/src/soundfont/load_soundfont.js

@@ -4,8 +4,8 @@ import { DLSSoundFont } from "./dls/dls_soundfont.js";
 import { SoundFont2 } from "./read_sf2/soundfont.js";
 
 /**
- * Loads a soundfont file
- * @param buffer {ArrayBuffer}
+ * Loads a soundfont or dls file
+ * @param buffer {ArrayBuffer} the binary file to load
  * @returns {BasicSoundBank}
  */
 export function loadSoundFont(buffer)

package/src/synthetizer/audio_engine/engine_components/compute_modulator.js

@@ -4,6 +4,7 @@ import { ModulationEnvelope } from "./modulation_envelope.js";
 import { generatorLimits, generatorTypes } from "../../../soundfont/basic_soundfont/generator.js";
 import { Modulator, modulatorSources } from "../../../soundfont/basic_soundfont/modulator.js";
 import { NON_CC_INDEX_OFFSET } from "./controller_tables.js";
+import { SpessaSynthWarn } from "../../../utils/loggin.js";
 
 /**
  * compute_modulator.js
@@ -137,6 +138,11 @@ export function computeModulators(voice, controllerTable, sourceUsesCC = -1, sou
         modulators.forEach(mod =>
         {
             const limits = generatorLimits[mod.modulatorDestination];
+            if (!limits)
+            {
+                SpessaSynthWarn(`Invalid modulator: ${mod.modulatorDestination}`);
+                return;
+            }
             const newValue = modulatedGenerators[mod.modulatorDestination] + computeModulator(
                 controllerTable,
                 mod,

package/src/synthetizer/audio_engine/engine_methods/system_exclusive.js

@@ -469,13 +469,28 @@ export function systemExclusive(syx, channelOffset = 0)
                                 case 0x00:
                                     // see https://github.com/spessasus/SpessaSynth/issues/154
                                     // pitch control
-                                    channelObject.sysExModulators.setModulator(
-                                        source,
-                                        generatorTypes.fineTune,
-                                        centeredValue * 100,
-                                        bipolar
-                                    );
-                                    niceLogging(channel, centeredValue, `${sourceName} pitch control`, "semitones");
+                                    // special case:
+                                    // if the source is a pitch wheel, it's a strange way of setting the bend range
+                                    // testcase: th07_03.mid
+                                    if (source === NON_CC_INDEX_OFFSET + modulatorSources.pitchWheel)
+                                    {
+                                        channelObject.controllerChange(midiControllers.RPNMsb, 0x0);
+                                        channelObject.controllerChange(midiControllers.RPNLsb, 0x0);
+                                        channelObject.controllerChange(
+                                            midiControllers.dataEntryMsb,
+                                            Math.floor(centeredValue)
+                                        );
+                                    }
+                                    else
+                                    {
+                                        channelObject.sysExModulators.setModulator(
+                                            source,
+                                            generatorTypes.fineTune,
+                                            centeredValue * 100,
+                                            bipolar
+                                        );
+                                        niceLogging(channel, centeredValue, `${sourceName} pitch control`, "semitones");
+                                    }
                                     break;
                                 
                                 case 0x01:
@@ -512,7 +527,8 @@ export function systemExclusive(syx, channelOffset = 0)
                                     channelObject.sysExModulators.setModulator(
                                         source,
                                         generatorTypes.vibLfoToPitch,
-                                        normalizedNotCentered * 600
+                                        normalizedNotCentered * 600,
+                                        bipolar
                                     );
                                     niceLogging(
                                         channel,
@@ -527,7 +543,8 @@ export function systemExclusive(syx, channelOffset = 0)
                                     channelObject.sysExModulators.setModulator(
                                         source,
                                         generatorTypes.vibLfoToFilterFc,
-                                        normalizedNotCentered * 2400
+                                        normalizedNotCentered * 2400,
+                                        bipolar
                                     );
                                     niceLogging(
                                         channel,
@@ -542,11 +559,12 @@ export function systemExclusive(syx, channelOffset = 0)
                                     channelObject.sysExModulators.setModulator(
                                         source,
                                         generatorTypes.vibLfoToVolume,
-                                        normalizedNotCentered * 960
+                                        normalizedValue * 960,
+                                        bipolar
                                     );
                                     niceLogging(
                                         channel,
-                                        normalizedNotCentered * 960,
+                                        normalizedValue * 960,
                                         `${sourceName} LFO1 amplitude depth`,
                                         "cB"
                                     );
@@ -559,7 +577,8 @@ export function systemExclusive(syx, channelOffset = 0)
                                     channelObject.sysExModulators.setModulator(
                                         source,
                                         generatorTypes.modLfoToPitch,
-                                        normalizedNotCentered * 600
+                                        normalizedNotCentered * 600,
+                                        bipolar
                                     );
                                     niceLogging(
                                         channel,
@@ -574,7 +593,8 @@ export function systemExclusive(syx, channelOffset = 0)
                                     channelObject.sysExModulators.setModulator(
                                         source,
                                         generatorTypes.modLfoToFilterFc,
-                                        normalizedNotCentered * 2400
+                                        normalizedNotCentered * 2400,
+                                        bipolar
                                     );
                                     niceLogging(
                                         channel,
@@ -589,11 +609,12 @@ export function systemExclusive(syx, channelOffset = 0)
                                     channelObject.sysExModulators.setModulator(
                                         source,
                                         generatorTypes.modLfoToVolume,
-                                        normalizedNotCentered * 960
+                                        normalizedValue * 960,
+                                        bipolar
                                     );
                                     niceLogging(
                                         channel,
-                                        normalizedNotCentered * 960,
+                                        normalizedValue * 960,
                                         `${sourceName} LFO2 amplitude depth`,
                                         "cB"
                                     );