spessasynth_lib 3.25.12 → 3.25.14

package/midi_parser/basic_midi.js

@@ -1,6 +1,6 @@
 import { MIDISequenceData } from "./midi_sequence.js";
 import { getStringBytes, readBytesAsString } from "../utils/byte_functions/string.js";
-import { messageTypes } from "./midi_message.js";
+import { messageTypes, MIDIMessage } from "./midi_message.js";
 import { readBytesAsUintBigEndian } from "../utils/byte_functions/big_endian.js";
 import { SpessaSynthGroup, SpessaSynthGroupEnd, SpessaSynthInfo } from "../utils/loggin.js";
 import { consoleColors, formatTitle, sanitizeKarLyrics } from "../utils/other.js";
@@ -8,6 +8,7 @@ import { writeMIDI } from "./midi_writer.js";
 import { applySnapshotToMIDI, modifyMIDI } from "./midi_editor.js";
 import { writeRMIDI } from "./rmidi_writer.js";
 import { getUsedProgramsAndKeys } from "./used_keys_loaded.js";
+import { IndexedByteArray } from "../utils/indexed_array.js";
 
 /**
  * BasicMIDI is the base of a complete MIDI file, used by the sequencer internally.
@@ -98,6 +99,9 @@ class BasicMIDI extends MIDISequenceData
         
         for (let i = 0; i < this.tracks.length; i++)
         {
+            /**
+             * @type {MIDIMessage[]}
+             */
             const track = this.tracks[i];
             const usedChannels = new Set();
             let trackHasVoiceMessages = false;
@@ -306,6 +310,31 @@ 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

package/midi_parser/midi_sequence.js

@@ -40,7 +40,7 @@ class MIDISequenceData
     
     /**
      * The track names in the MIDI file, an empty string if not set.
-     * @type {[]}
+     * @type {string[]}
      */
     trackNames = [];
     

package/package.json

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

package/sequencer/default_sequencer_options.js

@@ -0,0 +1,8 @@
+/**
+ * @type {SequencerOptions}
+ */
+export const DEFAULT_SEQUENCER_OPTIONS = {
+    skipToFirstNoteOn: true,
+    autoPlay: true,
+    preservePlaybackState: false
+};

package/sequencer/sequencer.js

@@ -11,6 +11,7 @@ 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";
 
 /**
  * sequencer.js
@@ -38,15 +39,6 @@ import { IndexedByteArray } from "../utils/indexed_array.js";
  * the sequencer will stay paused when seeking or changing the playback rate
  */
 
-/**
- * @type {SequencerOptions}
- */
-const DEFAULT_OPTIONS = {
-    skipToFirstNoteOn: true,
-    autoPlay: true,
-    preservePlaybackState: false
-};
-
 // noinspection JSUnusedGlobalSymbols
 export class Sequencer
 {
@@ -153,7 +145,7 @@ export class Sequencer
      * @param synth {Synthetizer} synth to send events to
      * @param options {SequencerOptions} the sequencer's options
      */
-    constructor(midiBinaries, synth, options = DEFAULT_OPTIONS)
+    constructor(midiBinaries, synth, options = DEFAULT_SEQUENCER_OPTIONS)
     {
         this.ignoreEvents = false;
         this.synth = synth;

package/sequencer/worklet_sequencer/events.js

@@ -95,7 +95,7 @@ export function processMessage(messageType, messageData)
             break;
         
         case WorkletSequencerMessageType.setSkipToFirstNote:
-            this._skipToFirstNoteOn = messageData;
+            this.skipToFirstNoteOn = messageData;
             break;
         
         case WorkletSequencerMessageType.setPreservePlaybackState:

package/sequencer/worklet_sequencer/worklet_sequencer.js

@@ -127,9 +127,8 @@ class WorkletSequencer
     
     /**
      * @type {boolean}
-     * @private
      */
-    _skipToFirstNoteOn = true;
+    skipToFirstNoteOn = true;
     
     /**
      * If true, seq will stay paused when seeking or changing the playback rate
@@ -178,7 +177,7 @@ class WorkletSequencer
         if (time > this.duration || time < 0)
         {
             // time is 0
-            if (this._skipToFirstNoteOn)
+            if (this.skipToFirstNoteOn)
             {
                 this.setTimeTicks(this.midiData.firstNoteOn - 1);
             }
@@ -188,7 +187,7 @@ class WorkletSequencer
             }
             return;
         }
-        if (this._skipToFirstNoteOn)
+        if (this.skipToFirstNoteOn)
         {
             if (time < this.firstNoteTime)
             {

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,

package/synthetizer/synth_constants.js

@@ -5,6 +5,7 @@
  * @property {boolean|undefined} oneOutput - if synth should use one output with 32 channels (2 audio channels for each midi channel).
  * this disabled chorus and reverb.
  * @property {number|undefined} loopCount - the times to loop the song
+ * @property {SequencerOptions} sequencerOptions - the options to pass to the sequencer
  */
 
 export const WORKLET_PROCESSOR_NAME = "spessasynth-worklet-system";

package/synthetizer/synthetizer.js

@@ -1,5 +1,5 @@
 import { IndexedByteArray } from "../utils/indexed_array.js";
-import { consoleColors, fillWithDefaults } from "../utils/other.js";
+import { consoleColors } from "../utils/other.js";
 import { getEvent, messageTypes, midiControllers } from "../midi_parser/midi_message.js";
 import { EventHandler } from "./synth_event_handler.js";
 import { FancyChorus } from "./audio_effects/fancy_chorus.js";
@@ -23,6 +23,8 @@ import {
     WORKLET_PROCESSOR_NAME
 } from "./synth_constants.js";
 import { BasicMIDI } from "../midi_parser/basic_midi.js";
+import { fillWithDefaults } from "../utils/fill_with_defaults.js";
+import { DEFAULT_SEQUENCER_OPTIONS } from "../sequencer/default_sequencer_options.js";
 
 
 /**
@@ -150,6 +152,15 @@ export class Synthetizer
                 }
                 sequencerRenderingData.snapshot = snapshot;
             }
+            if (startRenderingData?.sequencerOptions)
+            {
+                // sequencer options
+                sequencerRenderingData.sequencerOptions = fillWithDefaults(
+                    startRenderingData.sequencerOptions,
+                    DEFAULT_SEQUENCER_OPTIONS
+                );
+            }
+            
             sequencerRenderingData.loopCount = startRenderingData?.loopCount ?? 0;
         }