spessasynth_lib 3.25.13 → 3.25.15

package/midi_parser/basic_midi.js

@@ -310,31 +310,6 @@ class BasicMIDI extends MIDISequenceData
                     copyrightComponents.push(name);
                 }
             }
-            
-            // if the first event is not at 0 ticks, add a track name
-            // https://github.com/spessasus/SpessaSynth/issues/145
-            if (track[0].ticks > 0)
-            {
-                const name = this.trackNames[i];
-                if (name.length > 0)
-                {
-                    // can copy
-                    track.unshift(new MIDIMessage(
-                        0,
-                        messageTypes.trackName,
-                        getStringBytes(name)
-                    ));
-                }
-                else
-                {
-                    // sequence number
-                    track.unshift(new MIDIMessage(
-                        0,
-                        messageTypes.sequenceNumber,
-                        new IndexedByteArray([0x0, 0x0]) // two bytes
-                    ));
-                }
-            }
         }
         
         // reverse the tempo changes
@@ -540,6 +515,19 @@ class BasicMIDI extends MIDISequenceData
             );
         }
         
+        // if the first event is not at 0 ticks, add a track name
+        // https://github.com/spessasus/SpessaSynth/issues/145
+        if (!this.tracks.some(t => t[0].ticks === 0))
+        {
+            const track = this.tracks[0];
+            // can copy
+            track.unshift(new MIDIMessage(
+                0,
+                messageTypes.trackName,
+                new IndexedByteArray(this.rawMidiName.buffer)
+            ));
+        }
+        
         
         /**
          * The total playback time, in seconds

package/midi_parser/midi_sequence.js

@@ -121,7 +121,7 @@ class MIDISequenceData
      * Useful when the MIDI file uses a different code page.
      * @type {Uint8Array}
      */
-    rawMidiName = undefined;
+    rawMidiName;
     
     /**
      * The format of the MIDI file, which can be 0, 1, or 2, indicating the type of the MIDI file.

package/package.json

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

package/sequencer/sequencer.js

@@ -10,7 +10,6 @@ import { SpessaSynthWarn } from "../utils/loggin.js";
 import { DUMMY_MIDI_DATA, MIDIData } from "../midi_parser/midi_data.js";
 import { BasicMIDI } from "../midi_parser/basic_midi.js";
 import { readBytesAsUintBigEndian } from "../utils/byte_functions/big_endian.js";
-import { IndexedByteArray } from "../utils/indexed_array.js";
 import { DEFAULT_SEQUENCER_OPTIONS } from "./default_sequencer_options.js";
 
 /**
@@ -31,6 +30,7 @@ import { DEFAULT_SEQUENCER_OPTIONS } from "./default_sequencer_options.js";
  * @typedef {BasicMIDI|MidFile} MIDIFile
  */
 
+// noinspection JSUnusedGlobalSymbols
 /**
  * @typedef {Object} SequencerOptions
  * @property {boolean|undefined} skipToFirstNoteOn - if true, the sequencer will skip to the first note
@@ -50,7 +50,7 @@ export class Sequencer
     
     /**
      * Fires on text event
-     * @type {function}
+     * @type {Function}
      * @param data {Uint8Array} the data text
      * @param type {number} the status byte of the message (the meta-status byte)
      * @param lyricsIndex {number} if the text is a lyric, the index of the lyric in midiData.lyrics, otherwise -1
@@ -96,7 +96,7 @@ export class Sequencer
     
     /**
      * Fires on meta-event
-     * @type {Object<string, function([number, Uint8Array, number])>}
+     * @type {Object<string, function([number, Uint8Array, number, number])>}
      */
     onMetaEvent = {};
     
@@ -435,7 +435,8 @@ export class Sequencer
     
     /**
      * Adds a new event that gets called when a meta-event occurs
-     * @param callback {function([number, Uint8Array, number])} the meta-event type, its data and the track number
+     * @param callback {function([number, Uint8Array, number, number])} the meta-event type,
+     * its data, the track number and MIDI ticks
      * @param id {string} must be unique
      */
     addOnMetaEvent(callback, id)
@@ -564,13 +565,6 @@ export class Sequencer
                 }
                 break;
             
-            case WorkletSequencerReturnMessageType.textEvent:
-                if (this.onTextEvent)
-                {
-                    this.onTextEvent(...(messageData));
-                }
-                break;
-            
             case WorkletSequencerReturnMessageType.timeChange:
                 // message data is absolute time
                 const time = this.synth.currentTime - messageData;
@@ -614,16 +608,63 @@ export class Sequencer
                 break;
             
             case WorkletSequencerReturnMessageType.metaEvent:
-                const type = messageData[0];
-                if (type === messageTypes.setTempo)
+                /**
+                 * @type {MIDIMessage}
+                 */
+                const event = messageData[0];
+                switch (event.messageStatusByte)
                 {
-                    const arr = new IndexedByteArray(messageData[1]);
-                    const bpm = 60000000 / readBytesAsUintBigEndian(arr, 3);
-                    this.currentTempo = Math.round(bpm * 100) / 100;
-                    if (this.onTempoChange)
-                    {
-                        this._callEvents(this.onTempoChange, this.currentTempo);
-                    }
+                    case messageTypes.setTempo:
+                        event.messageData.currentIndex = 0;
+                        const bpm = 60000000 / readBytesAsUintBigEndian(event.messageData, 3);
+                        event.messageData.currentIndex = 0;
+                        this.currentTempo = Math.round(bpm * 100) / 100;
+                        if (this.onTempoChange)
+                        {
+                            this._callEvents(this.onTempoChange, this.currentTempo);
+                        }
+                        break;
+                    
+                    case messageTypes.text:
+                    case messageTypes.lyric:
+                    case messageTypes.copyright:
+                    case messageTypes.trackName:
+                    case messageTypes.marker:
+                    case messageTypes.cuePoint:
+                    case messageTypes.instrumentName:
+                    case messageTypes.programName:
+                        let lyricsIndex = -1;
+                        if (event.messageStatusByte === messageTypes.lyric)
+                        {
+                            lyricsIndex = Math.min(
+                                this.midiData.lyricsTicks.indexOf(event.ticks),
+                                this.midiData.lyrics.length - 1
+                            );
+                        }
+                        let sentStatus = event.messageStatusByte;
+                        // if MIDI is a karaoke file, it uses the "text" event type or "lyrics" for lyrics (duh)
+                        // why?
+                        // because the MIDI standard is a messy pile of garbage,
+                        // and it's not my fault that it's like this :(
+                        // I'm just trying to make the best out of a bad situation.
+                        // I'm sorry
+                        // okay I should get back to work
+                        // anyway,
+                        // check for a karaoke file and change the status byte to "lyric"
+                        // if it's a karaoke file
+                        if (this.midiData.isKaraokeFile && (
+                            event.messageStatusByte === messageTypes.text ||
+                            event.messageStatusByte === messageTypes.lyric
+                        ))
+                        {
+                            lyricsIndex = Math.min(
+                                this.midiData.lyricsTicks.indexOf(event.ticks),
+                                this.midiData.lyricsTicks.length
+                            );
+                            sentStatus = messageTypes.lyric;
+                        }
+                        this.onTextEvent(event.messageData, sentStatus, lyricsIndex, event.ticks);
+                        break;
                 }
                 this._callEvents(this.onMetaEvent, messageData);
                 break;

package/sequencer/worklet_sequencer/process_event.js

@@ -115,8 +115,6 @@ export function _processEvent(event, trackIndex)
         case messageTypes.keySignature:
         case messageTypes.sequenceNumber:
         case messageTypes.sequenceSpecific:
-            break;
-        
         case messageTypes.text:
         case messageTypes.lyric:
         case messageTypes.copyright:
@@ -125,40 +123,9 @@ export function _processEvent(event, trackIndex)
         case messageTypes.cuePoint:
         case messageTypes.instrumentName:
         case messageTypes.programName:
-            let lyricsIndex = -1;
-            if (statusByteData.status === messageTypes.lyric)
-            {
-                lyricsIndex = Math.min(
-                    this.midiData.lyricsTicks.indexOf(event.ticks),
-                    this.midiData.lyrics.length - 1
-                );
-            }
-            let sentStatus = statusByteData.status;
-            // if MIDI is a karaoke file, it uses the "text" event type or "lyrics" for lyrics (duh)
-            // why?
-            // because the MIDI standard is a messy pile of garbage, and it's not my fault that it's like this :(
-            // I'm just trying to make the best out of a bad situation.
-            // I'm sorry
-            // okay I should get back to work
-            // anyway,
-            // check for a karaoke file and change the status byte to "lyric" if it's a karaoke file
-            if (this.midiData.isKaraokeFile && (
-                statusByteData.status === messageTypes.text ||
-                statusByteData.status === messageTypes.lyric
-            ))
-            {
-                lyricsIndex = Math.min(
-                    this.midiData.lyricsTicks.indexOf(event.ticks),
-                    this.midiData.lyricsTicks.length
-                );
-                sentStatus = messageTypes.lyric;
-            }
-            this.post(
-                WorkletSequencerReturnMessageType.textEvent,
-                [event.messageData, sentStatus, lyricsIndex]
-            );
             break;
         
+        
         case messageTypes.midiPort:
             this.assignMIDIPort(trackIndex, event.messageData[0]);
             break;
@@ -183,7 +150,7 @@ export function _processEvent(event, trackIndex)
     {
         this.post(
             WorkletSequencerReturnMessageType.metaEvent,
-            [event.messageStatusByte, event.messageData, trackIndex]
+            [event, trackIndex]
         );
     }
 }

package/sequencer/worklet_sequencer/sequencer_message.js

@@ -43,12 +43,11 @@ export const WorkletSequencerMessageType = {
 export const WorkletSequencerReturnMessageType = {
     midiEvent: 0,               // [...midiEventBytes<number>]
     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>
-    songListChange: 9          // songListData<MIDIData[]>
+    timeChange: 2,              // newAbsoluteTime<number>
+    pause: 3,                   // no data
+    getMIDI: 4,                 // midiData<MIDI>
+    midiError: 5,               // errorMSG<string>
+    metaEvent: 6,               // [event<MIDIMessage>, trackNum<number>]
+    loopCountChange: 7,         // newLoopCount<number>
+    songListChange: 8          // songListData<MIDIData[]>
 };

package/sequencer/worklet_sequencer/song_control.js

@@ -144,7 +144,7 @@ export function loadNewSequence(parsedMidi, autoPlay = true)
     else
     {
         // this shall not play: play to the first note and then wait
-        const targetTime = this._skipToFirstNoteOn ? this.midiData.firstNoteOn - 1 : 0;
+        const targetTime = this.skipToFirstNoteOn ? this.midiData.firstNoteOn - 1 : 0;
         this.setTimeTicks(targetTime);
         this.pause();
     }

package/soundfont/dls/read_instrument.js

@@ -2,7 +2,7 @@ import { readBytesAsString } from "../../utils/byte_functions/string.js";
 import { readLittleEndian } from "../../utils/byte_functions/little_endian.js";
 import { DLSPreset } from "./dls_preset.js";
 import { findRIFFListType, readRIFFChunk } from "../basic_soundfont/riff_chunk.js";
-import { SpessaSynthGroup, SpessaSynthGroupEnd } from "../../utils/loggin.js";
+import { SpessaSynthGroupCollapsed, SpessaSynthGroupEnd } from "../../utils/loggin.js";
 import { BasicInstrumentZone } from "../basic_soundfont/basic_zones.js";
 import { consoleColors } from "../../utils/other.js";
 import { generatorLimits, generatorTypes } from "../basic_soundfont/generator.js";
@@ -54,7 +54,7 @@ export function readDLSInstrument(chunk)
     }
     preset.presetName = presetName;
     preset.DLSInstrument.instrumentName = presetName;
-    SpessaSynthGroup(
+    SpessaSynthGroupCollapsed(
         `%cParsing %c"${presetName}"%c...`,
         consoleColors.info,
         consoleColors.recognized,