Merge pull request #3123 from Holzhaus/float-warnings-pt-4

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

6 files changed, 17 insertions, 16 deletions

diff --git a/src/engine/controls/ratecontrol.cpp b/src/engine/controls/ratecontrol.cpp
index e2b25a20f7..f79cc0060d 100644
--- a/src/engine/controls/ratecontrol.cpp
+++ b/src/engine/controls/ratecontrol.cpp
@@ -475,7 +475,7 @@ double RateControl::calculateSpeed(double baserate, double speed, bool paused,
             }
             // If we are reversing (and not scratching,) flip the rate.  This is ok even when syncing.
             // Reverse with vinyl is only ok if absolute mode isn't on.
-            int vcmode = m_pVCMode ? m_pVCMode->get() : MIXXX_VCMODE_ABSOLUTE;
+            int vcmode = m_pVCMode ? static_cast<int>(m_pVCMode->get()) : MIXXX_VCMODE_ABSOLUTE;
             // TODO(owen): Instead of just ignoring reverse mode, should we
             // disable absolute mode instead?
             if (m_pReverseButton->get()
diff --git a/src/engine/enginesidechaincompressor.cpp b/src/engine/enginesidechaincompressor.cpp
index bfc6b49739..7ff4cb1b04 100644
--- a/src/engine/enginesidechaincompressor.cpp
+++ b/src/engine/enginesidechaincompressor.cpp
@@ -29,10 +29,10 @@ void EngineSideChainCompressor::calculateRates() {
         m_decayPerFrame = m_strength / m_decayTime;
     }
     if (m_attackPerFrame <= 0) {
-        m_attackPerFrame = 0.005;
+        m_attackPerFrame = 0.005f;
     }
     if (m_decayPerFrame <= 0) {
-        m_decayPerFrame = 0.005;
+        m_decayPerFrame = 0.005f;
     }
     //qDebug() << "Compressor attack per frame: " << m_attackPerFrame
     //         << "decay per frame: " << m_decayPerFrame;
diff --git a/src/engine/filters/enginefilterdelay.h b/src/engine/filters/enginefilterdelay.h
index d267b83089..e57d1ada34 100644
--- a/src/engine/filters/enginefilterdelay.h
+++ b/src/engine/filters/enginefilterdelay.h
@@ -108,7 +108,7 @@ class EngineFilterDelay : public EngineObjectConstIn {
     // it is an alternative for using pauseFillter() calls
     void processAndPauseFilter(const CSAMPLE* pIn, CSAMPLE* pOutput,
                        const int iBufferSize) {
-        double oldDelay = m_delaySamples;
+        int oldDelay = m_delaySamples;
         m_delaySamples = 0;
         process(pIn, pOutput, iBufferSize);
         m_delaySamples = oldDelay;
diff --git a/src/engine/filters/enginefiltermoogladder4.h b/src/engine/filters/enginefiltermoogladder4.h
index e7f87d3880..8d4f1c44cb 100644
--- a/src/engine/filters/enginefiltermoogladder4.h
+++ b/src/engine/filters/enginefiltermoogladder4.h
@@ -84,14 +84,15 @@ class EngineFilterMoogLadderBase : public EngineObjectConstIn {
         }
 
         // frequency & amplitude correction
-        float kfcr = 1.8730 * (kfc*kfc*kfc) + 0.4955 * (kfc*kfc) - 0.6490 * kfc + 0.9988;
+        const float kfcr = 1.8730f * (kfc * kfc * kfc) + 0.4955f * (kfc * kfc) -
+                0.6490f * kfc + 0.9988f;
 
-        float x  = -2.0 * kPi * kfcr * kf; // input for taylor approximations
+        float x = -2.0f * kPi * kfcr * kf; // input for taylor approximations
         float exp_out  = expf(x);
         m_k2vgNew = v2 * (1 - exp_out); // filter tuning
 
         // Resonance correction for self oscillation ~4
-        m_kacrNew = resonance * (-3.9364 * (kfc*kfc) + 1.8409 * kfc + 0.9968);
+        m_kacrNew = resonance * (-3.9364f * (kfc * kfc) + 1.8409f * kfc + 0.9968f);
 
         if (MODE == MoogMode::HighPassOversampling || MODE == MoogMode::HighPass) {
             m_postGainNew = 1;
@@ -135,12 +136,10 @@ class EngineFilterMoogLadderBase : public EngineObjectConstIn {
 
             for (int i = 0; i < iBufferSize; i += 2) {
                 cross_mix += cross_inc;
-                m_postGain = m_postGainNew * cross_mix
-                        + startPostGain * (1.0 - cross_mix);
-                m_kacr = m_kacrNew * cross_mix
-                        + startKacr * (1.0 - cross_mix);
-                m_k2vg = m_k2vgNew * cross_mix
-                        + startK2vg * (1.0 - cross_mix);
+                m_postGain = static_cast<float>(m_postGainNew * cross_mix +
+                        startPostGain * (1.0 - cross_mix));
+                m_kacr = static_cast<float>(m_kacrNew * cross_mix + startKacr * (1.0 - cross_mix));
+                m_k2vg = static_cast<float>(m_k2vgNew * cross_mix + startK2vg * (1.0 - cross_mix));
                 pOutput[i] = processSample(pIn[i], &m_buf[0]);
                 pOutput[i+1] = processSample(pIn[i+1], &m_buf[1]);
             }
diff --git a/src/engine/filters/enginefilterpansingle.h b/src/engine/filters/enginefilterpansingle.h
index 3a91f1cf78..df0a608148 100644
--- a/src/engine/filters/enginefilterpansingle.h
+++ b/src/engine/filters/enginefilterpansingle.h
@@ -53,8 +53,10 @@ class EngineFilterPanSingle {
         m_delayFrame = (m_delayFrame + 1) % SIZE;
 
         // prepare coefficients for linear interpolation using a linear stretching
-        CSAMPLE_GAIN timeBetweenFullSamplesLeft = fmod(delayLeftSourceFrame, 1);
-        CSAMPLE_GAIN timeBetweenFullSamplesRight = fmod(delayRightSourceFrame, 1);
+        const auto timeBetweenFullSamplesLeft =
+                static_cast<CSAMPLE_GAIN>(fmod(delayLeftSourceFrame, 1));
+        const auto timeBetweenFullSamplesRight =
+                static_cast<CSAMPLE_GAIN>(fmod(delayRightSourceFrame, 1));
 
         // applying the delay on left channel with linear interpolation between each sample
         pOutput[0] =
diff --git a/src/engine/positionscratchcontroller.cpp b/src/engine/positionscratchcontroller.cpp
index 44e8cd4d43..cb7a93e61d 100644
--- a/src/engine/positionscratchcontroller.cpp
+++ b/src/engine/positionscratchcontroller.cpp
@@ -111,7 +111,7 @@ void PositionScratchController::process(double currentSample, double releaseRate
     // have 0 ... 3 samples. The remaining jitter is ironed by the following IIR
     // lowpass filter
     const double m_dMouseSampeIntervall = 0.016;
-    const int callsPerDt = ceil(m_dMouseSampeIntervall/dt);
+    const auto callsPerDt = static_cast<int>(ceil(m_dMouseSampeIntervall / dt));
     double scratchPosition = 0;
     m_dMouseSampeTime += dt;
     if (m_dMouseSampeTime >= m_dMouseSampeIntervall || !m_bScratching) {