Merge pull request #14024 from ronso0/waveform-scratch-seek-fix

(fix) allow seeking (eg. to hotcue) while scratching with the waveform
mixxxdj · Dec 17, 2024 · a5b51ce · a5b51ce
2 parents 23f1b3b + 4965d2b
commit a5b51ce
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/engine/controls/ratecontrol.cpp b/src/engine/controls/ratecontrol.cpp
@@ -628,3 +628,7 @@ void RateControl::notifyWrapAround(mixxx::audio::FramePos triggerPos,
     m_jumpPos = triggerPos;
     m_targetPos = targetPos;
 }
+
+void RateControl::notifySeek(mixxx::audio::FramePos position) {
+    m_pScratchController->notifySeek(position);
+}
diff --git a/src/engine/controls/ratecontrol.h b/src/engine/controls/ratecontrol.h
@@ -88,6 +88,7 @@ public slots:
   void slotControlRatePermUpSmall(double);
   void slotControlFastForward(double);
   void slotControlFastBack(double);
+  void notifySeek(mixxx::audio::FramePos position) override;
 
 private:
   void processTempRate(const int bufferSamples);

diff --git a/src/engine/positionscratchcontroller.cpp b/src/engine/positionscratchcontroller.cpp
@@ -300,7 +300,7 @@ double PositionScratchController::getRate() {
 
 void PositionScratchController::notifySeek(mixxx::audio::FramePos position) {
     DEBUG_ASSERT(position.isValid());
-    // scratching continues after seek due to calculating the relative distance traveled
-    // in m_samplePosDeltaSum
+    // Scratching continues after seek due to calculating the relative
+    // distance traveled in m_samplePosDeltaSum
     m_prevSamplePos = position.toEngineSamplePos();
 }