spessasynth_lib 3.16.4 → 3.16.5

package/@types/midi_parser/rmidi_writer.d.ts

@@ -19,9 +19,10 @@
  * @param bankOffset {number} the bank offset for RMIDI
  * @param encoding {string} the encoding of the RMIDI info chunk
  * @param metadata {RMIDMetadata} the metadata of the file. Optional. If provided, the encoding is forced to utf-8/
+ * @param correctBankOffset {boolean}
  * @returns {IndexedByteArray}
  */
-export function writeRMIDI(soundfontBinary: Uint8Array, mid: MIDI, soundfont: SoundFont2, bankOffset?: number, encoding?: string, metadata?: RMIDMetadata): IndexedByteArray;
+export function writeRMIDI(soundfontBinary: Uint8Array, mid: MIDI, soundfont: SoundFont2, bankOffset?: number, encoding?: string, metadata?: RMIDMetadata, correctBankOffset?: boolean): IndexedByteArray;
 export type RMIDINFOChunks = string;
 export namespace RMIDINFOChunks {
     let name: string;

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

@@ -53,10 +53,11 @@ export class BasicSoundFont {
     /**
      * Get the appropriate preset, undefined if not foun d
      * @param bankNr {number}
-     * @param presetNr {number}
+     * @param programNr {number}
+     * @param fallbackToProgram {boolean} if true, if no exact match is found, will use any bank with the given preset
      * @return {BasicPreset}
      */
-    getPresetNoFallback(bankNr: number, presetNr: number): BasicPreset;
+    getPresetNoFallback(bankNr: number, programNr: number, fallbackToProgram?: boolean): BasicPreset;
     /**
      * To avoid overlapping on multiple desfonts
      * @param offset {number}
@@ -65,10 +66,10 @@ export class BasicSoundFont {
     /**
      * Get the appropriate preset
      * @param bankNr {number}
-     * @param presetNr {number}
+     * @param programNr {number}
      * @returns {BasicPreset}
      */
-    getPreset(bankNr: number, presetNr: number): BasicPreset;
+    getPreset(bankNr: number, programNr: number): BasicPreset;
     /**
      * gets preset by name
      * @param presetName {string}

package/@types/synthetizer/worklet_system/worklet_utilities/worklet_processor_channel.d.ts

@@ -14,7 +14,7 @@
  * @property {number} NRPFine - the current fine value of the Non-Registered Parameter
  * @property {number} RPValue - the current value of the Registered Parameter
  *
- * @property {Preset} preset - the channel's preset
+ * @property {BasicPreset} preset - the channel's preset
  * @property {boolean} lockPreset - indicates whether the program on the channel is locked
  * @property {boolean} presetUsesOverride - indcates if the channel uses a preset from the override soundfont.
  *
@@ -104,7 +104,7 @@ export type WorkletProcessorChannel = {
     /**
      * - the channel's preset
      */
-    preset: Preset;
+    preset: BasicPreset;
     /**
      * - indicates whether the program on the channel is locked
      */

package/midi_parser/midi_loader.js

@@ -117,6 +117,15 @@ class MIDI{
                             this.midiName = readBytesAsString(this.rawMidiName, this.rawMidiName.length, undefined, false);
                             nameDetected = true;
                         }
+                        // these can be used interchangeably
+                        if(this.RMIDInfo['IALB'] && !this.RMIDInfo['IPRD'])
+                        {
+                            this.RMIDInfo['IPRD'] = this.RMIDInfo['IALB'];
+                        }
+                        if(this.RMIDInfo['PRD'] && !this.RMIDInfo['IALB'])
+                        {
+                            this.RMIDInfo['IALB'] = this.RMIDInfo['IPRD'];
+                        }
                         this.bankOffset = 1; // defaults to 1
                         if(this.RMIDInfo[RMIDINFOChunks.bankOffset])
                         {

package/midi_parser/rmidi_writer.js

@@ -52,9 +52,18 @@ const DEFAULT_COPYRIGHT = "Created using SpessaSynth";
  * @param bankOffset {number} the bank offset for RMIDI
  * @param encoding {string} the encoding of the RMIDI info chunk
  * @param metadata {RMIDMetadata} the metadata of the file. Optional. If provided, the encoding is forced to utf-8/
+ * @param correctBankOffset {boolean}
  * @returns {IndexedByteArray}
  */
-export function writeRMIDI(soundfontBinary, mid, soundfont, bankOffset = 0, encoding = "Shift_JIS", metadata = {})
+export function writeRMIDI(
+    soundfontBinary,
+    mid,
+    soundfont,
+    bankOffset = 0,
+    encoding = "Shift_JIS",
+    metadata = {},
+    correctBankOffset = true
+)
 {
     SpessaSynthGroup("%cWriting the RMIDI File...", consoleColors.info);
     SpessaSynthInfo(`%cConfiguration: Bank offset: %c${bankOffset}%c, encoding: %c${encoding}`,
@@ -64,271 +73,243 @@ export function writeRMIDI(soundfontBinary, mid, soundfont, bankOffset = 0, enco
         consoleColors.value);
     SpessaSynthInfo("metadata", metadata);
     SpessaSynthInfo("Initial bank offset", mid.bankOffset);
-    // add offset to bank. See https://github.com/spessasus/sf2-rmidi-specification#readme
-    // also fix presets that don't exists since midiplayer6 doesn't seem to default to 0 when nonextistent...
-    let system = "gm";
-    /**
-     * The unwanted system messages such as gm/gm2 on
-     * @type {{tNum: number, e: MidiMessage}[]}
-     */
-    let unwantedSystems = [];
-    /**
-     * indexes for tracks
-     * @type {number[]}
-     */
-    const eventIndexes = Array(mid.tracks.length).fill(0);
-    let remainingTracks = mid.tracks.length;
-    function findFirstEventIndex()
-    {
-        let index = 0;
-        let ticks = Infinity;
-        mid.tracks.forEach((track, i) => {
-            if(eventIndexes[i] >= track.length)
-            {
-                return;
-            }
-            if(track[eventIndexes[i]].ticks < ticks)
-            {
-                index = i;
-                ticks = track[eventIndexes[i]].ticks;
-            }
-        });
-        return index;
-    }
-    // it copies midiPorts everywhere else, but here 0 works so DO NOT CHANGE!!!!!!!
-    const ports = Array(mid.tracks.length).fill(0);
-    const channelsAmount = 16 + mid.midiPortChannelOffsets.reduce((max, cur) => cur > max ? cur: max);
-    /**
-     * @type {{
-     *     program: number,
-     *     drums: boolean,
-     *     lastBank: MidiMessage,
-     *     hasBankSelect: boolean
-     * }[]}
-     */
-    const channelsInfo = [];
-    for (let i = 0; i < channelsAmount; i++)
+    if(correctBankOffset)
     {
-        channelsInfo.push({
-            program: 0,
-            drums: i % 16 === DEFAULT_PERCUSSION, // drums appear on 9 every 16 channels,
-            lastBank: undefined,
-            hasBankSelect: false,
-        });
-    }
-    while(remainingTracks > 0)
-    {
-        let trackNum = findFirstEventIndex();
-        const track = mid.tracks[trackNum];
-        if(eventIndexes[trackNum] >= track.length)
-        {
-            remainingTracks--;
-            continue;
-        }
-        const e = track[eventIndexes[trackNum]];
-        eventIndexes[trackNum]++;
+        // add offset to bank.
+        // See https://github.com/spessasus/sf2-rmidi-specification#readme
+        // also fix presets that don't exists
+        // since midiplayer6 doesn't seem to default to 0 when nonextistent...
+        let system = "gm";
+        /**
+         * The unwanted system messages such as gm/gm2 on
+         * @type {{tNum: number, e: MidiMessage}[]}
+         */
+        let unwantedSystems = [];
+        /**
+         * indexes for tracks
+         * @type {number[]}
+         */
+        const eventIndexes = Array(mid.tracks.length).fill(0);
+        let remainingTracks = mid.tracks.length;
 
-        let portOffset = mid.midiPortChannelOffsets[ports[trackNum]];
-        if(e.messageStatusByte === messageTypes.midiPort)
-        {
-            ports[trackNum] = e.messageData[0];
-            continue;
+        function findFirstEventIndex() {
+            let index = 0;
+            let ticks = Infinity;
+            mid.tracks.forEach((track, i) => {
+                if (eventIndexes[i] >= track.length) {
+                    return;
+                }
+                if (track[eventIndexes[i]].ticks < ticks) {
+                    index = i;
+                    ticks = track[eventIndexes[i]].ticks;
+                }
+            });
+            return index;
         }
-        const status = e.messageStatusByte & 0xF0;
-        if(
-            status !== messageTypes.controllerChange &&
-            status !== messageTypes.programChange &&
-            status !== messageTypes.systemExclusive
-        )
-        {
-            continue
+
+        // it copies midiPorts everywhere else, but here 0 works so DO NOT CHANGE!!!!!!!
+        const ports = Array(mid.tracks.length).fill(0);
+        const channelsAmount = 16 + mid.midiPortChannelOffsets.reduce((max, cur) => cur > max ? cur : max);
+        /**
+         * @type {{
+         *     program: number,
+         *     drums: boolean,
+         *     lastBank: MidiMessage,
+         *     hasBankSelect: boolean
+         * }[]}
+         */
+        const channelsInfo = [];
+        for (let i = 0; i < channelsAmount; i++) {
+            channelsInfo.push({
+                program: 0,
+                drums: i % 16 === DEFAULT_PERCUSSION, // drums appear on 9 every 16 channels,
+                lastBank: undefined,
+                hasBankSelect: false,
+            });
         }
+        while (remainingTracks > 0) {
+            let trackNum = findFirstEventIndex();
+            const track = mid.tracks[trackNum];
+            if (eventIndexes[trackNum] >= track.length) {
+                remainingTracks--;
+                continue;
+            }
+            const e = track[eventIndexes[trackNum]];
+            eventIndexes[trackNum]++;
 
-        if(status === messageTypes.systemExclusive)
-        {
-            // check for drum sysex
-            if(
-                e.messageData[0] !== 0x41 || // roland
-                e.messageData[2] !== 0x42 || // GS
-                e.messageData[3] !== 0x12 || // GS
-                e.messageData[4] !== 0x40 || // system parameter
-                (e.messageData[5] & 0x10 ) === 0 || // part parameter
-                e.messageData[6] !== 0x15 // drum part
-            )
-            {
-                // check for XG
-                if(
-                    e.messageData[0] === 0x43 && // yamaha
-                    e.messageData[2] === 0x4C && // sXG ON
-                    e.messageData[5] === 0x7E &&
-                    e.messageData[6] === 0x00
-                )
-                {
-                    system = "xg";
-                }
-                else
-                if(
-                    e.messageData[0] === 0x41    // roland
-                    && e.messageData[2] === 0x42 // GS
-                    && e.messageData[6] === 0x7F // Mode set
-                )
-                {
-                    system = "gs";
-                }
-                else
-                if(
-                    e.messageData[0] === 0x7E // non realtime
-                    && e.messageData[2] === 0x09 // gm system
-                )
-                {
-                    system = "gm";
-                    unwantedSystems.push({
-                        tNum: trackNum,
-                        e: e
-                    });
-                }
+            let portOffset = mid.midiPortChannelOffsets[ports[trackNum]];
+            if (e.messageStatusByte === messageTypes.midiPort) {
+                ports[trackNum] = e.messageData[0];
                 continue;
             }
-            const sysexChannel = [9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 12, 13, 14, 15][e.messageData[5] & 0x0F] + portOffset;
-            channelsInfo[sysexChannel].drums = !!(e.messageData[7] > 0 && e.messageData[5] >> 4);
-            continue;
-        }
+            const status = e.messageStatusByte & 0xF0;
+            if (
+                status !== messageTypes.controllerChange &&
+                status !== messageTypes.programChange &&
+                status !== messageTypes.systemExclusive
+            ) {
+                continue
+            }
 
-        // program change
-        const chNum = (e.messageStatusByte & 0xF) + portOffset;
-        const channel = channelsInfo[chNum];
-        if(status === messageTypes.programChange)
-        {
-            // check if the preset for this program exists
-            if(channel.drums)
-            {
-                if(soundfont.presets.findIndex(p => p.program === e.messageData[0] && p.bank === 128) === -1)
-                {
-                    // doesn't exist. pick any preset that has the 128 bank.
-                    e.messageData[0] = soundfont.presets.find(p => p.bank === 128)?.program || 0;
+            if (status === messageTypes.systemExclusive) {
+                // check for drum sysex
+                if (
+                    e.messageData[0] !== 0x41 || // roland
+                    e.messageData[2] !== 0x42 || // GS
+                    e.messageData[3] !== 0x12 || // GS
+                    e.messageData[4] !== 0x40 || // system parameter
+                    (e.messageData[5] & 0x10) === 0 || // part parameter
+                    e.messageData[6] !== 0x15 // drum part
+                ) {
+                    // check for XG
+                    if (
+                        e.messageData[0] === 0x43 && // yamaha
+                        e.messageData[2] === 0x4C && // sXG ON
+                        e.messageData[5] === 0x7E &&
+                        e.messageData[6] === 0x00
+                    ) {
+                        system = "xg";
+                    } else if (
+                        e.messageData[0] === 0x41    // roland
+                        && e.messageData[2] === 0x42 // GS
+                        && e.messageData[6] === 0x7F // Mode set
+                    ) {
+                        system = "gs";
+                    } else if (
+                        e.messageData[0] === 0x7E // non realtime
+                        && e.messageData[2] === 0x09 // gm system
+                    ) {
+                        system = "gm";
+                        unwantedSystems.push({
+                            tNum: trackNum,
+                            e: e
+                        });
+                    }
+                    continue;
                 }
+                const sysexChannel = [9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 12, 13, 14, 15][e.messageData[5] & 0x0F] + portOffset;
+                channelsInfo[sysexChannel].drums = !!(e.messageData[7] > 0 && e.messageData[5] >> 4);
+                continue;
             }
-            else
-            {
-                if (soundfont.presets.findIndex(p => p.program === e.messageData[0] && p.bank !== 128) === -1)
-                {
-                    // doesn't exist. pick any preset that does not have the 128 bank.
-                    e.messageData[0] = soundfont.presets.find(p => p.bank !== 128)?.program || 0;
+
+            // program change
+            const chNum = (e.messageStatusByte & 0xF) + portOffset;
+            const channel = channelsInfo[chNum];
+            if (status === messageTypes.programChange) {
+                // check if the preset for this program exists
+                if (channel.drums) {
+                    if (soundfont.presets.findIndex(p => p.program === e.messageData[0] && p.bank === 128) === -1) {
+                        // doesn't exist. pick any preset that has the 128 bank.
+                        e.messageData[0] = soundfont.presets.find(p => p.bank === 128)?.program || 0;
+                    }
+                } else {
+                    if (soundfont.presets.findIndex(p => p.program === e.messageData[0] && p.bank !== 128) === -1) {
+                        // doesn't exist. pick any preset that does not have the 128 bank.
+                        e.messageData[0] = soundfont.presets.find(p => p.bank !== 128)?.program || 0;
+                    }
+                }
+                channel.program = e.messageData[0];
+                // check if this preset exists for program and bank
+                const realBank = Math.max(0, channel.lastBank?.messageData[1] - mid.bankOffset); // make sure to take the previous bank offset into account
+                const bank = channel.drums ? 128 : realBank;
+                if (channel.lastBank === undefined) {
+                    continue;
+                }
+                if (system === "xg" && channel.drums) {
+                    // drums override: set bank to 127
+                    channelsInfo[chNum].lastBank.messageData[1] = 127;
+                }
+
+                if (soundfont.presets.findIndex(p => p.bank === bank && p.program === e.messageData[0]) === -1) {
+                    // no preset with this bank. find this program with any bank
+                    const targetBank = (soundfont.presets.find(p => p.program === e.messageData[0])?.bank + bankOffset) || bankOffset;
+                    channel.lastBank.messageData[1] = targetBank;
+                    SpessaSynthInfo(`%cNo preset %c${bank}:${e.messageData[0]}%c. Changing bank to ${targetBank}.`,
+                        consoleColors.info,
+                        consoleColors.recognized,
+                        consoleColors.info);
+                } else {
+                    // there is a preset with this bank. add offset. For drums add the normal offset.
+                    const newBank = (bank === 128 ? 0 : realBank) + bankOffset;
+                    channel.lastBank.messageData[1] = newBank;
+                    SpessaSynthInfo(`%cPreset %c${bank}:${e.messageData[0]}%c exists. Changing bank to ${newBank}.`,
+                        consoleColors.info,
+                        consoleColors.recognized,
+                        consoleColors.info);
                 }
-            }
-            channel.program = e.messageData[0];
-            // check if this preset exists for program and bank
-            const realBank = Math.max(0,channel.lastBank?.messageData[1] - mid.bankOffset); // make sure to take the previous bank offset into account
-            const bank = channel.drums ? 128 : realBank;
-            if(channel.lastBank === undefined)
-            {
                 continue;
             }
-            if(system === "xg" && channel.drums)
-            {
-                // drums override: set bank to 127
-                channelsInfo[chNum].lastBank.messageData[1] = 127;
-            }
-
-            if(soundfont.presets.findIndex(p => p.bank === bank && p.program === e.messageData[0]) === -1)
-            {
-                // no preset with this bank. find this program with any bank
-                const targetBank = (soundfont.presets.find(p => p.program === e.messageData[0])?.bank + bankOffset) || bankOffset;
-                channel.lastBank.messageData[1] = targetBank;
-                SpessaSynthInfo(`%cNo preset %c${bank}:${e.messageData[0]}%c. Changing bank to ${targetBank}.`,
-                    consoleColors.info,
-                    consoleColors.recognized,
-                    consoleColors.info);
+            // we only care about bank select
+            if (e.messageData[0] !== midiControllers.bankSelect) {
+                continue;
             }
-            else
-            {
-                // there is a preset with this bank. add offset. For drums add the normal offset.
-                const newBank = (bank === 128 ? 0 : realBank) + bankOffset;
-                channel.lastBank.messageData[1] = newBank;
-                SpessaSynthInfo(`%cPreset %c${bank}:${e.messageData[0]}%c exists. Changing bank to ${newBank}.`,
-                    consoleColors.info,
-                    consoleColors.recognized,
-                    consoleColors.info);
+            // bank select
+            channel.hasBankSelect = true;
+            if (system === "xg") {
+                // check for xg drums
+                channel.drums = e.messageData[1] === 120 || e.messageData[1] === 126 || e.messageData[1] === 127;
             }
-            continue;
+            channel.lastBank = e;
         }
-        // we only care about bank select
-        if(e.messageData[0] !== midiControllers.bankSelect)
-        {
-            continue;
-        }
-        // bank select
-        channel.hasBankSelect = true;
-        if(system === "xg")
-        {
-            // check for xg drums
-            channel.drums = e.messageData[1] === 120 || e.messageData[1] === 126 || e.messageData[1] === 127;
-        }
-        channel.lastBank = e;
-    }
 
-    // add missing bank selects
-    // add all bank selects that are missing for this track
-    channelsInfo.forEach((has, ch) => {
-        if(has.hasBankSelect === true)
-        {
-            return;
-        }
-        // find first program change (for the given channel)
-        const midiChannel = ch % 16;
-        const status = messageTypes.programChange | midiChannel;
-        // find track with this channel being used
-        const portOffset = Math.floor(ch / 16) * 16;
-        const port = mid.midiPortChannelOffsets.indexOf(portOffset);
-        const track = mid.tracks.find((t, tNum) => mid.midiPorts[tNum] === port && mid.usedChannelsOnTrack[tNum].has(midiChannel));
-        if(track === undefined)
-        {
-            // this channel is not used at all
-            return;
-        }
-        let indexToAdd = track.findIndex(e => e.messageStatusByte === status);
-        if(indexToAdd === -1)
-        {
-            // no program change...
-            // add programs if they are missing from the track (need them to activate bank 1 for the embedded sfont)
-            const programIndex = track.findIndex(e => (e.messageStatusByte > 0x80 && e.messageStatusByte < 0xF0) && (e.messageStatusByte & 0xF) === midiChannel);
-            if(programIndex === -1)
-            {
-                // no voices??? skip
+        // add missing bank selects
+        // add all bank selects that are missing for this track
+        channelsInfo.forEach((has, ch) => {
+            if (has.hasBankSelect === true) {
+                return;
+            }
+            // find first program change (for the given channel)
+            const midiChannel = ch % 16;
+            const status = messageTypes.programChange | midiChannel;
+            // find track with this channel being used
+            const portOffset = Math.floor(ch / 16) * 16;
+            const port = mid.midiPortChannelOffsets.indexOf(portOffset);
+            const track = mid.tracks.find((t, tNum) => mid.midiPorts[tNum] === port && mid.usedChannelsOnTrack[tNum].has(midiChannel));
+            if (track === undefined) {
+                // this channel is not used at all
                 return;
             }
-            const programTicks = track[programIndex].ticks;
-            const targetProgram = soundfont.getPreset(0, 0).program;
-            track.splice(programIndex, 0, new MidiMessage(
-                programTicks,
-                messageTypes.programChange | midiChannel,
-                new IndexedByteArray([targetProgram])
+            let indexToAdd = track.findIndex(e => e.messageStatusByte === status);
+            if (indexToAdd === -1) {
+                // no program change...
+                // add programs if they are missing from the track
+                // (need them to activate bank 1 for the embedded sfont)
+                const programIndex = track.findIndex(e => (e.messageStatusByte > 0x80 && e.messageStatusByte < 0xF0) && (e.messageStatusByte & 0xF) === midiChannel);
+                if (programIndex === -1) {
+                    // no voices??? skip
+                    return;
+                }
+                const programTicks = track[programIndex].ticks;
+                const targetProgram = soundfont.getPreset(0, 0).program;
+                track.splice(programIndex, 0, new MidiMessage(
+                    programTicks,
+                    messageTypes.programChange | midiChannel,
+                    new IndexedByteArray([targetProgram])
+                ));
+                indexToAdd = programIndex;
+            }
+            SpessaSynthInfo(`%cAdding bank select for %c${ch}`,
+                consoleColors.info,
+                consoleColors.recognized)
+            const ticks = track[indexToAdd].ticks;
+            const targetBank = (soundfont.getPreset(0, has.program)?.bank + bankOffset) || bankOffset;
+            track.splice(indexToAdd, 0, new MidiMessage(
+                ticks,
+                messageTypes.controllerChange | midiChannel,
+                new IndexedByteArray([midiControllers.bankSelect, targetBank])
             ));
-            indexToAdd = programIndex;
-        }
-        SpessaSynthInfo(`%cAdding bank select for %c${ch}`,
-            consoleColors.info,
-            consoleColors.recognized)
-        const ticks = track[indexToAdd].ticks;
-        const targetBank = (soundfont.getPreset(0, has.program)?.bank + bankOffset) || bankOffset;
-        track.splice(indexToAdd,0, new MidiMessage(
-            ticks,
-            messageTypes.controllerChange | midiChannel,
-            new IndexedByteArray([midiControllers.bankSelect, targetBank])
-        ));
-    });
+        });
 
-    // make sure to put xg if gm
-    if(system !== "gs" && system !== "xg")
-    {
-        for(const m of unwantedSystems)
-        {
-            mid.tracks[m.tNum].splice(mid.tracks[m.tNum].indexOf(m.e), 1);
-        }
-        let index = 0;
-        if(mid.tracks[0][0].messageStatusByte === messageTypes.trackName)
-            index++;
+        // make sure to put xg if gm
+        if (system !== "gs" && system !== "xg") {
+            for (const m of unwantedSystems) {
+                mid.tracks[m.tNum].splice(mid.tracks[m.tNum].indexOf(m.e), 1);
+            }
+            let index = 0;
+            if (mid.tracks[0][0].messageStatusByte === messageTypes.trackName)
+                index++;
             mid.tracks[0].splice(index, 0, getGsOn(0));
+        }
     }
     const newMid = new IndexedByteArray(writeMIDIFile(mid).buffer);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spessasynth_lib",
-  "version": "3.16.4",
+  "version": "3.16.5",
   "description": "No compromise MIDI and SoundFont2 Synthesizer library",
   "browser": "index.js",
   "types": "@types/index.d.ts",