spessasynth_lib 3.20.15 → 3.20.16

package/@types/midi_parser/basic_midi.d.ts

@@ -116,9 +116,9 @@ export class BasicMIDI {
      */
     tracks: MidiMessage[][];
     /**
-     * Coverts ticks to time in seconds
-     * @param ticks {number}
-     * @returns {number}
+     * 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/midi_parser/basic_midi.js

@@ -126,21 +126,29 @@ export class BasicMIDI
     }
 
     /**
-     * Coverts ticks to time in seconds
-     * @param ticks {number}
-     * @returns {number}
+     * Converts ticks to time in seconds
+     * @param ticks {number} time in MIDI ticks
+     * @returns {number} time in seconds
      * @protected
      */
-    _ticksToSeconds(ticks)
-    {
-        if (ticks <= 0) {
-            return 0;
+    _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;
         }
 
-        // find the last tempo change that has occured
-        let tempo = this.tempoChanges.find(v => v.ticks < ticks);
-
-        let timeSinceLastTempo = ticks - tempo.ticks;
-        return this._ticksToSeconds(ticks - timeSinceLastTempo) + (timeSinceLastTempo * 60) / (tempo.tempo * this.timeDivision);
+        return totalSeconds;
     }
+
+
 }

package/midi_parser/midi_loader.js

@@ -427,6 +427,12 @@ class MIDI extends BasicMIDI
                 consoleColors.value);
         }
 
+        SpessaSynthInfo(`%cAll tracks parsed correctly!`,
+            consoleColors.recognized);
+
+        SpessaSynthGroupCollapsed(`%cCorrecting loops, ports and detecting notes...`,
+            consoleColors.info)
+
         const firstNoteOns = [];
         for(const t of this.tracks)
         {
@@ -438,10 +444,12 @@ class MIDI extends BasicMIDI
         }
         this.firstNoteOn = Math.min(...firstNoteOns);
 
-        SpessaSynthInfo(`%cMIDI file parsed. Total tick time: %c${this.lastVoiceEventTick}`,
+        SpessaSynthInfo(`%cFirst note-on detected at: %c${this.firstNoteOn}%c ticks!`,
             consoleColors.info,
-            consoleColors.recognized);
-        SpessaSynthGroupEnd();
+            consoleColors.recognized,
+            consoleColors.info);
+
+
         
         if(loopStart !== null && loopEnd === null)
         {
@@ -461,6 +469,18 @@ class MIDI extends BasicMIDI
             }
         }
 
+        /**
+         *
+         * @type {{start: number, end: number}}
+         */
+        this.loop = {start: loopStart, end: loopEnd};
+
+        SpessaSynthInfo(`%cLoop points: start: %c${this.loop.start}%c end: %c${this.loop.end}`,
+            consoleColors.info,
+            consoleColors.recognized,
+            consoleColors.info,
+            consoleColors.recognized);
+
         // fix midi ports:
         // midi tracks without ports will have a value of -1
         // if all ports have a value of -1, set it to 0, otherwise take the first midi port and replace all -1 with it
@@ -481,12 +501,14 @@ class MIDI extends BasicMIDI
         {
             this.midiPortChannelOffsets = [0];
         }
-
-        /**
-         *
-         * @type {{start: number, end: number}}
-         */
-        this.loop = {start: loopStart, end: loopEnd};
+        if(this.midiPortChannelOffsets.length < 2)
+        {
+            SpessaSynthInfo(`%cNo additional MIDI Ports detected.`, consoleColors.info);
+        }
+        else
+        {
+            SpessaSynthInfo(`%cMIDI Ports detected!`, consoleColors.recognized);
+        }
 
         // midi name
         if(!nameDetected)
@@ -528,6 +550,8 @@ class MIDI extends BasicMIDI
         // if midiName is "", use the file name
         if(this.midiName.length === 0)
         {
+            SpessaSynthInfo(`%cNo name detected. Using the alt name!`,
+                consoleColors.info);
             this.midiName = formatTitle(fileName);
             // encode it too
             this.rawMidiName = new Uint8Array(this.midiName.length);
@@ -536,7 +560,12 @@ class MIDI extends BasicMIDI
                 this.rawMidiName[i] = this.midiName.charCodeAt(i);
             }
         }
-
+        else
+        {
+            SpessaSynthInfo(`%cMIDI Name detected! %c"${this.midiName}"`,
+                consoleColors.info,
+                consoleColors.recognized)
+        }
         // reverse the tempo changes
         this.tempoChanges.reverse();
 
@@ -545,6 +574,14 @@ class MIDI extends BasicMIDI
          * @type {number}
          */
         this.duration = this._ticksToSeconds(this.lastVoiceEventTick);
+
+        SpessaSynthGroupEnd();
+        SpessaSynthInfo(`%cMIDI file parsed. Total tick time: %c${this.lastVoiceEventTick}%c, total seconds time: %c${this.duration}`,
+            consoleColors.info,
+            consoleColors.recognized,
+            consoleColors.info,
+            consoleColors.recognized);
+        SpessaSynthGroupEnd();
     }
 
     /**

package/package.json

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

package/soundfont/dls/read_articulation.js

@@ -79,11 +79,7 @@ export function readArticulation(chunk, disableVibrato)
         const scale = readLittleEndian(artData, 4) | 0;
         const value = scale >> 16; // convert it to 16 bit as soundfont uses that
 
-        // if(destination === DLSDestinations.volEnvDecay)
-        // {
-        //     console.log(scale, value)
-        // }
-        //modulatorConverterDebug(source, control, destination, value, transform);
+        // modulatorConverterDebug(source, control, destination, value, transform);
         // interpret this somehow...
         // if source and control are both zero, it's a generator
         if(source === 0 && control === 0 && transform === 0)