Merge pull request #4217 from Holzhaus/enginebuffer-framepos

EngineBuffer: Use mixxx::audio::FramePos
mixxxdj · Sep 8, 2021 · a0ff12b · a0ff12b
2 parents e405c47 + bc616cc
commit a0ff12b
Show file tree

Hide file tree

Showing 7 changed files with 131 additions and 115 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.

diff --git a/src/engine/controls/enginecontrol.cpp b/src/engine/controls/enginecontrol.cpp
@@ -85,13 +85,13 @@ void EngineControl::setLoop(mixxx::audio::FramePos startPosition,
 
 void EngineControl::seekAbs(mixxx::audio::FramePos position) {
     if (m_pEngineBuffer) {
-        m_pEngineBuffer->slotControlSeekAbs(position.toEngineSamplePos());
+        m_pEngineBuffer->seekAbs(position);
     }
 }
 
 void EngineControl::seekExact(mixxx::audio::FramePos position) {
     if (m_pEngineBuffer) {
-        m_pEngineBuffer->slotControlSeekExact(position.toEngineSamplePos());
+        m_pEngineBuffer->seekExact(position);
     }
 }