Color Palette: Added getNthColor method

mixxxdj · Jun 6, 2024 · c986761 · c986761
1 parent b9a1f47
commit c986761
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 25 deletions.
diff --git a/src/mixer/basetrackplayer.cpp b/src/mixer/basetrackplayer.cpp
@@ -827,16 +827,7 @@ void BaseTrackPlayerImpl::slotTrackColorSelector(int steps) {
     ColorPalette colorPalette = colorPaletteSettings.getTrackColorPalette();
     mixxx::RgbColor::optional_t color = m_pLoadedTrack->getColor();
 
-    while (steps != 0) {
-        if (steps > 0) {
-            color = colorPalette.nextColor(color);
-            steps--;
-        } else {
-            color = colorPalette.previousColor(color);
-            steps++;
-        }
-    }
-    m_pLoadedTrack->setColor(color);
+    m_pLoadedTrack->setColor(colorPalette.getNthColor(color, steps));
 }
 
 void BaseTrackPlayerImpl::slotTrackColorChangeRequest(double v) {

diff --git a/src/util/color/colorpalette.cpp b/src/util/color/colorpalette.cpp
@@ -38,6 +38,20 @@ mixxx::RgbColor::optional_t ColorPalette::previousColor(mixxx::RgbColor::optiona
     return at(size() - 1);
 }
 
+mixxx::RgbColor::optional_t ColorPalette::getNthColor(
+        mixxx::RgbColor::optional_t color, int steps) const {
+    while (steps) {
+        if (steps > 0) {
+            color = nextColor(color);
+            steps--;
+        } else {
+            color = previousColor(color);
+            steps++;
+        }
+    }
+    return color;
+}
+
 mixxx::RgbColor ColorPalette::colorForHotcueIndex(unsigned int hotcueIndex) const {
     int colorIndex;
     if (m_colorIndicesByHotcue.isEmpty()) {

diff --git a/src/util/color/colorpalette.h b/src/util/color/colorpalette.h
@@ -35,6 +35,7 @@ class ColorPalette final {
     mixxx::RgbColor::optional_t nextColor(mixxx::RgbColor::optional_t color) const;
     mixxx::RgbColor previousColor(mixxx::RgbColor color) const;
     mixxx::RgbColor::optional_t previousColor(mixxx::RgbColor::optional_t color) const;
+    mixxx::RgbColor::optional_t getNthColor(mixxx::RgbColor::optional_t color, int steps) const;
     mixxx::RgbColor colorForHotcueIndex(unsigned int index) const;
 
     QList<mixxx::RgbColor>::const_iterator begin() const {

diff --git a/src/widget/wtracktableview.cpp b/src/widget/wtracktableview.cpp
@@ -431,22 +431,15 @@ void WTrackTableView::selectTrackColor(int steps) {
 
     QModelIndex index = indices.at(0);
     TrackPointer pTrack = trackModel->getTrack(index);
-    if (pTrack) {
-        ColorPaletteSettings colorPaletteSettings(m_pConfig);
-        ColorPalette colorPalette = colorPaletteSettings.getTrackColorPalette();
-        mixxx::RgbColor::optional_t color = pTrack->getColor();
-
-        while (steps != 0) {
-            if (steps > 0) {
-                color = colorPalette.nextColor(color);
-                steps--;
-            } else {
-                color = colorPalette.previousColor(color);
-                steps++;
-            }
-        }
-        pTrack->setColor(color);
+    if (!pTrack) {
+        return;
     }
+
+    ColorPaletteSettings colorPaletteSettings(m_pConfig);
+    ColorPalette colorPalette = colorPaletteSettings.getTrackColorPalette();
+    mixxx::RgbColor::optional_t color = pTrack->getColor();
+
+    pTrack->setColor(colorPalette.getNthColor(color, steps));
 }
 
 void WTrackTableView::slotPurge() {