EngineBuffer: Use mixxx::audio::FramePos internally

mixxxdj · Sep 7, 2021 · 1d9490d · 1d9490d
1 parent a0dc7c8
commit 1d9490d
Show file tree

Hide file tree

Showing 5 changed files with 105 additions and 97 deletions.
diff --git a/src/engine/controls/bpmcontrol.cpp b/src/engine/controls/bpmcontrol.cpp
@@ -723,8 +723,7 @@ mixxx::audio::FramePos BpmControl::getNearestPositionInPhase(
             return thisPosition;
         }
 
-        const auto otherPosition = mixxx::audio::FramePos::fromEngineSamplePos(
-                pOtherEngineBuffer->getExactPlayPos());
+        const auto otherPosition = pOtherEngineBuffer->getExactPlayPos();
         if (!BpmControl::getBeatContext(otherBeats,
                     otherPosition,
                     nullptr,
@@ -909,8 +908,7 @@ mixxx::audio::FramePos BpmControl::getBeatMatchPosition(
         return thisPosition;
     }
 
-    const auto otherPosition = mixxx::audio::FramePos::fromEngineSamplePos(
-            pOtherEngineBuffer->getExactPlayPos());
+    const auto otherPosition = pOtherEngineBuffer->getExactPlayPos();
     const mixxx::audio::SampleRate thisSampleRate = m_pBeats->getSampleRate();
 
     // Seek our next beat to the other next beat near our beat.