summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authorBe <be@mixxx.org>2020-10-04 23:21:58 -0500
committerBe <be@mixxx.org>2020-10-04 23:21:58 -0500
commite028e3e80b1aa5e6f8cbcbce206bd59fc2b4479e (patch)
tree8dc7c22e2fc0bf5e128bc6be066208e5b4f37ea1 /src/control
parent13f86a5029eafb8708c51c8db06e05907e2bc10f (diff)
parentef58c52d925eb3180042dbc54903a36572ad2a1e (diff)
Merge remote-tracking branch 'upstream/master' into controllerengine_refactoring
Diffstat (limited to 'src/control')
-rw-r--r--src/control/controllinpotmeter.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/control/controllinpotmeter.cpp b/src/control/controllinpotmeter.cpp
index 5ca5962f46..e3f16d44b4 100644
--- a/src/control/controllinpotmeter.cpp
+++ b/src/control/controllinpotmeter.cpp
@@ -10,9 +10,9 @@ ControlLinPotmeter::ControlLinPotmeter(ConfigKey key,
new ControlLinPotmeterBehavior(dMinValue, dMaxValue, allowOutOfBounds));
}
if (dStep) {
- setStepCount((dMaxValue - dMinValue) / dStep);
+ setStepCount(static_cast<int>((dMaxValue - dMinValue) / dStep));
}
if (dSmallStep) {
- setSmallStepCount((dMaxValue - dMinValue) / dSmallStep);
+ setSmallStepCount(static_cast<int>((dMaxValue - dMinValue) / dSmallStep));
}
}