Merge remote-tracking branch 'upstream/2.4' into main

xorik · Sep 5, 2023 · 4b4052e · 4b4052e
2 parents e997b17 + a428aae
commit 4b4052e
Show file tree

Hide file tree

Showing 95 changed files with 28,605 additions and 22,441 deletions.
diff --git a/.codespellignore b/.codespellignore
@@ -6,3 +6,4 @@ sord
 doubleClick
 sur
 jus
+caf
diff --git a/.eslintignore b/.eslintignore
@@ -1 +1,4 @@
 res/controllers/lodash.mixxx.js
+res/controllers/Novation-Launchpad MK2-scripts.js
+res/controllers/Novation-Launchpad Mini MK3-scripts.js
+res/controllers/Novation-Launchpad-scripts.js
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -75,8 +75,8 @@ repos:
           - commit
           - manual
         additional_dependencies:
-          - eslint@^v8.6.0
-          - eslint-plugin-jsdoc@^v37.5.0
+          - eslint@^8.48.0
+          - eslint-plugin-jsdoc@^v46.5.1
           - "@typescript-eslint/eslint-plugin"
           - "@typescript-eslint/parser"
   - repo: local

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1284,6 +1284,7 @@ else()
       src/waveform/renderers/allshader/waveformrenderer.cpp
       src/waveform/renderers/allshader/waveformrendererendoftrack.cpp
       src/waveform/renderers/allshader/waveformrendererfiltered.cpp
+      src/waveform/renderers/allshader/waveformrendererhsv.cpp
       src/waveform/renderers/allshader/waveformrendererlrrgb.cpp
       src/waveform/renderers/allshader/waveformrendererpreroll.cpp
       src/waveform/renderers/allshader/waveformrendererrgb.cpp
@@ -1292,6 +1293,7 @@ else()
       src/waveform/renderers/allshader/waveformrendermark.cpp
       src/waveform/renderers/allshader/waveformrendermarkrange.cpp
       src/waveform/widgets/allshader/filteredwaveformwidget.cpp
+      src/waveform/widgets/allshader/hsvwaveformwidget.cpp
       src/waveform/widgets/allshader/lrrgbwaveformwidget.cpp
       src/waveform/widgets/allshader/rgbwaveformwidget.cpp
       src/waveform/widgets/allshader/simplewaveformwidget.cpp
@@ -1338,6 +1340,7 @@ if(APPLE)
 
   target_sources(mixxx-lib PRIVATE
     src/util/darkappearance.mm
+    src/util/macosversion.mm
   )
 
   option(MACOS_ITUNES_LIBRARY "Native macOS iTunes/Music.app library integration" ON)
@@ -3095,6 +3098,7 @@ if(MEDIAFOUNDATION)
   )
   target_link_libraries(mixxx-lib PRIVATE
     ${MediaFoundation_LIBRARIES}
+    Version.lib
   )
 endif()
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,3 +6,4 @@ sord @@
     doubleClick
     sur
     jus
+    caf