summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSwiftb0y <12380386+Swiftb0y@users.noreply.github.com>2021-03-24 22:50:50 +0100
committerSwiftb0y <12380386+Swiftb0y@users.noreply.github.com>2021-03-24 22:50:50 +0100
commit28412d7e015cb2c93a1a6eb9236b3c010cfbbfa9 (patch)
treec37ea6c824bcb818b77d00eb377ae91c6cab12ec
parent4834a8f8da5189d4a0777636d4cd995a26dc893b (diff)
PredefinedColorPalettes: remove rekordbox CDJ palette
-rw-r--r--src/util/color/predefinedcolorpalettes.cpp8
-rw-r--r--src/util/color/predefinedcolorpalettes.h1
2 files changed, 2 insertions, 7 deletions
diff --git a/src/util/color/predefinedcolorpalettes.cpp b/src/util/color/predefinedcolorpalettes.cpp
index f72dd9f87e..d1ab06c5d8 100644
--- a/src/util/color/predefinedcolorpalettes.cpp
+++ b/src/util/color/predefinedcolorpalettes.cpp
@@ -245,11 +245,8 @@ const QList<mixxx::RgbColor> kRekordboxColorsSelection = {
kRekordboxHotcueColor16,
};
-const ColorPalette PredefinedColorPalettes::kRekordboxCDJHotcueColorPalette =
- ColorPalette(
- QStringLiteral("Rekordbox CDJ Hotcue Colors"),
- kRekordboxColorsSelection,
- {9});
+// the Rekordbox CDJ palette can be emulated by picking kRekordboxHotcueColor9
+// (0x10B176) as the default cue color.
const ColorPalette PredefinedColorPalettes::kRekordboxCOLD1HotcueColorPalette =
ColorPalette(
@@ -370,7 +367,6 @@ 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,
diff --git a/src/util/color/predefinedcolorpalettes.h b/src/util/color/predefinedcolorpalettes.h
index 5ae4bad145..ace9191baa 100644
--- a/src/util/color/predefinedcolorpalettes.h
+++ b/src/util/color/predefinedcolorpalettes.h
@@ -8,7 +8,6 @@ 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;