diff options
| author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-10-27 17:46:19 +0100 |
|---|---|---|
| committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-10-27 17:58:31 +0100 |
| commit | 3531ab2a4a98c17c7bfe2e2eb4944cff84fa2bd1 (patch) | |
| tree | f4b80f6a5f39788605a2940ceb66dce969487e6c /src/engine | |
| parent | 27ca8d7c85bb069e666b4f032d3735654aba4228 (diff) | |
Add missing typecasts to fix -Wfloat-comparison warnings
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/controls/bpmcontrol.cpp | 3 | ||||
| -rw-r--r-- | src/engine/enginedelay.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/engine/controls/bpmcontrol.cpp b/src/engine/controls/bpmcontrol.cpp index 274227b135..2943c25e45 100644 --- a/src/engine/controls/bpmcontrol.cpp +++ b/src/engine/controls/bpmcontrol.cpp @@ -30,7 +30,8 @@ constexpr double kBpmAdjustStep = 0.01; // Maximum allowed interval between beats (calculated from kBpmTapMin). constexpr double kBpmTapMin = 30.0; -const mixxx::Duration kBpmTapMaxInterval = mixxx::Duration::fromMillis(1000.0 * (60.0 / kBpmTapMin)); +const mixxx::Duration kBpmTapMaxInterval = mixxx::Duration::fromMillis( + static_cast<qint64>(1000.0 * (60.0 / kBpmTapMin))); constexpr int kBpmTapFilterLength = 5; // The local_bpm is calculated forward and backward this number of beats, so diff --git a/src/engine/enginedelay.cpp b/src/engine/enginedelay.cpp index fea2383373..1947dfc14d 100644 --- a/src/engine/enginedelay.cpp +++ b/src/engine/enginedelay.cpp @@ -24,8 +24,8 @@ namespace { constexpr double kdMaxDelayPot = 500; -const int kiMaxDelay = (kdMaxDelayPot + 8) / 1000 * - mixxx::audio::SampleRate::kValueMax * mixxx::kEngineChannelCount; +const int kiMaxDelay = static_cast<int>((kdMaxDelayPot + 8) / 1000 * + mixxx::audio::SampleRate::kValueMax * mixxx::kEngineChannelCount); } // anonymous namespace EngineDelay::EngineDelay(const QString& group, ConfigKey delayControl, bool bPersist) |