spessasynth_core 3.26.14 → 3.26.15

package/README.md

@@ -69,6 +69,7 @@ npm install --save spessasynth_core
   - **Sound Controllers:** Real-time filter and envelope control!
   - **MIDI Tuning Standard Support:** [more info here](https://github.com/spessasus/spessasynth_core/wiki/MIDI-Implementation#midi-tuning-standard)
   - [Full **RPN** and limited **NRPN** support](https://github.com/spessasus/spessasynth_core/wiki/MIDI-Implementation#supported-registered-parameters)
+  - **SoundFont2 NRPN Support**
   - [**AWE32** NRPN Compatibility Layer](https://github.com/spessasus/spessasynth_core/wiki/MIDI-Implementation#awe32-nrpn-compatibility-layer)
   - Supports some [**Roland GS** and **Yamaha XG** system exclusives](https://github.com/spessasus/spessasynth_core/wiki/MIDI-Implementation#supported-system-exclusives)
 

package/package.json

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

package/src/midi/README.md

@@ -1,6 +1,6 @@
 ## This is the MIDI file parsing folder.
 
-The code here is responsible for parsing the MIDI files and interpreting the messsages.
+The code here is responsible for parsing the MIDI files and interpreting the messages.
 All the events are defined in the `midi_message.js` file.
 
 ### MIDI Classes hierarchy

package/src/midi/basic_midi.js

@@ -402,7 +402,7 @@ class BasicMIDI extends MIDISequenceData
             }
         }
         
-        // fix empty port channel offsets (do a copy to turn empty slots into undefined so map goes over them)
+        // fix empty port channel offsets (do a copy to turn empty slots into undefined so the map goes over them)
         this.midiPortChannelOffsets = [...this.midiPortChannelOffsets].map(o => o ?? 0);
         
         // fix midi ports:

package/src/midi/midi_builder.js

@@ -126,8 +126,9 @@ export class MIDIBuilder extends BasicMIDI
      * @param track {number} the track number to use
      * @param channel {number} the channel to use
      * @param midiNote {number} the midi note of the key release
+     * @param velocity {number} optional and unsupported by spessasynth
      */
-    addNoteOff(ticks, track, channel, midiNote)
+    addNoteOff(ticks, track, channel, midiNote, velocity = 64)
     {
         channel %= 16;
         midiNote %= 128;
@@ -135,7 +136,7 @@ export class MIDIBuilder extends BasicMIDI
             ticks,
             track,
             messageTypes.noteOff | channel,
-            [midiNote, 64]
+            [midiNote, velocity]
         );
     }
     

package/src/midi/midi_tools/rmidi_writer.js

@@ -1,6 +1,6 @@
 import { combineArrays, IndexedByteArray } from "../../utils/indexed_array.js";
 import { writeRIFFOddSize } from "../../soundfont/basic_soundfont/riff_chunk.js";
-import { getStringBytes, getStringBytesZero } from "../../utils/byte_functions/string.js";
+import { getStringBytes } from "../../utils/byte_functions/string.js";
 import { messageTypes, midiControllers, MIDIMessage } from "../midi_message.js";
 import { getGsOn } from "./midi_editor.js";
 import { SpessaSynthGroup, SpessaSynthGroupEnd, SpessaSynthInfo } from "../../utils/loggin.js";
@@ -459,7 +459,7 @@ export function writeRMIDI(
             minute: "numeric"
         });
         infoContent.push(
-            writeRIFFOddSize(RMIDINFOChunks.creationDate, getStringBytesZero(today), true)
+            writeRIFFOddSize(RMIDINFOChunks.creationDate, getStringBytes(today, true), true)
         );
     }
     // comment
@@ -525,7 +525,7 @@ export function writeRMIDI(
         // use midi copyright if possible
         const copyright = mid.copyright.length > 0 ? mid.copyright : DEFAULT_COPYRIGHT;
         infoContent.push(
-            writeRIFFOddSize(RMIDINFOChunks.copyright, getStringBytesZero(copyright))
+            writeRIFFOddSize(RMIDINFOChunks.copyright, getStringBytes(copyright, true))
         );
     }
     
@@ -542,7 +542,7 @@ export function writeRMIDI(
         encoding = FORCED_ENCODING;
     }
     // encoding
-    infoContent.push(writeRIFFOddSize(RMIDINFOChunks.encoding, getStringBytesZero(encoding)));
+    infoContent.push(writeRIFFOddSize(RMIDINFOChunks.encoding, getStringBytes(encoding, true)));
     
     // combine and write out
     const infodata = combineArrays(infoContent);

package/src/sequencer/sequencer_engine.js

@@ -185,6 +185,7 @@ class SpessaSynthSequencer
      */
     _playbackRate = 1;
     
+    // noinspection JSUnusedGlobalSymbols
     /**
      * @param value {number}
      */

package/src/soundfont/basic_soundfont/generator.js

@@ -73,81 +73,82 @@ export const GENERATORS_AMOUNT = Object.keys(generatorTypes).length;
 export const MAX_GENERATOR = Math.max(...Object.values(generatorTypes));
 
 /**
- * @type {{min: number, max: number, def: number}[]}
+ * @type {{min: number, max: number, def: number, nrpn: number}[]}
+ * min: minimum value, max: maximum value, def: default value, nrpn: nprn scale...
  */
 const generatorLimits = [];
 // offsets
-generatorLimits[generatorTypes.startAddrsOffset] = { min: 0, max: 32768, def: 0 };
-generatorLimits[generatorTypes.endAddrOffset] = { min: -32768, max: 32768, def: 0 };
-generatorLimits[generatorTypes.startloopAddrsOffset] = { min: -32768, max: 32768, def: 0 };
-generatorLimits[generatorTypes.endloopAddrsOffset] = { min: -32768, max: 32768, def: 0 };
-generatorLimits[generatorTypes.startAddrsCoarseOffset] = { min: 0, max: 32768, def: 0 };
+generatorLimits[generatorTypes.startAddrsOffset] = { min: 0, max: 32768, def: 0, nrpn: 1 };
+generatorLimits[generatorTypes.endAddrOffset] = { min: -32768, max: 32768, def: 0, nrpn: 1 };
+generatorLimits[generatorTypes.startloopAddrsOffset] = { min: -32768, max: 32768, def: 0, nrpn: 1 };
+generatorLimits[generatorTypes.endloopAddrsOffset] = { min: -32768, max: 32768, def: 0, nrpn: 1 };
+generatorLimits[generatorTypes.startAddrsCoarseOffset] = { min: 0, max: 32768, def: 0, nrpn: 1 };
 
 // pitch influence
-generatorLimits[generatorTypes.modLfoToPitch] = { min: -12000, max: 12000, def: 0 };
-generatorLimits[generatorTypes.vibLfoToPitch] = { min: -12000, max: 12000, def: 0 };
-generatorLimits[generatorTypes.modEnvToPitch] = { min: -12000, max: 12000, def: 0 };
+generatorLimits[generatorTypes.modLfoToPitch] = { min: -12000, max: 12000, def: 0, nrpn: 2 };
+generatorLimits[generatorTypes.vibLfoToPitch] = { min: -12000, max: 12000, def: 0, nrpn: 2 };
+generatorLimits[generatorTypes.modEnvToPitch] = { min: -12000, max: 12000, def: 0, nrpn: 2 };
 
 // lowpass
-generatorLimits[generatorTypes.initialFilterFc] = { min: 1500, max: 13500, def: 13500 };
-generatorLimits[generatorTypes.initialFilterQ] = { min: 0, max: 960, def: 0 };
-generatorLimits[generatorTypes.modLfoToFilterFc] = { min: -12000, max: 12000, def: 0 };
-generatorLimits[generatorTypes.vibLfoToFilterFc] = { min: -12000, max: 12000, def: 0 }; // NON-STANDARD
-generatorLimits[generatorTypes.modEnvToFilterFc] = { min: -12000, max: 12000, def: 0 };
+generatorLimits[generatorTypes.initialFilterFc] = { min: 1500, max: 13500, def: 13500, nrpn: 2 };
+generatorLimits[generatorTypes.initialFilterQ] = { min: 0, max: 960, def: 0, nrpn: 1 };
+generatorLimits[generatorTypes.modLfoToFilterFc] = { min: -12000, max: 12000, def: 0, nrpn: 2 };
+generatorLimits[generatorTypes.vibLfoToFilterFc] = { min: -12000, max: 12000, def: 0, nrpn: 2 }; // NON-STANDARD
+generatorLimits[generatorTypes.modEnvToFilterFc] = { min: -12000, max: 12000, def: 0, nrpn: 2 };
 
-generatorLimits[generatorTypes.endAddrsCoarseOffset] = { min: -32768, max: 32768, def: 0 };
+generatorLimits[generatorTypes.endAddrsCoarseOffset] = { min: -32768, max: 32768, def: 0, nrpn: 1 };
 
-generatorLimits[generatorTypes.modLfoToVolume] = { min: -960, max: 960, def: 0 };
-generatorLimits[generatorTypes.vibLfoToVolume] = { min: -960, max: 960, def: 0 }; // NON-STANDARD
+generatorLimits[generatorTypes.modLfoToVolume] = { min: -960, max: 960, def: 0, nrpn: 1 };
+generatorLimits[generatorTypes.vibLfoToVolume] = { min: -960, max: 960, def: 0, nrpn: 1 }; // NON-STANDARD
 
 // effects, pan
-generatorLimits[generatorTypes.chorusEffectsSend] = { min: 0, max: 1000, def: 0 };
-generatorLimits[generatorTypes.reverbEffectsSend] = { min: 0, max: 1000, def: 0 };
-generatorLimits[generatorTypes.pan] = { min: -500, max: 500, def: 0 };
+generatorLimits[generatorTypes.chorusEffectsSend] = { min: 0, max: 1000, def: 0, nrpn: 1 };
+generatorLimits[generatorTypes.reverbEffectsSend] = { min: 0, max: 1000, def: 0, nrpn: 1 };
+generatorLimits[generatorTypes.pan] = { min: -500, max: 500, def: 0, nrpn: 1 };
 
 // lfo
-generatorLimits[generatorTypes.delayModLFO] = { min: -12000, max: 5000, def: -12000 };
-generatorLimits[generatorTypes.freqModLFO] = { min: -16000, max: 4500, def: 0 };
-generatorLimits[generatorTypes.delayVibLFO] = { min: -12000, max: 5000, def: -12000 };
-generatorLimits[generatorTypes.freqVibLFO] = { min: -16000, max: 4500, def: 0 };
+generatorLimits[generatorTypes.delayModLFO] = { min: -12000, max: 5000, def: -12000, nrpn: 2 };
+generatorLimits[generatorTypes.freqModLFO] = { min: -16000, max: 4500, def: 0, nrpn: 4 };
+generatorLimits[generatorTypes.delayVibLFO] = { min: -12000, max: 5000, def: -12000, nrpn: 2 };
+generatorLimits[generatorTypes.freqVibLFO] = { min: -16000, max: 4500, def: 0, nrpn: 4 };
 
 // mod env
-generatorLimits[generatorTypes.delayModEnv] = { min: -32768, max: 5000, def: -32768 }; // -32,768 indicates instant phase,
+generatorLimits[generatorTypes.delayModEnv] = { min: -32768, max: 5000, def: -32768, nrpn: 2 }; // -32,768 indicates instant phase,
 // this is done to prevent click at the start of filter modenv
-generatorLimits[generatorTypes.attackModEnv] = { min: -32768, max: 8000, def: -32768 };
-generatorLimits[generatorTypes.holdModEnv] = { min: -12000, max: 5000, def: -12000 };
-generatorLimits[generatorTypes.decayModEnv] = { min: -12000, max: 8000, def: -12000 };
-generatorLimits[generatorTypes.sustainModEnv] = { min: 0, max: 1000, def: 0 };
-generatorLimits[generatorTypes.releaseModEnv] = { min: -7200, max: 8000, def: -12000 }; // min is set to -7200 to prevent lowpass clicks
+generatorLimits[generatorTypes.attackModEnv] = { min: -32768, max: 8000, def: -32768, nrpn: 2 };
+generatorLimits[generatorTypes.holdModEnv] = { min: -12000, max: 5000, def: -12000, nrpn: 2 };
+generatorLimits[generatorTypes.decayModEnv] = { min: -12000, max: 8000, def: -12000, nrpn: 2 };
+generatorLimits[generatorTypes.sustainModEnv] = { min: 0, max: 1000, def: 0, nrpn: 1 };
+generatorLimits[generatorTypes.releaseModEnv] = { min: -7200, max: 8000, def: -12000, nrpn: 2 }; // min is set to -7200 to prevent lowpass clicks
 // key num to mod env
-generatorLimits[generatorTypes.keyNumToModEnvHold] = { min: -1200, max: 1200, def: 0 };
-generatorLimits[generatorTypes.keyNumToModEnvDecay] = { min: -1200, max: 1200, def: 0 };
+generatorLimits[generatorTypes.keyNumToModEnvHold] = { min: -1200, max: 1200, def: 0, nrpn: 1 };
+generatorLimits[generatorTypes.keyNumToModEnvDecay] = { min: -1200, max: 1200, def: 0, nrpn: 1 };
 
 // vol env
-generatorLimits[generatorTypes.delayVolEnv] = { min: -12000, max: 5000, def: -12000 };
-generatorLimits[generatorTypes.attackVolEnv] = { min: -12000, max: 8000, def: -12000 };
-generatorLimits[generatorTypes.holdVolEnv] = { min: -12000, max: 5000, def: -12000 };
-generatorLimits[generatorTypes.decayVolEnv] = { min: -12000, max: 8000, def: -12000 };
-generatorLimits[generatorTypes.sustainVolEnv] = { min: 0, max: 1440, def: 0 };
-generatorLimits[generatorTypes.releaseVolEnv] = { min: -7200, max: 8000, def: -12000 }; // min is set to -7200 prevent clicks
+generatorLimits[generatorTypes.delayVolEnv] = { min: -12000, max: 5000, def: -12000, nrpn: 2 };
+generatorLimits[generatorTypes.attackVolEnv] = { min: -12000, max: 8000, def: -12000, nrpn: 2 };
+generatorLimits[generatorTypes.holdVolEnv] = { min: -12000, max: 5000, def: -12000, nrpn: 2 };
+generatorLimits[generatorTypes.decayVolEnv] = { min: -12000, max: 8000, def: -12000, nrpn: 2 };
+generatorLimits[generatorTypes.sustainVolEnv] = { min: 0, max: 1440, def: 0, nrpn: 1 };
+generatorLimits[generatorTypes.releaseVolEnv] = { min: -7200, max: 8000, def: -12000, nrpn: 2 }; // min is set to -7200 prevent clicks
 // key num to vol env
-generatorLimits[generatorTypes.keyNumToVolEnvHold] = { min: -1200, max: 1200, def: 0 };
-generatorLimits[generatorTypes.keyNumToVolEnvDecay] = { min: -1200, max: 1200, def: 0 };
+generatorLimits[generatorTypes.keyNumToVolEnvHold] = { min: -1200, max: 1200, def: 0, nrpn: 1 };
+generatorLimits[generatorTypes.keyNumToVolEnvDecay] = { min: -1200, max: 1200, def: 0, nrpn: 1 };
 
-generatorLimits[generatorTypes.startloopAddrsCoarseOffset] = { min: -32768, max: 32768, def: 0 };
-generatorLimits[generatorTypes.keyNum] = { min: -1, max: 127, def: -1 };
-generatorLimits[generatorTypes.velocity] = { min: -1, max: 127, def: -1 };
+generatorLimits[generatorTypes.startloopAddrsCoarseOffset] = { min: -32768, max: 32768, def: 0, nrpn: 1 };
+generatorLimits[generatorTypes.keyNum] = { min: -1, max: 127, def: -1, nrpn: 1 };
+generatorLimits[generatorTypes.velocity] = { min: -1, max: 127, def: -1, nrpn: 1 };
 
-generatorLimits[generatorTypes.initialAttenuation] = { min: 0, max: 1440, def: 0 };
+generatorLimits[generatorTypes.initialAttenuation] = { min: 0, max: 1440, def: 0, nrpn: 1 };
 
-generatorLimits[generatorTypes.endloopAddrsCoarseOffset] = { min: -32768, max: 32768, def: 0 };
+generatorLimits[generatorTypes.endloopAddrsCoarseOffset] = { min: -32768, max: 32768, def: 0, nrpn: 1 };
 
-generatorLimits[generatorTypes.coarseTune] = { min: -120, max: 120, def: 0 };
-generatorLimits[generatorTypes.fineTune] = { min: -12700, max: 12700, def: 0 }; // this generator is used as initial pitch, hence this range
-generatorLimits[generatorTypes.scaleTuning] = { min: 0, max: 1200, def: 100 };
-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 };
+generatorLimits[generatorTypes.coarseTune] = { min: -120, max: 120, def: 0, nrpn: 1 };
+generatorLimits[generatorTypes.fineTune] = { min: -12700, max: 12700, def: 0, nrpn: 1 }; // this generator is used as initial pitch, hence this range
+generatorLimits[generatorTypes.scaleTuning] = { min: 0, max: 1200, def: 100, nrpn: 1 };
+generatorLimits[generatorTypes.exclusiveClass] = { min: 0, max: 99999, def: 0, nrpn: 0 };
+generatorLimits[generatorTypes.overridingRootKey] = { min: 0 - 1, max: 127, def: -1, nrpn: 0 };
+generatorLimits[generatorTypes.sampleModes] = { min: 0, max: 3, def: 0, nrpn: 0 };
 
 export { generatorLimits };
 

package/src/soundfont/basic_soundfont/riff_chunk.js

@@ -93,7 +93,7 @@ export function writeRIFFChunk(chunk, prepend = undefined)
  * @param header {string}
  * @param data {Uint8Array}
  * @param addZeroByte {Boolean}
- * @param isList {boolean}
+ * @param isList {boolean} adds "LIST" as the chunk type and writes the actual type at the start of the data
  * @returns {IndexedByteArray}
  */
 export function writeRIFFOddSize(header, data, addZeroByte = false, isList = false)

package/src/soundfont/basic_soundfont/write_dls/ins.js

@@ -3,10 +3,10 @@ import { combineZones } from "./combine_zones.js";
 import { writeRIFFOddSize } from "../riff_chunk.js";
 import { writeDword } from "../../../utils/byte_functions/little_endian.js";
 import { writeDLSRegion } from "./rgn2.js";
-import { getStringBytesZero } from "../../../utils/byte_functions/string.js";
 import { writeArticulator } from "./art2.js";
 import { SpessaSynthGroupCollapsed, SpessaSynthGroupEnd } from "../../../utils/loggin.js";
 import { consoleColors } from "../../../utils/other.js";
+import { getStringBytes } from "../../../utils/byte_functions/string.js";
 
 /**
  * @this {BasicSoundBank}
@@ -84,7 +84,7 @@ export function writeIns(preset)
     // writeINFO
     const inam = writeRIFFOddSize(
         "INAM",
-        getStringBytesZero(preset.presetName)
+        getStringBytes(preset.presetName, true)
     );
     const info = writeRIFFOddSize(
         "INFO",

package/src/soundfont/basic_soundfont/write_dls/wave.js

@@ -2,9 +2,9 @@ import { combineArrays, IndexedByteArray } from "../../../utils/indexed_array.js
 import { writeDword, writeWord } from "../../../utils/byte_functions/little_endian.js";
 import { writeRIFFOddSize } from "../riff_chunk.js";
 import { writeWavesample } from "./wsmp.js";
-import { getStringBytesZero } from "../../../utils/byte_functions/string.js";
 import { SpessaSynthInfo } from "../../../utils/loggin.js";
 import { consoleColors } from "../../../utils/other.js";
+import { getStringBytes } from "../../../utils/byte_functions/string.js";
 
 /**
  * @param sample {BasicSample}
@@ -66,7 +66,7 @@ export function writeDLSSample(sample)
     
     const inam = writeRIFFOddSize(
         "INAM",
-        getStringBytesZero(sample.sampleName)
+        getStringBytes(sample.sampleName, true)
     );
     const info = writeRIFFOddSize(
         "INFO",

package/src/soundfont/basic_soundfont/write_dls/write_dls.js

@@ -2,7 +2,7 @@ import { writeRIFFOddSize } from "../riff_chunk.js";
 import { writeDword } from "../../../utils/byte_functions/little_endian.js";
 import { combineArrays, IndexedByteArray } from "../../../utils/indexed_array.js";
 import { writeLins } from "./lins.js";
-import { getStringBytesZero, writeStringAsBytes } from "../../../utils/byte_functions/string.js";
+import { getStringBytes, writeStringAsBytes } from "../../../utils/byte_functions/string.js";
 import { writeWavePool } from "./wvpl.js";
 import { SpessaSynthGroupCollapsed, SpessaSynthGroupEnd, SpessaSynthInfo } from "../../../utils/loggin.js";
 import { consoleColors } from "../../../utils/other.js";
@@ -80,7 +80,7 @@ export function writeDLS()
         infos.push(
             writeRIFFOddSize(
                 info,
-                getStringBytesZero(data),
+                getStringBytes(data, true),
                 true
             )
         );

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

@@ -1,5 +1,5 @@
 import { combineArrays, IndexedByteArray } from "../../../utils/indexed_array.js";
-import { RiffChunk, writeRIFFChunk } from "../riff_chunk.js";
+import { RiffChunk, writeRIFFChunk, writeRIFFOddSize } from "../riff_chunk.js";
 import { writeStringAsBytes } from "../../../utils/byte_functions/string.js";
 import { consoleColors } from "../../../utils/other.js";
 import { getIGEN } from "./igen.js";
@@ -97,20 +97,17 @@ export function write(options = DEFAULT_WRITE_OPTIONS)
         }
         else
         {
-            const arr = new IndexedByteArray(data.length);
+            // pad with zero
+            const arr = new IndexedByteArray(data.length + 1);
             writeStringAsBytes(arr, data);
             infoArrays.push(writeRIFFChunk(new RiffChunk(
                 type,
-                data.length,
+                arr.length,
                 arr
             )));
         }
     }
-    const combined = combineArrays([
-        new IndexedByteArray([73, 78, 70, 79]), // INFO
-        ...infoArrays
-    ]);
-    const infoChunk = writeRIFFChunk(new RiffChunk("LIST", combined.length, combined));
+    const infoChunk = writeRIFFOddSize("INFO", combineArrays(infoArrays), false, true);
     
     SpessaSynthInfo(
         "%cWriting SDTA...",

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

@@ -27,7 +27,7 @@ export function computeModulator(controllerTable, modulator, voice)
         modulator.currentValue = 0;
         return 0;
     }
-    // mapped to 0-16384
+    // mapped to 0-16,384
     let rawSourceValue;
     if (modulator.sourceUsesCC)
     {
@@ -121,14 +121,23 @@ export function computeModulator(controllerTable, modulator, voice)
 /**
  * Computes modulators of a given voice. Source and index indicate what modulators shall be computed
  * @param voice {Voice} the voice to compute modulators for
- * @param controllerTable {Int16Array} all midi controllers as 14bit values + the non-controller indexes, starting at 128
  * @param sourceUsesCC {number} what modulators should be computed, -1 means all, 0 means modulator source enum 1 means midi controller
  * @param sourceIndex {number} enum for the source
+ * @this {MidiAudioChannel}
  */
-export function computeModulators(voice, controllerTable, sourceUsesCC = -1, sourceIndex = 0)
+export function computeModulators(voice, sourceUsesCC = -1, sourceIndex = 0)
 {
     const modulators = voice.modulators;
-    const generators = voice.generators;
+    let generators = voice.generators;
+    // apply offsets if enabled
+    if (this.generatorOffsetsEnabled)
+    {
+        generators = new Int16Array(generators);
+        for (let i = 0; i < generators.length; i++)
+        {
+            generators[i] += this.generatorOffsets[i];
+        }
+    }
     const modulatedGenerators = voice.modulatedGenerators;
     
     if (sourceUsesCC === -1)
@@ -144,7 +153,7 @@ export function computeModulators(voice, controllerTable, sourceUsesCC = -1, sou
                 return;
             }
             const newValue = modulatedGenerators[mod.modulatorDestination] + computeModulator(
-                controllerTable,
+                this.midiControllers,
                 mod,
                 voice
             );
@@ -186,7 +195,7 @@ export function computeModulators(voice, controllerTable, sourceUsesCC = -1, sou
                 // Reset this destination
                 modulatedGenerators[destination] = generators[destination];
                 // compute our modulator
-                computeModulator(controllerTable, mod, voice);
+                computeModulator(this.midiControllers, mod, voice);
                 // sum the values of all modulators for this destination
                 modulators.forEach(m =>
                 {

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

@@ -63,7 +63,8 @@ export const customControllers = {
     modulationMultiplier: 2,       // cents, set by modulation depth RPN
     masterTuning: 3,               // cents, set by system exclusive
     channelTuningSemitones: 4,     // semitones, for RPN coarse tuning
-    channelKeyShift: 5            // key shift: for system exclusive
+    channelKeyShift: 5,            // key shift: for system exclusive
+    sf2NPRNGeneratorLSB: 6         // sf2 NPRN LSB for selecting a generator value
 };
 export const CUSTOM_CONTROLLER_TABLE_SIZE = Object.keys(customControllers).length;
 export const customResetArray = new Float32Array(CUSTOM_CONTROLLER_TABLE_SIZE);

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

@@ -129,7 +129,7 @@ export class LowpassFilter
     
     /**
      * Applies a low-pass filter to the given buffer
-     * @param voice {Voice} the voice we're working on
+     * @param voice {Voice} the voice we are working on
      * @param outputBuffer {Float32Array} the buffer to apply the filter to
      * @param fcExcursion {number} the addition of modenv and mod lfo in cents to the filter
      * @param smoothingFactor {number} filter's cutoff frequency smoothing factor

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

@@ -32,7 +32,7 @@ import { chooseBank, isSystemXG, parseBankSelect } from "../../../utils/xg_hacks
 import { DEFAULT_PERCUSSION, GENERATOR_OVERRIDE_NO_CHANGE_VALUE } from "../../synth_constants.js";
 import { modulatorSources } from "../../../soundfont/basic_soundfont/modulator.js";
 import { DynamicModulatorSystem } from "./dynamic_modulator_system.js";
-import { GENERATORS_AMOUNT } from "../../../soundfont/basic_soundfont/generator.js";
+import { generatorLimits, GENERATORS_AMOUNT } from "../../../soundfont/basic_soundfont/generator.js";
 import { computeModulators } from "./compute_modulator.js";
 
 /**
@@ -90,6 +90,19 @@ class MidiAudioChannel
      */
     sysExModulators = new DynamicModulatorSystem();
     
+    /**
+     * An array of offsets generators for SF2 nrpn support.
+     * A value of 0 means no change; -10 means 10 lower, etc.
+     * @type {Int16Array}
+     */
+    generatorOffsets = new Int16Array(GENERATORS_AMOUNT);
+    
+    /**
+     * A small optimization that disables applying offsets until at least one is set.
+     * @type {boolean}
+     */
+    generatorOffsetsEnabled = false;
+    
     /**
      * An array of override generators for AWE32 support.
      * A value of 32,767 means unchanged, as it is not allowed anywhere.
@@ -226,6 +239,7 @@ class MidiAudioChannel
         this.preset = preset;
         this.channelNumber = channelNumber;
         this.resetGeneratorOverrides();
+        this.resetGeneratorOffsets();
     }
     
     get isXGChannel()
@@ -475,10 +489,30 @@ class MidiAudioChannel
             this.voices.forEach(v =>
             {
                 v.generators[gen] = value;
-                computeModulators(v, this.midiControllers);
+                this.computeModulators(v);
             });
         }
     }
+    
+    resetGeneratorOffsets()
+    {
+        this.generatorOffsets.fill(0);
+        this.generatorOffsetsEnabled = false;
+    }
+    
+    /**
+     * @param gen {generatorTypes}
+     * @param value {number}
+     */
+    setGeneratorOffset(gen, value)
+    {
+        this.generatorOffsets[gen] = value * generatorLimits[gen].nrpn;
+        this.generatorOffsetsEnabled = true;
+        this.voices.forEach(v =>
+        {
+            this.computeModulators(v);
+        });
+    }
 }
 
 // voice
@@ -487,6 +521,7 @@ MidiAudioChannel.prototype.panVoice = panVoice;
 MidiAudioChannel.prototype.killNote = killNote;
 MidiAudioChannel.prototype.stopAllNotes = stopAllNotes;
 MidiAudioChannel.prototype.muteChannel = muteChannel;
+MidiAudioChannel.prototype.computeModulators = computeModulators;
 
 // MIDI messages
 MidiAudioChannel.prototype.noteOn = noteOn;

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

@@ -400,7 +400,8 @@ export function getVoicesForPreset(preset, bank, program, midiNote, velocity, re
                 );
             }
             
-            // !! EMU initial attenuation correction, multiply initial attenuation by 0.4
+            // EMU initial attenuation correction, multiply initial attenuation by 0.4!
+            // all EMU sound cards have this quirk and all sf2 editors and players emulate it too
             generators[generatorTypes.initialAttenuation] = Math.floor(generators[generatorTypes.initialAttenuation] * 0.4);
             
             // key override

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

@@ -172,7 +172,7 @@ export class WavetableOscillator
                 let y1 = y0 + 1;    // point after the cursor
                 let y2 = y1 + 1;    // point 1 after the cursor
                 let y3 = y2 + 1;    // point 2 after the cursor
-                const t = cur - y0; // distance from y0 to cursor
+                const t = cur - y0; // the distance from y0 to cursor
                 // y0 is not handled here
                 // as it's math.floor of cur which is handled above
                 if (y1 >= sample.loopEnd)

package/src/synthetizer/audio_engine/engine_methods/controller_control/controller_change.js

@@ -1,6 +1,6 @@
 import { midiControllers } from "../../../../midi/midi_message.js";
-import { computeModulators } from "../../engine_components/compute_modulator.js";
-import { channelConfiguration, dataEntryStates } from "../../engine_components/controller_tables.js";
+import { channelConfiguration, customControllers, dataEntryStates } from "../../engine_components/controller_tables.js";
+import { nonRegisteredMSB } from "../data_entry/data_entry_coarse.js";
 
 /**
  * @param controllerNumber {number}
@@ -42,7 +42,7 @@ export function controllerChange(controllerNumber, controllerValue, force = fals
         }
         // append the lower nibble to the main controller
         this.midiControllers[actualCCNum] = (this.midiControllers[actualCCNum] & 0x3F80) | (controllerValue & 0x7F);
-        this.voices.forEach(v => computeModulators(v, this.midiControllers, 1, actualCCNum));
+        this.voices.forEach(v => this.computeModulators(v, 1, actualCCNum));
     }
     if (this.lockedControllers[controllerNumber])
     {
@@ -83,10 +83,37 @@ export function controllerChange(controllerNumber, controllerValue, force = fals
                 break;
             
             case midiControllers.NRPNMsb:
+                // sfspec section 9.6.2
+                this.customControllers[customControllers.sf2NPRNGeneratorLSB] = 0;
                 this.dataEntryState = dataEntryStates.NRPCoarse;
                 break;
             
             case midiControllers.NRPNLsb:
+                if (this.midiControllers[midiControllers.NRPNMsb] >> 7 === nonRegisteredMSB.SF2)
+                {
+                    // if a <100 value has already been sent, reset!
+                    if (this.customControllers[customControllers.sf2NPRNGeneratorLSB] % 100 !== 0)
+                    {
+                        this.customControllers[customControllers.sf2NPRNGeneratorLSB] = 0;
+                    }
+                    
+                    if (controllerValue === 100)
+                    {
+                        this.customControllers[customControllers.sf2NPRNGeneratorLSB] += 100;
+                    }
+                    else if (controllerValue === 101)
+                    {
+                        this.customControllers[customControllers.sf2NPRNGeneratorLSB] += 1000;
+                    }
+                    else if (controllerValue === 102)
+                    {
+                        this.customControllers[customControllers.sf2NPRNGeneratorLSB] += 10000;
+                    }
+                    else if (controllerValue < 100)
+                    {
+                        this.customControllers[customControllers.sf2NPRNGeneratorLSB] += controllerValue;
+                    }
+                }
                 this.dataEntryState = dataEntryStates.NRPFine;
                 break;
             
@@ -120,7 +147,7 @@ export function controllerChange(controllerNumber, controllerValue, force = fals
             
             // default: just compute modulators
             default:
-                this.voices.forEach(v => computeModulators(v, this.midiControllers, 1, controllerNumber));
+                this.voices.forEach(v => this.computeModulators(v, 1, controllerNumber));
                 break;
         }
     }

package/src/synthetizer/audio_engine/engine_methods/controller_control/reset_controllers.js

@@ -220,6 +220,7 @@ export function resetControllersRP15Compliant()
         }
     }
     this.resetGeneratorOverrides();
+    this.resetGeneratorOffsets();
 }
 
 /**
@@ -236,6 +237,7 @@ export function resetParameters()
     this.midiControllers[midiControllers.RPNLsb] = 127 << 7;
     this.midiControllers[midiControllers.RPNMsb] = 127 << 7;
     this.resetGeneratorOverrides();
+    this.resetGeneratorOffsets();
     SpessaSynthInfo(
         "%cResetting Registered and Non-Registered Parameters!",
         consoleColors.info

package/src/synthetizer/audio_engine/engine_methods/data_entry/data_entry_coarse.js

@@ -21,7 +21,8 @@ export const registeredParameterTypes = {
  */
 export const nonRegisteredMSB = {
     partParameter: 0x01,
-    awe32: 0x7F
+    awe32: 0x7F,
+    SF2: 120
 };
 
 /**
@@ -98,6 +99,7 @@ export function dataEntryCoarse(dataValue)
              * @type {number}
              */
             const NRPNFine = this.midiControllers[midiControllers.NRPNLsb] >> 7;
+            const dataEntryFine = this.midiControllers[midiControllers.lsbForControl6DataEntry] >> 7;
             switch (NRPNCoarse)
             {
                 default:
@@ -199,6 +201,20 @@ export function dataEntryCoarse(dataValue)
                 
                 case nonRegisteredMSB.awe32:
                     break;
+                
+                // SF2 NRPN
+                case nonRegisteredMSB.SF2:
+                    if (NRPNFine > 100)
+                    {
+                        // sfspec:
+                        // Note that NRPN Select LSB greater than 100 are for setup only, and should not be used on their own to select a
+                        // generator parameter.
+                        break;
+                    }
+                    const gen = this.customControllers[customControllers.sf2NPRNGeneratorLSB];
+                    const offset = (dataValue << 7 | dataEntryFine) - 8192;
+                    this.setGeneratorOffset(gen, offset);
+                    break;
             }
             break;
         

package/src/synthetizer/audio_engine/engine_methods/data_entry/data_entry_fine.js

@@ -76,6 +76,10 @@ export function dataEntryFine(dataValue)
              * @type {number}
              */
             const NRPNFine = this.midiControllers[midiControllers.NRPNLsb] >> 7;
+            if (NRPNCoarse === nonRegisteredMSB.SF2)
+            {
+                return;
+            }
             switch (NRPNCoarse)
             {
                 default:

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

@@ -1,4 +1,3 @@
-import { computeModulators } from "../engine_components/compute_modulator.js";
 import { generatorTypes } from "../../../soundfont/basic_soundfont/generator.js";
 import { midiControllers } from "../../../midi/midi_message.js";
 import { portamentoTimeToSeconds } from "./portamento_time.js";
@@ -159,7 +158,7 @@ export function noteOn(midiNote, velocity)
             });
         }
         // compute all modulators
-        computeModulators(voice, this.midiControllers);
+        this.computeModulators(voice);
         // modulate sample offsets (these are not real time)
         const cursorStartOffset = voice.modulatedGenerators[generatorTypes.startAddrsOffset] + voice.modulatedGenerators[generatorTypes.startAddrsCoarseOffset] * 32768;
         const endOffset = voice.modulatedGenerators[generatorTypes.endAddrOffset] + voice.modulatedGenerators[generatorTypes.endAddrsCoarseOffset] * 32768;

package/src/synthetizer/audio_engine/engine_methods/tuning_control/channel_pressure.js

@@ -1,6 +1,5 @@
 import { NON_CC_INDEX_OFFSET } from "../../engine_components/controller_tables.js";
 import { modulatorSources } from "../../../../soundfont/basic_soundfont/modulator.js";
-import { computeModulators } from "../../engine_components/compute_modulator.js";
 
 /**
  * Sets the pressure of the given channel
@@ -12,9 +11,8 @@ export function channelPressure(pressure)
     this.midiControllers[NON_CC_INDEX_OFFSET + modulatorSources.channelPressure] = pressure << 7;
     this.updateChannelTuning();
     this.voices.forEach(v =>
-        computeModulators(
+        this.computeModulators(
             v,
-            this.midiControllers,
             0,
             modulatorSources.channelPressure
         ));

package/src/synthetizer/audio_engine/engine_methods/tuning_control/pitch_wheel.js

@@ -1,6 +1,5 @@
 import { NON_CC_INDEX_OFFSET } from "../../engine_components/controller_tables.js";
 import { modulatorSources } from "../../../../soundfont/basic_soundfont/modulator.js";
-import { computeModulators } from "../../engine_components/compute_modulator.js";
 
 /**
  * Sets the pitch of the given channel
@@ -23,9 +22,8 @@ export function pitchWheel(MSB, LSB)
     this.midiControllers[NON_CC_INDEX_OFFSET + modulatorSources.pitchWheel] = bend;
     this.voices.forEach(v =>
         // compute pitch modulators
-        computeModulators(
+        this.computeModulators(
             v,
-            this.midiControllers,
             0,
             modulatorSources.pitchWheel
         ));

package/src/synthetizer/audio_engine/engine_methods/tuning_control/poly_pressure.js

@@ -1,4 +1,3 @@
-import { computeModulators } from "../../engine_components/compute_modulator.js";
 import { modulatorSources } from "../../../../soundfont/basic_soundfont/modulator.js";
 
 /**
@@ -16,9 +15,8 @@ export function polyPressure(midiNote, pressure)
             return;
         }
         v.pressure = pressure;
-        computeModulators(
+        this.computeModulators(
             v,
-            this.midiControllers,
             0,
             modulatorSources.polyPressure
         );

package/src/utils/byte_functions/string.js

@@ -51,30 +51,21 @@ export function readBytesAsString(dataArray, bytes, encoding = undefined, trimEn
 
 /**
  * @param string {string}
- * @param padLength {number}
+ * @param addZero {boolean} adds a zero terminator at the end
  * @returns {IndexedByteArray}
  */
-export function getStringBytes(string, padLength = 0)
+export function getStringBytes(string, addZero = false)
 {
     let len = string.length;
-    if (padLength > 0)
+    if (addZero)
     {
-        len = padLength;
+        len = len + 1;
     }
     const arr = new IndexedByteArray(len);
-    writeStringAsBytes(arr, string, padLength);
+    writeStringAsBytes(arr, string);
     return arr;
 }
 
-/**
- * @param string {string}
- * @returns {IndexedByteArray}
- */
-export function getStringBytesZero(string)
-{
-    return getStringBytes(string, string.length + 1);
-}
-
 /**
  * @param string {string}
  * @param outArray {IndexedByteArray}