Merge pull request mixxxdj#15086 from ronso0/scratch-load-freeze-fix

(fix) Avoid engine freeze when loading a new track while scratching with waveform or spinny

Author: daschuer

src/engine/controls/ratecontrol.cpp

@@ -628,3 +628,10 @@ void RateControl::notifyWrapAround(mixxx::audio::FramePos triggerPos,
 void RateControl::notifySeek(mixxx::audio::FramePos position) {
     m_pScratchController->notifySeek(position);
 }
+
+void RateControl::resetPositionScratchController() {
+    // Resets the scratch state to avoid engine freeze due to insanley high rate
+    // reported on track load while scratching.
+    // https://github.com/mixxxdj/mixxx/issues/15082
+    m_pScratchController->reset();
+}

src/engine/controls/ratecontrol.h

@@ -77,6 +77,7 @@ class RateControl : public EngineControl {
   void notifyWrapAround(mixxx::audio::FramePos triggerPos,
           mixxx::audio::FramePos targetPos);
   void notifySeek(mixxx::audio::FramePos position) override;
+  void resetPositionScratchController();
 
 public slots:
   void slotRateRangeChanged(double);

src/engine/enginebuffer.cpp

@@ -627,13 +627,19 @@ void EngineBuffer::ejectTrack() {
 
     if (pOldTrack) {
         notifyTrackLoaded(TrackPointer(), pOldTrack);
+    } else {
+        // When not invoking notifyTrackLoaded() call this separately
+        m_pRateControl->resetPositionScratchController();
     }
+
     m_iTrackLoading = 0;
     m_pChannelToCloneFrom = nullptr;
 }
 
 void EngineBuffer::notifyTrackLoaded(
         TrackPointer pNewTrack, TrackPointer pOldTrack) {
+    m_pRateControl->resetPositionScratchController();
+
     if (pOldTrack) {
         disconnect(
                 pOldTrack.get(),

src/engine/positionscratchcontroller.cpp

@@ -329,3 +329,13 @@ void PositionScratchController::notifySeek(mixxx::audio::FramePos position) {
     // distance traveled in m_samplePosDeltaSum
     m_seekSamplePos = newPos;
 }
+
+void PositionScratchController::reset() {
+    // Resets the scratch state to avoid engine freeze due to insanley high rate
+    // reported on track load while scratching.
+    // https://github.com/mixxxdj/mixxx/issues/15082
+    m_pScratchEnable->set(0.0);
+    m_isScratching = false;
+    m_inertiaEnabled = false;
+    m_rate = 0;
+}

src/engine/positionscratchcontroller.h

@@ -33,6 +33,7 @@ class PositionScratchController : public QObject {
         return m_rate;
     }
     void notifySeek(mixxx::audio::FramePos position);
+    void reset();
 
   private slots:
     void slotUpdateFilterParameters(double sampleRate);