util/color/colorpalette: Add additional predefined color palettes

CMakeLists.txt

@@ -562,6 +562,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/util/cmdlineargs.cpp
   src/util/color/color.cpp
   src/util/color/colorpalette.cpp
+  src/util/color/predefinedcolorpalettes.cpp
   src/util/console.cpp
   src/util/db/dbconnection.cpp
   src/util/db/dbconnectionpool.cpp

build/depends.py

@@ -1286,6 +1286,7 @@ def sources(self, build):
                    "src/util/console.cpp",
                    "src/util/color/color.cpp",
                    "src/util/color/colorpalette.cpp",
+                   "src/util/color/predefinedcolorpalettes.cpp",
                    "src/util/db/dbconnection.cpp",
                    "src/util/db/dbconnectionpool.cpp",
                    "src/util/db/dbconnectionpooler.cpp",

src/engine/controls/cuecontrol.cpp

@@ -11,6 +11,7 @@
 #include "engine/enginebuffer.h"
 #include "preferences/colorpalettesettings.h"
 #include "util/color/color.h"
+#include "util/color/predefinedcolorpalettes.h"
 #include "util/sample.h"
 #include "vinylcontrol/defs_vinylcontrol.h"
 
@@ -622,7 +623,7 @@ void CueControl::hotcueSet(HotcueControl* pControl, double v) {
         auto hotcueColorPalette = m_colorPaletteSettings.getHotcueColorPalette();
         pCue->setColor(hotcueColorPalette.colorForHotcueIndex(hotcue));
     } else {
-        pCue->setColor(ColorPalette::kDefaultCueColor);
+        pCue->setColor(mixxx::PredefinedColorPalettes::kDefaultCueColor);
     }
 
     // TODO(XXX) deal with spurious signals

src/preferences/colorpalettesettings.cpp

@@ -1,5 +1,7 @@
 #include "preferences/colorpalettesettings.h"
 
+#include "util/color/predefinedcolorpalettes.h"
+
 namespace {
 const mixxx::RgbColor kColorBlack(0x000000);
 const QString kColorPaletteConfigGroup = QStringLiteral("[Config]");
@@ -25,9 +27,11 @@ ConfigKey keyForIndex(const QString& group, int index, int numDigits) {
 
 ColorPalette ColorPaletteSettings::getColorPalette(
         const QString& name, const ColorPalette& defaultPalette) const {
-    QList<mixxx::RgbColor> colorList;
-
+    if (name.isEmpty()) {
+        return defaultPalette;
+    }
     const QString group = kColorPaletteGroupStart + name + kColorPaletteGroupEnd;
+    QList<mixxx::RgbColor> colorList;
     for (const ConfigKey& key : m_pConfig->getKeysWithGroup(group)) {
         mixxx::RgbColor color = mixxx::RgbColor(m_pConfig->getValue<mixxx::RgbColor>(key, kColorBlack));
         colorList.append(color);
@@ -72,10 +76,7 @@ void ColorPaletteSettings::removePalette(const QString& name) {
 
 ColorPalette ColorPaletteSettings::getHotcueColorPalette() const {
     QString name = m_pConfig->getValueString(kHotcueColorPaletteConfigKey);
-    if (name.isEmpty()) {
-        return ColorPalette::mixxxHotcuePalette;
-    }
-    return getColorPalette(name, ColorPalette::mixxxHotcuePalette);
+    return getColorPalette(name, mixxx::PredefinedColorPalettes::kDefaultHotcueColorPalette);
 }
 
 void ColorPaletteSettings::setHotcueColorPalette(const ColorPalette& colorPalette) {
@@ -90,10 +91,7 @@ void ColorPaletteSettings::setHotcueColorPalette(const ColorPalette& colorPalett
 
 ColorPalette ColorPaletteSettings::getTrackColorPalette() const {
     QString name = m_pConfig->getValueString(kTrackColorPaletteConfigKey);
-    if (name.isEmpty()) {
-        return ColorPalette::mixxxHotcuePalette;
-    }
-    return getColorPalette(name, ColorPalette::mixxxHotcuePalette);
+    return getColorPalette(name, mixxx::PredefinedColorPalettes::kDefaultTrackColorPalette);
 }
 
 void ColorPaletteSettings::setTrackColorPalette(const ColorPalette& colorPalette) {

src/test/colorconfig_test.cpp

@@ -3,6 +3,7 @@
 #include "preferences/colorpalettesettings.h"
 #include "test/mixxxtest.h"
 #include "util/color/colorpalette.h"
+#include "util/color/predefinedcolorpalettes.h"
 #include "util/color/rgbcolor.h"
 
 class ColorConfigTest : public MixxxTest {};
@@ -99,7 +100,8 @@ TEST_F(ColorConfigTest, LoadSavePalettes) {
 
 TEST_F(ColorConfigTest, DefaultColorPalette) {
     ColorPaletteSettings colorPaletteSettings(config());
-    ColorPalette colorPaletteFromConfig =
-            colorPaletteSettings.getHotcueColorPalette();
-    ASSERT_EQ(ColorPalette::mixxxHotcuePalette, colorPaletteFromConfig);
+    ASSERT_EQ(mixxx::PredefinedColorPalettes::kDefaultHotcueColorPalette,
+            colorPaletteSettings.getHotcueColorPalette());
+    ASSERT_EQ(mixxx::PredefinedColorPalettes::kDefaultTrackColorPalette,
+            colorPaletteSettings.getTrackColorPalette());
 }

src/test/colorpalette_test.cpp

@@ -3,25 +3,26 @@
 #include <gtest/gtest.h>
 
 #include "test/mixxxtest.h"
+#include "util/color/predefinedcolorpalettes.h"
 
 class ColorPaletteTest : public MixxxTest {};
 
 TEST_F(ColorPaletteTest, NextColor) {
-    const ColorPalette palette = ColorPalette::mixxxHotcuePalette;
+    const ColorPalette palette = mixxx::PredefinedColorPalettes::kDefaultHotcueColorPalette;
     ASSERT_TRUE(palette.size() >= 1);
     ASSERT_EQ(palette.nextColor(palette.at(0)), palette.at(1));
     ASSERT_EQ(palette.nextColor(palette.at(palette.size() - 1)), palette.at(0));
 }
 
 TEST_F(ColorPaletteTest, PreviousColor) {
-    const ColorPalette palette = ColorPalette::mixxxHotcuePalette;
+    const ColorPalette palette = mixxx::PredefinedColorPalettes::kDefaultHotcueColorPalette;
     ASSERT_TRUE(palette.size() >= 1);
     ASSERT_EQ(palette.previousColor(palette.at(1)), palette.at(0));
     ASSERT_EQ(palette.previousColor(palette.at(0)), palette.at(palette.size() - 1));
 }
 
 TEST_F(ColorPaletteTest, NextAndPreviousColorRoundtrip) {
-    const ColorPalette palette = ColorPalette::mixxxHotcuePalette;
+    const ColorPalette palette = mixxx::PredefinedColorPalettes::kDefaultHotcueColorPalette;
     ASSERT_TRUE(palette.size() >= 1);
     ASSERT_EQ(palette.nextColor(palette.previousColor(palette.at(0))), palette.at(0));
     ASSERT_EQ(palette.nextColor(palette.previousColor(palette.at(palette.size() - 1))), palette.at(palette.size() - 1));

src/track/cue.cpp

@@ -9,7 +9,7 @@
 #include "engine/engine.h"
 #include "util/assert.h"
 #include "util/color/color.h"
-#include "util/color/colorpalette.h"
+#include "util/color/predefinedcolorpalettes.h"
 
 namespace {
 
@@ -54,7 +54,7 @@ Cue::Cue()
           m_sampleStartPosition(Cue::kNoPosition),
           m_sampleEndPosition(Cue::kNoPosition),
           m_iHotCue(Cue::kNoHotCue),
-          m_color(ColorPalette::kDefaultCueColor) {
+          m_color(mixxx::PredefinedColorPalettes::kDefaultCueColor) {
 }
 
 Cue::Cue(
@@ -101,7 +101,7 @@ Cue::Cue(
                           sampleRate)),
           m_iHotCue(cueInfo.getHotCueNumber() ? *cueInfo.getHotCueNumber() : kNoHotCue),
           m_label(cueInfo.getLabel()),
-          m_color(cueInfo.getColor().value_or(ColorPalette::kDefaultCueColor)) {
+          m_color(cueInfo.getColor().value_or(mixxx::PredefinedColorPalettes::kDefaultCueColor)) {
 }
 
 mixxx::CueInfo Cue::getCueInfo(

src/util/color/colorpalette.cpp

@@ -1,38 +1,5 @@
 #include "colorpalette.h"
 
-namespace {
-
-constexpr mixxx::RgbColor kColorMixxxRed(0xC50A08);
-constexpr mixxx::RgbColor kColorMixxxYellow(0x32BE44);
-constexpr mixxx::RgbColor kColorMixxxGreen(0x42D4F4);
-constexpr mixxx::RgbColor kColorMixxxCeleste(0xF8D200);
-constexpr mixxx::RgbColor kColorMixxxBlue(0x0044FF);
-constexpr mixxx::RgbColor kColorMixxxPurple(0xAF00CC);
-constexpr mixxx::RgbColor kColorMixxxPink(0xFCA6D7);
-constexpr mixxx::RgbColor kColorMixxxWhite(0xF2F2FF);
-
-// Replaces "no color" values and is used for new cues if auto_hotcue_colors is
-// disabled
-constexpr mixxx::RgbColor kSchemaMigrationReplacementColor(0xFF8C00);
-
-} // anonymous namespace
-
-const ColorPalette ColorPalette::mixxxHotcuePalette =
-        ColorPalette(
-                QStringLiteral("Mixxx Hotcue Colors"),
-                QList<mixxx::RgbColor>{
-                        kColorMixxxRed,
-                        kColorMixxxYellow,
-                        kColorMixxxGreen,
-                        kColorMixxxCeleste,
-                        kColorMixxxBlue,
-                        kColorMixxxPurple,
-                        kColorMixxxPink,
-                        kColorMixxxWhite,
-                });
-
-const mixxx::RgbColor ColorPalette::kDefaultCueColor = kSchemaMigrationReplacementColor;
-
 mixxx::RgbColor ColorPalette::nextColor(mixxx::RgbColor color) const {
     //  Return first color if color not in palette ((-1 + 1) % size)
     return at((indexOf(color) + 1) % size());

src/util/color/colorpalette.h

@@ -44,9 +44,6 @@ class ColorPalette final {
         m_name = name;
     }
 
-    static const ColorPalette mixxxHotcuePalette;
-    static const mixxx::RgbColor kDefaultCueColor;
-
     const QList<mixxx::RgbColor>& getColorList() const {
         return m_colorList;
     }

src/util/color/predefinedcolorpalettes.cpp

@@ -0,0 +1,165 @@
+#include "predefinedcolorpalettes.h"
+
+namespace {
+
+constexpr mixxx::RgbColor kColorMixxxRed(0xC50A08);
+constexpr mixxx::RgbColor kColorMixxxYellow(0x32BE44);
+constexpr mixxx::RgbColor kColorMixxxGreen(0x42D4F4);
+constexpr mixxx::RgbColor kColorMixxxCeleste(0xF8D200);
+constexpr mixxx::RgbColor kColorMixxxBlue(0x0044FF);
+constexpr mixxx::RgbColor kColorMixxxPurple(0xAF00CC);
+constexpr mixxx::RgbColor kColorMixxxPink(0xFCA6D7);
+constexpr mixxx::RgbColor kColorMixxxWhite(0xF2F2FF);
+
+constexpr mixxx::RgbColor kRekordboxTrackColorPink(0xF870F8);
+constexpr mixxx::RgbColor kRekordboxTrackColorRed(0xF870900);
+constexpr mixxx::RgbColor kRekordboxTrackColorOrange(0xF8A030);
+constexpr mixxx::RgbColor kRekordboxTrackColorYellow(0xF8E331);
+constexpr mixxx::RgbColor kRekordboxTrackColorGreen(0x1EE000);
+constexpr mixxx::RgbColor kRekordboxTrackColorAqua(0x16C0F8);
+constexpr mixxx::RgbColor kRekordboxTrackColorBlue(0x0150F8);
+constexpr mixxx::RgbColor kRekordboxTrackColorPurple(0x9808F8);
+
+constexpr mixxx::RgbColor kTraktorProTrackColorRed(0xFA4B35);
+constexpr mixxx::RgbColor kTraktorProTrackColorOrange(0xFF8402);
+constexpr mixxx::RgbColor kTraktorProTrackColorYellow(0xFFF700);
+constexpr mixxx::RgbColor kTraktorProTrackColorGreen(0x00F329);
+constexpr mixxx::RgbColor kTraktorProTrackColorBlue(0x0187FF);
+constexpr mixxx::RgbColor kTraktorProTrackColorViolet(0xA669FF);
+constexpr mixxx::RgbColor kTraktorProTrackColorMagenta(0xFE55EA);
+
+constexpr mixxx::RgbColor kSeratoDJProTrackColorGrey1(0x333333);
+constexpr mixxx::RgbColor kSeratoDJProTrackColorGrey2(0x555555);
+constexpr mixxx::RgbColor kSeratoDJProTrackColorPink1(0x993399);
+constexpr mixxx::RgbColor kSeratoDJProTrackColorPink2(0x993377);
+constexpr mixxx::RgbColor kSeratoDJProTrackColorRed1(0x993355);
+constexpr mixxx::RgbColor kSeratoDJProTrackColorRed2(0x993333);
+constexpr mixxx::RgbColor kSeratoDJProTrackColorOrange(0x995533);
+constexpr mixxx::RgbColor kSeratoDJProTrackColorBrown1(0x997733);
+constexpr mixxx::RgbColor kSeratoDJProTrackColorBrown2(0x999933);
+constexpr mixxx::RgbColor kSeratoDJProTrackColorBrown3(0x779933);
+constexpr mixxx::RgbColor kSeratoDJProTrackColorGreen1(0x559933);
+constexpr mixxx::RgbColor kSeratoDJProTrackColorGreen2(0x339933);
+constexpr mixxx::RgbColor kSeratoDJProTrackColorGreen3(0x339955);
+constexpr mixxx::RgbColor kSeratoDJProTrackColorTurquoise1(0x339977);
+constexpr mixxx::RgbColor kSeratoDJProTrackColorTurquoise2(0x339999);
+constexpr mixxx::RgbColor kSeratoDJProTrackColorTurquoise3(0x337799);
+constexpr mixxx::RgbColor kSeratoDJProTrackColorBlue(0x335599);
+constexpr mixxx::RgbColor kSeratoDJProTrackColorPurple1(0x333399);
+constexpr mixxx::RgbColor kSeratoDJProTrackColorPurple2(0x553399);
+constexpr mixxx::RgbColor kSeratoDJProTrackColorPurple3(0x773399);
+
+constexpr mixxx::RgbColor kVirtualDJTrackColorRed(0xFF0000);
+constexpr mixxx::RgbColor kVirtualDJTrackColorYellow(0xFFFF00);
+constexpr mixxx::RgbColor kVirtualDJTrackColorGreen(0x00FF00);
+constexpr mixxx::RgbColor kVirtualDJTrackColorCyan(0x00FFFF);
+constexpr mixxx::RgbColor kVirtualDJTrackColorBlue(0x0000FF);
+constexpr mixxx::RgbColor kVirtualDJTrackColorFuchsia(0xFF00FF);
+constexpr mixxx::RgbColor kVirtualDJTrackColorWhite(0xFFFFFF);
+
+// Replaces "no color" values and is used for new cues if auto_hotcue_colors is
+// disabled
+constexpr mixxx::RgbColor kSchemaMigrationReplacementColor(0xFF8000);
+
+} // anonymous namespace
+
+namespace mixxx {
+
+const ColorPalette PredefinedColorPalettes::kMixxxHotcueColorPalette =
+        ColorPalette(
+                QStringLiteral("Mixxx Hotcue Colors"),
+                QList<mixxx::RgbColor>{
+                        kColorMixxxRed,
+                        kColorMixxxYellow,
+                        kColorMixxxGreen,
+                        kColorMixxxCeleste,
+                        kColorMixxxBlue,
+                        kColorMixxxPurple,
+                        kColorMixxxPink,
+                        kColorMixxxWhite,
+                });
+
+const ColorPalette PredefinedColorPalettes::kRekordboxTrackColorPalette =
+        ColorPalette(
+                QStringLiteral("Rekordbox Track Colors"),
+                QList<mixxx::RgbColor>{
+                        kRekordboxTrackColorPink,
+                        kRekordboxTrackColorRed,
+                        kRekordboxTrackColorOrange,
+                        kRekordboxTrackColorYellow,
+                        kRekordboxTrackColorGreen,
+                        kRekordboxTrackColorAqua,
+                        kRekordboxTrackColorBlue,
+                        kRekordboxTrackColorPurple,
+                });
+
+const ColorPalette PredefinedColorPalettes::kSeratoDJProTrackColorPalette =
+        ColorPalette(
+                QStringLiteral("Serato DJ Pro Track Colors"),
+                QList<mixxx::RgbColor>{
+                        kSeratoDJProTrackColorGrey1,
+                        kSeratoDJProTrackColorGrey2,
+                        kSeratoDJProTrackColorPink1,
+                        kSeratoDJProTrackColorPink2,
+                        kSeratoDJProTrackColorRed1,
+                        kSeratoDJProTrackColorRed2,
+                        kSeratoDJProTrackColorOrange,
+                        kSeratoDJProTrackColorBrown1,
+                        kSeratoDJProTrackColorBrown2,
+                        kSeratoDJProTrackColorBrown3,
+                        kSeratoDJProTrackColorGreen1,
+                        kSeratoDJProTrackColorGreen2,
+                        kSeratoDJProTrackColorGreen3,
+                        kSeratoDJProTrackColorTurquoise1,
+                        kSeratoDJProTrackColorTurquoise2,
+                        kSeratoDJProTrackColorTurquoise3,
+                        kSeratoDJProTrackColorBlue,
+                        kSeratoDJProTrackColorPurple1,
+                        kSeratoDJProTrackColorPurple2,
+                        kSeratoDJProTrackColorPurple3,
+                });
+
+const ColorPalette PredefinedColorPalettes::kTraktorProTrackColorPalette =
+        ColorPalette(
+                QStringLiteral("Traktor Pro Track Colors"),
+                QList<mixxx::RgbColor>{
+                        kTraktorProTrackColorRed,
+                        kTraktorProTrackColorOrange,
+                        kTraktorProTrackColorYellow,
+                        kTraktorProTrackColorGreen,
+                        kTraktorProTrackColorBlue,
+                        kTraktorProTrackColorViolet,
+                        kTraktorProTrackColorMagenta,
+                });
+
+const ColorPalette PredefinedColorPalettes::kVirtualDJTrackColorPalette =
+        ColorPalette(
+                QStringLiteral("VirtualDJ Track Colors"),
+                QList<mixxx::RgbColor>{
+                        kVirtualDJTrackColorRed,
+                        kVirtualDJTrackColorYellow,
+                        kVirtualDJTrackColorGreen,
+                        kVirtualDJTrackColorCyan,
+                        kVirtualDJTrackColorBlue,
+                        kVirtualDJTrackColorFuchsia,
+                        kVirtualDJTrackColorWhite,
+                });
+
+const ColorPalette PredefinedColorPalettes::kDefaultHotcueColorPalette =
+        mixxx::PredefinedColorPalettes::kMixxxHotcueColorPalette;
+
+const ColorPalette PredefinedColorPalettes::kDefaultTrackColorPalette =
+        mixxx::PredefinedColorPalettes::kMixxxHotcueColorPalette;
+
+const QList<ColorPalette> PredefinedColorPalettes::kPalettes{
+        mixxx::PredefinedColorPalettes::kMixxxHotcueColorPalette,
+        mixxx::PredefinedColorPalettes::kRekordboxTrackColorPalette,
+        mixxx::PredefinedColorPalettes::kSeratoDJProTrackColorPalette,
+        mixxx::PredefinedColorPalettes::kTraktorProTrackColorPalette,
+        mixxx::PredefinedColorPalettes::kVirtualDJTrackColorPalette,
+};
+
+const mixxx::RgbColor PredefinedColorPalettes::kDefaultCueColor =
+        kSchemaMigrationReplacementColor;
+
+} // namespace mixxx

src/util/color/predefinedcolorpalettes.h

@@ -0,0 +1,21 @@
+#pragma once
+#include "util/color/colorpalette.h"
+
+namespace mixxx {
+
+class PredefinedColorPalettes {
+  public:
+    static const ColorPalette kMixxxHotcueColorPalette;
+    static const ColorPalette kRekordboxTrackColorPalette;
+    static const ColorPalette kSeratoDJProTrackColorPalette;
+    static const ColorPalette kTraktorProTrackColorPalette;
+    static const ColorPalette kVirtualDJTrackColorPalette;
+
+    static const ColorPalette kDefaultHotcueColorPalette;
+    static const ColorPalette kDefaultTrackColorPalette;
+
+    static const QList<ColorPalette> kPalettes;
+    static const mixxx::RgbColor kDefaultCueColor;
+};
+
+} // namespace mixxx