LoopingControl: Use mixxx::audio::FramePos instead of double samples

mixxxdj · Aug 8, 2021 · 418ca90 · 418ca90
1 parent 7d1be27
commit 418ca90
Show file tree

Hide file tree

Showing 5 changed files with 380 additions and 370 deletions.
diff --git a/src/engine/controls/cuecontrol.cpp b/src/engine/controls/cuecontrol.cpp
@@ -2280,7 +2280,8 @@ void CueControl::slotLoopEnabledChanged(bool enabled) {
     }
 }
 
-void CueControl::slotLoopUpdated(double startPositionSamples, double endPositionSamples) {
+void CueControl::slotLoopUpdated(mixxx::audio::FramePos startPosition,
+        mixxx::audio::FramePos endPosition) {
     HotcueControl* pSavedLoopControl = m_pCurrentSavedLoopControl;
     if (!pSavedLoopControl) {
         return;
@@ -2302,16 +2303,10 @@ void CueControl::slotLoopUpdated(double startPositionSamples, double endPosition
         return;
     }
 
-    const auto startPosition =
-            mixxx::audio::FramePos::fromEngineSamplePosMaybeInvalid(
-                    startPositionSamples);
-    const auto endPosition =
-            mixxx::audio::FramePos::fromEngineSamplePosMaybeInvalid(
-                    endPositionSamples);
-
-    DEBUG_ASSERT(startPosition.isValid());
-    DEBUG_ASSERT(endPosition.isValid());
-    DEBUG_ASSERT(startPosition < endPosition);
+    VERIFY_OR_DEBUG_ASSERT(startPosition.isValid() && endPosition.isValid() &&
+            startPosition < endPosition) {
+        return;
+    }
 
     DEBUG_ASSERT(pSavedLoopControl->getStatus() == HotcueControl::Status::Active);
     pCue->setStartPosition(startPosition);

diff --git a/src/engine/controls/cuecontrol.h b/src/engine/controls/cuecontrol.h
@@ -207,7 +207,7 @@ class CueControl : public EngineControl {
   public slots:
     void slotLoopReset();
     void slotLoopEnabledChanged(bool enabled);
-    void slotLoopUpdated(double startPosition, double endPosition);
+    void slotLoopUpdated(mixxx::audio::FramePos startPosition, mixxx::audio::FramePos endPosition);
 
   private slots:
     void quantizeChanged(double v);