cursor row is locked when following

selecting a pattern jumps to it when following

include/trackerboy/engine/Engine.hpp

@@ -58,6 +58,8 @@ class Engine {
     //
     void halt();
 
+    void jump(int pattern);
+
     //
     // Lock the given channel. Channel is reloaded with music settings.
     //

include/trackerboy/engine/MusicRuntime.hpp

@@ -38,6 +38,8 @@ class MusicRuntime {
 
     void unlock(RuntimeContext const& rc, ChType ch);
 
+    void jump(int pattern);
+
     bool step(RuntimeContext const& rc, Frame &frame);
 
     void repeatPattern(bool repeat);

libtrackerboy/engine/Engine.cpp

@@ -63,6 +63,12 @@ void Engine::halt() {
     }
 }
 
+void Engine::jump(int pattern) {
+    if (mMusicContext) {
+        mMusicContext->jump(pattern);
+    }
+}
+
 void Engine::lock(ChType ch) {
     if (mMusicContext) {
         mMusicContext->lock(*mRc, ch);

libtrackerboy/engine/MusicRuntime.cpp

@@ -33,6 +33,11 @@ void MusicRuntime::halt(RuntimeContext const &rc) {
     haltChannels(rc);
 }
 
+void MusicRuntime::jump(int pattern) {
+    mOrderCounter = pattern;
+    mRowCounter = 0;
+}
+
 void MusicRuntime::lock(RuntimeContext const& rc, ChType ch) {
     // do nothing if channel is already locked
     if (mFlags.test(+ch)) {

ui/core/audio/Renderer.cpp

@@ -292,6 +292,13 @@ void Renderer::stepFromCursor() {
     }
 }
 
+void Renderer::jumpToPattern(int pattern) {
+    if (mStream.isEnabled()) {
+        auto ctx = mContext.access();
+        ctx->engine.jump(pattern);
+    }
+}
+
 void Renderer::setPatternRepeat(bool repeat) {
 
     if (mStream.isEnabled()) {

ui/core/audio/Renderer.hpp

@@ -159,6 +159,11 @@ public slots:
 
     void stepFromCursor();
 
+    //
+    // Jumps to the given pattern if currently playing music
+    //
+    void jumpToPattern(int pattern);
+
     //
     // Stop previewing an instrument, waveform or row.
     //

ui/core/model/PatternModel.cpp

@@ -193,6 +193,10 @@ PatternClip PatternModel::clip() {
 // slots -------------------------------
 
 void PatternModel::moveCursorRow(int amount, SelectMode mode) {
+    if (mPlaying && mFollowing) {
+        return;
+    }
+
     if (mode == SelectionModify) {
         selectCursor();
     } else if (mode == SelectionRemove) {
@@ -221,6 +225,10 @@ void PatternModel::moveCursorTrack(int amount) {
 }
 
 void PatternModel::setCursorRow(int row) {
+    if (mPlaying && mFollowing) {
+        return;
+    }
+
     CursorChangeFlags flags = CursorUnchanged;
     setCursorRowImpl(row, flags);
     emitIfChanged(flags);
@@ -319,7 +327,9 @@ void PatternModel::setCursorTrackImpl(int track, CursorChangeFlags &flags) {
 
 void PatternModel::setCursor(PatternCursor const cursor) {
     CursorChangeFlags flags = CursorUnchanged;
-    setCursorRowImpl(cursor.row, flags);
+    if (!(mPlaying && mFollowing)) {
+        setCursorRowImpl(cursor.row, flags);
+    }
     setCursorColumnImpl(cursor.column, flags);
     setCursorTrackImpl(cursor.track, flags);
     emitIfChanged(flags);
@@ -357,7 +367,9 @@ void PatternModel::setTrackerCursor(int row, int pattern) {
     if (changed) {
         if (mFollowing) {
             mDocument.orderModel().selectPattern(pattern);
-            setCursorRow(row);
+            CursorChangeFlags flags = CursorUnchanged;
+            setCursorRowImpl(row, flags);
+            emitIfChanged(flags);
         }
         emit trackerCursorChanged(row, pattern);
     }

ui/forms/MainWindow.cpp

@@ -1196,6 +1196,8 @@ void MainWindow::setupUi() {
             mContextMenuOrder.popup(pos);
         });
 
+    connect(&mSidebar, &Sidebar::patternJumpRequested, &mRenderer, &Renderer::jumpToPattern);
+
     // order actions
     connect(&mActions[ActionSongOrderInsert], &QAction::triggered, this,
         [this]() {

ui/widgets/PatternEditor.cpp

@@ -355,7 +355,8 @@ void PatternEditor::wheelEvent(QWheelEvent *evt) {
     }
 
     if (amount) {
-        mDocument->patternModel().moveCursorRow(amount);
+        auto &patternModel = mDocument->patternModel();
+        patternModel.moveCursorRow(amount);
     }
 
     evt->accept();
@@ -375,12 +376,15 @@ void PatternEditor::hscrollAction(int action) {
 }
 
 void PatternEditor::vscrollAction(int action) {
+
+    auto &patternModel = mDocument->patternModel();
+
     switch (action) {
         case QAbstractSlider::SliderSingleStepAdd:
-            mDocument->patternModel().moveCursorRow(1);
+            patternModel.moveCursorRow(1);
             break;
         case QAbstractSlider::SliderSingleStepSub:
-            mDocument->patternModel().moveCursorRow(-1);
+            patternModel.moveCursorRow(-1);
             break;
         default:
             break;

ui/widgets/Sidebar.cpp

@@ -233,7 +233,17 @@ void Sidebar::currentChanged(QModelIndex const &current, QModelIndex const &prev
 
     if (mDocument) {
         mIgnoreSelect = true;
-        mDocument->orderModel().select(current.row(), current.column());
+        auto &orderModel = mDocument->orderModel();
+        auto &patternModel = mDocument->patternModel();
+        if (patternModel.isPlaying() && patternModel.isFollowing()) {
+            if (orderModel.currentPattern() != current.row()) {
+                // jump to this pattern instead of selecting it
+                emit patternJumpRequested(current.row());
+            }
+            orderModel.selectTrack(current.column());
+        } else {
+            orderModel.select(current.row(), current.column());
+        }
         mIgnoreSelect = false;
     }
 }

ui/widgets/Sidebar.hpp

@@ -36,6 +36,8 @@ class Sidebar : public QWidget {
 signals:
     void orderMenuRequested(QPoint const& pos);
 
+    void patternJumpRequested(int pattern);
+
 private:
 
     void currentIndexChanged(QModelIndex const& index);