summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Holthuis <jan.holthuis@ruhr-uni-bochum.de>2020-10-27 17:46:19 +0100
committerJan Holthuis <jan.holthuis@ruhr-uni-bochum.de>2020-10-27 17:58:31 +0100
commit3531ab2a4a98c17c7bfe2e2eb4944cff84fa2bd1 (patch)
treef4b80f6a5f39788605a2940ceb66dce969487e6c /src
parent27ca8d7c85bb069e666b4f032d3735654aba4228 (diff)
Add missing typecasts to fix -Wfloat-comparison warnings
Diffstat (limited to 'src')
-rw-r--r--src/effects/builtin/balanceeffect.cpp2
-rw-r--r--src/engine/controls/bpmcontrol.cpp3
-rw-r--r--src/engine/enginedelay.cpp4
-rw-r--r--src/library/dlgtrackinfo.cpp9
4 files changed, 11 insertions, 7 deletions
diff --git a/src/effects/builtin/balanceeffect.cpp b/src/effects/builtin/balanceeffect.cpp
index e120c101e7..87c5eb348e 100644
--- a/src/effects/builtin/balanceeffect.cpp
+++ b/src/effects/builtin/balanceeffect.cpp
@@ -77,7 +77,7 @@ BalanceGroupState::BalanceGroupState(const mixxx::EngineParameters& bufferParame
: EffectState(bufferParameters),
m_pHighBuf(MAX_BUFFER_LEN),
m_oldSampleRate(bufferParameters.sampleRate()),
- m_freq(kMinCornerHz),
+ m_freq(static_cast<int>(kMinCornerHz)),
m_oldBalance(0),
m_oldMidSide(0) {
m_low = std::make_unique<EngineFilterLinkwitzRiley4Low>(bufferParameters.sampleRate(),
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)
diff --git a/src/library/dlgtrackinfo.cpp b/src/library/dlgtrackinfo.cpp
index 917b96b46f..adf44e43cd 100644
--- a/src/library/dlgtrackinfo.cpp
+++ b/src/library/dlgtrackinfo.cpp
@@ -22,11 +22,14 @@
#include "widget/wcoverartlabel.h"
#include "widget/wstarrating.h"
-const int kFilterLength = 80;
-const int kMinBpm = 30;
+namespace {
+constexpr int kFilterLength = 80;
+constexpr int kMinBpm = 30;
+} // namespace
// Maximum allowed interval between beats (calculated from kMinBpm).
-const mixxx::Duration kMaxInterval = mixxx::Duration::fromMillis(1000.0 * (60.0 / kMinBpm));
+const mixxx::Duration kMaxInterval = mixxx::Duration::fromMillis(
+ static_cast<qint64>(1000.0 * (60.0 / kMinBpm)));
DlgTrackInfo::DlgTrackInfo(
const TrackModel* trackModel)