left/right arrow with and without ctrl/command during playback moves …

…from playback cursor location

- left/right arrow: move between beats
- left/right arrow + ctrl/command: move between measures

src/notation/internal/notationactioncontroller.cpp

@@ -27,6 +27,7 @@
 
 #include "engraving/dom/note.h"
 #include "engraving/dom/text.h"
+#include "engraving/playback/playbackmodel.h"
 
 #include "translation.h"
 #include "log.h"
@@ -979,6 +980,33 @@ void NotationActionController::move(MoveDirection direction, bool quickly)
             return;
         }
 
+        if (playbackController()->isPlaying()) {
+            MeasureBeat beat = playbackController()->currentBeat();
+            int targetBeatIdx = beat.beatIndex;
+            int targetMeasureIdx = beat.measureIndex;
+            int increment = (direction == MoveDirection::Right ? 1 : -1);
+
+            const engraving::RepeatList& rl = currentMasterNotation()->masterScore()->repeatList(true);
+
+            if (quickly) {
+                targetBeatIdx = 0;
+                targetMeasureIdx += increment;
+            } else {
+                targetBeatIdx += increment;
+                if (targetBeatIdx > beat.maxBeatIndex) {
+                    targetBeatIdx = 0;
+                    targetMeasureIdx += 1;
+                } else if (targetBeatIdx < 0) {
+                    targetBeatIdx = beat.maxBeatIndex;
+                    targetMeasureIdx -= 1;
+                }
+            }
+            int targetTick = currentMasterNotation()->playback()->beatToTick(targetMeasureIdx, targetBeatIdx);
+            double targetSec = rl.utick2utime(rl.tick2utick(targetTick));
+            playbackController()->seek(targetSec);
+            break;
+        }
+
         if (selectedElement && selectedElement->isTextBase()) {
             interaction->nudge(direction, quickly);
         } else {

src/playback/internal/playbackcontroller.h

@@ -117,6 +117,7 @@ class PlaybackController : public IPlaybackController, public muse::actions::Act
 
     bool canReceiveAction(const muse::actions::ActionCode& code) const override;
 
+    void seek(const muse::audio::secs_t secs) override;
 private:
     muse::audio::IPlayerPtr currentPlayer() const;
 
@@ -131,7 +132,6 @@ class PlaybackController : public IPlaybackController, public muse::actions::Act
     void updateCurrentTempo();
 
     void seek(const muse::midi::tick_t tick);
-    void seek(const muse::audio::secs_t secs);
 
     bool isPaused() const;
     bool isLoaded() const;

src/playback/iplaybackcontroller.h

@@ -100,6 +100,8 @@ class IPlaybackController : MODULE_EXPORT_INTERFACE
 
     virtual void setNotation(notation::INotationPtr notation) = 0;
     virtual void setIsExportingAudio(bool exporting) = 0;
+
+    virtual void seek(const muse::audio::secs_t secs) = 0;
 };
 }
 

src/playback/tests/mocks/playbackcontrollermock.h

@@ -86,6 +86,8 @@ class PlaybackControllerMock : public IPlaybackController
 
     MOCK_METHOD(void, setNotation, (notation::INotationPtr), (override));
     MOCK_METHOD(void, setIsExportingAudio, (bool), (override));
+
+    MOCK_METHOD(void, seek, (const muse::audio::secs_t), (override));
 };
 }
 

src/stubs/playback/playbackcontrollerstub.cpp

@@ -44,6 +44,10 @@ muse::async::Notification PlaybackControllerStub::isPlayingChanged() const
     return muse::async::Notification();
 }
 
+void PlaybackControllerStub::seek(const muse::audio::msecs_t)
+{
+}
+
 void PlaybackControllerStub::reset()
 {
 }

src/stubs/playback/playbackcontrollerstub.h

@@ -82,6 +82,8 @@ class PlaybackControllerStub : public IPlaybackController
 
     void setNotation(notation::INotationPtr notation) override;
     void setIsExportingAudio(bool exporting) override;
+
+    void seek(const muse::audio::msecs_t msecs) override;
 };
 }