spessasynth_lib 3.25.2 → 3.25.4

package/midi_parser/midi_editor.js

@@ -5,8 +5,8 @@ import { consoleColors } from "../utils/other.js";
 
 import { customControllers } from "../synthetizer/worklet_system/worklet_utilities/controller_tables.js";
 import { DEFAULT_PERCUSSION } from "../synthetizer/synth_constants.js";
-import { isGMOn, isGSOn, isXGOn } from "../utils/sysex_detector.js";
-import { isXGDrums, XG_SFX_VOICE } from "../utils/xg_hacks.js";
+import { isGM2On, isGMOn, isGSOn, isXGOn } from "../utils/sysex_detector.js";
+import { isSystemXG, isXGDrums, XG_SFX_VOICE } from "../utils/xg_hacks.js";
 
 /**
  * @param ticks {number}
@@ -380,7 +380,7 @@ export function modifyMIDI(
                         };
                         
                         // on xg, add lsb
-                        if (system === "xg")
+                        if (isSystemXG(system))
                         {
                             // xg drums: msb can be 120, 126 or 127
                             if (change.isDrum)
@@ -504,9 +504,9 @@ export function modifyMIDI(
                 }
                 else
                     // check for GM/2 on
-                if (isGMOn(e))
+                if (isGMOn(e) || isGM2On(e))
                 {
-                    // that's a GM/2 system change, remove it!
+                    // that's a GM1 system change, remove it!
                     SpessaSynthInfo(
                         "%cGM/2 on detected, removing!",
                         consoleColors.info

package/midi_parser/rmidi_writer.js

@@ -7,8 +7,8 @@ import { SpessaSynthGroup, SpessaSynthGroupEnd, SpessaSynthInfo } from "../utils
 import { consoleColors } from "../utils/other.js";
 import { writeLittleEndian } from "../utils/byte_functions/little_endian.js";
 import { DEFAULT_PERCUSSION } from "../synthetizer/synth_constants.js";
-import { chooseBank, parseBankSelect } from "../utils/xg_hacks.js";
-import { isGMOn, isGSDrumsOn, isGSOn, isXGOn } from "../utils/sysex_detector.js";
+import { chooseBank, isSystemXG, parseBankSelect } from "../utils/xg_hacks.js";
+import { isGM2On, isGMOn, isGSDrumsOn, isGSOn, isXGOn } from "../utils/sysex_detector.js";
 
 /**
  * @enum {string}
@@ -183,12 +183,17 @@ export function writeRMIDI(
                     }
                     else if (isGMOn(e))
                     {
+                        // we do not want gm1
                         system = "gm";
                         unwantedSystems.push({
                             tNum: trackNum,
                             e: e
                         });
                     }
+                    else if (isGM2On(e))
+                    {
+                        system = "gm2";
+                    }
                     continue;
                 }
                 const sysexChannel = [9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 12, 13, 14, 15][e.messageData[5] & 0x0F] + portOffset;
@@ -204,7 +209,7 @@ export function writeRMIDI(
             const channel = channelsInfo[chNum];
             if (status === messageTypes.programChange)
             {
-                const isXG = system === "xg";
+                const isXG = isSystemXG(system);
                 // check if the preset for this program exists
                 const initialProgram = e.messageData[0];
                 if (channel.drums)
@@ -274,7 +279,7 @@ export function writeRMIDI(
                 {
                     // There is a preset with this bank. Add offset. For drums add the normal offset.
                     let drumBank = bank;
-                    if (system === "xg" && bank === 128)
+                    if (isSystemXG(system) && bank === 128)
                     {
                         bank = 127;
                     }
@@ -384,7 +389,7 @@ export function writeRMIDI(
             const targetBank = (soundfont.getPreset(
                 0,
                 has.program,
-                system === "xg"
+                isSystemXG(system)
             )?.bank + bankOffset) || bankOffset;
             track.splice(indexToAdd, 0, new MIDIMessage(
                 ticks,
@@ -394,7 +399,7 @@ export function writeRMIDI(
         });
         
         // make sure to put xg if gm
-        if (system !== "gs" && system !== "xg")
+        if (system !== "gs" && !isSystemXG(system))
         {
             for (const m of unwantedSystems)
             {

package/midi_parser/used_keys_loaded.js

@@ -2,7 +2,7 @@ import { SpessaSynthGroupCollapsed, SpessaSynthGroupEnd, SpessaSynthInfo } from
 import { consoleColors } from "../utils/other.js";
 import { messageTypes, midiControllers } from "./midi_message.js";
 import { DEFAULT_PERCUSSION } from "../synthetizer/synth_constants.js";
-import { chooseBank, parseBankSelect } from "../utils/xg_hacks.js";
+import { chooseBank, isSystemXG, parseBankSelect } from "../utils/xg_hacks.js";
 import { isGSDrumsOn, isXGOn } from "../utils/sysex_detector.js";
 
 /**
@@ -42,9 +42,9 @@ export function getUsedProgramsAndKeys(soundfont)
     
     function updateString(ch)
     {
-        const bank = chooseBank(ch.bank, ch.bankLSB, ch.drums, system === "xg");
+        const bank = chooseBank(ch.bank, ch.bankLSB, ch.drums, isSystemXG(system));
         // check if this exists in the soundfont
-        let exists = soundfont.getPreset(bank, ch.program, system === "xg");
+        let exists = soundfont.getPreset(bank, ch.program, isSystemXG(system));
         ch.actualBank = exists.bank;
         ch.program = exists.program;
         ch.string = ch.actualBank + ":" + ch.program;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spessasynth_lib",
-  "version": "3.25.2",
+  "version": "3.25.4",
   "description": "MIDI and SoundFont2/DLS library with no compromises",
   "browser": "index.js",
   "type": "module",

package/sequencer/sequencer.js

@@ -66,11 +66,17 @@ export class Sequencer
     onTextEvent;
     
     /**
-     * The sequence's data, except for the track data.
+     * The current MIDI data, with the exclusion of the embedded sound bank and event data.
      *  @type {MIDIData}
      */
     midiData;
     
+    /**
+     * The current MIDI data for all songs, like the midiData property.
+     * @type {MIDIData[]}
+     */
+    songListData = [];
+    
     /**
      * @type {Object<string, function(MIDIData)>}
      * @private
@@ -285,11 +291,11 @@ export class Sequencer
         this._shuffleSongs = value;
         if (value)
         {
-            this._sendMessage(WorkletSequencerMessageType.changeSong, SongChangeType.shuffleOn);
+            this._sendMessage(WorkletSequencerMessageType.changeSong, [SongChangeType.shuffleOn]);
         }
         else
         {
-            this._sendMessage(WorkletSequencerMessageType.changeSong, SongChangeType.shuffleOff);
+            this._sendMessage(WorkletSequencerMessageType.changeSong, [SongChangeType.shuffleOff]);
         }
     }
     
@@ -476,14 +482,30 @@ export class Sequencer
         });
     }
     
+    /**
+     * Switch to the next song in the playlist
+     */
     nextSong()
     {
-        this._sendMessage(WorkletSequencerMessageType.changeSong, SongChangeType.forwards);
+        this._sendMessage(WorkletSequencerMessageType.changeSong, [SongChangeType.forwards]);
     }
     
+    /**
+     * Switch to the previous song in the playlist
+     */
     previousSong()
     {
-        this._sendMessage(WorkletSequencerMessageType.changeSong, SongChangeType.backwards);
+        this._sendMessage(WorkletSequencerMessageType.changeSong, [SongChangeType.backwards]);
+    }
+    
+    /**
+     * Sets the song index in the playlist
+     * @param index
+     */
+    setSongIndex(index)
+    {
+        const clamped = Math.max(Math.min(this.songsAmount - 1, index), 0);
+        this._sendMessage(WorkletSequencerMessageType.changeSong, [SongChangeType.index, clamped]);
     }
     
     /**
@@ -536,19 +558,15 @@ export class Sequencer
                 break;
             
             case WorkletSequencerReturnMessageType.songChange:
-                /**
-                 * messageData is expected to be {MIDIData}
-                 * @type {MIDIData}
-                 */
-                let songChangeData = messageData[0];
-                this.songIndex = messageData[1];
+                this.songIndex = messageData[0];
+                const songChangeData = this.songListData[this.songIndex];
                 this.midiData = songChangeData;
                 this.hasDummyData = false;
                 this.absoluteStartTime = 0;
                 this.duration = this.midiData.duration;
                 this._callEvents(this.onSongChange, songChangeData);
                 // if is auto played, unpause
-                if (messageData[2] === true)
+                if (messageData[1] === true)
                 {
                     this.unpause();
                 }
@@ -626,6 +644,10 @@ export class Sequencer
                 }
                 break;
             
+            case WorkletSequencerReturnMessageType.songListChange:
+                this.songListData = messageData;
+                break;
+            
             default:
                 break;
         }

package/sequencer/worklet_sequencer/events.js

@@ -61,7 +61,7 @@ export function processMessage(messageType, messageData)
             break;
         
         case WorkletSequencerMessageType.changeSong:
-            switch (messageData)
+            switch (messageData[0])
             {
                 case SongChangeType.forwards:
                     this.nextSong();
@@ -81,6 +81,12 @@ export function processMessage(messageType, messageData)
                     this.shuffleSongIndexes();
                     this.songIndex = 0;
                     this.loadCurrentSong();
+                    break;
+                
+                case SongChangeType.index:
+                    this.songIndex = messageData[1];
+                    this.loadCurrentSong();
+                    break;
             }
             break;
         

package/sequencer/worklet_sequencer/sequencer_message.js

@@ -1,8 +1,9 @@
 export const SongChangeType = {
-    backwards: 0,
-    forwards: 1,
-    shuffleOn: 2,
-    shuffleOff: 3
+    backwards: 0,   // no additional data
+    forwards: 1,    // no additional data
+    shuffleOn: 2,   // no additional data
+    shuffleOff: 3,  // no additional data
+    index: 4        // songIndex<number>
 };
 
 /**
@@ -14,8 +15,8 @@ export const SongChangeType = {
  * @property {number} setTime                  - 4 -> time<number>
  * @property {number} changeMIDIMessageSending - 5 -> sendMIDIMessages<boolean>
  * @property {number} setPlaybackRate          - 6 -> playbackRate<number>
- * @property {number} setLoop                  - 7 -> [loop<boolean>, count<number]
- * @property {number} changeSong               - 8 -> changeType<number> 0 - back, 1 - forward, 2 - shuffle ON, 3 - shuffle OFF
+ * @property {number} setLoop                  - 7 -> [loop<boolean>, count<number>]
+ * @property {number} changeSong               - 8 -> [changeType<SongChangeType>, data<number>]
  * @property {number} getMIDI                  - 9 -> (no data)
  * @property {number} setSkipToFirstNote       -10 -> skipToFirstNoteOn<boolean>
  * @property {number} setPreservePlaybackState -11 -> preservePlaybackState<boolean>
@@ -41,12 +42,13 @@ export const WorkletSequencerMessageType = {
  */
 export const WorkletSequencerReturnMessageType = {
     midiEvent: 0,               // [...midiEventBytes<number>]
-    songChange: 1,              // [midiData<MIDIData>, songIndex<number>, isAutoPlayed<boolean>]
+    songChange: 1,              // [songIndex<number>, isAutoPlayed<boolean>]
     textEvent: 2,               // [messageData<number[]>, statusByte<number>, lyricsIndex<number>]
     timeChange: 3,              // newAbsoluteTime<number>
     pause: 4,                   // no data
     getMIDI: 5,                 // midiData<MIDI>
     midiError: 6,               // errorMSG<string>
     metaEvent: 7,               // [messageType<number>, messageData<Uint8Array>, trackNum<number>]
-    loopCountChange: 8          // newLoopCount<number>
+    loopCountChange: 8,         // newLoopCount<number>
+    songListChange: 9          // songListData<MIDIData[]>
 };

package/sequencer/worklet_sequencer/song_control.js

@@ -127,7 +127,7 @@ export function loadNewSequence(parsedMidi, autoPlay = true)
     this.firstNoteTime = this.midiData.MIDIticksToSeconds(this.midiData.firstNoteOn);
     SpessaSynthInfo(`%cTotal song time: ${formatTime(Math.ceil(this.duration)).time}`, consoleColors.recognized);
     
-    this.post(WorkletSequencerReturnMessageType.songChange, [new MIDIData(this.midiData), this.songIndex, autoPlay]);
+    this.post(WorkletSequencerReturnMessageType.songChange, [this.songIndex, autoPlay]);
     
     if (this.duration <= 1)
     {
@@ -190,6 +190,8 @@ export function loadNewSongList(midiBuffers, autoPlay = true)
         this.loop = false;
     }
     this.shuffleSongIndexes();
+    const midiDatas = this.songs.map(s => new MIDIData(s));
+    this.post(WorkletSequencerReturnMessageType.songListChange, midiDatas);
     this.loadCurrentSong(autoPlay);
 }