spessasynth_lib 3.20.19 → 3.20.20

package/@types/index.d.ts

@@ -14,6 +14,7 @@ import { writeMIDIFile } from './midi_parser/midi_writer.js';
 import { writeRMIDI } from './midi_parser/rmidi_writer.js';
 import { applySnapshotToMIDI } from './midi_parser/midi_editor.js';
 import { modifyMIDI } from './midi_parser/midi_editor.js';
+import { MIDIticksToSeconds } from './midi_parser/basic_midi.js';
 import { audioBufferToWav } from './utils/buffer_to_wav.js';
 import { SpessaSynthLogging } from './utils/loggin.js';
 import { SpessaSynthGroup } from './utils/loggin.js';
@@ -34,4 +35,4 @@ import { readBytesAsUintBigEndian } from './utils/byte_functions/big_endian.js';
 import { NON_CC_INDEX_OFFSET } from './synthetizer/worklet_system/worklet_utilities/worklet_processor_channel.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, encodeVorbis, MIDI, MIDIBuilder, IndexedByteArray, writeMIDIFile, writeRMIDI, applySnapshotToMIDI, modifyMIDI, 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, loadSoundFont, trimSoundfont, modulatorSources, encodeVorbis, 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/midi_parser/basic_midi.d.ts

@@ -1,3 +1,10 @@
+/**
+ * Converts ticks to time in seconds
+ * @param ticks {number} time in MIDI ticks
+ * @param mid {BasicMIDI} the MIDI
+ * @returns {number} time in seconds
+ */
+export function MIDIticksToSeconds(ticks: number, mid: BasicMIDI): number;
 export class BasicMIDI {
     /**
      * The time division of the sequence
@@ -115,11 +122,4 @@ export class BasicMIDI {
      * @type {MidiMessage[][]}
      */
     tracks: MidiMessage[][];
-    /**
-     * Converts ticks to time in seconds
-     * @param ticks {number} time in MIDI ticks
-     * @returns {number} time in seconds
-     * @protected
-     */
-    protected _ticksToSeconds(ticks: number): number;
 }

package/@types/synthetizer/synthetizer.d.ts

@@ -7,6 +7,7 @@
  * @property {BasicMIDI} parsedMIDI - the MIDI to render
  * @property {SynthesizerSnapshot} snapshot - the snapshot to apply
  * @property {boolean|undefined} oneOutput - if synth should use one output with 32 channels (2 audio channels for each midi channel). this disables chorus and reverb.
+ * @property {number|undefined} loopCount - the times to loop the song
  */
 export const WORKLET_PROCESSOR_NAME: "spessasynth-worklet-system";
 export const VOICE_CAP: 450;
@@ -312,6 +313,10 @@ export type StartRenderingDataConfig = {
      * - if synth should use one output with 32 channels (2 audio channels for each midi channel). this disables chorus and reverb.
      */
     oneOutput: boolean | undefined;
+    /**
+     * - the times to loop the song
+     */
+    loopCount: number | undefined;
 };
 import { EventHandler } from './synth_event_handler.js';
 import { SoundfontManager } from './synth_soundfont_manager.js';

package/@types/synthetizer/worklet_system/worklet_utilities/worklet_processor_channel.d.ts

@@ -6,6 +6,7 @@
  *
  * @property {number} channelTransposeKeyShift - key shift of the channel
  * @property {Int8Array} channelOctaveTuning - the tuning for octave on this channel
+ * @property {Int16Array} keyCentTuning - tuning of individual keys in cents
  * @property {boolean} holdPedal - indicates whether the hold pedal is active
  * @property {boolean} drumChannel - indicates whether the channel is a drum channel
  *
@@ -77,6 +78,10 @@ export type WorkletProcessorChannel = {
      * - the tuning for octave on this channel
      */
     channelOctaveTuning: Int8Array;
+    /**
+     * - tuning of individual keys in cents
+     */
+    keyCentTuning: Int16Array;
     /**
      * - indicates whether the hold pedal is active
      */

package/README.md

@@ -41,7 +41,8 @@ document.getElementById("button").onclick = async () => {
   - **SoundFont3 Support:** Play compressed SoundFonts!
   - **Experimental SF2Pack Support:** Play soundfonts compressed with BASSMIDI! (*Note: only works with vorbis compression*)
   - **Can load very large SoundFonts:** up to 4GB! *Note: Only Firefox handles this well; Chromium has a hard-coded memory limit*
-  - **Soundfont manager:** Stack multiple soundfonts!
+- **Soundfont manager:** Stack multiple soundfonts!
+- **DLS Level 1 and 2 Support:** *internally converted to sf2*
 - **Reverb and chorus support:** [customizable!](https://github.com/spessasus/SpessaSynth/wiki/Synthetizer-Class#effects-configuration-object)
 - **Export audio files** using [OfflineAudioContext](https://developer.mozilla.org/en-US/docs/Web/API/OfflineAudioContext)
 - **[Custom modulators for additional controllers](https://github.com/spessasus/SpessaSynth/wiki/Modulator-Class#default-modulators):** Why not?
@@ -101,7 +102,7 @@ document.getElementById("button").onclick = async () => {
 
 #### Read and play DLS Level 1 or 2 files
 - Read DLS (DownLoadable Sounds) files as SF2 files!
-- **Works like a normal soundfont:** *Saving is still [just one function!](https://github.com/spessasus/SpessaSynth/wiki/SoundFont2-Class#write)*
+- **Works like a normal soundfont:** *Saving it as sf2 is still [just one function!](https://github.com/spessasus/SpessaSynth/wiki/SoundFont2-Class#write)*
 - Converts articulators to both **modulators** and **generators**!
 - Works with both unsigned 8-bit samples and signed 16-bit samples!
 - **Covers special generator cases:** *such as modLfoToPitch*!

package/index.js

@@ -2,6 +2,7 @@
 import { loadSoundFont } from "./soundfont/load_soundfont.js";
 import { BasicSoundFont } from "./soundfont/basic_soundfont/basic_soundfont.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";
 import { Synthetizer, VOICE_CAP, DEFAULT_PERCUSSION } from './synthetizer/synthetizer.js';
 import { Sequencer } from './sequencer/sequencer.js';
@@ -54,6 +55,7 @@ export {
     writeRMIDI,
     applySnapshotToMIDI,
     modifyMIDI,
+    MIDIticksToSeconds,
 
     // Utilities
     audioBufferToWav,

package/midi_parser/basic_midi.js

@@ -124,31 +124,30 @@ export class BasicMIDI
          */
         this.tracks = [];
     }
-
-    /**
-     * Converts ticks to time in seconds
-     * @param ticks {number} time in MIDI ticks
-     * @returns {number} time in seconds
-     * @protected
-     */
-    _ticksToSeconds(ticks) {
-        let totalSeconds = 0;
-
-        while (ticks > 0)
-        {
-            // tempo changes are reversed so the first element is the last tempo change and the last element is the first tempo change
-            // (always at tick 0 and tempo 120)
-            // find the last tempo change that has occurred
-            let tempo = this.tempoChanges.find(v => v.ticks < ticks);
-
-            // calculate the difference and tempo time
-            let timeSinceLastTempo = ticks - tempo.ticks;
-            totalSeconds += (timeSinceLastTempo * 60) / (tempo.tempo * this.timeDivision);
-            ticks -= timeSinceLastTempo;
-        }
-
-        return totalSeconds;
+}
+
+/**
+ * Converts ticks to time in seconds
+ * @param ticks {number} time in MIDI ticks
+ * @param mid {BasicMIDI} the MIDI
+ * @returns {number} time in seconds
+ */
+export function MIDIticksToSeconds(ticks, mid) {
+    let totalSeconds = 0;
+
+    while (ticks > 0)
+    {
+        // tempo changes are reversed so the first element is the last tempo change
+        // and the last element is the first tempo change
+        // (always at tick 0 and tempo 120)
+        // find the last tempo change that has occurred
+        let tempo = mid.tempoChanges.find(v => v.ticks < ticks);
+
+        // calculate the difference and tempo time
+        let timeSinceLastTempo = ticks - tempo.ticks;
+        totalSeconds += (timeSinceLastTempo * 60) / (tempo.tempo * mid.timeDivision);
+        ticks -= timeSinceLastTempo;
     }
 
-
+    return totalSeconds;
 }

package/midi_parser/midi_builder.js

@@ -1,4 +1,4 @@
-import { BasicMIDI } from './basic_midi.js'
+import { BasicMIDI, MIDIticksToSeconds } from './basic_midi.js'
 import { messageTypes,  MidiMessage } from './midi_message.js'
 import { IndexedByteArray } from '../utils/indexed_array.js'
 import { readBytesAsUintBigEndian } from '../utils/byte_functions/big_endian.js'
@@ -101,7 +101,7 @@ export class MIDIBuilder extends BasicMIDI
 
         // reverse tempo and compute duration
         this.tempoChanges.reverse();
-        this.duration = this._ticksToSeconds(this.lastVoiceEventTick);
+        this.duration = MIDIticksToSeconds(this.lastVoiceEventTick, this);
 
         // fix midi ports:
         // midi tracks without ports will have a value of -1

package/midi_parser/midi_loader.js

@@ -8,7 +8,7 @@ import { readBytesAsUintBigEndian } from '../utils/byte_functions/big_endian.js'
 import { readBytesAsString } from '../utils/byte_functions/string.js'
 import { readLittleEndian } from '../utils/byte_functions/little_endian.js'
 import { RMIDINFOChunks } from './rmidi_writer.js'
-import { BasicMIDI } from './basic_midi.js'
+import { BasicMIDI, MIDIticksToSeconds } from './basic_midi.js'
 
 /**
  * midi_loader.js
@@ -573,7 +573,7 @@ class MIDI extends BasicMIDI
          * The total playback time, in seconds
          * @type {number}
          */
-        this.duration = this._ticksToSeconds(this.lastVoiceEventTick);
+        this.duration = MIDIticksToSeconds(this.lastVoiceEventTick, this);
 
         SpessaSynthGroupEnd();
         SpessaSynthInfo(`%cMIDI file parsed. Total tick time: %c${this.lastVoiceEventTick}%c, total seconds time: %c${this.duration}`,

package/package.json

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

package/sequencer/worklet_sequencer/play.js

@@ -1,6 +1,7 @@
 import { getEvent, messageTypes, midiControllers } from '../../midi_parser/midi_message.js'
 import { WorkletSequencerReturnMessageType } from './sequencer_message.js'
 import { MIDI_CHANNEL_COUNT } from '../../synthetizer/synthetizer.js'
+import { MIDIticksToSeconds } from '../../midi_parser/basic_midi.js'
 
 
 // an array with preset default values
@@ -271,26 +272,6 @@ export function play(resetTime = false)
     this.setProcessHandler();
 }
 
-/**
- * Coverts ticks to time in seconds
- * @param changes {{tempo: number, ticks: number}[]}
- * @param ticks {number}
- * @param division {number}
- * @returns {number}
- */
-export function ticksToSeconds(changes, ticks, division)
-{
-    if (ticks <= 0) {
-        return 0;
-    }
-
-    // find the last tempo change that has occured
-    let tempo = changes.find(v => v.ticks < ticks);
-
-    let timeSinceLastTempo = ticks - tempo.ticks;
-    return ticksToSeconds(changes, ticks - timeSinceLastTempo, division) + (timeSinceLastTempo * 60) / (tempo.tempo * division);
-}
-
 /**
  * @this {WorkletSequencer}
  * @param ticks {number}
@@ -302,7 +283,7 @@ export function setTimeTicks(ticks)
     this.pausedTime = undefined;
     this.post(
         WorkletSequencerReturnMessageType.timeChange,
-        currentTime - ticksToSeconds(this.midiData.tempoChanges, ticks, this.midiData.timeDivision)
+        currentTime - MIDIticksToSeconds(ticks, this.midiData)
     );
     const isNotFinished = this._playTo(0, ticks);
     this._recalculateStartTime(this.playedTime);

package/sequencer/worklet_sequencer/process_tick.js

@@ -37,16 +37,18 @@ export function _processTick()
         this.playedTime += this.oneTickToSeconds * (eventNext.ticks - event.ticks);
 
         // loop
-        if((this.midiData.loop.end <= event.ticks) && this.loop)
+        if((this.midiData.loop.end <= event.ticks) && this.loop && this.currentLoopCount > 0)
         {
+            this.currentLoopCount--;
             this.setTimeTicks(this.midiData.loop.start);
             return;
         }
         // if song has ended
         else if(current >= this.duration)
         {
-            if(this.loop)
+            if(this.loop && this.currentLoopCount > 0)
             {
+                this.currentLoopCount--;
                 this.setTimeTicks(this.midiData.loop.start);
                 return;
             }

package/sequencer/worklet_sequencer/song_control.js

@@ -1,10 +1,10 @@
 import { WorkletSequencerReturnMessageType } from './sequencer_message.js'
 import { consoleColors, formatTime } from '../../utils/other.js'
 import { SpessaSynthGroupCollapsed, SpessaSynthGroupEnd, SpessaSynthInfo, SpessaSynthWarn } from '../../utils/loggin.js'
-import { ticksToSeconds } from './play.js'
 import { MidiData } from '../../midi_parser/midi_data.js'
 import { MIDI } from '../../midi_parser/midi_loader.js'
 import { getUsedProgramsAndKeys } from '../../midi_parser/used_keys_loaded.js'
+import { MIDIticksToSeconds } from '../../midi_parser/basic_midi.js'
 
 /**
  * @param trackNum {number}
@@ -53,6 +53,8 @@ export function loadNewSequence(parsedMidi)
      */
     this.midiData = parsedMidi;
 
+    this.currentLoopCount = this.loopCount;
+
     // check for embedded soundfont
     if(this.midiData.embeddedSoundFont !== undefined)
     {
@@ -108,7 +110,7 @@ export function loadNewSequence(parsedMidi)
      * @type {number}
      */
     this.duration = this.midiData.duration;
-    this.firstNoteTime = ticksToSeconds(this.midiData.tempoChanges, this.midiData.firstNoteOn, this.midiData.timeDivision);
+    this.firstNoteTime = MIDIticksToSeconds(this.midiData.firstNoteOn, this.midiData);
     SpessaSynthInfo(`%cTotal song time: ${formatTime(Math.ceil(this.duration)).time}`, consoleColors.recognized);
 
     this.post(WorkletSequencerReturnMessageType.songChange, [new MidiData(this.midiData), this.songIndex]);

package/sequencer/worklet_sequencer/worklet_sequencer.js

@@ -24,6 +24,9 @@ class WorkletSequencer
          */
         this.sendMIDIMessages = false;
 
+        this.loopCount = Infinity;
+        this.currentLoopCount = this.loopCount;
+
         // event's number in this.events
         /**
          * @type {number[]}

package/synthetizer/synthetizer.js

@@ -24,6 +24,7 @@ import { SoundfontManager } from './synth_soundfont_manager.js'
  * @property {BasicMIDI} parsedMIDI - the MIDI to render
  * @property {SynthesizerSnapshot} snapshot - the snapshot to apply
  * @property {boolean|undefined} oneOutput - if synth should use one output with 32 channels (2 audio channels for each midi channel). this disables chorus and reverb.
+ * @property {number|undefined} loopCount - the times to loop the song
  */
 
 export const WORKLET_PROCESSOR_NAME = "spessasynth-worklet-system";