spessasynth_lib 3.25.7 → 3.25.9

package/midi_parser/README.md

@@ -1,4 +1,32 @@
 ## This is the MIDI file parsing folder.
 
 The code here is responsible for parsing the MIDI files and interpreting the messsages.
-All the events are defined in the `midi_message.js` file.
+All the events are defined in the `midi_message.js` file.
+
+### MIDI Classes hierarchy
+
+#### MIDI Sequence
+- The most basic class, containing all the metadata that inheritors have.
+- It does not contain track data or embedded sound bank.
+- Contains the function for calculating time from ticks.
+- Contains the copying code.
+
+#### MIDI Data
+- Inherits from MIDI Sequence.
+- Has an `isEmbedded` property to mark the existence of embedded bank. This is the class that is available in `sequencer.midiData`.
+
+#### Basic MIDI
+- Inherits from MIDI Sequence.
+- The actual MIDI representation, containing the track data and embedded sound banks.
+- Contains the code for parsing the MIDI and filling in the metadata automatically.
+- Contains the SMF/RMI writing functions.
+- Contains the code for determining used channels on tracks.
+
+#### MIDI Builder
+- Inherits from Basic MIDI.
+- Used for building MIDIs from scratch.
+
+### MIDI
+- Inherits from Basic MIDI.
+- The SMF/RMI/XMF file parser.
+- Called by the sequencer if an `ArrayBuffer` is provided.

package/midi_parser/basic_midi.js

@@ -44,38 +44,10 @@ class BasicMIDI extends MIDISequenceData
     static copyFrom(mid)
     {
         const m = new BasicMIDI();
+        m._copyFromSequence(mid);
         
-        m.midiName = mid.midiName;
-        m.midiNameUsesFileName = mid.midiNameUsesFileName;
-        m.fileName = mid.fileName;
-        m.timeDivision = mid.timeDivision;
-        m.duration = mid.duration;
-        m.copyright = mid.copyright;
-        m.tracksAmount = mid.tracksAmount;
-        m.firstNoteOn = mid.firstNoteOn;
-        m.keyRange = { ...mid.keyRange }; // Deep copy of keyRange
-        m.lastVoiceEventTick = mid.lastVoiceEventTick;
-        m.loop = { ...mid.loop }; // Deep copy of loop
-        m.format = mid.format;
-        m.bankOffset = mid.bankOffset;
-        m.isKaraokeFile = mid.isKaraokeFile;
-        m.isMultiPort = mid.isMultiPort;
         m.isDLSRMIDI = mid.isDLSRMIDI;
-        
-        // Copying arrays
-        m.tempoChanges = [...mid.tempoChanges]; // Shallow copy
-        m.lyrics = mid.lyrics.map(arr => new Uint8Array(arr)); // Deep copy of each binary chunk
-        m.lyricsTicks = [...mid.lyricsTicks]; // Shallow copy
-        m.midiPorts = [...mid.midiPorts]; // Shallow copy
-        m.midiPortChannelOffsets = [...mid.midiPortChannelOffsets]; // Shallow copy
-        m.usedChannelsOnTrack = mid.usedChannelsOnTrack.map(set => new Set(set)); // Deep copy
-        m.rawMidiName = mid.rawMidiName ? new Uint8Array(mid.rawMidiName) : undefined; // Deep copy
         m.embeddedSoundFont = mid.embeddedSoundFont ? mid.embeddedSoundFont.slice(0) : undefined; // Deep copy
-        
-        // Copying RMID Info object (deep copy)
-        m.RMIDInfo = { ...mid.RMIDInfo };
-        
-        // Copying track data (deep copy of each track)
         m.tracks = mid.tracks.map(track => [...track]); // Shallow copy of each track array
         
         return m;
@@ -310,21 +282,27 @@ class BasicMIDI extends MIDISequenceData
                             }
                         }
                         break;
+                    
+                    case messageTypes.trackName:
+                        break;
                 }
             }
             // add used channels
             this.usedChannelsOnTrack.push(usedChannels);
             
-            // If the track has no voice messages, its "track name" event (if it has any)
-            // is some metadata.
-            // Add it to copyright
-            if (!trackHasVoiceMessages)
+            // track name
+            this.trackNames[i] = "";
+            const trackName = track.find(e => e.messageStatusByte === messageTypes.trackName);
+            if (trackName)
             {
-                const trackName = track.find(e => e.messageStatusByte === messageTypes.trackName);
-                if (trackName)
+                trackName.messageData.currentIndex = 0;
+                const name = readBytesAsString(trackName.messageData, trackName.messageData.length);
+                this.trackNames[i] = name;
+                // If the track has no voice messages, its "track name" event (if it has any)
+                // is some metadata.
+                // Add it to copyright
+                if (!trackHasVoiceMessages)
                 {
-                    trackName.messageData.currentIndex = 0;
-                    const name = readBytesAsString(trackName.messageData, trackName.messageData.length);
                     copyrightComponents.push(name);
                 }
             }

package/midi_parser/midi_data.js

@@ -22,29 +22,7 @@ export class MIDIData extends MIDISequenceData
     constructor(midi)
     {
         super();
-        this.timeDivision = midi.timeDivision;
-        this.duration = midi.duration;
-        this.tempoChanges = midi.tempoChanges;
-        this.copyright = midi.copyright;
-        this.tracksAmount = midi.tracksAmount;
-        this.lyrics = midi.lyrics;
-        this.lyricsTicks = midi.lyricsTicks;
-        this.firstNoteOn = midi.firstNoteOn;
-        this.keyRange = midi.keyRange;
-        this.lastVoiceEventTick = midi.lastVoiceEventTick;
-        this.midiPorts = midi.midiPorts;
-        this.midiPortChannelOffsets = midi.midiPortChannelOffsets;
-        this.usedChannelsOnTrack = midi.usedChannelsOnTrack;
-        this.loop = midi.loop;
-        this.midiName = midi.midiName;
-        this.midiNameUsesFileName = midi.midiNameUsesFileName;
-        this.fileName = midi.fileName;
-        this.rawMidiName = midi.rawMidiName;
-        this.format = midi.format;
-        this.RMIDInfo = midi.RMIDInfo;
-        this.bankOffset = midi.bankOffset;
-        this.isKaraokeFile = midi.isKaraokeFile;
-        this.isMultiPort = midi.isMultiPort;
+        this._copyFromSequence(midi);
         
         // Set isEmbedded based on the presence of an embeddedSoundFont
         this.isEmbedded = midi.embeddedSoundFont !== undefined;

package/midi_parser/midi_loader.js

@@ -155,7 +155,7 @@ class MIDI extends BasicMIDI
         {
             fileByteArray = binaryData;
         }
-        const headerChunk = this.readMIDIChunk(fileByteArray);
+        const headerChunk = this._readMIDIChunk(fileByteArray);
         if (headerChunk.type !== "MThd")
         {
             SpessaSynthGroupEnd();
@@ -181,7 +181,7 @@ class MIDI extends BasicMIDI
              * @type {MIDIMessage[]}
              */
             const track = [];
-            const trackChunk = this.readMIDIChunk(fileByteArray);
+            const trackChunk = this._readMIDIChunk(fileByteArray);
             
             if (trackChunk.type !== "MTrk")
             {
@@ -303,8 +303,9 @@ class MIDI extends BasicMIDI
     /**
      * @param fileByteArray {IndexedByteArray}
      * @returns {{type: string, size: number, data: IndexedByteArray}}
+     * @private
      */
-    readMIDIChunk(fileByteArray)
+    _readMIDIChunk(fileByteArray)
     {
         const chunk = {};
         // type

package/midi_parser/midi_sequence.js

@@ -38,6 +38,12 @@ class MIDISequenceData
      */
     tracksAmount = 0;
     
+    /**
+     * The track names in the MIDI file, an empty string if not set.
+     * @type {[]}
+     */
+    trackNames = [];
+    
     /**
      * An array containing the lyrics of the sequence, stored as binary chunks (Uint8Array).
      * @type {Uint8Array[]}
@@ -175,6 +181,45 @@ class MIDISequenceData
         
         return totalSeconds;
     }
+    
+    /**
+     * INTERNAL USE ONLY!
+     * DO NOT USE IN SPESSASYNTH_LIB
+     * @param sequence {MIDISequenceData}
+     * @protected
+     */
+    _copyFromSequence(sequence)
+    {
+        // properties can be assigned
+        this.midiName = sequence.midiName;
+        this.midiNameUsesFileName = sequence.midiNameUsesFileName;
+        this.fileName = sequence.fileName;
+        this.timeDivision = sequence.timeDivision;
+        this.duration = sequence.duration;
+        this.copyright = sequence.copyright;
+        this.tracksAmount = sequence.tracksAmount;
+        this.firstNoteOn = sequence.firstNoteOn;
+        this.lastVoiceEventTick = sequence.lastVoiceEventTick;
+        this.format = sequence.format;
+        this.bankOffset = sequence.bankOffset;
+        this.isKaraokeFile = sequence.isKaraokeFile;
+        this.isMultiPort = sequence.isMultiPort;
+        
+        // copying arrays
+        this.tempoChanges = [...sequence.tempoChanges];
+        this.lyrics = sequence.lyrics.map(arr => new Uint8Array(arr));
+        this.lyricsTicks = [...sequence.lyricsTicks];
+        this.midiPorts = [...sequence.midiPorts];
+        this.trackNames = [...sequence.trackNames];
+        this.midiPortChannelOffsets = [...sequence.midiPortChannelOffsets];
+        this.usedChannelsOnTrack = sequence.usedChannelsOnTrack.map(set => new Set(set));
+        this.rawMidiName = sequence.rawMidiName ? new Uint8Array(sequence.rawMidiName) : undefined;
+        
+        // copying objects
+        this.loop = { ...sequence.loop };
+        this.keyRange = { ...sequence.keyRange };
+        this.RMIDInfo = { ...sequence.RMIDInfo };
+    }
 }
 
 export { MIDISequenceData };

package/package.json

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

package/soundfont/basic_soundfont/basic_soundfont.js

@@ -166,11 +166,11 @@ class BasicSoundBank
         // MUST be a valid XG bank.
         // allowed banks: (see XG specification)
         // 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 16, 17, 24,
-        // 25, 27, 28, 29, 30, 31, 32, 33, 40, 41, 48,
+        // 25, 27, 28, 29, 30, 31, 32, 33, 40, 41, 48, 56, 57, 58,
         // 64, 65, 66, 126, 127
         const allowedPrograms = new Set([
             0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 16, 17, 24,
-            25, 27, 28, 29, 30, 31, 32, 33, 40, 41, 48,
+            25, 27, 28, 29, 30, 31, 32, 33, 40, 41, 48, 56, 57, 58,
             64, 65, 66, 126, 127
         ]);
         for (const preset of this.presets)
@@ -182,6 +182,12 @@ class BasicSoundBank
                 {
                     // not valid!
                     this.isXGBank = false;
+                    SpessaSynthInfo(
+                        `%cThis bank is not valid XG. Preset %c${preset.bank}:${preset.program}%c is not a valid XG drum. XG mode will use presets on bank 128.`,
+                        consoleColors.info,
+                        consoleColors.value,
+                        consoleColors.info
+                    );
                     break;
                 }
             }

package/synthetizer/synthetizer.js

@@ -77,6 +77,12 @@ export class Synthetizer
      */
     channelProperties = [];
     
+    /**
+     * The current preset list
+     * @type {{presetName: string, bank: number, program: number}[]}
+     */
+    presetList = [];
+    
     /**
      * Creates a new instance of the SpessaSynth synthesizer.
      * @param targetNode {AudioNode}
@@ -242,10 +248,16 @@ export class Synthetizer
         }
         
         // attach a new channel to keep track of channels count
-        this.eventHandler.addEvent("newchannel", "synth-new-channel", () =>
+        this.eventHandler.addEvent("newchannel", `synth-new-channel-${Math.random()}`, () =>
         {
             this.channelsAmount++;
         });
+        
+        // attach a new event for preset list change
+        this.eventHandler.addEvent("presetlistchange", `synth-preset-list-change-${Math.random()}`, e =>
+        {
+            this.presetList = e;
+        });
     }
     
     /**
@@ -396,11 +408,17 @@ export class Synthetizer
         const messageData = message.messageData;
         switch (message.messageType)
         {
-            case returnMessageType.channelProperties:
+            case returnMessageType.channelPropertyChange:
+                /**
+                 * @type {number}
+                 */
+                const channelNumber = messageData[0];
                 /**
-                 * @type {ChannelProperty[]}
+                 * @type {ChannelProperty}
                  */
-                this.channelProperties = messageData;
+                const property = messageData[1];
+                
+                this.channelProperties[channelNumber] = property;
                 
                 this._voicesAmount = this.channelProperties.reduce((sum, voices) => sum + voices.voicesAmount, 0);
                 break;
@@ -485,7 +503,9 @@ export class Synthetizer
             pitchBendRangeSemitones: 0,
             isMuted: false,
             isDrum: false,
-            transposition: 0
+            transposition: 0,
+            program: 0,
+            bank: this.channelsAmount % 16 === DEFAULT_PERCUSSION ? 128 : 0
         });
         if (!postMessage)
         {