Fix broken looped playback when score has repeats

musescore · May 8, 2024 · 14063f5 · 14063f5
1 parent d91d5be
commit 14063f5
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/playback/internal/playbackcontroller.cpp b/src/playback/internal/playbackcontroller.cpp
@@ -802,9 +802,16 @@ void PlaybackController::updateLoop()
         return;
     }
 
-    msecs_t fromMsesc = tickToMsecs(boundaries.loopInTick);
-    msecs_t toMsecs = tickToMsecs(boundaries.loopOutTick);
-    playback()->player()->setLoop(m_currentSequenceId, fromMsesc, toMsecs);
+    // Convert from raw ticks (visual tick != playback tick due to repeats etc)
+    RetVal<tick_t> playbackTickFrom = notationPlayback()->playPositionTickByRawTick(boundaries.loopInTick);
+    RetVal<tick_t> playbackTickTo = notationPlayback()->playPositionTickByRawTick(boundaries.loopOutTick);
+    if (!playbackTickFrom.ret || !playbackTickTo.ret) {
+        return;
+    }
+
+    msecs_t fromMsecs = tickToMsecs(playbackTickFrom.val);
+    msecs_t toMsecs = tickToMsecs(playbackTickTo.val);
+    playback()->player()->setLoop(m_currentSequenceId, fromMsecs, toMsecs);
 
     enableLoop();