summaryrefslogtreecommitdiffstats
path: root/src/engine
diff options
context:
space:
mode:
authorUwe Klotz <uklotz@mixxx.org>2020-12-12 19:16:22 +0100
committerUwe Klotz <uklotz@mixxx.org>2020-12-12 20:30:22 +0100
commit440b6fed6a6295c8a94a811e57fd9b9407b42982 (patch)
treedccdf66fcbcfaeb43b0591b7cc91e8ea3a12e1de /src/engine
parent18f698dffece85b0897c62f65020704ef2c2aeef (diff)
Fix inconsistent naming of hot cue "index" vs. "number"
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/controls/cuecontrol.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/controls/cuecontrol.cpp b/src/engine/controls/cuecontrol.cpp
index 1def96cc28..e73c60e14b 100644
--- a/src/engine/controls/cuecontrol.cpp
+++ b/src/engine/controls/cuecontrol.cpp
@@ -48,9 +48,9 @@ inline mixxx::RgbColor::optional_t doubleToRgbColor(double value) {
/// Works independent of if the hot cue index is either 0-based
/// or 1..n-based.
inline int hotcueIndexToHotcueNumber(int hotcueIndex) {
- if (hotcueIndex >= Cue::kFirstHotCue) {
+ if (hotcueIndex >= mixxx::kFirstHotCueIndex) {
DEBUG_ASSERT(hotcueIndex != Cue::kNoHotCue);
- return (hotcueIndex - Cue::kFirstHotCue) + 1; // to 1-based numbering
+ return (hotcueIndex - mixxx::kFirstHotCueIndex) + 1; // to 1-based numbering
} else {
DEBUG_ASSERT(hotcueIndex == Cue::kNoHotCue);
return kNoHotCueNumber;
@@ -64,7 +64,7 @@ inline int hotcueIndexToHotcueNumber(int hotcueIndex) {
inline int hotcueNumberToHotcueIndex(int hotcueNumber) {
if (hotcueNumber >= 1) {
DEBUG_ASSERT(hotcueNumber != kNoHotCueNumber);
- return Cue::kFirstHotCue + (hotcueNumber - 1); // from 1-based numbering
+ return mixxx::kFirstHotCueIndex + (hotcueNumber - 1); // from 1-based numbering
} else {
DEBUG_ASSERT(hotcueNumber == kNoHotCueNumber);
return Cue::kNoHotCue;