Merge pull request #3121 from Holzhaus/float-warnings-pt-2

Fix some -Wfloat-conversion warnings (Pt. 2)

4 files changed, 15 insertions, 10 deletions

diff --git a/src/engine/channels/engineaux.cpp b/src/engine/channels/engineaux.cpp
index d67b8912e5..eaaef154ae 100644
--- a/src/engine/channels/engineaux.cpp
+++ b/src/engine/channels/engineaux.cpp
@@ -75,14 +75,15 @@ void EngineAux::receiveBuffer(AudioInput input, const CSAMPLE* pBuffer,
 
 void EngineAux::process(CSAMPLE* pOut, const int iBufferSize) {
     const CSAMPLE* sampleBuffer = m_sampleBuffer; // save pointer on stack
-    double pregain = m_pPregain->get();
+    CSAMPLE_GAIN pregain = static_cast<CSAMPLE_GAIN>(m_pPregain->get());
     if (sampleBuffer) {
         SampleUtil::copyWithGain(pOut, sampleBuffer, pregain, iBufferSize);
         EngineEffectsManager* pEngineEffectsManager = m_pEffectsManager->getEngineEffectsManager();
         if (pEngineEffectsManager != nullptr) {
             pEngineEffectsManager->processPreFaderInPlace(
-                m_group.handle(), m_pEffectsManager->getMasterHandle(),
-                pOut, iBufferSize, m_pSampleRate->get());
+                    m_group.handle(), m_pEffectsManager->getMasterHandle(), pOut, iBufferSize,
+                    // TODO(jholthuis): Use mixxx::audio::SampleRate instead
+                    static_cast<unsigned int>(m_pSampleRate->get()));
         }
         m_sampleBuffer = NULL;
     } else {
diff --git a/src/engine/channels/enginedeck.cpp b/src/engine/channels/enginedeck.cpp
index e0047eab61..27431078c6 100644
--- a/src/engine/channels/enginedeck.cpp
+++ b/src/engine/channels/enginedeck.cpp
@@ -90,9 +90,12 @@ void EngineDeck::process(CSAMPLE* pOut, const int iBufferSize) {
 
     EngineEffectsManager* pEngineEffectsManager = m_pEffectsManager->getEngineEffectsManager();
     if (pEngineEffectsManager != nullptr) {
-        pEngineEffectsManager->processPreFaderInPlace(
-            m_group.handle(), m_pEffectsManager->getMasterHandle(),
-            pOut, iBufferSize, m_pSampleRate->get());
+        pEngineEffectsManager->processPreFaderInPlace(m_group.handle(),
+                m_pEffectsManager->getMasterHandle(),
+                pOut,
+                iBufferSize,
+                // TODO(jholthuis): Use mixxx::audio::SampleRate instead
+                static_cast<unsigned int>(m_pSampleRate->get()));
     }
 
     // Update VU meter
diff --git a/src/engine/channels/enginemicrophone.cpp b/src/engine/channels/enginemicrophone.cpp
index ddc78fa882..be6e8c4174 100644
--- a/src/engine/channels/enginemicrophone.cpp
+++ b/src/engine/channels/enginemicrophone.cpp
@@ -74,14 +74,15 @@ void EngineMicrophone::process(CSAMPLE* pOut, const int iBufferSize) {
     // If configured read into the output buffer.
     // Otherwise, skip the appropriate number of samples to throw them away.
     const CSAMPLE* sampleBuffer = m_sampleBuffer; // save pointer on stack
-    double pregain =  m_pPregain->get();
+    CSAMPLE_GAIN pregain = static_cast<CSAMPLE_GAIN>(m_pPregain->get());
     if (sampleBuffer) {
         SampleUtil::copyWithGain(pOut, sampleBuffer, pregain, iBufferSize);
         EngineEffectsManager* pEngineEffectsManager = m_pEffectsManager->getEngineEffectsManager();
         if (pEngineEffectsManager != nullptr) {
             pEngineEffectsManager->processPreFaderInPlace(
-                m_group.handle(), m_pEffectsManager->getMasterHandle(),
-                pOut, iBufferSize, m_pSampleRate->get());
+                    m_group.handle(), m_pEffectsManager->getMasterHandle(), pOut, iBufferSize,
+                    // TODO(jholthuis): Use mixxx::audio::SampleRate instead
+                    static_cast<unsigned int>(m_pSampleRate->get()));
         }
     } else {
         SampleUtil::clear(pOut, iBufferSize);
diff --git a/src/engine/enginebuffer.h b/src/engine/enginebuffer.h
index f00cc47d81..f51f9a59a3 100644
--- a/src/engine/enginebuffer.h
+++ b/src/engine/enginebuffer.h
@@ -316,7 +316,7 @@ class EngineBuffer : public EngineObject {
     double m_rate_old;
 
     // Copy of length of file
-    int m_trackSamplesOld;
+    double m_trackSamplesOld;
 
     // Copy of file sample rate
     double m_trackSampleRateOld;