diff options
120 files changed, 1342 insertions, 1359 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index aa5fba2edf..6b9a320981 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -167,7 +167,8 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL src/control/controlproxy.cpp src/control/controlpushbutton.cpp src/control/controlttrotary.cpp - src/controllers/colorjsproxy.cpp + src/controllers/colormapper.cpp + src/controllers/colormapperjsproxy.cpp src/controllers/controller.cpp src/controllers/controllerdebug.cpp src/controllers/controllerengine.cpp @@ -313,7 +314,6 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL src/errordialoghandler.cpp src/library/analysisfeature.cpp src/library/analysislibrarytablemodel.cpp - src/library/trackloader.cpp src/library/autodj/autodjfeature.cpp src/library/autodj/autodjprocessor.cpp src/library/autodj/dlgautodj.cpp @@ -410,6 +410,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL src/library/tableitemdelegate.cpp src/library/trackcollection.cpp src/library/trackcollectionmanager.cpp + src/library/trackloader.cpp src/library/traktor/traktorfeature.cpp src/library/treeitem.cpp src/library/treeitemmodel.cpp @@ -476,6 +477,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL src/preferences/dialog/dlgprefwaveformdlg.ui src/preferences/dlgpreferencepage.cpp src/preferences/effectsettingsmodel.cpp + src/preferences/colorpalettesettings.cpp src/preferences/replaygainsettings.cpp src/preferences/settingsmanager.cpp src/preferences/upgrade.cpp @@ -538,7 +540,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL src/util/cache.cpp src/util/cmdlineargs.cpp src/util/color/color.cpp - src/util/color/predefinedcolor.cpp + src/util/color/colorpalette.cpp src/util/console.cpp src/util/db/dbconnection.cpp src/util/db/dbconnectionpool.cpp @@ -926,6 +928,8 @@ add_executable(mixxx-test src/test/broadcastsettings_test.cpp src/test/cache_test.cpp src/test/channelhandle_test.cpp + src/test/colorconfig_test.cpp + src/test/colorpalette_test.cpp src/test/compatibility_test.cpp src/test/configobject_test.cpp src/test/controller_preset_validation_test.cpp diff --git a/build/depends.py b/build/depends.py index 4740b2c5c0..e13d2df5b3 100644 --- a/build/depends.py +++ b/build/depends.py @@ -790,6 +790,7 @@ class MixxxCore(Feature): "src/preferences/effectsettingsmodel.cpp", "src/preferences/broadcastprofile.cpp", "src/preferences/upgrade.cpp", + "src/preferences/colorpalettesettings.cpp", "src/preferences/dlgpreferencepage.cpp", "src/effects/effectmanifest.cpp", @@ -925,7 +926,8 @@ class MixxxCore(Feature): "src/controllers/midi/midioutputhandler.cpp", "src/controllers/softtakeover.cpp", "src/controllers/keyboard/keyboardeventfilter.cpp", - "src/controllers/colorjsproxy.cpp", + "src/controllers/colormapper.cpp", + "src/controllers/colormapperjsproxy.cpp", "src/main.cpp", "src/mixxx.cpp", @@ -1283,6 +1285,7 @@ class MixxxCore(Feature): "src/util/cache.cpp", "src/util/console.cpp", "src/util/color/color.cpp", + "src/util/color/colorpalette.cpp", "src/util/db/dbconnection.cpp", "src/util/db/dbconnectionpool.cpp", "src/util/db/dbconnectionpooler.cpp", @@ -1309,8 +1312,7 @@ class MixxxCore(Feature): "src/util/desktophelper.cpp", "src/util/widgetrendertimer.cpp", "src/util/workerthread.cpp", - "src/util/workerthreadscheduler.cpp", - "src/util/color/predefinedcolor.cpp" + "src/util/workerthreadscheduler.cpp" ] proto_args = { diff --git a/res/controllers/.eslintrc.json b/res/controllers/.eslintrc.json index a5f60376e3..b2687b106a 100644 --- a/res/controllers/.eslintrc.json +++ b/res/controllers/.eslintrc.json @@ -1,7 +1,7 @@ { "globals": { + "ColorMapper": "readonly", "_": "readonly", - "color": "readonly", "components": "readonly", "engine": "readonly", "midi": "readonly", diff --git a/res/controllers/Roland_DJ-505-scripts.js b/res/controllers/Roland_DJ-505-scripts.js index be2ddb4f77..ceee4d06b3 100644 --- a/res/controllers/Roland_DJ-505-scripts.js +++ b/res/controllers/Roland_DJ-505-scripts.js @@ -970,17 +970,24 @@ DJ505.PadColor = { DIM_MODIFIER: 0x10, }; -DJ505.PadColorMap = [ - DJ505.PadColor.OFF, - DJ505.PadColor.RED, - DJ505.PadColor.GREEN, - DJ505.PadColor.BLUE, - DJ505.PadColor.YELLOW, - DJ505.PadColor.CELESTE, - DJ505.PadColor.PURPLE, - DJ505.PadColor.APRICOT, - DJ505.PadColor.WHITE, -]; +DJ505.PadColorMap = new ColorMapper({ + "#CC0000": DJ505.PadColor.RED, + "#CC4400": DJ505.PadColor.CORAL, + "#CC8800": DJ505.PadColor.ORANGE, |