summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Holthuis <jan.holthuis@ruhr-uni-bochum.de>2021-03-23 13:42:36 +0100
committerSwiftb0y <12380386+Swiftb0y@users.noreply.github.com>2021-03-24 17:44:43 +0100
commit4834a8f8da5189d4a0777636d4cd995a26dc893b (patch)
tree2e299e07087a06687b21eba08a0979f13bc1c584
parent25f342e606c78e3da390ace708aebb50485ab9bf (diff)
PredefinedColorPalettes: Add Rekordbox Hotcue Color Palettes
-rw-r--r--src/util/color/predefinedcolorpalettes.cpp70
-rw-r--r--src/util/color/predefinedcolorpalettes.h4
2 files changed, 74 insertions, 0 deletions
diff --git a/src/util/color/predefinedcolorpalettes.cpp b/src/util/color/predefinedcolorpalettes.cpp
index 529adf5624..f72dd9f87e 100644
--- a/src/util/color/predefinedcolorpalettes.cpp
+++ b/src/util/color/predefinedcolorpalettes.cpp
@@ -43,6 +43,24 @@ constexpr mixxx::RgbColor kRekordboxTrackColorAqua(0x16C0F8);
constexpr mixxx::RgbColor kRekordboxTrackColorBlue(0x0150F8);
constexpr mixxx::RgbColor kRekordboxTrackColorPurple(0x9808F8);
+// Rekordbox Hotcue Color Palette
+constexpr mixxx::RgbColor kRekordboxHotcueColor1(0xDE44CF);
+constexpr mixxx::RgbColor kRekordboxHotcueColor2(0xB432FF);
+constexpr mixxx::RgbColor kRekordboxHotcueColor3(0xAA42FF);
+constexpr mixxx::RgbColor kRekordboxHotcueColor4(0x6473FF);
+constexpr mixxx::RgbColor kRekordboxHotcueColor5(0x305AFF);
+constexpr mixxx::RgbColor kRekordboxHotcueColor6(0x50B4FF);
+constexpr mixxx::RgbColor kRekordboxHotcueColor7(0x00E0FF);
+constexpr mixxx::RgbColor kRekordboxHotcueColor8(0x1FA382);
+constexpr mixxx::RgbColor kRekordboxHotcueColor9(0x10B176);
+constexpr mixxx::RgbColor kRekordboxHotcueColor10(0x28E214);
+constexpr mixxx::RgbColor kRekordboxHotcueColor11(0xA5E116);
+constexpr mixxx::RgbColor kRekordboxHotcueColor12(0xB4BE04);
+constexpr mixxx::RgbColor kRekordboxHotcueColor13(0xC3AF04);
+constexpr mixxx::RgbColor kRekordboxHotcueColor14(0xE0641B);
+constexpr mixxx::RgbColor kRekordboxHotcueColor15(0xE62828);
+constexpr mixxx::RgbColor kRekordboxHotcueColor16(0xFF127B);
+
// Traktor Track Color Palette
constexpr mixxx::RgbColor kTraktorProTrackColorRed(0xFA4B35);
constexpr mixxx::RgbColor kTraktorProTrackColorOrange(0xFF8402);
@@ -203,6 +221,54 @@ const ColorPalette PredefinedColorPalettes::kSeratoDJProHotcueColorPalette =
},
{0, 2, 12, 3, 6, 15, 9, 14});
+// All Rekordbox Palette types, share the same color, but their default colors
+// are not in the selection offered to the user. This usecase is not supported
+// by mixxx's ColorPalette. The compromise is slightly altering the default
+// colors used so they're part of the selection. The difference between these
+// colors should be imperceptible for the unknowing user.
+const QList<mixxx::RgbColor> kRekordboxColorsSelection = {
+ kRekordboxHotcueColor1,
+ kRekordboxHotcueColor2,
+ kRekordboxHotcueColor3,
+ kRekordboxHotcueColor4,
+ kRekordboxHotcueColor5,
+ kRekordboxHotcueColor6,
+ kRekordboxHotcueColor7,
+ kRekordboxHotcueColor8,
+ kRekordboxHotcueColor9,
+ kRekordboxHotcueColor10,
+ kRekordboxHotcueColor11,
+ kRekordboxHotcueColor12,
+ kRekordboxHotcueColor13,
+ kRekordboxHotcueColor14,
+ kRekordboxHotcueColor15,
+ kRekordboxHotcueColor16,
+};
+
+const ColorPalette PredefinedColorPalettes::kRekordboxCDJHotcueColorPalette =
+ ColorPalette(
+ QStringLiteral("Rekordbox CDJ Hotcue Colors"),
+ kRekordboxColorsSelection,
+ {9});
+
+const ColorPalette PredefinedColorPalettes::kRekordboxCOLD1HotcueColorPalette =
+ ColorPalette(
+ QStringLiteral("Rekordbox COLD1 Hotcue Colors"),
+ kRekordboxColorsSelection,
+ {5, 8, 1, 6, 7, 2, 7, 5});
+
+const ColorPalette PredefinedColorPalettes::kRekordboxCOLD2HotcueColorPalette =
+ ColorPalette(
+ QStringLiteral("Rekordbox COLD2 Hotcue Colors"),
+ kRekordboxColorsSelection,
+ {7, 5, 5, 5, 3, 4, 3, 2});
+
+const ColorPalette PredefinedColorPalettes::kRekordboxCOLORFULHotcueColorPalette =
+ ColorPalette(
+ QStringLiteral("Rekordbox COLORFUL Hotcue Colors"),
+ kRekordboxColorsSelection,
+ {15, 5, 10, 2, 8, 13, 4, 12});
+
const ColorPalette PredefinedColorPalettes::kMixxxTrackColorPalette =
ColorPalette(
QStringLiteral("Mixxx Track Colors"),
@@ -304,6 +370,10 @@ const QList<ColorPalette> PredefinedColorPalettes::kPalettes{
// Hotcue Color Palettes
mixxx::PredefinedColorPalettes::kMixxxHotcueColorPalette,
mixxx::PredefinedColorPalettes::kSeratoDJProHotcueColorPalette,
+ mixxx::PredefinedColorPalettes::kRekordboxCDJHotcueColorPalette,
+ mixxx::PredefinedColorPalettes::kRekordboxCOLD1HotcueColorPalette,
+ mixxx::PredefinedColorPalettes::kRekordboxCOLD2HotcueColorPalette,
+ mixxx::PredefinedColorPalettes::kRekordboxCOLORFULHotcueColorPalette,
// Track Color Palettes
mixxx::PredefinedColorPalettes::kMixxxTrackColorPalette,
mixxx::PredefinedColorPalettes::kRekordboxTrackColorPalette,
diff --git a/src/util/color/predefinedcolorpalettes.h b/src/util/color/predefinedcolorpalettes.h
index 482afb3729..5ae4bad145 100644
--- a/src/util/color/predefinedcolorpalettes.h
+++ b/src/util/color/predefinedcolorpalettes.h
@@ -8,6 +8,10 @@ class PredefinedColorPalettes {
static const ColorPalette kMixxxHotcueColorPalette;
static const ColorPalette kSeratoTrackMetadataHotcueColorPalette;
static const ColorPalette kSeratoDJProHotcueColorPalette;
+ static const ColorPalette kRekordboxCDJHotcueColorPalette;
+ static const ColorPalette kRekordboxCOLD1HotcueColorPalette;
+ static const ColorPalette kRekordboxCOLD2HotcueColorPalette;
+ static const ColorPalette kRekordboxCOLORFULHotcueColorPalette;
static const ColorPalette kMixxxTrackColorPalette;
static const ColorPalette kRekordboxTrackColorPalette;