@coderline/alphatab 1.3.0-alpha.874 → 1.3.0-alpha.877

package/dist/alphaTab.mjs

@@ -1,7 +1,7 @@
 /**
- * alphaTab v1.3.0-alpha.874 (develop, build 874)
+ * alphaTab v1.3.0-alpha.877 (develop, build 877)
  * 
- * Copyright © 2023, Daniel Kuschny and Contributors, All rights reserved.
+ * Copyright © 2024, Daniel Kuschny and Contributors, All rights reserved.
  * 
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -16803,6 +16803,16 @@ class Queue {
     }
 }
 
+/**
+ * Represents a beat and when it is actually played according to the generated audio.
+ */
+class BeatTickLookupItem {
+    constructor(beat, playbackStart, playbackDuration) {
+        this.beat = beat;
+        this.playbackStart = playbackStart;
+        this.playbackDuration = playbackDuration;
+    }
+}
 /**
  * Represents the time period, for which one or multiple {@link Beat}s are played
  */
@@ -16838,13 +16848,13 @@ class BeatTickLookup {
      * Marks the given beat as highlighed as part of this lookup.
      * @param beat The beat to add.
      */
-    highlightBeat(beat) {
+    highlightBeat(beat, playbackStart, playbackDuration) {
         if (beat.isEmpty) {
             return;
         }
         if (!this._highlightedBeats.has(beat.id)) {
             this._highlightedBeats.set(beat.id, true);
-            this.highlightedBeats.push(beat);
+            this.highlightedBeats.push(new BeatTickLookupItem(beat, playbackStart, playbackDuration));
         }
     }
     /**
@@ -16854,8 +16864,8 @@ class BeatTickLookup {
      */
     getVisibleBeatAtStart(visibleTracks) {
         for (const b of this.highlightedBeats) {
-            if (b.playbackStart == this.start && visibleTracks.has(b.voice.bar.staff.track.index)) {
-                return b;
+            if (b.playbackStart == this.start && visibleTracks.has(b.beat.voice.bar.staff.track.index)) {
+                return b.beat;
             }
         }
         return null;
@@ -16885,6 +16895,10 @@ class MasterBarTickLookup {
          * Gets or sets the {@link MasterBarTickLookup} of the next masterbar in the {@link Score}
          */
         this.nextMasterBar = null;
+        /**
+         * Gets or sets the {@link MasterBarTickLookup} of the previous masterbar in the {@link Score}
+         */
+        this.previousMasterBar = null;
     }
     /**
      * Inserts `newNextBeat` after `currentBeat` in the linked list of items and updates.
@@ -17032,7 +17046,7 @@ class MasterBarTickLookup {
         // Variant A
         if (this.firstBeat == null) {
             const n1 = new BeatTickLookup(start, end);
-            n1.highlightBeat(beat);
+            n1.highlightBeat(beat, start, duration);
             this.insertAfter(this.firstBeat, n1);
         }
         // Variant B
@@ -17040,7 +17054,7 @@ class MasterBarTickLookup {
         else if (start >= this.lastBeat.end) {
             // using the end here allows merge of B & C
             const n1 = new BeatTickLookup(this.lastBeat.end, end);
-            n1.highlightBeat(beat);
+            n1.highlightBeat(beat, start, duration);
             this.insertAfter(this.lastBeat, n1);
         }
         else {
@@ -17071,34 +17085,34 @@ class MasterBarTickLookup {
                 if (end == l1.start) {
                     // using firstBeat.start here allows merge of D & E
                     const n1 = new BeatTickLookup(start, l1.start);
-                    n1.highlightBeat(beat);
+                    n1.highlightBeat(beat, start, duration);
                     this.insertBefore(this.firstBeat, n1);
                 }
                 // Variant F
                 else if (end < l1.end) {
                     const n1 = new BeatTickLookup(start, l1.start);
-                    n1.highlightBeat(beat);
+                    n1.highlightBeat(beat, start, duration);
                     this.insertBefore(l1, n1);
                     const n2 = new BeatTickLookup(l1.start, end);
                     for (const b of l1.highlightedBeats) {
-                        n2.highlightBeat(b);
+                        n2.highlightBeat(b.beat, b.playbackStart, b.playbackDuration);
                     }
-                    n2.highlightBeat(beat);
+                    n2.highlightBeat(beat, start, duration);
                     this.insertBefore(l1, n2);
                     l1.start = end;
                 }
                 // Variant G
                 else if (end == l1.end) {
                     const n1 = new BeatTickLookup(start, l1.start);
-                    n1.highlightBeat(beat);
-                    l1.highlightBeat(beat);
+                    n1.highlightBeat(beat, start, duration);
+                    l1.highlightBeat(beat, start, duration);
                     this.insertBefore(l1, n1);
                 }
                 // Variant H
                 else /* end > this.firstBeat.end */ {
                     const n1 = new BeatTickLookup(start, l1.start);
-                    n1.highlightBeat(beat);
-                    l1.highlightBeat(beat);
+                    n1.highlightBeat(beat, start, duration);
+                    l1.highlightBeat(beat, start, duration);
                     this.insertBefore(l1, n1);
                     this.addBeat(beat, l1.end, end - l1.end);
                 }
@@ -17108,10 +17122,10 @@ class MasterBarTickLookup {
                 if (end == l1.end) {
                     const n1 = new BeatTickLookup(l1.start, start);
                     for (const b of l1.highlightedBeats) {
-                        n1.highlightBeat(b);
+                        n1.highlightBeat(b.beat, b.playbackStart, b.playbackDuration);
                     }
                     l1.start = start;
-                    l1.highlightBeat(beat);
+                    l1.highlightBeat(beat, start, duration);
                     this.insertBefore(l1, n1);
                 }
                 // Variant J
@@ -17121,20 +17135,20 @@ class MasterBarTickLookup {
                     const n2 = new BeatTickLookup(start, end);
                     this.insertBefore(l1, n2);
                     for (const b of l1.highlightedBeats) {
-                        n1.highlightBeat(b);
-                        n2.highlightBeat(b);
+                        n1.highlightBeat(b.beat, b.playbackStart, b.playbackDuration);
+                        n2.highlightBeat(b.beat, b.playbackStart, b.playbackDuration);
                     }
-                    n2.highlightBeat(beat);
+                    n2.highlightBeat(beat, start, duration);
                     l1.start = end;
                 }
                 // Variant K
                 else /* end > l1.end */ {
                     const n1 = new BeatTickLookup(l1.start, start);
                     for (const b of l1.highlightedBeats) {
-                        n1.highlightBeat(b);
+                        n1.highlightBeat(b.beat, b.playbackStart, b.playbackDuration);
                     }
                     l1.start = start;
-                    l1.highlightBeat(beat);
+                    l1.highlightBeat(beat, start, duration);
                     this.insertBefore(l1, n1);
                     this.addBeat(beat, l1.end, end - l1.end);
                 }
@@ -17142,21 +17156,21 @@ class MasterBarTickLookup {
             else /* start == l1.start */ {
                 // Variant L
                 if (end === l1.end) {
-                    l1.highlightBeat(beat);
+                    l1.highlightBeat(beat, start, end);
                 }
                 // Variant M
                 else if (end < l1.end) {
                     const n1 = new BeatTickLookup(l1.start, end);
                     for (const b of l1.highlightedBeats) {
-                        n1.highlightBeat(b);
+                        n1.highlightBeat(b.beat, b.playbackStart, b.playbackDuration);
                     }
-                    n1.highlightBeat(beat);
+                    n1.highlightBeat(beat, start, duration);
                     l1.start = end;
                     this.insertBefore(l1, n1);
                 }
                 // variant N
                 else /* end > l1.end */ {
-                    l1.highlightBeat(beat);
+                    l1.highlightBeat(beat, start, duration);
                     this.addBeat(beat, l1.end, end - l1.end);
                 }
             }
@@ -17282,6 +17296,11 @@ class MidiTickLookup {
             current.tickDuration = current.nextBeat.start - current.start;
             current.duration = MidiUtils.ticksToMillis(current.tickDuration, current.masterBar.tempo);
         }
+        // no next beat, animate to the end of the bar (could be an incomplete bar)
+        if (!current.nextBeat) {
+            current.tickDuration = current.masterBar.end - current.start;
+            current.duration = MidiUtils.ticksToMillis(current.tickDuration, current.masterBar.tempo);
+        }
     }
     findBeatSlow(trackLookup, currentBeatHint, tick, isNextSearch) {
         // get all beats within the masterbar
@@ -17329,7 +17348,7 @@ class MidiTickLookup {
      * @returns
      */
     findBeatInMasterBar(masterBar, currentStartLookup, tick, visibleTracks, fillNext, isNextSeach) {
-        var _a;
+        var _a, _b, _c;
         if (!currentStartLookup) {
             return null;
         }
@@ -17344,23 +17363,39 @@ class MidiTickLookup {
                 // in this case scan further to the next lookup which has any visible beat
                 if (!startBeat) {
                     if (isNextSeach) {
-                        while (currentStartLookup != null) {
-                            startBeat = currentStartLookup.getVisibleBeatAtStart(visibleTracks);
-                            if (startBeat) {
-                                startBeatLookup = currentStartLookup;
-                                break;
+                        let currentMasterBar = masterBar;
+                        while (currentMasterBar != null && startBeat == null) {
+                            while (currentStartLookup != null) {
+                                startBeat = currentStartLookup.getVisibleBeatAtStart(visibleTracks);
+                                if (startBeat) {
+                                    startBeatLookup = currentStartLookup;
+                                    masterBar = currentMasterBar;
+                                    break;
+                                }
+                                currentStartLookup = currentStartLookup.nextBeat;
+                            }
+                            if (!startBeat || !startBeatLookup) {
+                                currentMasterBar = currentMasterBar.nextMasterBar;
+                                currentStartLookup = (_a = currentMasterBar === null || currentMasterBar === void 0 ? void 0 : currentMasterBar.firstBeat) !== null && _a !== void 0 ? _a : null;
                             }
-                            currentStartLookup = currentStartLookup.nextBeat;
                         }
                     }
                     else {
-                        while (currentStartLookup != null) {
-                            startBeat = currentStartLookup.getVisibleBeatAtStart(visibleTracks);
-                            if (startBeat) {
-                                startBeatLookup = currentStartLookup;
-                                break;
+                        let currentMasterBar = masterBar;
+                        while (currentMasterBar != null && startBeat == null) {
+                            while (currentStartLookup != null) {
+                                startBeat = currentStartLookup.getVisibleBeatAtStart(visibleTracks);
+                                if (startBeat) {
+                                    startBeatLookup = currentStartLookup;
+                                    masterBar = currentMasterBar;
+                                    break;
+                                }
+                                currentStartLookup = currentStartLookup.previousBeat;
+                            }
+                            if (!startBeat || !startBeatLookup) {
+                                currentMasterBar = currentMasterBar.previousMasterBar;
+                                currentStartLookup = (_b = currentMasterBar === null || currentMasterBar === void 0 ? void 0 : currentMasterBar.firstBeat) !== null && _b !== void 0 ? _b : null;
                             }
-                            currentStartLookup = currentStartLookup.previousBeat;
                         }
                     }
                 }
@@ -17368,7 +17403,7 @@ class MidiTickLookup {
             else if (currentStartLookup.end > relativeTick) {
                 break;
             }
-            currentStartLookup = (_a = currentStartLookup === null || currentStartLookup === void 0 ? void 0 : currentStartLookup.nextBeat) !== null && _a !== void 0 ? _a : null;
+            currentStartLookup = (_c = currentStartLookup === null || currentStartLookup === void 0 ? void 0 : currentStartLookup.nextBeat) !== null && _c !== void 0 ? _c : null;
         }
         if (startBeat == null) {
             return null;
@@ -17450,6 +17485,7 @@ class MidiTickLookup {
     addMasterBar(masterBar) {
         this.masterBars.push(masterBar);
         if (this._currentMasterBar) {
+            masterBar.previousMasterBar = this._currentMasterBar;
             this._currentMasterBar.nextMasterBar = masterBar;
         }
         this._currentMasterBar = masterBar;
@@ -19513,16 +19549,13 @@ class MidiFileGenerator {
                 }
             }
         }
-        const realTickOffset = !beat.nextBeat
-            ? audioDuration
-            : beat.nextBeat.absolutePlaybackStart - beat.absolutePlaybackStart;
         // in case of normal playback register playback
         if (realBar === beat.voice.bar) {
-            this.tickLookup.addBeat(beat, beatStart, realTickOffset > audioDuration ? realTickOffset : audioDuration);
+            this.tickLookup.addBeat(beat, beatStart, audioDuration);
         }
         else {
             // in case of simile marks where we repeat we also register 
-            this.tickLookup.addBeat(beat, 0, realTickOffset > audioDuration ? realTickOffset : audioDuration);
+            this.tickLookup.addBeat(beat, 0, audioDuration);
         }
         const track = beat.voice.bar.staff.track;
         for (const automation of beat.automations) {
@@ -26130,7 +26163,7 @@ class AlphaTabApiBase {
         if (this._playerState === PlayerState.Playing && !stop) {
             if (this.settings.player.enableElementHighlighting) {
                 for (let highlight of beatsToHighlight) {
-                    let className = BeatContainerGlyph.getGroupId(highlight);
+                    let className = BeatContainerGlyph.getGroupId(highlight.beat);
                     this.uiFacade.highlightElements(className, beat.voice.bar.index);
                 }
             }
@@ -26164,7 +26197,7 @@ class AlphaTabApiBase {
         // trigger an event for others to indicate which beat/bar is played
         if (shouldNotifyBeatChange) {
             this.onPlayedBeatChanged(beat);
-            this.onActiveBeatsChanged(new ActiveBeatsChangedEventArgs(beatsToHighlight));
+            this.onActiveBeatsChanged(new ActiveBeatsChangedEventArgs(beatsToHighlight.map(i => i.beat)));
         }
     }
     onPlayedBeatChanged(beat) {
@@ -42793,8 +42826,8 @@ class CoreSettings {
 // </auto-generated>
 class VersionInfo {
 }
-VersionInfo.version = '1.3.0-alpha.874';
-VersionInfo.date = '2023-12-30T01:20:54.980Z';
+VersionInfo.version = '1.3.0-alpha.877';
+VersionInfo.date = '2024-01-02T01:23:49.737Z';
 
 var index$5 = /*#__PURE__*/Object.freeze({
     __proto__: null,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@coderline/alphatab",
-    "version": "1.3.0-alpha.874",
+    "version": "1.3.0-alpha.877",
     "description": "alphaTab is a music notation and guitar tablature rendering library",
     "keywords": [
         "guitar",