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

package/dist/alphaTab.d.ts

@@ -5613,6 +5613,24 @@ declare class Environment {
     private static detectWebPlatform;
 }
 
+/**
+ * Represents a beat and when it is actually played according to the generated audio.
+ */
+declare class BeatTickLookupItem {
+    /**
+     * Gets the beat represented by this item.
+     */
+    readonly beat: Beat;
+    /**
+     * Gets the playback start of the beat according to the generated audio.
+     */
+    readonly playbackStart: number;
+    /**
+     * Gets the playback start of the beat duration according to the generated audio.
+     */
+    readonly playbackDuration: number;
+    constructor(beat: Beat, playbackStart: number, playbackDuration: number);
+}
 /**
  * Represents the time period, for which one or multiple {@link Beat}s are played
  */
@@ -5631,7 +5649,7 @@ declare class BeatTickLookup {
      * the beat of this lookup starts playing. This might not mean
      * the beats start at this position.
      */
-    highlightedBeats: Beat[];
+    highlightedBeats: BeatTickLookupItem[];
     /**
      * Gets the next BeatTickLookup which comes after this one and is in the same
      * MasterBarTickLookup.
@@ -5651,7 +5669,7 @@ declare class BeatTickLookup {
      * Marks the given beat as highlighed as part of this lookup.
      * @param beat The beat to add.
      */
-    highlightBeat(beat: Beat): void;
+    highlightBeat(beat: Beat, playbackStart: number, playbackDuration: number): void;
     /**
      * Looks for the first visible beat which starts at this lookup so it can be used for cursor placement.
      * @param visibleTracks The visible tracks.
@@ -5700,6 +5718,10 @@ declare class MasterBarTickLookup {
      * Gets or sets the {@link MasterBarTickLookup} of the next masterbar in the {@link Score}
      */
     nextMasterBar: MasterBarTickLookup | null;
+    /**
+     * Gets or sets the {@link MasterBarTickLookup} of the previous masterbar in the {@link Score}
+     */
+    previousMasterBar: MasterBarTickLookup | null;
     /**
      * Adds a new beat to this masterbar following the slicing logic required by the MidiTickLookup.
      * @returns The first item of the chain which was affected.

package/dist/alphaTab.js

@@ -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
@@ -16809,6 +16809,16 @@
         }
     }
 
+    /**
+     * 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
      */
@@ -16844,13 +16854,13 @@
          * 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));
             }
         }
         /**
@@ -16860,8 +16870,8 @@
          */
         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;
@@ -16891,6 +16901,10 @@
              * 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.
@@ -17038,7 +17052,7 @@
             // 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
@@ -17046,7 +17060,7 @@
             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 {
@@ -17077,34 +17091,34 @@
                     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);
                     }
@@ -17114,10 +17128,10 @@
                     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
@@ -17127,20 +17141,20 @@
                         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);
                     }
@@ -17148,21 +17162,21 @@
                 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);
                     }
                 }
@@ -17288,6 +17302,11 @@
                 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
@@ -17335,7 +17354,7 @@
          * @returns
          */
         findBeatInMasterBar(masterBar, currentStartLookup, tick, visibleTracks, fillNext, isNextSeach) {
-            var _a;
+            var _a, _b, _c;
             if (!currentStartLookup) {
                 return null;
             }
@@ -17350,23 +17369,39 @@
                     // 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;
                             }
                         }
                     }
@@ -17374,7 +17409,7 @@
                 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;
@@ -17456,6 +17491,7 @@
         addMasterBar(masterBar) {
             this.masterBars.push(masterBar);
             if (this._currentMasterBar) {
+                masterBar.previousMasterBar = this._currentMasterBar;
                 this._currentMasterBar.nextMasterBar = masterBar;
             }
             this._currentMasterBar = masterBar;
@@ -19519,16 +19555,13 @@
                     }
                 }
             }
-            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) {
@@ -26136,7 +26169,7 @@
             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);
                     }
                 }
@@ -26170,7 +26203,7 @@
             // 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) {
@@ -42799,8 +42832,8 @@
     // </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,