ControllerEngine: add stopDeck()

mixxxdj · Mar 29, 2022 · 6ebce1b · 6ebce1b
1 parent 8de13cd
commit 6ebce1b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/src/controllers/controllerengine.cpp b/src/controllers/controllerengine.cpp
@@ -1250,6 +1250,18 @@ bool ControllerEngine::isDeckPlaying(const QString& group) {
     return pPlay->get() > 0.0;
 }
 
+void ControllerEngine::stopDeck(const QString& group) {
+    ControlObjectScript* pPlay = getControlObjectScript(group, "play");
+
+    if (pPlay == nullptr) {
+        QString error = QString("Could not getControlObjectScript()");
+        scriptErrorDialog(error, error);
+        return;
+    }
+
+    pPlay->set(0.0);
+}
+
 /* -------- ------------------------------------------------------
     Purpose: Enables scratching for relative controls
     Input:   Virtual deck to scratch,
@@ -1410,10 +1422,7 @@ void ControllerEngine::scratchProcess(int timerId) {
         if (m_brakeActive[deck] || m_spinbackActive[deck]) {
             // If in brake mode, set scratch2 rate to 0 and stop the deck.
             pScratch2->slotSet(0.0);
-            ControlObjectScript* pPlay = getControlObjectScript(group, "play");
-            if (pPlay != nullptr) {
-                pPlay->slotSet(0.0);
-            }
+            stopDeck(group);
         }
 
         // Clear scratch2_enable to end scratching.
@@ -1589,7 +1598,7 @@ void ControllerEngine::brake(int deck, bool activate, double factor, double rate
         m_brakeActive[deck] = false;
         m_spinbackActive[deck] = false;
         stopScratchTimer(timerId);
-        // TODO(ronso0) Stop deck as if we were braking to halt
+        stopDeck(group);
         return;
     }
     stopScratchTimer(timerId);

diff --git a/src/controllers/controllerengine.h b/src/controllers/controllerengine.h
@@ -196,6 +196,7 @@ class ControllerEngine : public QObject {
     void stopScratchTimer(int timerId);
 
     bool isDeckPlaying(const QString& group);
+    void stopDeck(const QString& group);
     double getDeckRate(const QString& group);
 
     Controller* m_pController;