Skip to content

Ensure we respect repeats on getting beat playback position #1055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Danielku15 merged 1 commit into from
Nov 26, 2022
Merged

Ensure we respect repeats on getting beat playback position #1055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions src/AlphaTabApiBase.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,9 +805,7 @@ export class AlphaTabApiBase<TSettings> {
let currentBeat = this._currentBeat;
let tickCache = this._tickCache;
if (currentBeat && tickCache) {
this.player!.tickPosition =
tickCache.getMasterBarStart(currentBeat.currentBeat.voice.bar.masterBar) +
currentBeat.currentBeat.playbackStart;
this.player!.tickPosition = tickCache.getBeatStart(currentBeat.currentBeat);
}
}
});
Expand Down Expand Up @@ -1145,8 +1143,8 @@ export class AlphaTabApiBase<TSettings> {
if (this.settings.player.enableUserInteraction) {
// for the selection ensure start < end
if (this._selectionEnd) {
let startTick: number = this._selectionStart!.beat.absolutePlaybackStart;
let endTick: number = this._selectionEnd!.beat.absolutePlaybackStart;
let startTick: number = this._tickCache?.getBeatStart(this._selectionStart!.beat) ?? this._selectionStart!.beat.absolutePlaybackStart;
let endTick: number = this._tickCache?.getBeatStart(this._selectionEnd!.beat) ?? this._selectionEnd!.beat.absolutePlaybackStart;
if (endTick < startTick) {
let t: SelectionInfo = this._selectionStart!;
this._selectionStart = this._selectionEnd;
Expand All @@ -1162,7 +1160,7 @@ export class AlphaTabApiBase<TSettings> {
// move to selection start
this._currentBeat = null; // reset current beat so it is updating the cursor
if (this._playerState === PlayerState.Paused) {
this.cursorUpdateTick(this._selectionStart.beat.absolutePlaybackStart, false);
this.cursorUpdateTick(this._tickCache.getBeatStart(this._selectionStart.beat), false);
}
this.tickPosition = realMasterBarStart + this._selectionStart.beat.playbackStart;
// set playback range
Expand Down Expand Up @@ -1314,8 +1312,8 @@ export class AlphaTabApiBase<TSettings> {
if (!endBeat.bounds) {
endBeat.bounds = cache.findBeat(endBeat.beat);
}
let startTick: number = startBeat.beat.absolutePlaybackStart;
let endTick: number = endBeat.beat.absolutePlaybackStart;
let startTick: number = this._tickCache?.getBeatStart(startBeat.beat) ?? startBeat.beat.absolutePlaybackStart;
let endTick: number = this._tickCache?.getBeatStart(endBeat.beat) ?? endBeat.beat.absolutePlaybackStart;
if (endTick < startTick) {
let t: SelectionInfo = startBeat;
startBeat = endBeat;
Expand Down
14 changes: 14 additions & 0 deletions src/midi/MidiTickLookup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,20 @@ export class MidiTickLookup {
return this.masterBarLookup.get(bar.index)!.start;
}


/**
* Gets the start time in midi ticks for a given beat at which the masterbar is played the first time.
* @param beat The beat to find the time period for.
* @returns The time in midi ticks at which the beat is played the first time or 0 if the beat is not contained
*/
public getBeatStart(beat:Beat): number {
if (!this.masterBarLookup.has(beat.voice.bar.index)) {
return 0;
}

return this.masterBarLookup.get(beat.voice.bar.index)!.start + beat.playbackStart;
}

/**
* Adds a new {@link MasterBarTickLookup} to the lookup table.
* @param masterBar The item to add.
Expand Down