beatToMilliseconds uses played ticks

musescore · Jul 27, 2024 · 5fd330f · 5fd330f
1 parent d910ca8
commit 5fd330f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/notation/internal/notationactioncontroller.cpp b/src/notation/internal/notationactioncontroller.cpp
@@ -1006,7 +1006,7 @@ void NotationActionController::move(MoveDirection direction, bool quickly)
 
             audio::secs_t targetSec = playbackController()->beatToSecs(targetMeasureIdx, targetBeatIdx);
             playbackController()->seek(targetSec);
-            break;
+            return;
         }
 
         if (selectedElement && selectedElement->isTextBase()) {

diff --git a/src/playback/internal/playbackcontroller.cpp b/src/playback/internal/playbackcontroller.cpp
@@ -1434,7 +1434,14 @@ MeasureBeat PlaybackController::currentBeat() const
 
 msecs_t PlaybackController::beatToMilliseconds(int measureIndex, int beatIndex) const
 {
-    return notationPlayback() ? playedTickToMsecs(notationPlayback()->beatToRawTick(measureIndex, beatIndex)) : 0;
+    if (!notationPlayback()) {
+        return 0;
+    }
+
+    muse::midi::tick_t rawTick = notationPlayback()->beatToRawTick(measureIndex, beatIndex);
+    muse::midi::tick_t playedTick = notationPlayback()->playPositionTickByRawTick(rawTick).val;
+
+    return playedTickToMsecs(playedTick);
 }
 
 secs_t PlaybackController::beatToSecs(int measureIndex, int beatIndex) const