spessasynth_lib 3.23.12 → 3.23.13

package/@types/index.d.ts

@@ -3,6 +3,13 @@ import { Synthetizer } from './synthetizer/synthetizer.js';
 import { DEFAULT_PERCUSSION } from './synthetizer/synthetizer.js';
 import { VOICE_CAP } from './synthetizer/synthetizer.js';
 import { BasicSoundFont } from "./soundfont/basic_soundfont/basic_soundfont.js";
+import { BasicSample } from "./soundfont/basic_soundfont/basic_sample.js";
+import { BasicInstrumentZone } from "./soundfont/basic_soundfont/basic_zones.js";
+import { BasicInstrument } from "./soundfont/basic_soundfont/basic_instrument.js";
+import { BasicPreset } from "./soundfont/basic_soundfont/basic_preset.js";
+import { BasicPresetZone } from "./soundfont/basic_soundfont/basic_zones.js";
+import { Generator } from "./soundfont/basic_soundfont/generator.js";
+import { Modulator } from "./soundfont/basic_soundfont/modulator.js";
 import { loadSoundFont } from "./soundfont/load_soundfont.js";
 import { trimSoundfont } from "./soundfont/basic_soundfont/write_sf2/soundfont_trimmer.js";
 import { modulatorSources } from "./soundfont/basic_soundfont/modulator.js";
@@ -34,4 +41,4 @@ import { readBytesAsUintBigEndian } from './utils/byte_functions/big_endian.js';
 import { NON_CC_INDEX_OFFSET } from "./synthetizer/worklet_system/worklet_utilities/controller_tables.js";
 import { ALL_CHANNELS_OR_DIFFERENT_ACTION } from './synthetizer/worklet_system/message_protocol/worklet_message.js';
 import { WORKLET_URL_ABSOLUTE } from './synthetizer/worklet_url.js';
-export { Sequencer, Synthetizer, DEFAULT_PERCUSSION, VOICE_CAP, BasicSoundFont, loadSoundFont, trimSoundfont, modulatorSources, MIDI, MIDIBuilder, IndexedByteArray, writeMIDIFile, writeRMIDI, applySnapshotToMIDI, modifyMIDI, MIDIticksToSeconds, audioBufferToWav, SpessaSynthLogging, SpessaSynthGroup, SpessaSynthTable, SpessaSynthGroupEnd, SpessaSynthInfo, SpessaSynthWarn, SpessaSynthGroupCollapsed, midiControllers, messageTypes, MIDIDeviceHandler, WebMidiLinkHandler, arrayToHexString, consoleColors, formatTitle, formatTime, readBytesAsUintBigEndian, NON_CC_INDEX_OFFSET, ALL_CHANNELS_OR_DIFFERENT_ACTION, WORKLET_URL_ABSOLUTE };
+export { Sequencer, Synthetizer, DEFAULT_PERCUSSION, VOICE_CAP, BasicSoundFont, BasicSample, BasicInstrumentZone, BasicInstrument, BasicPreset, BasicPresetZone, Generator, Modulator, loadSoundFont, trimSoundfont, modulatorSources, MIDI, MIDIBuilder, IndexedByteArray, writeMIDIFile, writeRMIDI, applySnapshotToMIDI, modifyMIDI, MIDIticksToSeconds, audioBufferToWav, SpessaSynthLogging, SpessaSynthGroup, SpessaSynthTable, SpessaSynthGroupEnd, SpessaSynthInfo, SpessaSynthWarn, SpessaSynthGroupCollapsed, midiControllers, messageTypes, MIDIDeviceHandler, WebMidiLinkHandler, arrayToHexString, consoleColors, formatTitle, formatTime, readBytesAsUintBigEndian, NON_CC_INDEX_OFFSET, ALL_CHANNELS_OR_DIFFERENT_ACTION, WORKLET_URL_ABSOLUTE };

package/@types/sequencer/sequencer.d.ts

@@ -23,10 +23,12 @@ export class Sequencer {
     private onSongChange;
     /**
      * Fires on text event
+     * @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
      */
-    onTextEvent: any;
+    onTextEvent: Function;
     /**
      * Fires when CurrentTime changes
      * @type {Object<string, function(number)>} the time that was changed to

package/index.js

@@ -1,6 +1,13 @@
 // Import modules
 import { loadSoundFont } from "./soundfont/load_soundfont.js";
 import { BasicSoundFont } from "./soundfont/basic_soundfont/basic_soundfont.js";
+import { BasicSample } from "./soundfont/basic_soundfont/basic_sample.js";
+import { BasicInstrumentZone } from "./soundfont/basic_soundfont/basic_zones.js";
+import { BasicInstrument } from "./soundfont/basic_soundfont/basic_instrument.js";
+import { Generator } from "./soundfont/basic_soundfont/generator.js";
+import { Modulator } from "./soundfont/basic_soundfont/modulator.js";
+import { BasicPresetZone } from "./soundfont/basic_soundfont/basic_zones.js";
+import { BasicPreset } from "./soundfont/basic_soundfont/basic_preset.js";
 import { MIDI } from './midi_parser/midi_loader.js';
 import { MIDIticksToSeconds } from './midi_parser/basic_midi.js';
 import { MIDIBuilder } from "./midi_parser/midi_builder.js";
@@ -38,13 +45,20 @@ export {
     Synthetizer,
     DEFAULT_PERCUSSION,
     VOICE_CAP,
-
+    
     // SoundFont
     BasicSoundFont,
+    BasicSample,
+    BasicInstrumentZone,
+    BasicInstrument,
+    BasicPreset,
+    BasicPresetZone,
+    Generator,
+    Modulator,
     loadSoundFont,
     trimSoundfont,
     modulatorSources,
-
+    
     // MIDI
     MIDI,
     MIDIBuilder,
@@ -54,7 +68,7 @@ export {
     applySnapshotToMIDI,
     modifyMIDI,
     MIDIticksToSeconds,
-
+    
     // Utilities
     audioBufferToWav,
     SpessaSynthLogging,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spessasynth_lib",
-  "version": "3.23.12",
+  "version": "3.23.13",
   "description": "MIDI and SoundFont2/DLS library with no compromises",
   "browser": "index.js",
   "types": "@types/index.d.ts",

package/sequencer/sequencer.js

@@ -61,8 +61,10 @@ export class Sequencer
     onSongChange = {};
     /**
      * Fires on text event
+     * @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
      */
     onTextEvent;
     /**
@@ -304,7 +306,6 @@ export class Sequencer
     addOnSongChangeEvent(callback, id)
     {
         this.onSongChange[id] = callback;
-        callback(this.midiData);
     }
     
     /**
@@ -419,13 +420,9 @@ export class Sequencer
                 break;
             
             case WorkletSequencerReturnMessageType.textEvent:
-                /**
-                 * @type {[Uint8Array, number]}
-                 */
-                let textEventData = messageData;
                 if (this.onTextEvent)
                 {
-                    this.onTextEvent(textEventData[0], textEventData[1]);
+                    this.onTextEvent(...(messageData));
                 }
                 break;
             

package/sequencer/worklet_sequencer/process_event.js

@@ -117,7 +117,18 @@ export function _processEvent(event, trackIndex)
         case messageTypes.cuePoint:
         case messageTypes.instrumentName:
         case messageTypes.programName:
-            this.post(WorkletSequencerReturnMessageType.textEvent, [event.messageData, statusByteData.status]);
+            let lyricsIndex = -1;
+            if (statusByteData.status === messageTypes.lyric)
+            {
+                lyricsIndex = Math.min(
+                    this.midiData.lyrics.indexOf(event.messageData) + 1,
+                    this.midiData.lyrics.length - 1
+                );
+            }
+            this.post(
+                WorkletSequencerReturnMessageType.textEvent,
+                [event.messageData, statusByteData.status, lyricsIndex]
+            );
             break;
         
         case messageTypes.midiPort:

package/sequencer/worklet_sequencer/sequencer_message.js

@@ -35,7 +35,7 @@ export const WorkletSequencerMessageType = {
 export const WorkletSequencerReturnMessageType = {
     midiEvent: 0,               // [...midiEventBytes<number>]
     songChange: 1,              // [midiData<MidiData>, songIndex<number>, isAutoPlayed<boolean>]
-    textEvent: 2,               // [messageData<number[]>, statusByte<number]
+    textEvent: 2,               // [messageData<number[]>, statusByte<number>, lyricsIndex<number>]
     timeChange: 3,              // newAbsoluteTime<number>
     pause: 4,                   // no data
     getMIDI: 5,                 // midiData<MIDI>

package/sequencer/worklet_sequencer/worklet_sequencer.js

@@ -219,7 +219,6 @@ class WorkletSequencer
             for (let c = 0; c < MIDI_CHANNEL_COUNT; c++)
             {
                 this.sendMIDICC(c, midiControllers.allNotesOff, 0);
-                this.sendMIDICC(c, midiControllers.allSoundOff, 0);
             }
         }
     }