From f121cfa6a525677c3659f2ea68971f194b07b4b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Thu, 19 Nov 2020 21:29:27 +0100 Subject: Added debug assertions and comments --- src/engine/controls/cuecontrol.cpp | 7 ++++++- src/engine/controls/cuecontrol.h | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'src/engine') diff --git a/src/engine/controls/cuecontrol.cpp b/src/engine/controls/cuecontrol.cpp index 09f667cd03..8bae9c3061 100644 --- a/src/engine/controls/cuecontrol.cpp +++ b/src/engine/controls/cuecontrol.cpp @@ -44,12 +44,17 @@ inline mixxx::RgbColor::optional_t doubleToRgbColor(double value) { return mixxx::RgbColor::optional(colorCode); } +/// Convert 0-based hot cue index to 1-based number inline int hotcueIndexToHotcueNumber(int hotcueIndex) { + DEBUG_ASSERT(hotcueIndex == Cue::kNoHotCue || hotcueIndex >= 0); return hotcueIndex + 1; } +/// Convert 1-based hot cue number to 0-based index inline int hotcueNumberToHotcueIndex(int hotcueNumber) { - return hotcueNumber - 1; + int hotcueIndex = hotcueNumber - 1; + DEBUG_ASSERT(hotcueIndex == Cue::kNoHotCue || hotcueIndex >= 0); + return hotcueIndex; } } // namespace diff --git a/src/engine/controls/cuecontrol.h b/src/engine/controls/cuecontrol.h index 3634a0d32a..177c1584ea 100644 --- a/src/engine/controls/cuecontrol.h +++ b/src/engine/controls/cuecontrol.h @@ -50,7 +50,7 @@ class HotcueControl : public QObject { return m_hotcueIndex; } - CuePointer getCue() { + CuePointer getCue() const { return m_pCue; } double getPosition() const; -- cgit v1.2.3