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

.clang-tidy

@@ -1,5 +1,13 @@
 ---
-Checks: "-*,modernize-use-bool-literals,modernize-use-nullptr,modernize-use-override,readability-braces-around-statements,readability-namespace-comment,readability-non-const-parameter,readability-qualified-auto"
+Checks: >-
+  -*,
+  google-readability-namespace-comments,
+  modernize-use-bool-literals,
+  modernize-use-nullptr,
+  modernize-use-override,
+  readability-braces-around-statements,
+  readability-non-const-parameter,
+  readability-qualified-auto
 WarningsAsErrors: ""
 HeaderFilterRegex: ""
 AnalyzeTemporaryDtors: false
@@ -8,9 +16,9 @@ User: user
 CheckOptions:
   - key: readability-braces-around-statements.ShortStatementLines
     value: 0
-  - key: readability-namespace-comments.ShortNamespaceLines
+  - key: google-readability-namespace-comments.ShortNamespaceLines
     value: 0
-  - key: readability-namespace-comments.SpacesBeforeComments
+  - key: google-readability-namespace-comments.SpacesBeforeComments
     value: 1
   - key: readability-qualified-auto.AddConstToQualified
     value: true

CMakeLists.txt

@@ -438,7 +438,7 @@ elseif(GNU_GCC OR LLVM_CLANG)
     # Clang sanitizers.
     # Note: It is only included in -O on machines where it does not
     # interfere with debugging
-    if(NOT PROFILING AND NOT CLANG_SANITIZERS)
+    if(NOT PROFILING AND NOT SANITIZERS)
       add_compile_options(-fomit-frame-pointer)
     endif()
 
@@ -1007,6 +1007,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/skin/legacy/pixmapsource.cpp
   src/skin/legacy/skincontext.cpp
   src/skin/legacy/tooltips.cpp
+  src/skin/skincontrols.cpp
   src/skin/skinloader.cpp
   src/soundio/sounddevice.cpp
   src/soundio/sounddevicenetwork.cpp
@@ -2836,26 +2837,26 @@ if(CLANG_COLORDIAG)
 endif()
 
 # Clang Sanitizers
-set(CLANG_SANITIZERS "")
-option(CLANG_ASAN "Clang Address Sanitizer" OFF)
-if(CLANG_ASAN)
-  list(APPEND CLANG_SANITIZERS "address")
-endif()
-option(CLANG_UBSAN "Clang Undefined Behaviour Sanitizer" OFF)
-if(CLANG_UBSAN)
-  list(APPEND CLANG_SANITIZERS "undefined")
-endif()
-option(CLANG_TSAN "Clang Thread Sanitizer" OFF)
-if(CLANG_TSAN)
-  list(APPEND CLANG_SANITIZERS "thread")
-endif()
-if(NOT CLANG_SANITIZERS STREQUAL "")
-  if(NOT LLVM_CLANG)
-    message(FATAL_ERROR "Clang Sanitizers are only available when using Clang.")
-  endif()
-  list(JOIN CLANG_SANITIZERS "," CLANG_SANITZERS_JOINED)
-  target_compile_options(mixxx-lib PUBLIC -fsanitize=${CLANG_SANITZERS_JOINED})
-  target_link_options(mixxx-lib PUBLIC -fsanitize=${CLANG_SANITZERS_JOINED})
+set(SANITIZERS "")
+option(SANITIZE_ADDRESS "Address Sanitizer" OFF)
+if(SANITIZE_ADDRESS)
+  list(APPEND SANITIZERS "address")
+endif()
+option(SANITIZE_UNDEFINED "Clang Undefined Behaviour Sanitizer" OFF)
+if(SANITIZE_UNDEFINED)
+  list(APPEND SANITIZERS "undefined")
+endif()
+option(SANITIZE_THREAD "Clang Thread Sanitizer" OFF)
+if(SANITIZE_THREAD)
+  list(APPEND SANITIZERS "thread")
+endif()
+if(NOT SANITIZERS STREQUAL "")
+  if(NOT (LLVM_CLANG OR GNU_GCC))
+    message(FATAL_ERROR "Sanitizers are only available on Clang or GCC")
+  endif()
+  list(JOIN SANITIZERS "," SANITZERS_JOINED)
+  target_compile_options(mixxx-lib PUBLIC -fsanitize=${SANITZERS_JOINED})
+  target_link_options(mixxx-lib PUBLIC -fsanitize=${SANITZERS_JOINED})
 endif()
 
 # CoreAudio MP3/AAC Decoder

res/controllers/Denon-MC6000MK2-scripts.js

@@ -1533,7 +1533,7 @@ DenonMC6000MK2.recvAreaButton = function(_channel, _control, value, _status, _gr
 
 DenonMC6000MK2.recvListButton = function(_channel, _control, value, _status, _group) {
     if (DenonMC6000MK2.isButtonPressed(value)) {
-        script.toggleControl("[Master]", "maximize_library");
+        script.toggleControl("[Skin]", "show_maximized_library");
     }
 };
 

res/controllers/Denon-MC7000-scripts.js

@@ -680,7 +680,7 @@ MC7000.loadButton = function(channel, control, value, status, group) {
 MC7000.wheelTouch = function(channel, control, value, status, group) {
     const deckNumber = script.deckFromGroup(group);
     const deckIndex = deckNumber - 1;
-    const libraryMaximized = engine.getValue("[Master]", "maximize_library") > 0;
+    const libraryMaximized = engine.getValue("[Skin]", "show_maximized_library") > 0;
     if (MC7000.isVinylMode[deckIndex] && !libraryMaximized) {
         if (value === 0x7F) {
             engine.scratchEnable(deckNumber, MC7000.jogWheelTicksPerRevolution,
@@ -711,7 +711,7 @@ MC7000.wheelTurn = function(channel, control, value, status, group) {
     const adjustedSpeed = numTicks * MC7000.jogSensitivity / 10;
     const deckNumber = script.deckFromGroup(group);
     const deckIndex = deckNumber - 1;
-    const libraryMaximized = engine.getValue("[Master]", "maximize_library");
+    const libraryMaximized = engine.getValue("[Skin]", "show_maximized_library");
     if (libraryMaximized === 1 && numTicks > 0) {
         engine.setValue("[Library]", "MoveDown", 1);
     } else if (libraryMaximized === 1 && numTicks < 0) {

res/controllers/Denon-MC7000.midi.xml

@@ -2197,8 +2197,8 @@
                 </options>
             </control>
             <control>
-                <group>[Master]</group>
-                <key>maximize_library</key>
+                <group>[Skin]</group>
+                <key>show_maximized_library</key>
                 <description>Full screen Library</description>
                 <status>0x9F</status>
                 <midino>0x0F</midino>

res/controllers/Electrix-Tweaker-scripts.js

@@ -506,7 +506,7 @@ ElectrixTweaker.bigEncoderButton = function(channel, control, value, _status, _g
         if (ElectrixTweaker.topShift) {
             engine.setValue("[Playlist]", "LoadSelectedIntoFirstStopped", 1);
         } else {
-            engine.setValue("[Master]", "maximize_library", ! engine.getValue("[Master]", "maximize_library"));
+            engine.setValue("[Skin]", "show_maximized_library", ! engine.getValue("[Skin]", "show_maximized_library"));
         }
     }
 };

res/controllers/Hercules P32 DJ.midi.xml

@@ -15,8 +15,8 @@
         </scriptfiles>
         <controls>
             <control>
-                <group>[Master]</group>
-                <key>maximize_library</key>
+                <group>[Skin]</group>
+                <key>show_maximized_library</key>
                 <status>0x90</status>
                 <midino>0x01</midino>
                 <options>

res/controllers/Hercules_DJControl_Inpulse_200.midi.xml

@@ -237,8 +237,8 @@
             <!-- NN's MIDI Channel 4 (0x93 - SHIFT MODE)-->
             <!--Browser section (Encoder button)-->
             <control>
-                <group>[Master]</group>
-                <key>maximize_library</key>
+                <group>[Skin]</group>
+                <key>show_maximized_library</key>
                 <description>Browser button - Maximize Library view</description>
                 <status>0x93</status>
                 <midino>0x00</midino>
@@ -1293,8 +1293,8 @@
                 <off>0x07</off>
             </output>
             <output>
-                <group>[Master]</group>
-                <key>maximize_library</key>
+                <group>[Skin]</group>
+                <key>show_maximized_library</key>
                 <description>Browser LED (GREEN)</description>
                 <minimum>0.5</minimum>
                 <maximum>1</maximum>

res/controllers/Hercules_DJControl_Inpulse_300.midi.xml

@@ -336,8 +336,8 @@
 
 			<!--Browser section (Encoder button)-->
 			<control>
-				<group>[Master]</group>
-				<key>maximize_library</key>
+				<group>[Skin]</group>
+				<key>show_maximized_library</key>
 				<description>Browser button - Maximize Library view</description>
 				<status>0x93</status>
 				<midino>0x00</midino>
@@ -2206,8 +2206,8 @@
 				<off>0x07</off>
 			</output>
 			<output>
-				<group>[Master]</group>
-				<key>maximize_library</key>
+				<group>[Skin]</group>
+				<key>show_maximized_library</key>
 				<description>Browser LED (GREEN)</description>
 				<minimum>0.5</minimum>
 				<maximum>1</maximum>

res/controllers/Hercules_DJControl_Jogvision.midi.xml

@@ -1016,8 +1016,8 @@
       </control>
       <!-- View button -->
       <control>
-        <group>[Master]</group>
-        <key>maximize_library</key>
+        <group>[Skin]</group>
+        <key>show_maximized_library</key>
         <description>Browser button - Maximize Library view</description>
         <status>0x90</status>
         <midino>0x47</midino>
@@ -1719,8 +1719,8 @@
       </output>
       <!--  VIEW LED -->
       <output>
-        <group>[Master]</group>
-        <key>maximize_library</key>
+        <group>[Skin]</group>
+        <key>show_maximized_library</key>
         <description>VIEW button LED</description>
         <minimum>0.5</minimum>
         <maximum>1</maximum>

res/controllers/Ion Discover DJ.midi.xml

@@ -13,8 +13,8 @@
         </scriptfiles>
         <controls>
             <control>
-                <group>[Master]</group>
-                <key>maximize_library</key>
+                <group>[Skin]</group>
+                <key>show_maximized_library</key>
                 <description>MIDI Learned from 2 messages.</description>
                 <status>0x90</status>
                 <midino>0x4F</midino>
@@ -336,8 +336,8 @@
                 </options>
             </control>
             <control>
-                <group>[Master]</group>
-                <key>maximize_library</key>
+                <group>[Skin]</group>
+                <key>show_maximized_library</key>
                 <description>MIDI Learned from 2 messages.</description>
                 <status>0x80</status>
                 <midino>0x4F</midino>

res/controllers/Novation-Launchpad MK2-scripts.js

@@ -3846,8 +3846,8 @@ var NLMK2 = (function () {
 	};
 	const masterControlDef = {
 	  maximize_library: {
-	    group: '[Master]',
-	    name: 'maximize_library',
+	    group: '[Skin]',
+	    name: 'show_maximized_library',
 	    type: 'binary'
 	  },
 	  num_samplers: {

res/controllers/Novation-Launchpad Mini MK3-scripts.js

@@ -3846,8 +3846,8 @@ var NLMMK3 = (function () {
 	};
 	const masterControlDef = {
 	  maximize_library: {
-	    group: '[Master]',
-	    name: 'maximize_library',
+	    group: '[Skin]',
+	    name: 'show_maximized_library',
 	    type: 'binary'
 	  },
 	  num_samplers: {

res/controllers/Novation-Launchpad-scripts.js

@@ -3846,8 +3846,8 @@ var NLMK1 = (function () {
 	};
 	const masterControlDef = {
 	  maximize_library: {
-	    group: '[Master]',
-	    name: 'maximize_library',
+	    group: '[Skin]',
+	    name: 'show_maximized_library',
 	    type: 'binary'
 	  },
 	  num_samplers: {

res/controllers/Numark iDJ Live II.midi.xml

@@ -47,8 +47,8 @@
 	</options>
       </control>
       <control>
-	<group>[Master]</group>
-	<key>maximize_library</key>
+	<group>[Skin]</group>
+	<key>show_maximized_library</key>
 	<status>0x90</status>
 	<midino>0x4F</midino>
       </control>

res/controllers/Numark-Mixtrack-3-scripts.js

@@ -1091,7 +1091,7 @@ NumarkMixtrack3.BrowseButton = function(channel, control, value, status, group)
 	    } else {
 	        // Browse push : maximize/minimize library view
 	        if (value === ON) {
-	            script.toggleControl("[Master]", "maximize_library");
+	            script.toggleControl("[Skin]", "show_maximized_library");
 	        }
 	    }
     }

res/controllers/Numark-N4-scripts.js

@@ -355,8 +355,8 @@ NumarkN4.MixerTemplate = function() {
     this.navigationEncoderButton = new components.Button({
         shift: function() {
             this.type=components.Button.prototype.types.toggle;
-            this.group="[Master]";
-            this.inKey="maximize_library";
+            this.group="[Skin]";
+            this.inKey="show_maximized_library";
         },
         unshift: function() {
             this.type=components.Button.prototype.types.push;

res/controllers/Pioneer-DDJ-SB.midi.xml

@@ -273,8 +273,8 @@
                 </options>
             </control>
             <control>
-                <group>[Master]</group>
-                <key>maximize_library</key>
+                <group>[Skin]</group>
+                <key>show_maximized_library</key>
                 <status>0x96</status>
                 <midino>0x65</midino>
                 <options>

res/controllers/Pioneer-DDJ-SX-scripts.js

@@ -2206,7 +2206,7 @@ PioneerDDJSX.backButton = function(channel, control, value, status) {
 
 PioneerDDJSX.shiftBackButton = function(channel, control, value, status) {
     if (value) {
-        script.toggleControl("[Master]", "maximize_library");
+        script.toggleControl("[Skin]", "show_maximized_library");
     }
 };
 

res/controllers/Reloop Jockey 3 ME.midi.xml

@@ -78,8 +78,8 @@
                 </options>
             </control>
             <control>
-                <group>[Master]</group>
-                <key>maximize_library</key>
+                <group>[Skin]</group>
+                <key>show_maximized_library</key>
                 <description>TraxPush to Browse</description>
                 <status>0x90</status>
                 <midino>0x35</midino>

res/controllers/Roland_DJ-505-scripts.js

@@ -298,8 +298,8 @@ DJ505.addPrepareButton = new components.Button({
     shiftOffset: -7,
     sendShifted: true,
     shiftControl: true,
-    group: "[Master]",
-    key: "maximize_library",
+    group: "[Skin]",
+    key: "show_maximized_library",
     type: components.Button.prototype.types.toggle,
 });
 

res/controllers/Stanton-DJC-4.midi.xml

@@ -2615,8 +2615,8 @@
         </options>
       </control>
       <control>
-        <group>[Master]</group>
-        <key>maximize_library</key>
+        <group>[Skin]</group>
+        <key>show_maximized_library</key>
         <status>0x90</status>
         <midino>0x59</midino>
         <options>

res/controllers/Traktor-Kontrol-S2-MK2-hid-scripts.js

@@ -181,7 +181,7 @@ TraktorS2MK2.registerInputPackets = function() {
     MessageShort.addControl("[EffectRack1_EffectUnit1]", "group_[Channel2]_enable", 0x0E, "B", 0x02);
     MessageShort.addControl("[EffectRack1_EffectUnit2]", "group_[Channel2]_enable", 0x0E, "B", 0x01);
 
-    MessageShort.addControl("[Master]", "maximize_library", 0x0F, "B", 0x04, false, this.toggleButton);
+    MessageShort.addControl("[Skin]", "show_maximized_library", 0x0F, "B", 0x04, false, this.toggleButton);
 
     MessageShort.addControl("[Microphone]", "talkover", 0x0A, "B", 0x08, false, this.toggleButton);
 

res/controllers/Traktor-Kontrol-S2-MK3-hid-scripts.js

@@ -506,7 +506,7 @@ TraktorS2MK3.maximizeLibraryHandler = function(field) {
         return;
     }
 
-    script.toggleControl("[Master]", "maximize_library");
+    script.toggleControl("[Skin]", "show_maximized_library");
 };
 
 TraktorS2MK3.selectLoopHandler = function(field) {

res/controllers/Traktor-Kontrol-S3-hid-scripts.js

@@ -529,7 +529,7 @@ TraktorS3.Controller = class {
 
         engine.connectControl("[Microphone]", "pfl", this.pflOutput);
 
-        engine.connectControl("[Master]", "maximize_library", TraktorS3.Controller.prototype.maximizeLibraryOutput.bind(this));
+        engine.connectControl("[Skin]", "show_maximized_library", TraktorS3.Controller.prototype.maximizeLibraryOutput.bind(this));
 
         // Master VuMeters
         this.masterVuMeter.VuMeterL.connection = engine.makeConnection("[Master]", "VuMeterL", TraktorS3.Controller.prototype.masterVuMeterHandler.bind(this));
@@ -1145,7 +1145,7 @@ TraktorS3.Deck = class {
             return;
         }
 
-        script.toggleControl("[Master]", "maximize_library");
+        script.toggleControl("[Skin]", "show_maximized_library");
     }
 
     selectLoopHandler(field) {