From df146e2d9ee8d1471447829d502753388511da79 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Sun, 1 May 2022 01:23:11 +0200
Subject: [PATCH 001/388] KeyControl: simplify updatePitch() &
 updatePitchAdjust(), more const

---
 src/engine/controls/keycontrol.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/engine/controls/keycontrol.cpp b/src/engine/controls/keycontrol.cpp
index 1d2236573c3..bba99180cc4 100644
--- a/src/engine/controls/keycontrol.cpp
+++ b/src/engine/controls/keycontrol.cpp
@@ -353,7 +353,7 @@ void KeyControl::slotPitchChanged(double pitch) {
 }
 
 void KeyControl::updatePitch() {
-    double pitch = m_pPitch->get();
+    const double pitch = m_pPitch->get();
 
     if constexpr (kEnableDebugOutput) {
         qDebug() << "   .";
@@ -364,17 +364,17 @@ void KeyControl::updatePitch() {
         qDebug() << "   | m_pPitchAdjust  " << m_pPitchAdjust->get();
     }
 
-    double speedSliderPitchRatio =
-            m_pitchRateInfo.pitchRatio / m_pitchRateInfo.pitchTweakRatio;
     // speedSliderPitchRatio must be unchanged
-    double pitchKnobRatio = KeyUtils::semitoneChangeToPowerOf2(pitch);
-    m_pitchRateInfo.pitchRatio = pitchKnobRatio;
-    m_pitchRateInfo.pitchTweakRatio = pitchKnobRatio / speedSliderPitchRatio;
+    const double speedSliderPitchRatio =
+            m_pitchRateInfo.pitchRatio / m_pitchRateInfo.pitchTweakRatio;
+    m_pitchRateInfo.pitchRatio = KeyUtils::semitoneChangeToPowerOf2(pitch);
+    m_pitchRateInfo.pitchTweakRatio =
+            m_pitchRateInfo.pitchRatio / speedSliderPitchRatio;
 
-    double dFileKey = m_pFileKey->get();
+    const double dFileKey = m_pFileKey->get();
     m_pPitchAdjust->set(
             KeyUtils::powerOf2ToSemitoneChange(m_pitchRateInfo.pitchTweakRatio));
-    updateKeyCOs(dFileKey, KeyUtils::powerOf2ToOctaveChange(pitchKnobRatio));
+    updateKeyCOs(dFileKey, KeyUtils::powerOf2ToOctaveChange(m_pitchRateInfo.pitchRatio));
 
     if constexpr (kEnableDebugOutput) {
         qDebug() << "   --after KeyControl::updatePitch";
@@ -392,7 +392,7 @@ void KeyControl::slotPitchAdjustChanged(double pitchAdjust) {
 }
 
 void KeyControl::updatePitchAdjust() {
-    double pitchAdjust = m_pPitchAdjust->get();
+    const double pitchAdjust = m_pPitchAdjust->get();
 
     if constexpr (kEnableDebugOutput) {
         qDebug() << "   .";
@@ -403,16 +403,16 @@ void KeyControl::updatePitchAdjust() {
         qDebug() << "   | m_pPitch        " << m_pPitch->get();
     }
 
-    double speedSliderPitchRatio = m_pitchRateInfo.pitchRatio / m_pitchRateInfo.pitchTweakRatio;
     // speedSliderPitchRatio must be unchanged
-    double pitchAdjustKnobRatio = KeyUtils::semitoneChangeToPowerOf2(pitchAdjust);
+    const double speedSliderPitchRatio =
+            m_pitchRateInfo.pitchRatio / m_pitchRateInfo.pitchTweakRatio;
+    m_pitchRateInfo.pitchTweakRatio = KeyUtils::semitoneChangeToPowerOf2(pitchAdjust);
 
     // pitch_adjust is an offset to the pitch set by the speed controls
     // calc absolute pitch
-    m_pitchRateInfo.pitchTweakRatio = pitchAdjustKnobRatio;
-    m_pitchRateInfo.pitchRatio = pitchAdjustKnobRatio * speedSliderPitchRatio;
+    m_pitchRateInfo.pitchRatio = m_pitchRateInfo.pitchTweakRatio * speedSliderPitchRatio;
 
-    double dFileKey = m_pFileKey->get();
+    const double dFileKey = m_pFileKey->get();
     updateKeyCOs(dFileKey, KeyUtils::powerOf2ToOctaveChange(m_pitchRateInfo.pitchRatio));
 
     if constexpr (kEnableDebugOutput) {

From 958e2f54754b4d5a6287b74e24898e29aa0e353c Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Fri, 6 May 2022 23:47:17 +0200
Subject: [PATCH 002/388] KeyControl: (fix) make "Lock original key" also reset
 pitch_adjust

This prevents the continuous key shift when un/locking repeatedly with
"Lock original key" and "Unlock, keep current key".
---
 src/engine/controls/keycontrol.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/engine/controls/keycontrol.cpp b/src/engine/controls/keycontrol.cpp
index bba99180cc4..c4ce95d7289 100644
--- a/src/engine/controls/keycontrol.cpp
+++ b/src/engine/controls/keycontrol.cpp
@@ -189,11 +189,14 @@ void KeyControl::updateRate() {
                              << speedSliderPitchRatio;
                     qDebug() << "   |";
                 }
-            } else { // Lock at original track pitch
+            } else { // Lock at original track pitch, reset pitch_adjust
                 speedSliderPitchRatio = 1.0;
+                m_pitchRateInfo.pitchTweakRatio = 1.0;
+                m_pPitchAdjust->set(0);
                 if constexpr (kEnableDebugOutput) {
-                    qDebug() << "   LOCK original key";
-                    qDebug() << "   | speedSliderPitchRatio = 1.0";
+                    qDebug() << "   LOCK original key, reset pitch_adjust";
+                    qDebug() << "   | speedSliderPitchRatio =" << speedSliderPitchRatio;
+                    qDebug() << "   | pitchTweakRatio       =" << m_pitchRateInfo.pitchTweakRatio;
                     qDebug() << "   |";
                 }
             }
@@ -221,7 +224,7 @@ void KeyControl::updateRate() {
                     qDebug() << "   |   / pitchTweakRatio" << m_pitchRateInfo.pitchTweakRatio;
                     qDebug() << "   | =" << qSetRealNumberPrecision(18) << speedSliderPitchRatio;
                     qDebug() << "   |";
-                    qDebug() << "   : pitchTweakRatio *=";
+                    qDebug() << "   | pitchTweakRatio *=";
                     qDebug() << "   |   speedSliderPitchRatio" << speedSliderPitchRatio;
                     qDebug() << "   |   / tempoRatio        " << m_pitchRateInfo.tempoRatio;
                     qDebug() << "   | =" << qSetRealNumberPrecision(18)
@@ -265,7 +268,7 @@ void KeyControl::updateRate() {
 
     m_pitchRateInfo.pitchRatio = m_pitchRateInfo.pitchTweakRatio * speedSliderPitchRatio;
     if constexpr (kEnableDebugOutput) {
-        qDebug() << "   : pitchRatio =";
+        qDebug() << "   | pitchRatio =";
         qDebug() << "   | pitchTweakRatio        " << m_pitchRateInfo.pitchTweakRatio;
         qDebug() << "   | * speedSliderPitchRatio" << speedSliderPitchRatio;
         qDebug() << "   | =" << qSetRealNumberPrecision(18) << m_pitchRateInfo.pitchRatio;

From 28a8a49828af4019503fe493af4117ef2874f1d6 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Sat, 7 May 2022 00:03:27 +0200
Subject: [PATCH 003/388] KeyControl: (fix) apply pitch_adjust on "Unlock,
 reset to linear pitch"

---
 src/engine/controls/keycontrol.cpp | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/engine/controls/keycontrol.cpp b/src/engine/controls/keycontrol.cpp
index c4ce95d7289..b26f9ac61ec 100644
--- a/src/engine/controls/keycontrol.cpp
+++ b/src/engine/controls/keycontrol.cpp
@@ -237,15 +237,8 @@ void KeyControl::updateRate() {
                 m_pPitchAdjust->set(
                         KeyUtils::powerOf2ToSemitoneChange(m_pitchRateInfo.pitchTweakRatio));
             } else { // Unlock and reset to linear pitch (orig. key + pitch fader offset)
-                // If 'current' aka 'not original' key was locked
-                // TODO(ronso0) Why does it depend on keylock mode?
-                if (m_keylockMode->get() == kLockCurrentKey) {
-                    // reset to linear pitch
-                    m_pitchRateInfo.pitchTweakRatio = 1.0;
-                    // was missing?
-                    // m_pPitchAdjust->set(
-                    //        KeyUtils::powerOf2ToSemitoneChange(m_pitchRateInfo.pitchTweakRatio));
-                }
+                m_pitchRateInfo.pitchTweakRatio = 1.0;
+                m_pPitchAdjust->set(0);
                 if constexpr (kEnableDebugOutput) {
                     qDebug() << "   UNLOCKING reset to linear pitch";
                     qDebug() << "   : pitchTweakRatio = 1.0";

From f36934cf64e26fb7eb1c86c8176f2b5978586062 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 20 Jun 2023 00:43:04 +0200
Subject: [PATCH 004/388] DisableKeylockResetsPitch test: use
 KeyunlockMode::ResetLockedKey explicitly

---
 src/test/enginebuffertest.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/test/enginebuffertest.cpp b/src/test/enginebuffertest.cpp
index 1c006dd7b56..db6e1629b0c 100644
--- a/src/test/enginebuffertest.cpp
+++ b/src/test/enginebuffertest.cpp
@@ -22,10 +22,12 @@ class EngineBufferTest : public MockedEngineBackendTest {};
 class EngineBufferE2ETest : public SignalPathTest {};
 
 TEST_F(EngineBufferTest, DisableKeylockResetsPitch) {
-    // To prevent one-slider users from getting stuck on a key, unsetting
-    // keylock resets the musical pitch.
+    // To prevent one-slider users from getting stuck on a key,
+    // KeyunlockMode::ResetLockedKey resets the musical pitch.
     ControlObject::set(ConfigKey(m_sGroup1, "keylockMode"),
-                       1.0);  // kLockCurrentKey;
+            1.0); // KeylockMode::LockCurrentKey
+    ControlObject::set(ConfigKey(m_sGroup1, "keyunlockMode"),
+            0.0); // KeyunlockMode::ResetLockedKey
     ControlObject::set(ConfigKey(m_sGroup1, "file_bpm"), 128.0);
     ControlObject::set(ConfigKey(m_sGroup1, "keylock"), 1.0);
     ControlObject::set(ConfigKey(m_sGroup1, "pitch"), 0.5);

From c13fc9eae50f4f93f17215e4caf6f522dfec85af Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 20 Jun 2023 00:45:24 +0200
Subject: [PATCH 005/388] PitchRoundtrip test: (fix) use
 KeyunlockMode::ResetLockedKey explicitly

---
 src/test/enginebuffertest.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/test/enginebuffertest.cpp b/src/test/enginebuffertest.cpp
index db6e1629b0c..b40da975695 100644
--- a/src/test/enginebuffertest.cpp
+++ b/src/test/enginebuffertest.cpp
@@ -55,7 +55,9 @@ TEST_F(EngineBufferTest, TrackLoadResetsPitch) {
 TEST_F(EngineBufferTest, PitchRoundtrip) {
     ControlObject::set(ConfigKey(m_sGroup1, "keylock"), 0.0);
     ControlObject::set(ConfigKey(m_sGroup1, "keylockMode"),
-                       0.0);  // kLockOriginalKey;
+            0.0); // KeylockMode::LockOriginalKey
+    ControlObject::set(ConfigKey(m_sGroup1, "keyunlockMode"),
+            0.0); // KeyunlockMode::ResetLockedKey
     ProcessBuffer();
     // we are in kPakmOffsetScaleReseting mode
     ControlObject::set(ConfigKey(m_sGroup1, "rate"), 0.5);
@@ -77,7 +79,7 @@ TEST_F(EngineBufferTest, PitchRoundtrip) {
     ASSERT_DOUBLE_EQ(0.5, ControlObject::get(ConfigKey(m_sGroup1, "rate")));
 
     ControlObject::set(ConfigKey(m_sGroup1, "keylockMode"),
-                       1.0);  // kLockCurrentKey;
+            1.0); // KeylockMode::LockCurrentKey
     ProcessBuffer();
     // rate must not change
     ASSERT_DOUBLE_EQ(0.5, ControlObject::get(ConfigKey(m_sGroup1, "rate")));
@@ -85,7 +87,7 @@ TEST_F(EngineBufferTest, PitchRoundtrip) {
     ASSERT_NEAR(0.5, ControlObject::get(ConfigKey(m_sGroup1, "pitch")), 1e-10);
 
     ControlObject::set(ConfigKey(m_sGroup1, "keylockMode"),
-                       0.0);  // kLockOriginalKey;
+            0.0); // KeylockMode::LockOriginalKey
     ProcessBuffer();
     // rate must not change
     ASSERT_NEAR(0.5, ControlObject::get(ConfigKey(m_sGroup1, "pitch")), 1e-10);

From a479828fcafabcc85e425cba330b65104f772d47 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 20 Jun 2023 01:15:28 +0200
Subject: [PATCH 006/388] PitchRoundtrip test: adjust to new pitch_adjust reset
 with key un/lock modes

---
 src/test/enginebuffertest.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/test/enginebuffertest.cpp b/src/test/enginebuffertest.cpp
index b40da975695..76efc121e66 100644
--- a/src/test/enginebuffertest.cpp
+++ b/src/test/enginebuffertest.cpp
@@ -62,7 +62,7 @@ TEST_F(EngineBufferTest, PitchRoundtrip) {
     // we are in kPakmOffsetScaleReseting mode
     ControlObject::set(ConfigKey(m_sGroup1, "rate"), 0.5);
     ProcessBuffer();
-    // pitch must not change
+    // pitch_adjust must not change
     ASSERT_DOUBLE_EQ(0.0,
                      ControlObject::get(ConfigKey(m_sGroup1, "pitch_adjust")));
 
@@ -73,10 +73,11 @@ TEST_F(EngineBufferTest, PitchRoundtrip) {
 
     ControlObject::set(ConfigKey(m_sGroup1, "keylock"), 1.0);
     ProcessBuffer();
-    // pitch and speed must not change
-    ASSERT_DOUBLE_EQ(0.5,
-                     ControlObject::get(ConfigKey(m_sGroup1, "pitch_adjust")));
+    // pitch is reset, as well as pitch_adjust
+    // speed must not change, pitch and pitch_adjust must be 0
     ASSERT_DOUBLE_EQ(0.5, ControlObject::get(ConfigKey(m_sGroup1, "rate")));
+    ASSERT_DOUBLE_EQ(0.0, ControlObject::get(ConfigKey(m_sGroup1, "pitch")));
+    ASSERT_DOUBLE_EQ(0.0, ControlObject::get(ConfigKey(m_sGroup1, "pitch_adjust")));
 
     ControlObject::set(ConfigKey(m_sGroup1, "keylockMode"),
             1.0); // KeylockMode::LockCurrentKey
@@ -84,15 +85,15 @@ TEST_F(EngineBufferTest, PitchRoundtrip) {
     // rate must not change
     ASSERT_DOUBLE_EQ(0.5, ControlObject::get(ConfigKey(m_sGroup1, "rate")));
     // pitch must reflect the absolute pitch
-    ASSERT_NEAR(0.5, ControlObject::get(ConfigKey(m_sGroup1, "pitch")), 1e-10);
+    ASSERT_DOUBLE_EQ(0.0, ControlObject::get(ConfigKey(m_sGroup1, "pitch")));
 
     ControlObject::set(ConfigKey(m_sGroup1, "keylockMode"),
             0.0); // KeylockMode::LockOriginalKey
     ProcessBuffer();
     // rate must not change
-    ASSERT_NEAR(0.5, ControlObject::get(ConfigKey(m_sGroup1, "pitch")), 1e-10);
-    // pitch must reflect the pitch shift only
     ASSERT_DOUBLE_EQ(0.5, ControlObject::get(ConfigKey(m_sGroup1, "rate")));
+    // pitch must be 0
+    ASSERT_NEAR(0.0, ControlObject::get(ConfigKey(m_sGroup1, "pitch")), 1e-10);
 }
 
 TEST_F(EngineBufferTest, SlowRubberBand) {

From f888df729e9437e0a49bec942707f9b18ec59956 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 25 Apr 2023 10:04:33 +0200
Subject: [PATCH 007/388] Pref Mixer, ui: set xfader button group in ui file

---
 src/preferences/dialog/dlgprefmixer.cpp   | 9 ++++-----
 src/preferences/dialog/dlgprefmixerdlg.ui | 9 +++++++++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index 4d745e66a6e..15d8f9a923d 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -72,10 +72,6 @@ DlgPrefMixer::DlgPrefMixer(
           m_bGainAutoReset(false) {
     setupUi(this);
 
-    QButtonGroup crossfaderModes;
-    crossfaderModes.addButton(radioButtonAdditive);
-    crossfaderModes.addButton(radioButtonConstantPower);
-
     loadSettings();
 
     connect(SliderXFader,
@@ -148,7 +144,10 @@ DlgPrefMixer::DlgPrefMixer(
 
     setUpMainEQ();
 
-    setScrollSafeGuardForAllInputWidgets(this);
+    setScrollSafeGuard(SliderXFader);
+    setScrollSafeGuard(SliderHiEQ);
+    setScrollSafeGuard(SliderLoEQ);
+    setScrollSafeGuard(comboBoxMainEq);
 
     slotUpdate();
     slotApply();
diff --git a/src/preferences/dialog/dlgprefmixerdlg.ui b/src/preferences/dialog/dlgprefmixerdlg.ui
index 878892ef87f..84b47a1a444 100644
--- a/src/preferences/dialog/dlgprefmixerdlg.ui
+++ b/src/preferences/dialog/dlgprefmixerdlg.ui
@@ -38,6 +38,9 @@
         <property name="text">
          <string>Slow fade/Fast cut (additive)</string>
         </property>
+        <attribute name="buttonGroup">
+         <string notr="true">buttonGroupCrossfaderModes</string>
+        </attribute>
        </widget>
       </item>
       <item>
@@ -45,6 +48,9 @@
         <property name="text">
          <string>Constant power</string>
         </property>
+        <attribute name="buttonGroup">
+         <string notr="true">buttonGroupCrossfaderModes</string>
+        </attribute>
        </widget>
       </item>
       <item>
@@ -658,5 +664,8 @@
       Dynamically add Main EQ sliders -->
  </tabstops>
  <resources/>
+ <buttongroups>
+  <buttongroup name="buttonGroupCrossfaderModes"/>
+ </buttongroups>
  <connections/>
 </ui>

From c40030637c0f3cbef89454c9c7b16ebdfc7412d3 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 25 Apr 2023 11:35:56 +0200
Subject: [PATCH 008/388] Pref Mixer, ui: fix widget tab focus order

---
 src/preferences/dialog/dlgprefmixerdlg.ui | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixerdlg.ui b/src/preferences/dialog/dlgprefmixerdlg.ui
index 84b47a1a444..3a1f98269cf 100644
--- a/src/preferences/dialog/dlgprefmixerdlg.ui
+++ b/src/preferences/dialog/dlgprefmixerdlg.ui
@@ -653,11 +653,11 @@
   <tabstop>CheckBoxSingleEqEffect</tabstop>
   <!-- TODO(ronso0)
       Dynamically add Eq / Quick Effect comboboxes -->
-  <tabstop>SliderHiEQ</tabstop>
-  <tabstop>SliderLoEQ</tabstop>
+  <tabstop>CheckBoxBypass</tabstop>
   <tabstop>CheckBoxEqAutoReset</tabstop>
   <tabstop>CheckBoxGainAutoReset</tabstop>
-  <tabstop>CheckBoxBypass</tabstop>
+  <tabstop>SliderHiEQ</tabstop>
+  <tabstop>SliderLoEQ</tabstop>
   <tabstop>comboBoxMainEq</tabstop>
   <tabstop>pbResetMainEq</tabstop>
   <!-- TODO(ronso0)

From ca18756f2cd77cea46860942592b51e4ec32e26b Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 25 Apr 2023 11:47:25 +0200
Subject: [PATCH 009/388] Pref Mixer, xFader: update settings only when
 touching xfader widgets

---
 src/preferences/dialog/dlgprefmixer.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index 15d8f9a923d..c764182e333 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -80,12 +80,14 @@ DlgPrefMixer::DlgPrefMixer(
             &DlgPrefMixer::slotUpdateXFader);
     connect(SliderXFader, &QSlider::sliderMoved, this, &DlgPrefMixer::slotUpdateXFader);
     connect(SliderXFader, &QSlider::sliderReleased, this, &DlgPrefMixer::slotUpdateXFader);
-    connect(SliderXFader, &QSlider::sliderReleased, this, &DlgPrefMixer::slotApply);
 
     // Update the crossfader curve graph and other settings when the
     // crossfader mode is changed.
-    connect(radioButtonAdditive, &QRadioButton::clicked, this, &DlgPrefMixer::slotUpdate);
-    connect(radioButtonConstantPower, &QRadioButton::clicked, this, &DlgPrefMixer::slotUpdate);
+    connect(radioButtonAdditive, &QRadioButton::clicked, this, &DlgPrefMixer::slotUpdateXFader);
+    connect(radioButtonConstantPower,
+            &QRadioButton::clicked,
+            this,
+            &DlgPrefMixer::slotUpdateXFader);
 
     // Don't allow the xfader graph getting keyboard focus
     graphicsViewXfader->setFocusPolicy(Qt::NoFocus);

From f2303823f144653e74410ca78bcdde9b0a6a608d Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 25 Apr 2023 15:02:06 +0200
Subject: [PATCH 010/388] Pref Mixer, xfader: don't store pointer to curve
 scene

---
 src/preferences/dialog/dlgprefmixer.cpp | 25 +++++++++----------------
 src/preferences/dialog/dlgprefmixer.h   |  2 --
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index c764182e333..071aeeb4b4a 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -48,7 +48,6 @@ DlgPrefMixer::DlgPrefMixer(
         UserSettingsPointer pConfig)
         : DlgPreferencePage(pParent),
           m_pConfig(pConfig),
-          m_pxfScene(nullptr),
           m_xFaderMode(MIXXX_XFADER_ADDITIVE),
           m_transform(EngineXfader::kTransformDefault),
           m_cal(0.0),
@@ -156,8 +155,6 @@ DlgPrefMixer::DlgPrefMixer(
 }
 
 DlgPrefMixer::~DlgPrefMixer() {
-    delete m_pxfScene;
-
     qDeleteAll(m_deckEqEffectSelectors);
     m_deckEqEffectSelectors.clear();
 
@@ -736,13 +733,9 @@ void DlgPrefMixer::drawXfaderDisplay() {
     int sizeY = graphicsViewXfader->height() - 2 * frameWidth;
 
     // Initialize Scene
-    if (m_pxfScene) {
-        delete m_pxfScene;
-        m_pxfScene = nullptr;
-    }
-    m_pxfScene = new QGraphicsScene();
-    m_pxfScene->setSceneRect(0, 0, sizeX, sizeY);
-    m_pxfScene->setBackgroundBrush(Qt::black);
+    QGraphicsScene* pXfScene = new QGraphicsScene();
+    pXfScene->setSceneRect(0, 0, sizeX, sizeY);
+    pXfScene->setBackgroundBrush(Qt::black);
 
     // Initialize QPens
     QPen gridPen(Qt::green);
@@ -750,11 +743,11 @@ void DlgPrefMixer::drawXfaderDisplay() {
 
     // draw grid
     for (int i = 1; i < kGrindXLines; i++) {
-        m_pxfScene->addLine(
+        pXfScene->addLine(
                 QLineF(0, i * (sizeY / kGrindXLines), sizeX, i * (sizeY / kGrindXLines)), gridPen);
     }
     for (int i = 1; i < kGrindYLines; i++) {
-        m_pxfScene->addLine(
+        pXfScene->addLine(
                 QLineF(i * (sizeX / kGrindYLines), 0, i * (sizeX / kGrindYLines), sizeY), gridPen);
     }
 
@@ -786,9 +779,9 @@ void DlgPrefMixer::drawXfaderDisplay() {
         point2 = QPointF(i + 1, (1. - gain2) * (sizeY)-3);
 
         if (i > 0) {
-            m_pxfScene->addLine(QLineF(pointTotal, pointTotalPrev), QPen(Qt::red));
-            m_pxfScene->addLine(QLineF(point1, point1Prev), graphLinePen);
-            m_pxfScene->addLine(QLineF(point2, point2Prev), graphLinePen);
+            pXfScene->addLine(QLineF(pointTotal, pointTotalPrev), QPen(Qt::red));
+            pXfScene->addLine(QLineF(point1, point1Prev), graphLinePen);
+            pXfScene->addLine(QLineF(point2, point2Prev), graphLinePen);
         }
 
         // Save old values
@@ -797,7 +790,7 @@ void DlgPrefMixer::drawXfaderDisplay() {
         point2Prev = point2;
     }
 
-    graphicsViewXfader->setScene(m_pxfScene);
+    graphicsViewXfader->setScene(pXfScene);
     graphicsViewXfader->show();
     graphicsViewXfader->repaint();
 }
diff --git a/src/preferences/dialog/dlgprefmixer.h b/src/preferences/dialog/dlgprefmixer.h
index 149ac9af6fd..60ad0255b3b 100644
--- a/src/preferences/dialog/dlgprefmixer.h
+++ b/src/preferences/dialog/dlgprefmixer.h
@@ -74,8 +74,6 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
 
     UserSettingsPointer m_pConfig;
 
-    QGraphicsScene* m_pxfScene;
-
     // X-fader values
     double m_xFaderMode, m_transform, m_cal;
 

From 14f6811e7517225e80980fb3661d9ffad4e2d749 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 25 Apr 2023 12:04:10 +0200
Subject: [PATCH 011/388] Pref Mixer: read config only in slotUpdate() pt I

---
 src/preferences/dialog/dlgprefmixer.cpp | 219 +++++++++++-------------
 src/preferences/dialog/dlgprefmixer.h   |   4 +-
 2 files changed, 102 insertions(+), 121 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index 071aeeb4b4a..187de4a4fea 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -71,7 +71,7 @@ DlgPrefMixer::DlgPrefMixer(
           m_bGainAutoReset(false) {
     setupUi(this);
 
-    loadSettings();
+    slotUpdate();
 
     connect(SliderXFader,
             QOverload<int>::of(&QSlider::valueChanged),
@@ -122,15 +122,6 @@ DlgPrefMixer::DlgPrefMixer(
             &QCheckBox::stateChanged,
             this,
             &DlgPrefMixer::slotSingleEqCheckboxChanged);
-    // Quick hack to update the checkbox "Use the same EQ filter for all decks"
-    // to not use the default state (checked) when slotNumDecksChanged() calls
-    // slotSingleEqCheckboxChanged(state) here in constructor, because that would
-    // be written to config immediateley and thus reset the previous unchecked state.
-    // TODO(ronso0) Write only in slotApply(), read from config only in slotUpdate().
-    // Currently config is read in both slotUpdate() and loadSettings().
-    CheckBoxSingleEqEffect->setChecked(
-            m_pConfig->getValue(ConfigKey(kConfigGroup, kSingleEq), "yes") == "yes");
-    slotSingleEqCheckboxChanged(CheckBoxSingleEqEffect->isChecked());
 
     // Add drop down lists for current decks and connect num_decks control
     // to slotNumDecksChanged
@@ -359,99 +350,6 @@ QUrl DlgPrefMixer::helpUrl() const {
     return QUrl(MIXXX_MANUAL_EQ_URL);
 }
 
-void DlgPrefMixer::loadSettings() {
-    // Range xFaderCurve EngineXfader::kTransformMin .. EngineXfader::kTransformMax
-    m_transform = m_pConfig->getValue(
-            ConfigKey(EngineXfader::kXfaderConfigKey, "xFaderCurve"),
-            EngineXfader::kTransformDefault);
-
-    // Range SliderXFader 0 .. 100
-    double sliderVal = RescalerUtils::oneByXToLinear(
-            m_transform - EngineXfader::kTransformMin + 1,
-            EngineXfader::kTransformMax - EngineXfader::kTransformMin + 1,
-            SliderXFader->minimum(),
-            SliderXFader->maximum());
-    SliderXFader->setValue(static_cast<int>(sliderVal + 0.5));
-
-    m_xFaderMode = m_pConfig->getValueString(
-                                    ConfigKey(EngineXfader::kXfaderConfigKey, "xFaderMode"))
-                           .toInt();
-
-    if (m_xFaderMode == MIXXX_XFADER_CONSTPWR) {
-        radioButtonConstantPower->setChecked(true);
-    } else {
-        radioButtonAdditive->setChecked(true);
-    }
-
-    m_xFaderReverse = m_pConfig->getValueString(
-                                       ConfigKey(EngineXfader::kXfaderConfigKey, "xFaderReverse"))
-                              .toInt() == 1;
-    checkBoxReverse->setChecked(m_xFaderReverse);
-
-    slotUpdateXFader();
-    slotApply();
-
-    // EQ ////////////////////////////////////////////////
-    QString highEqCourse = m_pConfig->getValueString(ConfigKey(kConfigGroup, "HiEQFrequency"));
-    QString highEqPrecise = m_pConfig->getValueString(
-            ConfigKey(kConfigGroup, "HiEQFrequencyPrecise"));
-    QString lowEqCourse = m_pConfig->getValueString(ConfigKey(kConfigGroup, "LoEQFrequency"));
-    QString lowEqPrecise = m_pConfig->getValueString(
-            ConfigKey(kConfigGroup, "LoEQFrequencyPrecise"));
-    m_bEqAutoReset = static_cast<bool>(
-            m_pConfig->getValueString(ConfigKey(kConfigGroup, "EqAutoReset"))
-                    .toInt());
-    CheckBoxEqAutoReset->setChecked(m_bEqAutoReset);
-    m_bGainAutoReset = static_cast<bool>(
-            m_pConfig->getValueString(ConfigKey(kConfigGroup, "GainAutoReset"))
-                    .toInt());
-    CheckBoxGainAutoReset->setChecked(m_bGainAutoReset);
-    CheckBoxBypass->setChecked(
-            m_pConfig->getValue(
-                    ConfigKey(kConfigGroup, kEnableEqs), QString("yes")) == "no");
-    CheckBoxEqOnly->setChecked(
-            m_pConfig->getValue(
-                    ConfigKey(kConfigGroup, kEqsOnly), "yes") == "yes");
-    CheckBoxSingleEqEffect->setChecked(
-            m_pConfig->getValue(
-                    ConfigKey(kConfigGroup, kSingleEq), "yes") == "yes");
-
-    double lowEqFreq = 0.0;
-    double highEqFreq = 0.0;
-
-    // Precise takes precedence over course.
-    lowEqFreq = lowEqCourse.isEmpty() ? lowEqFreq : lowEqCourse.toDouble();
-    lowEqFreq = lowEqPrecise.isEmpty() ? lowEqFreq : lowEqPrecise.toDouble();
-    highEqFreq = highEqCourse.isEmpty() ? highEqFreq : highEqCourse.toDouble();
-    highEqFreq = highEqPrecise.isEmpty() ? highEqFreq : highEqPrecise.toDouble();
-
-    if (lowEqFreq == 0.0 || highEqFreq == 0.0 || lowEqFreq == highEqFreq) {
-        setDefaultShelves();
-        lowEqFreq = m_pConfig
-                            ->getValueString(ConfigKey(
-                                    kConfigGroup, "LoEQFrequencyPrecise"))
-                            .toDouble();
-        highEqFreq = m_pConfig
-                             ->getValueString(ConfigKey(
-                                     kConfigGroup, "HiEQFrequencyPrecise"))
-                             .toDouble();
-    }
-
-    SliderHiEQ->setValue(
-            getSliderPosition(highEqFreq,
-                    SliderHiEQ->minimum(),
-                    SliderHiEQ->maximum()));
-    SliderLoEQ->setValue(
-            getSliderPosition(lowEqFreq,
-                    SliderLoEQ->minimum(),
-                    SliderLoEQ->maximum()));
-
-    if (m_pConfig->getValue(
-                ConfigKey(kConfigGroup, kEnableEqs), "yes") == "yes") {
-        CheckBoxBypass->setChecked(false);
-    }
-}
-
 void DlgPrefMixer::setDefaultShelves() {
     m_pConfig->set(ConfigKey(kConfigGroup, "HiEQFrequency"), ConfigValue(2500));
     m_pConfig->set(ConfigKey(kConfigGroup, "LoEQFrequency"), ConfigValue(250));
@@ -472,8 +370,6 @@ void DlgPrefMixer::slotResetToDefaults() {
     checkBoxReverse->setChecked(false);
 
     // EQ //////////////////////////////////
-    slotMainEQToDefault();
-    setDefaultShelves();
     for (const auto& pCombo : std::as_const(m_deckEqEffectSelectors)) {
         pCombo->setCurrentIndex(
                 pCombo->findData(kDefaultEqId));
@@ -482,13 +378,15 @@ void DlgPrefMixer::slotResetToDefaults() {
         pCombo->setCurrentIndex(
                 pCombo->findText(kDefaultQuickEffectChainName));
     }
-    loadSettings();
     CheckBoxBypass->setChecked(false);
     CheckBoxEqOnly->setChecked(true);
     CheckBoxSingleEqEffect->setChecked(true);
     CheckBoxEqAutoReset->setChecked(m_bEqAutoReset);
     CheckBoxGainAutoReset->setChecked(m_bGainAutoReset);
-    slotUpdate();
+
+    setDefaultShelves();
+    slotMainEQToDefault();
+    // slotUpdate();
     slotApply();
 }
 
@@ -699,27 +597,98 @@ void DlgPrefMixer::slotApply() {
     applySelections();
 }
 
-// supposed to set the widgets to match internal state
+// Update the widgets with values from config
 void DlgPrefMixer::slotUpdate() {
-    if (radioButtonAdditive->isChecked()) {
-        m_xFaderMode = MIXXX_XFADER_ADDITIVE;
-    }
-    if (radioButtonConstantPower->isChecked()) {
-        m_xFaderMode = MIXXX_XFADER_CONSTPWR;
+    // xfader //////////////////////////////////////////////////////////////////
+    m_transform = m_pConfig->getValue(
+            ConfigKey(EngineXfader::kXfaderConfigKey, "xFaderCurve"),
+            EngineXfader::kTransformDefault);
+
+    // Range SliderXFader 0 .. 100
+    double sliderVal = RescalerUtils::oneByXToLinear(
+            m_transform - EngineXfader::kTransformMin + 1,
+            EngineXfader::kTransformMax - EngineXfader::kTransformMin + 1,
+            SliderXFader->minimum(),
+            SliderXFader->maximum());
+    SliderXFader->setValue(static_cast<int>(sliderVal + 0.5));
+
+    m_xFaderMode = m_pConfig->getValueString(
+                                    ConfigKey(EngineXfader::kXfaderConfigKey, "xFaderMode"))
+                           .toInt();
+    if (m_xFaderMode == MIXXX_XFADER_CONSTPWR) {
+        radioButtonConstantPower->setChecked(true);
+    } else {
+        radioButtonAdditive->setChecked(true);
     }
 
+    m_xFaderReverse = m_pConfig->getValueString(
+                                       ConfigKey(EngineXfader::kXfaderConfigKey, "xFaderReverse"))
+                              .toInt() == 1;
+    checkBoxReverse->setChecked(m_xFaderReverse);
+
     slotUpdateXFader();
 
-    slotUpdateLoEQ();
-    slotUpdateHiEQ();
+    // EQs & QuickEffects //////////////////////////////////////////////////////
     slotPopulateDeckEffectSelectors();
-    CheckBoxEqAutoReset->setChecked(m_bEqAutoReset);
-    CheckBoxGainAutoReset->setChecked(m_bGainAutoReset);
-
+    CheckBoxSingleEqEffect->setChecked(
+            m_pConfig->getValue(ConfigKey(kConfigGroup, kSingleEq), "yes") == "yes");
+    slotSingleEqCheckboxChanged(CheckBoxSingleEqEffect->isChecked());
     m_eqIndiciesOnUpdate.clear();
     for (const auto& box : std::as_const(m_deckEqEffectSelectors)) {
         m_eqIndiciesOnUpdate.append(box->currentIndex());
     }
+
+    m_bEqAutoReset = static_cast<bool>(
+            m_pConfig->getValueString(ConfigKey(kConfigGroup, "EqAutoReset"))
+                    .toInt());
+    CheckBoxEqAutoReset->setChecked(m_bEqAutoReset);
+
+    m_bGainAutoReset = static_cast<bool>(
+            m_pConfig->getValueString(ConfigKey(kConfigGroup, "GainAutoReset"))
+                    .toInt());
+    CheckBoxGainAutoReset->setChecked(m_bGainAutoReset);
+
+    CheckBoxBypass->setChecked(
+            m_pConfig->getValue(ConfigKey(kConfigGroup, kEnableEqs),
+                    QString("yes")) == "no");
+    slotBypassEqChanged(CheckBoxBypass->checkState());
+
+    // EQ shelves //////////////////////////////////////////////////////////////
+    QString highEqCourse = m_pConfig->getValueString(ConfigKey(kConfigGroup, "HiEQFrequency"));
+    QString highEqPrecise = m_pConfig->getValueString(
+            ConfigKey(kConfigGroup, "HiEQFrequencyPrecise"));
+    QString lowEqCourse = m_pConfig->getValueString(ConfigKey(kConfigGroup, "LoEQFrequency"));
+    QString lowEqPrecise = m_pConfig->getValueString(
+            ConfigKey(kConfigGroup, "LoEQFrequencyPrecise"));
+    double lowEqFreq = 0.0;
+    double highEqFreq = 0.0;
+
+    // Precise takes precedence over coarse.
+    lowEqFreq = lowEqCourse.isEmpty() ? lowEqFreq : lowEqCourse.toDouble();
+    lowEqFreq = lowEqPrecise.isEmpty() ? lowEqFreq : lowEqPrecise.toDouble();
+    highEqFreq = highEqCourse.isEmpty() ? highEqFreq : highEqCourse.toDouble();
+    highEqFreq = highEqPrecise.isEmpty() ? highEqFreq : highEqPrecise.toDouble();
+
+    if (lowEqFreq == 0.0 || highEqFreq == 0.0 || lowEqFreq == highEqFreq) {
+        setDefaultShelves();
+        lowEqFreq = m_pConfig->getValueString(
+                                     ConfigKey(kConfigGroup, "LoEQFrequencyPrecise"))
+                            .toDouble();
+        highEqFreq = m_pConfig->getValueString(
+                                      ConfigKey(kConfigGroup, "HiEQFrequencyPrecise"))
+                             .toDouble();
+    }
+
+    SliderHiEQ->setValue(
+            getSliderPosition(highEqFreq,
+                    SliderHiEQ->minimum(),
+                    SliderHiEQ->maximum()));
+    SliderLoEQ->setValue(
+            getSliderPosition(lowEqFreq,
+                    SliderLoEQ->minimum(),
+                    SliderLoEQ->maximum()));
+    slotUpdateLoEQ();
+    slotUpdateHiEQ();
 }
 
 // Draw the crossfader curve graph. Only needs to get drawn when a change
@@ -797,6 +766,12 @@ void DlgPrefMixer::drawXfaderDisplay() {
 
 // Update and save the crossfader's parameters from the dialog's widgets.
 void DlgPrefMixer::slotUpdateXFader() {
+    if (radioButtonAdditive->isChecked()) {
+        m_xFaderMode = MIXXX_XFADER_ADDITIVE;
+    } else {
+        m_xFaderMode = MIXXX_XFADER_CONSTPWR;
+    }
+
     // m_transform is in the range of 1 to 1000 while 50 % slider results
     // to ~2, which represents a medium rounded fader curve.
     m_transform = RescalerUtils::linearToOneByX(
@@ -806,6 +781,7 @@ void DlgPrefMixer::slotUpdateXFader() {
                           EngineXfader::kTransformMax) -
             1 + EngineXfader::kTransformMin;
     m_cal = EngineXfader::getPowerCalibration(m_transform);
+    // TODO move to slotApply
     m_pConfig->set(ConfigKey(EngineXfader::kXfaderConfigKey, "xFaderMode"),
             ConfigValue(m_xFaderMode));
     m_pConfig->set(ConfigKey(EngineXfader::kXfaderConfigKey, "xFaderCurve"),
@@ -825,11 +801,12 @@ void DlgPrefMixer::slotUpdateGainAutoReset(int i) {
 }
 
 void DlgPrefMixer::slotBypassEqChanged(int state) {
+    // TODO only disable EQ combobox here. Move config/Control parts to slotApply()
     bool bypass = static_cast<bool>(state);
 
     m_pConfig->set(ConfigKey(kConfigGroup, kEnableEqs), ConfigValue(bypass ? "no" : "yes"));
     // Disable/enable EQ effect processing for all decks by setting the appropriate
-    // controls to 0 or 1 ("[EqualizerRackX_EffectUnitDeck_Effect1],enable")
+    // controls to 0 or 1 ("[EqualizerRackX_EffectUnitDeck_Effect1],enabled")
     int deck = 0;
     for (const auto& box : std::as_const(m_deckEqEffectSelectors)) {
         QString group = EqualizerEffectChain::formatEffectSlotGroup(
@@ -838,6 +815,9 @@ void DlgPrefMixer::slotBypassEqChanged(int state) {
         deck++;
         box->setEnabled(!bypass);
     }
+
+    // TODO also disable waveform filtering for consistency of audio & GUI (waveforms + VU)
+    // pChainSlot->setFilterWaveform
 }
 
 void DlgPrefMixer::setUpMainEQ() {
@@ -890,6 +870,7 @@ void DlgPrefMixer::setUpMainEQ() {
 }
 
 void DlgPrefMixer::slotMainEqEffectChanged(int effectIndex) {
+    // TODO Add GUI hint that EQ changes are applied instantly
     // clear parameters view first
     qDeleteAll(m_mainEQSliders);
     m_mainEQSliders.clear();
diff --git a/src/preferences/dialog/dlgprefmixer.h b/src/preferences/dialog/dlgprefmixer.h
index 60ad0255b3b..fea39e7cedb 100644
--- a/src/preferences/dialog/dlgprefmixer.h
+++ b/src/preferences/dialog/dlgprefmixer.h
@@ -51,7 +51,6 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
     void slotMainEqEffectChanged(int effectIndex);
 
   private:
-    void loadSettings();
     void drawXfaderDisplay();
     void setDefaultShelves();
     double getEqFreq(int value, int minimum, int maximum);
@@ -75,7 +74,8 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
     UserSettingsPointer m_pConfig;
 
     // X-fader values
-    double m_xFaderMode, m_transform, m_cal;
+    int m_xFaderMode;
+    double m_transform, m_cal;
 
     PollingControlProxy m_mode;
     PollingControlProxy m_curve;

From 555b02da4f487a0c9a84d3c5003c065f0b78bc16 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 25 Apr 2023 12:13:49 +0200
Subject: [PATCH 012/388] Pref Mixer, bypass EQ: add bool for checkbox state,
 apply 'only in slotApply()

---
 src/preferences/dialog/dlgprefmixer.cpp | 45 ++++++++++++++-----------
 src/preferences/dialog/dlgprefmixer.h   |  1 +
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index 187de4a4fea..ce11bffbbfc 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -68,7 +68,8 @@ DlgPrefMixer::DlgPrefMixer(
           m_pNumDecks(nullptr),
           m_inSlotPopulateDeckEffectSelectors(false),
           m_bEqAutoReset(false),
-          m_bGainAutoReset(false) {
+          m_bGainAutoReset(false),
+          m_bEqBypass(false) {
     setupUi(this);
 
     slotUpdate();
@@ -576,6 +577,7 @@ int DlgPrefMixer::getSliderPosition(double eqFreq, int minValue, int maxValue) {
 }
 
 void DlgPrefMixer::slotApply() {
+    // xfader //////////////////////////////////////////////////////////////////
     m_mode.set(m_xFaderMode);
     m_curve.set(m_transform);
     m_calibration.set(m_cal);
@@ -587,7 +589,21 @@ void DlgPrefMixer::slotApply() {
     }
     slotUpdateXFader();
 
-    // EQ ////////////////////////////////////////
+    // Bypass EQ ///////////////////////////////////////////////////////////////
+    m_pConfig->set(ConfigKey(kConfigGroup, kEnableEqs), ConfigValue(m_bEqBypass ? "no" : "yes"));
+    // Disable/enable EQ effect processing for all decks by setting the appropriate
+    // controls to 0 or 1 ("[EqualizerRackX_EffectUnitDeck_Effect1],enabled")
+    int deck = 0;
+    while (deck < m_deckEqEffectSelectors.count()) {
+        QString group = EqualizerEffectChain::formatEffectSlotGroup(
+                PlayerManager::groupForDeck(deck));
+        ControlObject::set(ConfigKey(group, "enabled"), m_bEqBypass ? 0 : 1);
+        deck++;
+    }
+    // TODO also disable waveform filtering for consistency of audio & GUI (waveforms + VU)
+    // pChainSlot->setFilterWaveform
+
+    // EQ shelves //////////////////////////////////////////////////////////////
     m_COLoFreq.set(m_lowEqFreq);
     m_COHiFreq.set(m_highEqFreq);
     m_pConfig->set(ConfigKey(kConfigGroup, "EqAutoReset"),
@@ -648,9 +664,9 @@ void DlgPrefMixer::slotUpdate() {
                     .toInt());
     CheckBoxGainAutoReset->setChecked(m_bGainAutoReset);
 
-    CheckBoxBypass->setChecked(
-            m_pConfig->getValue(ConfigKey(kConfigGroup, kEnableEqs),
-                    QString("yes")) == "no");
+    m_bEqBypass = m_pConfig->getValue(
+                          ConfigKey(kConfigGroup, kEnableEqs), QString("yes")) == "no";
+    CheckBoxBypass->setChecked(m_bEqBypass);
     slotBypassEqChanged(CheckBoxBypass->checkState());
 
     // EQ shelves //////////////////////////////////////////////////////////////
@@ -801,23 +817,12 @@ void DlgPrefMixer::slotUpdateGainAutoReset(int i) {
 }
 
 void DlgPrefMixer::slotBypassEqChanged(int state) {
-    // TODO only disable EQ combobox here. Move config/Control parts to slotApply()
-    bool bypass = static_cast<bool>(state);
+    m_bEqBypass = static_cast<bool>(state);
 
-    m_pConfig->set(ConfigKey(kConfigGroup, kEnableEqs), ConfigValue(bypass ? "no" : "yes"));
-    // Disable/enable EQ effect processing for all decks by setting the appropriate
-    // controls to 0 or 1 ("[EqualizerRackX_EffectUnitDeck_Effect1],enabled")
-    int deck = 0;
-    for (const auto& box : std::as_const(m_deckEqEffectSelectors)) {
-        QString group = EqualizerEffectChain::formatEffectSlotGroup(
-                PlayerManager::groupForDeck(deck));
-        ControlObject::set(ConfigKey(group, "enabled"), bypass ? 0 : 1);
-        deck++;
-        box->setEnabled(!bypass);
+    // De/activate deck EQ comboboxes
+    for (const auto& box : qAsConst(m_deckEqEffectSelectors)) {
+        box->setEnabled(!m_bEqBypass);
     }
-
-    // TODO also disable waveform filtering for consistency of audio & GUI (waveforms + VU)
-    // pChainSlot->setFilterWaveform
 }
 
 void DlgPrefMixer::setUpMainEQ() {
diff --git a/src/preferences/dialog/dlgprefmixer.h b/src/preferences/dialog/dlgprefmixer.h
index fea39e7cedb..0ccb95faafa 100644
--- a/src/preferences/dialog/dlgprefmixer.h
+++ b/src/preferences/dialog/dlgprefmixer.h
@@ -107,6 +107,7 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
 
     bool m_bEqAutoReset;
     bool m_bGainAutoReset;
+    bool m_bEqBypass;
 
     QList<int> m_eqIndiciesOnUpdate;
 };

From 9554e8427c802b11c30e56b2a4d811d03e2de574 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 25 Apr 2023 13:26:50 +0200
Subject: [PATCH 013/388] Pref Mixer, deck EQ & QuickEffects: prevent unneeded
 reload during init

---
 src/preferences/dialog/dlgprefmixer.cpp | 32 +++++++++++++++----------
 src/preferences/dialog/dlgprefmixer.h   |  3 +++
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index ce11bffbbfc..68c8e6e2c54 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -67,12 +67,15 @@ DlgPrefMixer::DlgPrefMixer(
           m_firstSelectorLabel(nullptr),
           m_pNumDecks(nullptr),
           m_inSlotPopulateDeckEffectSelectors(false),
+          m_singleEq(true),
           m_bEqAutoReset(false),
           m_bGainAutoReset(false),
-          m_bEqBypass(false) {
+          m_bEqBypass(false),
+          m_initializing(true) {
     setupUi(this);
 
     slotUpdate();
+    m_initializing = false;
 
     connect(SliderXFader,
             QOverload<int>::of(&QSlider::valueChanged),
@@ -193,7 +196,7 @@ void DlgPrefMixer::slotNumDecksChanged(double numDecks) {
 
         if (deckNo == 1) {
             m_firstSelectorLabel = label;
-            if (CheckBoxSingleEqEffect->isChecked()) {
+            if (m_singleEq) {
                 m_firstSelectorLabel->clear();
             }
         }
@@ -230,7 +233,7 @@ void DlgPrefMixer::slotNumDecksChanged(double numDecks) {
         m_deckEqEffectSelectors[i]->setCurrentIndex(selectedEQEffectIndex);
     }
     applySelections();
-    slotSingleEqCheckboxChanged(CheckBoxSingleEqEffect->isChecked());
+    slotSingleEqCheckboxChanged(m_singleEq);
 }
 
 void DlgPrefMixer::slotPopulateDeckEffectSelectors() {
@@ -317,13 +320,14 @@ void DlgPrefMixer::populateDeckQuickEffectBoxList(
 }
 
 void DlgPrefMixer::slotSingleEqCheckboxChanged(int checked) {
-    bool do_hide = static_cast<bool>(checked);
+    m_singleEq = static_cast<bool>(checked);
+    // TODO move this line to slotApply()
     m_pConfig->set(ConfigKey(kConfigGroup, kSingleEq),
-            do_hide ? QString("yes") : QString("no"));
+            m_singleEq ? QString("yes") : QString("no"));
     if (m_deckEqEffectSelectors.size()) {
         int deck1EQIndex = m_deckEqEffectSelectors.at(0)->currentIndex();
         for (int i = 2; i < m_deckEqEffectSelectors.size() + 1; ++i) {
-            if (do_hide) {
+            if (m_singleEq) {
                 m_deckEqEffectSelectors.at(i - 1)->setCurrentIndex(deck1EQIndex);
                 gridLayout_3->itemAtPosition(i, 0)->widget()->hide();
                 gridLayout_3->itemAtPosition(i, 1)->widget()->hide();
@@ -337,13 +341,14 @@ void DlgPrefMixer::slotSingleEqCheckboxChanged(int checked) {
     }
 
     if (m_firstSelectorLabel != nullptr) {
-        if (do_hide) {
+        if (m_singleEq) {
             m_firstSelectorLabel->clear();
         } else {
             m_firstSelectorLabel->setText(QObject::tr("Deck 1"));
         }
     }
 
+    // TODO move this line to slotApply()
     applySelections();
 }
 
@@ -402,7 +407,7 @@ void DlgPrefMixer::slotEffectChangedOnDeck(int effectIndex) {
     int deckNumber = pBoxList->indexOf(c);
     // If we are in single-effect mode and the first effect was changed,
     // change the others as well.
-    if (deckNumber == 0 && CheckBoxSingleEqEffect->isChecked()) {
+    if (deckNumber == 0 && m_singleEq) {
         for (int otherDeck = 1;
                 otherDeck < static_cast<int>(m_pNumDecks->get());
                 ++otherDeck) {
@@ -427,7 +432,7 @@ void DlgPrefMixer::slotQuickEffectChangedOnDeck(int effectIndex) {
     int deckNumber = pBoxList->indexOf(c);
     // If we are in single-effect mode and the first effect was changed,
     // change the others as well.
-    if (deckNumber == 0 && CheckBoxSingleEqEffect->isChecked()) {
+    if (deckNumber == 0 && m_singleEq) {
         for (int otherDeck = 1;
                 otherDeck < static_cast<int>(m_pNumDecks->get());
                 ++otherDeck) {
@@ -645,10 +650,13 @@ void DlgPrefMixer::slotUpdate() {
     slotUpdateXFader();
 
     // EQs & QuickEffects //////////////////////////////////////////////////////
+    m_singleEq = m_pConfig->getValue(ConfigKey(kConfigGroup, kSingleEq), "yes") == "yes";
     slotPopulateDeckEffectSelectors();
-    CheckBoxSingleEqEffect->setChecked(
-            m_pConfig->getValue(ConfigKey(kConfigGroup, kSingleEq), "yes") == "yes");
-    slotSingleEqCheckboxChanged(CheckBoxSingleEqEffect->isChecked());
+    if (m_initializing || CheckBoxSingleEqEffect->isChecked() != m_singleEq) {
+        CheckBoxSingleEqEffect->setChecked(m_singleEq);
+        slotSingleEqCheckboxChanged(CheckBoxSingleEqEffect->checkState());
+    }
+
     m_eqIndiciesOnUpdate.clear();
     for (const auto& box : std::as_const(m_deckEqEffectSelectors)) {
         m_eqIndiciesOnUpdate.append(box->currentIndex());
diff --git a/src/preferences/dialog/dlgprefmixer.h b/src/preferences/dialog/dlgprefmixer.h
index 0ccb95faafa..3d4e0a53b45 100644
--- a/src/preferences/dialog/dlgprefmixer.h
+++ b/src/preferences/dialog/dlgprefmixer.h
@@ -105,9 +105,12 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
     QList<QLabel*> m_mainEQLabels;
     QWeakPointer<EffectSlot> m_pEffectMainEQ;
 
+    bool m_singleEq;
     bool m_bEqAutoReset;
     bool m_bGainAutoReset;
     bool m_bEqBypass;
 
+    bool m_initializing;
+
     QList<int> m_eqIndiciesOnUpdate;
 };

From f731e9db9e65031604aa202b8b53456cf6071676 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 25 Apr 2023 14:02:48 +0200
Subject: [PATCH 014/388] Pref Mixer: improve function names, remove b prefix
 from bools, comments

---
 src/preferences/dialog/dlgprefmixer.cpp | 118 +++++++++++++-----------
 src/preferences/dialog/dlgprefmixer.h   |  35 ++++---
 2 files changed, 80 insertions(+), 73 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index 68c8e6e2c54..e2c65138c8c 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -68,9 +68,9 @@ DlgPrefMixer::DlgPrefMixer(
           m_pNumDecks(nullptr),
           m_inSlotPopulateDeckEffectSelectors(false),
           m_singleEq(true),
-          m_bEqAutoReset(false),
-          m_bGainAutoReset(false),
-          m_bEqBypass(false),
+          m_eqAutoReset(false),
+          m_gainAutoReset(false),
+          m_eqBypass(false),
           m_initializing(true) {
     setupUi(this);
 
@@ -105,27 +105,27 @@ DlgPrefMixer::DlgPrefMixer(
     connect(SliderLoEQ, &QSlider::sliderReleased, this, &DlgPrefMixer::slotUpdateLoEQ);
 
     connect(CheckBoxEqAutoReset,
-            &QCheckBox::stateChanged,
+            &QCheckBox::toggled,
             this,
-            &DlgPrefMixer::slotUpdateEqAutoReset);
+            &DlgPrefMixer::slotEqAutoResetToggled);
     connect(CheckBoxGainAutoReset,
-            &QCheckBox::stateChanged,
+            &QCheckBox::toggled,
             this,
-            &DlgPrefMixer::slotUpdateGainAutoReset);
+            &DlgPrefMixer::slotGainAutoResetToggled);
     connect(CheckBoxBypass,
-            &QCheckBox::stateChanged,
+            &QCheckBox::toggled,
             this,
-            &DlgPrefMixer::slotBypassEqChanged);
+            &DlgPrefMixer::slotBypassEqToggled);
 
     connect(CheckBoxEqOnly,
-            &QCheckBox::stateChanged,
+            &QCheckBox::toggled,
             this,
             &DlgPrefMixer::slotPopulateDeckEffectSelectors);
 
     connect(CheckBoxSingleEqEffect,
-            &QCheckBox::stateChanged,
+            &QCheckBox::toggled,
             this,
-            &DlgPrefMixer::slotSingleEqCheckboxChanged);
+            &DlgPrefMixer::slotSingleEqToggled);
 
     // Add drop down lists for current decks and connect num_decks control
     // to slotNumDecksChanged
@@ -146,6 +146,9 @@ DlgPrefMixer::DlgPrefMixer(
     setScrollSafeGuard(comboBoxMainEq);
 
     slotUpdate();
+
+    // Save all settings back to config, especially EQs and QuickEffects might
+    // changed.
     slotApply();
 }
 
@@ -170,7 +173,7 @@ void DlgPrefMixer::slotNumDecksChanged(double numDecks) {
         connect(pEqComboBox,
                 QOverload<int>::of(&QComboBox::currentIndexChanged),
                 this,
-                &DlgPrefMixer::slotEffectChangedOnDeck);
+                &DlgPrefMixer::slotEQEffectChangedOnDeck);
         setScrollSafeGuard(pEqComboBox);
 
         // Create the drop down list for Quick Effects
@@ -232,8 +235,8 @@ void DlgPrefMixer::slotNumDecksChanged(double numDecks) {
         }
         m_deckEqEffectSelectors[i]->setCurrentIndex(selectedEQEffectIndex);
     }
-    applySelections();
-    slotSingleEqCheckboxChanged(m_singleEq);
+    applySelectionsToDecks();
+    slotSingleEqToggled(m_singleEq);
 }
 
 void DlgPrefMixer::slotPopulateDeckEffectSelectors() {
@@ -319,8 +322,8 @@ void DlgPrefMixer::populateDeckQuickEffectBoxList(
     }
 }
 
-void DlgPrefMixer::slotSingleEqCheckboxChanged(int checked) {
-    m_singleEq = static_cast<bool>(checked);
+void DlgPrefMixer::slotSingleEqToggled(bool checked) {
+    m_singleEq = checked;
     // TODO move this line to slotApply()
     m_pConfig->set(ConfigKey(kConfigGroup, kSingleEq),
             m_singleEq ? QString("yes") : QString("no"));
@@ -349,7 +352,7 @@ void DlgPrefMixer::slotSingleEqCheckboxChanged(int checked) {
     }
 
     // TODO move this line to slotApply()
-    applySelections();
+    applySelectionsToDecks();
 }
 
 QUrl DlgPrefMixer::helpUrl() const {
@@ -387,16 +390,15 @@ void DlgPrefMixer::slotResetToDefaults() {
     CheckBoxBypass->setChecked(false);
     CheckBoxEqOnly->setChecked(true);
     CheckBoxSingleEqEffect->setChecked(true);
-    CheckBoxEqAutoReset->setChecked(m_bEqAutoReset);
-    CheckBoxGainAutoReset->setChecked(m_bGainAutoReset);
+    CheckBoxEqAutoReset->setChecked(m_eqAutoReset);
+    CheckBoxGainAutoReset->setChecked(m_gainAutoReset);
 
     setDefaultShelves();
     slotMainEQToDefault();
-    // slotUpdate();
     slotApply();
 }
 
-void DlgPrefMixer::slotEffectChangedOnDeck(int effectIndex) {
+void DlgPrefMixer::slotEQEffectChangedOnDeck(int effectIndex) {
     QComboBox* c = qobject_cast<QComboBox*>(sender());
     // Check if qobject_cast was successful
     if (!c || m_inSlotPopulateDeckEffectSelectors) {
@@ -417,7 +419,7 @@ void DlgPrefMixer::slotEffectChangedOnDeck(int effectIndex) {
     }
 
     // This is required to remove a previous selected effect that does not
-    // fit to the current ShowAllEffects checkbox
+    // fit to the current 'EQ effects only' checkbox
     slotPopulateDeckEffectSelectors();
 }
 
@@ -451,15 +453,11 @@ void DlgPrefMixer::slotQuickEffectChangedOnDeck(int effectIndex) {
     }
 }
 
-void DlgPrefMixer::applySelections() {
+void DlgPrefMixer::applySelectionsToDecks() {
     if (m_inSlotPopulateDeckEffectSelectors) {
         return;
     }
 
-    applySelectionsToDecks();
-}
-
-void DlgPrefMixer::applySelectionsToDecks() {
     int deck = 0;
     for (QComboBox* box : std::as_const(m_deckEqEffectSelectors)) {
         const EffectManifestPointer pManifest =
@@ -509,7 +507,7 @@ void DlgPrefMixer::slotUpdateHiEQ() {
     m_highEqFreq = getEqFreq(SliderHiEQ->value(),
             SliderHiEQ->minimum(),
             SliderHiEQ->maximum());
-    validate_levels();
+    validateEQShelves();
     if (m_highEqFreq < 1000) {
         TextHiEQ->setText(QString("%1 Hz").arg((int)m_highEqFreq));
     } else {
@@ -521,6 +519,7 @@ void DlgPrefMixer::slotUpdateHiEQ() {
             ConfigValue(QString::number(m_highEqFreq, 'f')));
 
     slotApply();
+    // TODO Maybe add a 'Apply values immediately" checkbox for instant testing (sweep freq)?
 }
 
 void DlgPrefMixer::slotUpdateLoEQ() {
@@ -530,7 +529,7 @@ void DlgPrefMixer::slotUpdateLoEQ() {
     m_lowEqFreq = getEqFreq(SliderLoEQ->value(),
             SliderLoEQ->minimum(),
             SliderLoEQ->maximum());
-    validate_levels();
+    validateEQShelves();
     if (m_lowEqFreq < 1000) {
         TextLoEQ->setText(QString("%1 Hz").arg((int)m_lowEqFreq));
     } else {
@@ -542,6 +541,7 @@ void DlgPrefMixer::slotUpdateLoEQ() {
             ConfigValue(QString::number(m_lowEqFreq, 'f')));
 
     slotApply();
+    // TODO Maybe add a 'Apply values immediately" checkbox for instant testing (sweep freq)?
 }
 
 void DlgPrefMixer::slotApplyMainEQParameter(int value) {
@@ -570,6 +570,9 @@ void DlgPrefMixer::slotApplyMainEQParameter(int value) {
 }
 
 int DlgPrefMixer::getSliderPosition(double eqFreq, int minValue, int maxValue) {
+    // TODO there is some conversion issue with this and getEqFreq():
+    // values above ~15 kHz are lowered with each slotUpdate() until the settle
+    // at a certain value
     if (eqFreq >= kFrequencyUpperLimit) {
         return maxValue;
     } else if (eqFreq <= kFrequencyLowerLimit) {
@@ -582,6 +585,8 @@ int DlgPrefMixer::getSliderPosition(double eqFreq, int minValue, int maxValue) {
 }
 
 void DlgPrefMixer::slotApply() {
+    // TODO unify ConfigValues to int, migrate yes/no
+
     // xfader //////////////////////////////////////////////////////////////////
     m_mode.set(m_xFaderMode);
     m_curve.set(m_transform);
@@ -595,14 +600,14 @@ void DlgPrefMixer::slotApply() {
     slotUpdateXFader();
 
     // Bypass EQ ///////////////////////////////////////////////////////////////
-    m_pConfig->set(ConfigKey(kConfigGroup, kEnableEqs), ConfigValue(m_bEqBypass ? "no" : "yes"));
+    m_pConfig->set(ConfigKey(kConfigGroup, kEnableEqs), ConfigValue(m_eqBypass ? "no" : "yes"));
     // Disable/enable EQ effect processing for all decks by setting the appropriate
     // controls to 0 or 1 ("[EqualizerRackX_EffectUnitDeck_Effect1],enabled")
     int deck = 0;
     while (deck < m_deckEqEffectSelectors.count()) {
         QString group = EqualizerEffectChain::formatEffectSlotGroup(
                 PlayerManager::groupForDeck(deck));
-        ControlObject::set(ConfigKey(group, "enabled"), m_bEqBypass ? 0 : 1);
+        ControlObject::set(ConfigKey(group, "enabled"), m_eqBypass ? 0 : 1);
         deck++;
     }
     // TODO also disable waveform filtering for consistency of audio & GUI (waveforms + VU)
@@ -612,10 +617,10 @@ void DlgPrefMixer::slotApply() {
     m_COLoFreq.set(m_lowEqFreq);
     m_COHiFreq.set(m_highEqFreq);
     m_pConfig->set(ConfigKey(kConfigGroup, "EqAutoReset"),
-            ConfigValue(m_bEqAutoReset ? 1 : 0));
+            ConfigValue(m_eqAutoReset ? 1 : 0));
     m_pConfig->set(ConfigKey(kConfigGroup, "GainAutoReset"),
-            ConfigValue(m_bGainAutoReset ? 1 : 0));
-    applySelections();
+            ConfigValue(m_gainAutoReset ? 1 : 0));
+    applySelectionsToDecks();
 }
 
 // Update the widgets with values from config
@@ -654,7 +659,7 @@ void DlgPrefMixer::slotUpdate() {
     slotPopulateDeckEffectSelectors();
     if (m_initializing || CheckBoxSingleEqEffect->isChecked() != m_singleEq) {
         CheckBoxSingleEqEffect->setChecked(m_singleEq);
-        slotSingleEqCheckboxChanged(CheckBoxSingleEqEffect->checkState());
+        slotSingleEqToggled(CheckBoxSingleEqEffect->isChecked());
     }
 
     m_eqIndiciesOnUpdate.clear();
@@ -662,20 +667,21 @@ void DlgPrefMixer::slotUpdate() {
         m_eqIndiciesOnUpdate.append(box->currentIndex());
     }
 
-    m_bEqAutoReset = static_cast<bool>(
+    m_eqAutoReset = static_cast<bool>(
             m_pConfig->getValueString(ConfigKey(kConfigGroup, "EqAutoReset"))
                     .toInt());
-    CheckBoxEqAutoReset->setChecked(m_bEqAutoReset);
+    CheckBoxEqAutoReset->setChecked(m_eqAutoReset);
 
-    m_bGainAutoReset = static_cast<bool>(
+    m_gainAutoReset = static_cast<bool>(
             m_pConfig->getValueString(ConfigKey(kConfigGroup, "GainAutoReset"))
                     .toInt());
-    CheckBoxGainAutoReset->setChecked(m_bGainAutoReset);
+    CheckBoxGainAutoReset->setChecked(m_gainAutoReset);
 
-    m_bEqBypass = m_pConfig->getValue(
-                          ConfigKey(kConfigGroup, kEnableEqs), QString("yes")) == "no";
-    CheckBoxBypass->setChecked(m_bEqBypass);
-    slotBypassEqChanged(CheckBoxBypass->checkState());
+    m_eqBypass = m_pConfig->getValue(
+                         ConfigKey(kConfigGroup, kEnableEqs), QString("yes")) == "no";
+    CheckBoxBypass->setChecked(m_eqBypass);
+    // Deactivate EQ comboboxes when Bypass is enabled
+    slotBypassEqToggled(CheckBoxBypass->isChecked());
 
     // EQ shelves //////////////////////////////////////////////////////////////
     QString highEqCourse = m_pConfig->getValueString(ConfigKey(kConfigGroup, "HiEQFrequency"));
@@ -788,7 +794,6 @@ void DlgPrefMixer::drawXfaderDisplay() {
     graphicsViewXfader->repaint();
 }
 
-// Update and save the crossfader's parameters from the dialog's widgets.
 void DlgPrefMixer::slotUpdateXFader() {
     if (radioButtonAdditive->isChecked()) {
         m_xFaderMode = MIXXX_XFADER_ADDITIVE;
@@ -816,21 +821,22 @@ void DlgPrefMixer::slotUpdateXFader() {
     drawXfaderDisplay();
 }
 
-void DlgPrefMixer::slotUpdateEqAutoReset(int i) {
-    m_bEqAutoReset = static_cast<bool>(i);
+void DlgPrefMixer::slotEqAutoResetToggled(bool checked) {
+    m_eqAutoReset = checked;
 }
 
-void DlgPrefMixer::slotUpdateGainAutoReset(int i) {
-    m_bGainAutoReset = static_cast<bool>(i);
+void DlgPrefMixer::slotGainAutoResetToggled(bool checked) {
+    m_gainAutoReset = checked;
 }
 
-void DlgPrefMixer::slotBypassEqChanged(int state) {
-    m_bEqBypass = static_cast<bool>(state);
+void DlgPrefMixer::slotBypassEqToggled(bool checked) {
+    m_eqBypass = checked;
 
     // De/activate deck EQ comboboxes
-    for (const auto& box : qAsConst(m_deckEqEffectSelectors)) {
-        box->setEnabled(!m_bEqBypass);
+    for (const auto& box : std::as_const(m_deckEqEffectSelectors)) {
+        box->setEnabled(!m_eqBypass);
     }
+    // TODO Also disable relevant checkboxes
 }
 
 void DlgPrefMixer::setUpMainEQ() {
@@ -884,7 +890,7 @@ void DlgPrefMixer::setUpMainEQ() {
 
 void DlgPrefMixer::slotMainEqEffectChanged(int effectIndex) {
     // TODO Add GUI hint that EQ changes are applied instantly
-    // clear parameters view first
+    // Clear parameters view first
     qDeleteAll(m_mainEQSliders);
     m_mainEQSliders.clear();
     qDeleteAll(m_mainEQValues);
@@ -961,6 +967,7 @@ void DlgPrefMixer::slotMainEqEffectChanged(int effectIndex) {
                     // Otherwise, without pressing 'Reset parameter', the previously saved
                     // parameter values (of another EQ effect) would be loaded on next start
                     // which (unnoticed) messes up the parameters displayed now.
+                    // TODO store this in effects.xml
                     m_pConfig->set(ConfigKey(kConfigGroup,
                                            kMainEQParameterKey + QString::number(i + 1)),
                             ConfigValue(valueText));
@@ -990,7 +997,7 @@ double DlgPrefMixer::getEqFreq(int sliderVal, int minValue, int maxValue) {
     return result;
 }
 
-void DlgPrefMixer::validate_levels() {
+void DlgPrefMixer::validateEQShelves() {
     m_highEqFreq = math_clamp<double>(m_highEqFreq, kFrequencyLowerLimit, kFrequencyUpperLimit);
     m_lowEqFreq = math_clamp<double>(m_lowEqFreq, kFrequencyLowerLimit, kFrequencyUpperLimit);
     if (m_lowEqFreq == m_highEqFreq) {
@@ -1037,6 +1044,7 @@ void DlgPrefMixer::setMainEQParameter(int i, double value) {
             QString valueText = QString::number(value);
             valueLabel->setText(valueText);
 
+            // TODO store this in effects.xml
             m_pConfig->set(ConfigKey(kConfigGroup,
                                    kMainEQParameterKey + QString::number(i + 1)),
                     ConfigValue(valueText));
diff --git a/src/preferences/dialog/dlgprefmixer.h b/src/preferences/dialog/dlgprefmixer.h
index 3d4e0a53b45..fd1a49f7d37 100644
--- a/src/preferences/dialog/dlgprefmixer.h
+++ b/src/preferences/dialog/dlgprefmixer.h
@@ -23,27 +23,26 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
     QUrl helpUrl() const override;
 
   public slots:
-    // Apply changes to widget
     void slotApply() override;
     void slotUpdate() override;
     void slotResetToDefaults() override;
-    void slotUpdateXFader();
 
   private slots:
-    void slotEffectChangedOnDeck(int effectIndex);
-    void slotQuickEffectChangedOnDeck(int effectIndex);
     void slotNumDecksChanged(double numDecks);
-    void slotSingleEqCheckboxChanged(int checked);
-    // Slot for toggling between advanced and basic views
+    void slotEQEffectChangedOnDeck(int effectIndex);
+    void slotQuickEffectChangedOnDeck(int effectIndex);
+    void slotSingleEqToggled(bool checked);
+    void slotEqAutoResetToggled(bool checked);
+    void slotGainAutoResetToggled(bool checked);
+    void slotBypassEqToggled(bool checked);
+    // Create, populate and show/hide EQ & QuickEffect selectors, considering the
+    // number of decks and the 'Single EQ' checkbox
     void slotPopulateDeckEffectSelectors();
-    // Update Hi EQ
+
+    void slotUpdateXFader();
     void slotUpdateHiEQ();
-    // Update Lo EQ
     void slotUpdateLoEQ();
 
-    void slotUpdateEqAutoReset(int);
-    void slotUpdateGainAutoReset(int);
-    void slotBypassEqChanged(int state);
     // Update the Main EQ
     void slotApplyMainEQParameter(int value);
     void slotMainEQToDefault();
@@ -55,10 +54,10 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
     void setDefaultShelves();
     double getEqFreq(int value, int minimum, int maximum);
     int getSliderPosition(double eqFreq, int minimum, int maximum);
-    void validate_levels();
-    void updateBandFilter(int index, double value);
+    void validateEQShelves();
     void setUpMainEQ();
-    void applySelections();
+
+    void applySelectionsToDecks();
 
     typedef bool (*EffectManifestFilterFnc)(EffectManifest* pManifest);
     const QList<EffectManifestPointer> getFilteredManifests(
@@ -69,7 +68,6 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
     void populateDeckQuickEffectBoxList(
             const QList<QComboBox*>& boxList);
 
-    void applySelectionsToDecks();
 
     UserSettingsPointer m_pConfig;
 
@@ -106,9 +104,10 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
     QWeakPointer<EffectSlot> m_pEffectMainEQ;
 
     bool m_singleEq;
-    bool m_bEqAutoReset;
-    bool m_bGainAutoReset;
-    bool m_bEqBypass;
+    bool m_eqEffectsOnly;
+    bool m_eqAutoReset;
+    bool m_gainAutoReset;
+    bool m_eqBypass;
 
     bool m_initializing;
 

From 96929a0dee02364d9c1efb674567ee2fdc374d70 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Thu, 27 Apr 2023 11:56:45 +0200
Subject: [PATCH 015/388] Pref Mixer: apply settings only in slotApply(),
 except Main EQ

---
 src/preferences/dialog/dlgprefmixer.cpp | 168 ++++++++++++++----------
 src/preferences/dialog/dlgprefmixer.h   |   5 +-
 2 files changed, 105 insertions(+), 68 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index e2c65138c8c..7d41834c806 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -96,13 +96,13 @@ DlgPrefMixer::DlgPrefMixer(
     graphicsViewXfader->setFocusPolicy(Qt::NoFocus);
 
     // Connection
-    connect(SliderHiEQ, &QSlider::valueChanged, this, &DlgPrefMixer::slotUpdateHiEQ);
-    connect(SliderHiEQ, &QSlider::sliderMoved, this, &DlgPrefMixer::slotUpdateHiEQ);
-    connect(SliderHiEQ, &QSlider::sliderReleased, this, &DlgPrefMixer::slotUpdateHiEQ);
+    connect(SliderHiEQ, &QSlider::valueChanged, this, &DlgPrefMixer::slotHiEqSliderChanged);
+    connect(SliderHiEQ, &QSlider::sliderMoved, this, &DlgPrefMixer::slotHiEqSliderChanged);
+    connect(SliderHiEQ, &QSlider::sliderReleased, this, &DlgPrefMixer::slotHiEqSliderChanged);
 
-    connect(SliderLoEQ, &QSlider::valueChanged, this, &DlgPrefMixer::slotUpdateLoEQ);
-    connect(SliderLoEQ, &QSlider::sliderMoved, this, &DlgPrefMixer::slotUpdateLoEQ);
-    connect(SliderLoEQ, &QSlider::sliderReleased, this, &DlgPrefMixer::slotUpdateLoEQ);
+    connect(SliderLoEQ, &QSlider::valueChanged, this, &DlgPrefMixer::slotLoEqSliderChanged);
+    connect(SliderLoEQ, &QSlider::sliderMoved, this, &DlgPrefMixer::slotLoEqSliderChanged);
+    connect(SliderLoEQ, &QSlider::sliderReleased, this, &DlgPrefMixer::slotLoEqSliderChanged);
 
     connect(CheckBoxEqAutoReset,
             &QCheckBox::toggled,
@@ -244,10 +244,8 @@ void DlgPrefMixer::slotPopulateDeckEffectSelectors() {
 
     EffectManifestFilterFnc filterEQ;
     if (CheckBoxEqOnly->isChecked()) {
-        m_pConfig->set(ConfigKey(kConfigGroup, kEqsOnly), QString("yes"));
         filterEQ = isMixingEQ;
     } else {
-        m_pConfig->set(ConfigKey(kConfigGroup, kEqsOnly), QString("no"));
         filterEQ = nullptr; // take all
     }
 
@@ -324,9 +322,6 @@ void DlgPrefMixer::populateDeckQuickEffectBoxList(
 
 void DlgPrefMixer::slotSingleEqToggled(bool checked) {
     m_singleEq = checked;
-    // TODO move this line to slotApply()
-    m_pConfig->set(ConfigKey(kConfigGroup, kSingleEq),
-            m_singleEq ? QString("yes") : QString("no"));
     if (m_deckEqEffectSelectors.size()) {
         int deck1EQIndex = m_deckEqEffectSelectors.at(0)->currentIndex();
         for (int i = 2; i < m_deckEqEffectSelectors.size() + 1; ++i) {
@@ -360,10 +355,16 @@ QUrl DlgPrefMixer::helpUrl() const {
 }
 
 void DlgPrefMixer::setDefaultShelves() {
-    m_pConfig->set(ConfigKey(kConfigGroup, "HiEQFrequency"), ConfigValue(2500));
-    m_pConfig->set(ConfigKey(kConfigGroup, "LoEQFrequency"), ConfigValue(250));
-    m_pConfig->set(ConfigKey(kConfigGroup, "HiEQFrequencyPrecise"), ConfigValue(2500.0));
-    m_pConfig->set(ConfigKey(kConfigGroup, "LoEQFrequencyPrecise"), ConfigValue(250.0));
+    SliderHiEQ->setValue(
+            getSliderPosition(2500,
+                    SliderHiEQ->minimum(),
+                    SliderHiEQ->maximum()));
+    SliderLoEQ->setValue(
+            getSliderPosition(250,
+                    SliderLoEQ->minimum(),
+                    SliderLoEQ->maximum()));
+    slotLoEqSliderChanged();
+    slotHiEqSliderChanged();
 }
 
 void DlgPrefMixer::slotResetToDefaults() {
@@ -442,15 +443,6 @@ void DlgPrefMixer::slotQuickEffectChangedOnDeck(int effectIndex) {
             box->setCurrentIndex(effectIndex);
         }
     }
-
-    QString deckGroupName = PlayerManager::groupForDeck(deckNumber);
-    QString unitGroup = QuickEffectChain::formatEffectChainGroup(deckGroupName);
-    EffectChainPointer pChain = m_pEffectsManager->getEffectChain(unitGroup);
-    QList<EffectChainPresetPointer> presetList =
-            m_pChainPresetManager->getQuickEffectPresetsSorted();
-    if (pChain && effectIndex >= 0 && effectIndex < presetList.size()) {
-        pChain->loadChainPreset(presetList[effectIndex]);
-    }
 }
 
 void DlgPrefMixer::applySelectionsToDecks() {
@@ -458,24 +450,30 @@ void DlgPrefMixer::applySelectionsToDecks() {
         return;
     }
 
-    int deck = 0;
+    // EQ effects
     for (QComboBox* box : std::as_const(m_deckEqEffectSelectors)) {
+        int deck = m_deckEqEffectSelectors.indexOf(box);
+        QString deckGroup = PlayerManager::groupForDeck(deck);
+
         const EffectManifestPointer pManifest =
                 m_pBackendManager->getManifestFromUniqueId(
                         box->itemData(box->currentIndex()).toString());
 
-        QString group = PlayerManager::groupForDeck(deck);
-
         bool needLoad = true;
-        bool startingUp = (m_eqIndiciesOnUpdate.size() < (deck + 1));
+        bool startingUp = m_eqIndiciesOnUpdate.size() < (deck + 1);
         if (!startingUp) {
-            needLoad = (box->currentIndex() != m_eqIndiciesOnUpdate[deck]);
+            needLoad = box->currentIndex() != m_eqIndiciesOnUpdate[deck];
         }
         if (needLoad) {
-            auto pChainSlot = m_pEffectsManager->getEqualizerEffectChain(group);
+            auto pChainSlot = m_pEffectsManager->getEqualizerEffectChain(deckGroup);
+
+            VERIFY_OR_DEBUG_ASSERT(pChainSlot) {
+                return;
+            }
+
             auto pEffectSlot = pChainSlot->getEffectSlot(0);
             pEffectSlot->loadEffectWithDefaults(pManifest);
-            if (pManifest && pManifest->isMixingEQ()) {
+            if (pManifest && pManifest->isMixingEQ() && !m_eqBypass) {
                 pChainSlot->setFilterWaveform(true);
             } else {
                 pChainSlot->setFilterWaveform(false);
@@ -489,18 +487,33 @@ void DlgPrefMixer::applySelectionsToDecks() {
             if (pManifest) {
                 configString = pManifest->uniqueId();
             }
-            m_pConfig->set(ConfigKey(kConfigGroup, kEffectForGroupPrefix + group),
+            // TODO store this in effects.xml
+            m_pConfig->set(ConfigKey(kConfigGroup, kEffectForGroupPrefix + deckGroup),
                     configString);
 
             // This is required to remove a previous selected effect that does not
             // fit to the current ShowAllEffects checkbox
             slotPopulateDeckEffectSelectors();
         }
-        ++deck;
+    }
+
+    // Quick effects
+    for (const auto& box : qAsConst(m_deckQuickEffectSelectors)) {
+        int deck = m_deckQuickEffectSelectors.indexOf(box);
+        QString deckGroup = PlayerManager::groupForDeck(deck);
+        const QString quickEffectGroup = QuickEffectChain::formatEffectChainGroup(deckGroup);
+        EffectChainPointer pChain = m_pEffectsManager->getEffectChain(quickEffectGroup);
+        const QList<EffectChainPresetPointer> presetList =
+                m_pChainPresetManager->getQuickEffectPresetsSorted();
+        int effectIndex = box->currentIndex();
+        // TODO handle index < 0 ??
+        if (pChain && effectIndex >= 0 && effectIndex < presetList.size()) {
+            pChain->loadChainPreset(presetList[effectIndex]);
+        }
     }
 }
 
-void DlgPrefMixer::slotUpdateHiEQ() {
+void DlgPrefMixer::slotHiEqSliderChanged() {
     if (SliderHiEQ->value() < SliderLoEQ->value()) {
         SliderHiEQ->setValue(SliderLoEQ->value());
     }
@@ -513,16 +526,11 @@ void DlgPrefMixer::slotUpdateHiEQ() {
     } else {
         TextHiEQ->setText(QString("%1 kHz").arg((int)m_highEqFreq / 1000.));
     }
-    m_pConfig->set(ConfigKey(kConfigGroup, "HiEQFrequency"),
-            ConfigValue(QString::number(static_cast<int>(m_highEqFreq))));
-    m_pConfig->set(ConfigKey(kConfigGroup, "HiEQFrequencyPrecise"),
-            ConfigValue(QString::number(m_highEqFreq, 'f')));
 
-    slotApply();
     // TODO Maybe add a 'Apply values immediately" checkbox for instant testing (sweep freq)?
 }
 
-void DlgPrefMixer::slotUpdateLoEQ() {
+void DlgPrefMixer::slotLoEqSliderChanged() {
     if (SliderLoEQ->value() > SliderHiEQ->value()) {
         SliderLoEQ->setValue(SliderHiEQ->value());
     }
@@ -535,12 +543,7 @@ void DlgPrefMixer::slotUpdateLoEQ() {
     } else {
         TextLoEQ->setText(QString("%1 kHz").arg((int)m_lowEqFreq / 1000.));
     }
-    m_pConfig->set(ConfigKey(kConfigGroup, "LoEQFrequency"),
-            ConfigValue(QString::number(static_cast<int>(m_lowEqFreq))));
-    m_pConfig->set(ConfigKey(kConfigGroup, "LoEQFrequencyPrecise"),
-            ConfigValue(QString::number(m_lowEqFreq, 'f')));
 
-    slotApply();
     // TODO Maybe add a 'Apply values immediately" checkbox for instant testing (sweep freq)?
 }
 
@@ -597,30 +600,65 @@ void DlgPrefMixer::slotApply() {
         m_crossfader.set(0.0 - position);
         m_xFaderReverse = checkBoxReverse->isChecked();
     }
-    slotUpdateXFader();
+    m_pConfig->set(ConfigKey(EngineXfader::kXfaderConfigKey, "xFaderMode"),
+            ConfigValue(m_xFaderMode));
+    m_pConfig->set(ConfigKey(EngineXfader::kXfaderConfigKey, "xFaderCurve"),
+            ConfigValue(QString::number(m_transform)));
+    m_pConfig->set(ConfigKey(EngineXfader::kXfaderConfigKey, "xFaderReverse"),
+            ConfigValue(checkBoxReverse->isChecked() ? 1 : 0));
 
     // Bypass EQ ///////////////////////////////////////////////////////////////
     m_pConfig->set(ConfigKey(kConfigGroup, kEnableEqs), ConfigValue(m_eqBypass ? "no" : "yes"));
     // Disable/enable EQ effect processing for all decks by setting the appropriate
     // controls to 0 or 1 ("[EqualizerRackX_EffectUnitDeck_Effect1],enabled")
-    int deck = 0;
-    while (deck < m_deckEqEffectSelectors.count()) {
-        QString group = EqualizerEffectChain::formatEffectSlotGroup(
+    for (const auto& box : qAsConst(m_deckEqEffectSelectors)) {
+        int deck = m_deckEqEffectSelectors.indexOf(box);
+        QString deckGroup = PlayerManager::groupForDeck(deck);
+        QString eqGroup = EqualizerEffectChain::formatEffectSlotGroup(
                 PlayerManager::groupForDeck(deck));
-        ControlObject::set(ConfigKey(group, "enabled"), m_eqBypass ? 0 : 1);
-        deck++;
+        ControlObject::set(ConfigKey(eqGroup, "enabled"), m_eqBypass ? 0 : 1);
+
+        auto pChainSlot = m_pEffectsManager->getEqualizerEffectChain(deckGroup);
+        VERIFY_OR_DEBUG_ASSERT(pChainSlot) {
+            return;
+        }
+        const EffectManifestPointer pManifest =
+                m_pBackendManager->getManifestFromUniqueId(
+                        box->itemData(box->currentIndex()).toString());
+        if (pManifest && pManifest->isMixingEQ() && !m_eqBypass) {
+            pChainSlot->setFilterWaveform(true);
+        } else {
+            pChainSlot->setFilterWaveform(false);
+        }
     }
-    // TODO also disable waveform filtering for consistency of audio & GUI (waveforms + VU)
-    // pChainSlot->setFilterWaveform
 
-    // EQ shelves //////////////////////////////////////////////////////////////
-    m_COLoFreq.set(m_lowEqFreq);
-    m_COHiFreq.set(m_highEqFreq);
+    // EQ & QuickEffect comboboxes /////////////////////////////////////////////
+    m_pConfig->set(ConfigKey(kConfigGroup, kSingleEq),
+            m_singleEq ? QString("yes") : QString("no"));
+    m_pConfig->set(ConfigKey(kConfigGroup, kEqsOnly),
+            ConfigValue(CheckBoxEqOnly->isChecked() ? "yes" : "no"));
+
     m_pConfig->set(ConfigKey(kConfigGroup, "EqAutoReset"),
             ConfigValue(m_eqAutoReset ? 1 : 0));
     m_pConfig->set(ConfigKey(kConfigGroup, "GainAutoReset"),
             ConfigValue(m_gainAutoReset ? 1 : 0));
     applySelectionsToDecks();
+
+    // EQ shelves //////////////////////////////////////////////////////////////
+    if (m_initializing) {
+        return;
+    }
+
+    m_COLoFreq.set(m_lowEqFreq);
+    m_COHiFreq.set(m_highEqFreq);
+    m_pConfig->set(ConfigKey(kConfigGroup, "HiEQFrequency"),
+            ConfigValue(QString::number(static_cast<int>(m_highEqFreq))));
+    m_pConfig->set(ConfigKey(kConfigGroup, "HiEQFrequencyPrecise"),
+            ConfigValue(QString::number(m_highEqFreq, 'f')));
+    m_pConfig->set(ConfigKey(kConfigGroup, "LoEQFrequency"),
+            ConfigValue(QString::number(static_cast<int>(m_lowEqFreq))));
+    m_pConfig->set(ConfigKey(kConfigGroup, "LoEQFrequencyPrecise"),
+            ConfigValue(QString::number(m_lowEqFreq, 'f')));
 }
 
 // Update the widgets with values from config
@@ -659,13 +697,18 @@ void DlgPrefMixer::slotUpdate() {
     slotPopulateDeckEffectSelectors();
     if (m_initializing || CheckBoxSingleEqEffect->isChecked() != m_singleEq) {
         CheckBoxSingleEqEffect->setChecked(m_singleEq);
-        slotSingleEqToggled(CheckBoxSingleEqEffect->isChecked());
+        slotSingleEqToggled(m_singleEq);
     }
 
+    // TODO populate these index lists in each populateDeck..Boxes()
     m_eqIndiciesOnUpdate.clear();
     for (const auto& box : std::as_const(m_deckEqEffectSelectors)) {
         m_eqIndiciesOnUpdate.append(box->currentIndex());
     }
+    m_quickEffectIndiciesOnUpdate.clear();
+    for (const auto& box : std::as_const(m_deckQuickEffectSelectors)) {
+        m_quickEffectIndiciesOnUpdate.append(box->currentIndex());
+    }
 
     m_eqAutoReset = static_cast<bool>(
             m_pConfig->getValueString(ConfigKey(kConfigGroup, "EqAutoReset"))
@@ -717,8 +760,8 @@ void DlgPrefMixer::slotUpdate() {
             getSliderPosition(lowEqFreq,
                     SliderLoEQ->minimum(),
                     SliderLoEQ->maximum()));
-    slotUpdateLoEQ();
-    slotUpdateHiEQ();
+    slotLoEqSliderChanged();
+    slotHiEqSliderChanged();
 }
 
 // Draw the crossfader curve graph. Only needs to get drawn when a change
@@ -810,13 +853,6 @@ void DlgPrefMixer::slotUpdateXFader() {
                           EngineXfader::kTransformMax) -
             1 + EngineXfader::kTransformMin;
     m_cal = EngineXfader::getPowerCalibration(m_transform);
-    // TODO move to slotApply
-    m_pConfig->set(ConfigKey(EngineXfader::kXfaderConfigKey, "xFaderMode"),
-            ConfigValue(m_xFaderMode));
-    m_pConfig->set(ConfigKey(EngineXfader::kXfaderConfigKey, "xFaderCurve"),
-            ConfigValue(QString::number(m_transform)));
-    m_pConfig->set(ConfigKey(EngineXfader::kXfaderConfigKey, "xFaderReverse"),
-            ConfigValue(checkBoxReverse->isChecked() ? 1 : 0));
 
     drawXfaderDisplay();
 }
diff --git a/src/preferences/dialog/dlgprefmixer.h b/src/preferences/dialog/dlgprefmixer.h
index fd1a49f7d37..edf89814c8f 100644
--- a/src/preferences/dialog/dlgprefmixer.h
+++ b/src/preferences/dialog/dlgprefmixer.h
@@ -40,8 +40,8 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
     void slotPopulateDeckEffectSelectors();
 
     void slotUpdateXFader();
-    void slotUpdateHiEQ();
-    void slotUpdateLoEQ();
+    void slotHiEqSliderChanged();
+    void slotLoEqSliderChanged();
 
     // Update the Main EQ
     void slotApplyMainEQParameter(int value);
@@ -112,4 +112,5 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
     bool m_initializing;
 
     QList<int> m_eqIndiciesOnUpdate;
+    QList<int> m_quickEffectIndiciesOnUpdate;
 };

From 770c643a02a1acaf31c73c664bf96f058e79ea87 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Sat, 1 Jul 2023 00:13:31 +0200
Subject: [PATCH 016/388] Pref Mixer, main EQ: rework loading, updating &
 saving

---
 src/preferences/dialog/dlgprefmixer.cpp | 318 +++++++++++++-----------
 src/preferences/dialog/dlgprefmixer.h   |   9 +-
 2 files changed, 173 insertions(+), 154 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index 7d41834c806..593354ca584 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -21,6 +21,7 @@
 namespace {
 const QString kConfigGroup = QStringLiteral("[Mixer Profile]");
 const QString kEffectForGroupPrefix = QStringLiteral("EffectForGroup_");
+const QString kEffectGroupForMaster = QStringLiteral("EffectForGroup_[Master]");
 const QString kEnableEqs = QStringLiteral("EnableEQs");
 const QString kEqsOnly = QStringLiteral("EQsOnly");
 const QString kSingleEq = QStringLiteral("SingleEQEffect");
@@ -74,6 +75,8 @@ DlgPrefMixer::DlgPrefMixer(
           m_initializing(true) {
     setupUi(this);
 
+    setUpMainEQ();
+
     slotUpdate();
     m_initializing = false;
 
@@ -138,8 +141,6 @@ DlgPrefMixer::DlgPrefMixer(
             this,
             &DlgPrefMixer::slotPopulateDeckEffectSelectors);
 
-    setUpMainEQ();
-
     setScrollSafeGuard(SliderXFader);
     setScrollSafeGuard(SliderHiEQ);
     setScrollSafeGuard(SliderLoEQ);
@@ -148,7 +149,7 @@ DlgPrefMixer::DlgPrefMixer(
     slotUpdate();
 
     // Save all settings back to config, especially EQs and QuickEffects might
-    // changed.
+    // have changed.
     slotApply();
 }
 
@@ -547,29 +548,24 @@ void DlgPrefMixer::slotLoEqSliderChanged() {
     // TODO Maybe add a 'Apply values immediately" checkbox for instant testing (sweep freq)?
 }
 
-void DlgPrefMixer::slotApplyMainEQParameter(int value) {
+void DlgPrefMixer::slotMainEQParameterSliderChanged(int value) {
     EffectSlotPointer pEffectSlot(m_pEffectMainEQ);
-    if (!pEffectSlot.isNull()) {
-        QSlider* slider = qobject_cast<QSlider*>(sender());
-        int index = slider->property("index").toInt();
-        auto pParameterSlot = pEffectSlot->getEffectParameterSlot(
-                EffectManifestParameter::ParameterType::Knob, index);
-
-        if (pParameterSlot->isLoaded()) {
-            // Calculate parameter value from relative slider position
-            double paramValue = static_cast<double>(value - slider->minimum()) /
-                    static_cast<double>(slider->maximum() - slider->minimum());
-            pParameterSlot->setParameter(paramValue);
-            QLabel* valueLabel = m_mainEQValues[index];
-            double dValue = value / 100.0;
-            QString valueText = QString::number(dValue);
-            valueLabel->setText(valueText);
-
-            m_pConfig->set(ConfigKey(kConfigGroup,
-                                   kMainEQParameterKey + QString::number(index + 1)),
-                    ConfigValue(valueText));
-        }
+    if (pEffectSlot.isNull()) {
+        return;
+    }
+
+    QSlider* slider = qobject_cast<QSlider*>(sender());
+    VERIFY_OR_DEBUG_ASSERT(slider) { // no slider, called from elsewhere
+        return;
     }
+
+    // Update slider label
+    int index = m_mainEQSliders.indexOf(slider);
+    QLabel* valueLabel = m_mainEQValues[index]; // verify
+    VERIFY_OR_DEBUG_ASSERT(valueLabel) {
+        return;
+    }
+    valueLabel->setText(QString::number(value / 100.0));
 }
 
 int DlgPrefMixer::getSliderPosition(double eqFreq, int minValue, int maxValue) {
@@ -762,6 +758,8 @@ void DlgPrefMixer::slotUpdate() {
                     SliderLoEQ->maximum()));
     slotLoEqSliderChanged();
     slotHiEqSliderChanged();
+
+    updateMainEQ();
 }
 
 // Draw the crossfader curve graph. Only needs to get drawn when a change
@@ -876,6 +874,16 @@ void DlgPrefMixer::slotBypassEqToggled(bool checked) {
 }
 
 void DlgPrefMixer::setUpMainEQ() {
+    auto pChainSlot = m_pEffectsManager->getOutputEffectChain();
+    VERIFY_OR_DEBUG_ASSERT(pChainSlot) {
+        return;
+    }
+    auto pEffectSlot = pChainSlot->getEffectSlot(0);
+    VERIFY_OR_DEBUG_ASSERT(pEffectSlot) {
+        return;
+    }
+    m_pEffectMainEQ = pEffectSlot;
+
     connect(pbResetMainEq, &QPushButton::clicked, this, &DlgPrefMixer::slotMainEQToDefault);
 
     connect(comboBoxMainEq,
@@ -883,44 +891,44 @@ void DlgPrefMixer::setUpMainEQ() {
             this,
             &DlgPrefMixer::slotMainEqEffectChanged);
 
-    const QString configuredEffectId = m_pConfig->getValue(ConfigKey(kConfigGroup,
-                                                                   "EffectForGroup_[Master]"),
-            kDefaultMainEqId);
-    const EffectManifestPointer configuredEffectManifest =
-            m_pBackendManager->getManifestFromUniqueId(configuredEffectId);
-
     const QList<EffectManifestPointer> availableMainEQEffects =
             getFilteredManifests(isMainEQ);
 
-    // Add empty item at the top: no Main EQ
+    // Add empty '---' item at the top
     comboBoxMainEq->addItem(kNoEffectString);
     for (const auto& pManifest : availableMainEQEffects) {
         comboBoxMainEq->addItem(pManifest->name(), QVariant(pManifest->uniqueId()));
     }
-    int mainEqIndex = 0; // selects "None" by default
+    comboBoxMainEq->setCurrentIndex(0);
+}
+
+void DlgPrefMixer::updateMainEQ() {
+    const QString configuredEffectId =
+            m_pConfig->getValue(ConfigKey(kConfigGroup, kEffectGroupForMaster),
+                    kDefaultMainEqId);
+    const EffectManifestPointer configuredEffectManifest =
+            m_pBackendManager->getManifestFromUniqueId(configuredEffectId);
+    int mainEqIndex = 0; // selects '---' by default
     if (configuredEffectManifest) {
         mainEqIndex = comboBoxMainEq->findData(configuredEffectManifest->uniqueId());
     }
+    // set index and create required sliders and labels
     comboBoxMainEq->setCurrentIndex(mainEqIndex);
-
-    // Load parameters from preferences:
-    EffectSlotPointer pEffectSlot(m_pEffectMainEQ);
-    if (!pEffectSlot.isNull()) {
-        int knobNum = pEffectSlot->numParameters(EffectManifestParameter::ParameterType::Knob);
-        for (int i = 0; i < knobNum; i++) {
-            auto pParameterSlot = pEffectSlot->getEffectParameterSlot(
-                    EffectManifestParameter::ParameterType::Knob, i);
-
-            if (pParameterSlot->isLoaded()) {
-                QString strValue = m_pConfig->getValueString(ConfigKey(kConfigGroup,
-                        kMainEQParameterKey + QString::number(i + 1)));
-                bool ok;
-                double value = strValue.toDouble(&ok);
-                if (ok) {
-                    setMainEQParameter(i, value);
-                }
-            }
+    // slotMainEqEffectChanged(mainEqIndex);
+
+    // Load parameters from preferences and set sliders
+    for (QSlider* slider : qAsConst(m_mainEQSliders)) {
+        int paramIndex = slider->property("index").toInt();
+        QString strValue = m_pConfig->getValueString(ConfigKey(kConfigGroup,
+                kMainEQParameterKey + QString::number(paramIndex + 1)));
+
+        bool ok;
+        double paramValue = strValue.toDouble(&ok);
+        if (!ok) {
+            continue;
         }
+        slider->setValue(static_cast<int>(paramValue * 100));
+        // label is updated in  slotMainEQParameterSliderChanged()
     }
 }
 
@@ -944,78 +952,56 @@ void DlgPrefMixer::slotMainEqEffectChanged(int effectIndex) {
         pbResetMainEq->show();
     }
 
-    auto pChainSlot = m_pEffectsManager->getOutputEffectChain();
-    if (pChainSlot) {
-        auto pEffectSlot = pChainSlot->getEffectSlot(0);
-        if (pEffectSlot) {
-            pEffectSlot->loadEffectWithDefaults(pManifest);
-            pEffectSlot->setEnabled(true);
-            m_pEffectMainEQ = pEffectSlot;
-
-            int knobNum = pEffectSlot->numParameters(EffectManifestParameter::ParameterType::Knob);
-
-            // Create and set up Main EQ's sliders
-            int i;
-            for (i = 0; i < knobNum; i++) {
-                auto pParameterSlot = pEffectSlot->getEffectParameterSlot(
-                        EffectManifestParameter::ParameterType::Knob, i);
-
-                if (pParameterSlot->isLoaded()) {
-                    EffectManifestParameterPointer pManifestParameter =
-                            pParameterSlot->getManifest();
-
-                    // Setup Label
-                    QLabel* centerFreqLabel = new QLabel(this);
-                    QString labelText = pParameterSlot->getManifest()->name();
-                    m_mainEQLabels.append(centerFreqLabel);
-                    centerFreqLabel->setText(labelText);
-                    slidersGridLayout->addWidget(centerFreqLabel, 0, i + 1, Qt::AlignCenter);
-
-                    QSlider* slider = new QSlider(this);
-                    slider->setMinimum(static_cast<int>(pManifestParameter->getMinimum() * 100));
-                    slider->setMaximum(static_cast<int>(pManifestParameter->getMaximum() * 100));
-                    slider->setSingleStep(1);
-                    slider->setValue(static_cast<int>(pManifestParameter->getDefault() * 100));
-                    slider->setMinimumHeight(90);
-                    // Set the index as a property because we need it inside slotUpdateFilter()
-                    slider->setProperty("index", QVariant(i));
-                    setScrollSafeGuard(slider);
-                    slidersGridLayout->addWidget(slider, 1, i + 1, Qt::AlignCenter);
-                    m_mainEQSliders.append(slider);
-                    // catch drag event
-                    connect(slider,
-                            &QSlider::sliderMoved,
-                            this,
-                            &DlgPrefMixer::slotApplyMainEQParameter);
-                    // catch scroll event
-                    connect(slider,
-                            &QSlider::valueChanged,
-                            this,
-                            &DlgPrefMixer::slotApplyMainEQParameter);
-
-                    QLabel* valueLabel = new QLabel(this);
-                    m_mainEQValues.append(valueLabel);
-                    QString valueText = QString::number((double)slider->value() / 100);
-                    valueLabel->setText(valueText);
-                    slidersGridLayout->addWidget(valueLabel, 2, i + 1, Qt::AlignCenter);
-
-                    // Immediately save the new (default) parameter values in preferences.
-                    // Otherwise, without pressing 'Reset parameter', the previously saved
-                    // parameter values (of another EQ effect) would be loaded on next start
-                    // which (unnoticed) messes up the parameters displayed now.
-                    // TODO store this in effects.xml
-                    m_pConfig->set(ConfigKey(kConfigGroup,
-                                           kMainEQParameterKey + QString::number(i + 1)),
-                            ConfigValue(valueText));
-                }
-            }
-        }
+    if (m_pEffectMainEQ.isNull() || !pManifest) {
+        return;
     }
 
-    // Update the configured effect for the current QComboBox
-    if (pManifest) {
-        m_pConfig->set(ConfigKey(kConfigGroup, "EffectForGroup_[Master]"),
-                ConfigValue(pManifest->uniqueId()));
+    // Create and set up Main EQ's sliders
+    const auto params = pManifest->parameters();
+    for (const auto& param : params) {
+        if (param->parameterType() != EffectManifestParameter::ParameterType::Knob) {
+            continue;
+        }
+        int i = param->index();
+
+        QLabel* centerFreqLabel = new QLabel(this);
+        QString labelText = param->name();
+        centerFreqLabel->setText(labelText);
+        m_mainEQLabels.append(centerFreqLabel);
+        slidersGridLayout->addWidget(centerFreqLabel, 0, i + 1, Qt::AlignCenter);
+
+        QSlider* slider = new QSlider(this);
+        setScrollSafeGuard(slider);
+        slider->setProperty("index", QVariant(i));
+        slider->setMinimumHeight(90);
+        slider->setMinimum(static_cast<int>(param->getMinimum() * 100));
+        slider->setMaximum(static_cast<int>(param->getMaximum() * 100));
+        // TODO make steps depend on range: 0.1, 1, 10, 100
+        slider->setSingleStep(1);
+        slider->setValue(static_cast<int>(param->getDefault() * 100));
+        // Set the index as a property because we need it in applyMainEqParameter
+        // Ignore scroll events if slider is not focused.
+        // See eventFilter() for details.
+        slidersGridLayout->addWidget(slider, 1, i + 1, Qt::AlignCenter);
+        m_mainEQSliders.append(slider);
+        // catch drag event
+        connect(slider,
+                &QSlider::sliderMoved,
+                this,
+                &DlgPrefMixer::slotMainEQParameterSliderChanged);
+        // catch scroll event
+        connect(slider,
+                &QSlider::valueChanged,
+                this,
+                &DlgPrefMixer::slotMainEQParameterSliderChanged);
+
+        QLabel* valueLabel = new QLabel(this);
+        QString valueText = QString::number((double)slider->value() / 100);
+        valueLabel->setText(valueText);
+        // TODO use max required label width so column width doesn't change
+        // when slider is moved. See WEffectParameterNameBase::parameterUpdated()
+        m_mainEQValues.append(valueLabel);
+        slidersGridLayout->addWidget(valueLabel, 2, i + 1, Qt::AlignCenter);
     }
 }
 
@@ -1048,44 +1034,74 @@ void DlgPrefMixer::validateEQShelves() {
 }
 
 void DlgPrefMixer::slotMainEQToDefault() {
+    const EffectManifestPointer pManifest =
+            m_pBackendManager->getManifestFromUniqueId(
+                    comboBoxMainEq->currentData().toString());
+    if (!pManifest) {
+        return;
+    }
+
+    for (QSlider* slider : qAsConst(m_mainEQSliders)) {
+        int paramIndex = slider->property("index").toInt();
+        auto pParam = pManifest->parameter(paramIndex);
+        slider->setValue(static_cast<int>(pParam->getDefault() * 100));
+    }
+}
+
+void DlgPrefMixer::applyMainEQ() {
     EffectSlotPointer pEffectSlot(m_pEffectMainEQ);
-    if (!pEffectSlot.isNull()) {
-        int knobNum = pEffectSlot->numParameters(EffectManifestParameter::ParameterType::Knob);
-        for (int i = 0; i < knobNum; i++) {
-            auto pParameterSlot = pEffectSlot->getEffectParameterSlot(
-                    EffectManifestParameter::ParameterType::Knob, i);
-            if (pParameterSlot->isLoaded()) {
-                double defaultValue = pParameterSlot->getManifest()->getDefault();
-                setMainEQParameter(i, defaultValue);
-            }
-        }
+    VERIFY_OR_DEBUG_ASSERT(!pEffectSlot.isNull()) {
+        return;
+    }
+
+    // load & store effect
+    const EffectManifestPointer pManifest =
+            m_pBackendManager->getManifestFromUniqueId(
+                    comboBoxMainEq->currentData().toString());
+    if (pManifest) {
+        pEffectSlot->loadEffectWithDefaults(pManifest);
+        pEffectSlot->setEnabled(true);
+    }
+
+    m_pConfig->set(ConfigKey(kConfigGroup, kEffectGroupForMaster),
+            ConfigValue(pManifest ? pManifest->uniqueId() : ""));
+
+    // apply & store parameters
+    for (QSlider* slider : qAsConst(m_mainEQSliders)) {
+        int index = m_mainEQSliders.indexOf(slider);
+        applyMainEqParameter(index);
     }
 }
 
-void DlgPrefMixer::setMainEQParameter(int i, double value) {
+void DlgPrefMixer::applyMainEqParameter(int index) {
     EffectSlotPointer pEffectSlot(m_pEffectMainEQ);
-    if (!pEffectSlot.isNull()) {
-        auto pParameterSlot = pEffectSlot->getEffectParameterSlot(
-                EffectManifestParameter::ParameterType::Knob, i);
-
-        if (pParameterSlot->isLoaded()) {
-            QSlider* slider = m_mainEQSliders[i];
-            // Calculate parameter value from relative slider position
-            double paramValue = static_cast<double>(value - slider->minimum()) /
-                    static_cast<double>(slider->maximum() - slider->minimum());
-            pParameterSlot->setParameter(paramValue);
-            slider->setValue(static_cast<int>(value * 100));
-
-            QLabel* valueLabel = m_mainEQValues[i];
-            QString valueText = QString::number(value);
-            valueLabel->setText(valueText);
+    VERIFY_OR_DEBUG_ASSERT(!pEffectSlot.isNull()) {
+        return;
+    }
 
-            // TODO store this in effects.xml
-            m_pConfig->set(ConfigKey(kConfigGroup,
-                                   kMainEQParameterKey + QString::number(i + 1)),
-                    ConfigValue(valueText));
-        }
+    QSlider* slider = m_mainEQSliders[index];
+    VERIFY_OR_DEBUG_ASSERT(slider) {
+        return;
+    }
+    int paramIndex = slider->property("index").toInt();
+    auto pParameterSlot = pEffectSlot->getEffectParameterSlot(
+            EffectManifestParameter::ParameterType::Knob, paramIndex);
+    VERIFY_OR_DEBUG_ASSERT(pParameterSlot && pParameterSlot->isLoaded()) {
+        return;
     }
+
+    // Calculate parameter value from relative slider position
+    int sValue = slider->value();
+    double paramValue = static_cast<double>(sValue - slider->minimum()) /
+            static_cast<double>(slider->maximum() - slider->minimum());
+    // Set the parameter
+    pParameterSlot->setParameter(paramValue);
+
+    // TODO store this in effects.xml
+    m_pConfig->set(ConfigKey(kConfigGroup,
+                           kMainEQParameterKey + QString::number(index + 1)),
+            // TODO we could as well simply read the parameter label
+            ConfigValue(QString::number((double)sValue / 100.0)));
 }
 
 const QList<EffectManifestPointer> DlgPrefMixer::getFilteredManifests(
diff --git a/src/preferences/dialog/dlgprefmixer.h b/src/preferences/dialog/dlgprefmixer.h
index edf89814c8f..8fbef59e91e 100644
--- a/src/preferences/dialog/dlgprefmixer.h
+++ b/src/preferences/dialog/dlgprefmixer.h
@@ -44,9 +44,8 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
     void slotLoEqSliderChanged();
 
     // Update the Main EQ
-    void slotApplyMainEQParameter(int value);
+    void slotMainEQParameterSliderChanged(int value);
     void slotMainEQToDefault();
-    void setMainEQParameter(int i, double value);
     void slotMainEqEffectChanged(int effectIndex);
 
   private:
@@ -55,10 +54,14 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
     double getEqFreq(int value, int minimum, int maximum);
     int getSliderPosition(double eqFreq, int minimum, int maximum);
     void validateEQShelves();
-    void setUpMainEQ();
 
     void applySelectionsToDecks();
 
+    void setUpMainEQ();
+    void updateMainEQ();
+    void applyMainEQ();
+    void applyMainEqParameter(int index);
+
     typedef bool (*EffectManifestFilterFnc)(EffectManifest* pManifest);
     const QList<EffectManifestPointer> getFilteredManifests(
             EffectManifestFilterFnc filterFunc) const;

From 6b248d51f53dde46b3e320257644658e4c7c43a6 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Sat, 29 Apr 2023 13:09:41 +0200
Subject: [PATCH 017/388] Pref Mixer, main EQ: add checkbox to apply parameter
 changes instantly

---
 src/preferences/dialog/dlgprefmixer.cpp   | 26 ++++++++++++++++++++++-
 src/preferences/dialog/dlgprefmixer.h     |  2 ++
 src/preferences/dialog/dlgprefmixerdlg.ui | 13 ++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index 593354ca584..f8e9252fcbd 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -72,6 +72,7 @@ DlgPrefMixer::DlgPrefMixer(
           m_eqAutoReset(false),
           m_gainAutoReset(false),
           m_eqBypass(false),
+          m_instantMainEq(false),
           m_initializing(true) {
     setupUi(this);
 
@@ -130,6 +131,11 @@ DlgPrefMixer::DlgPrefMixer(
             this,
             &DlgPrefMixer::slotSingleEqToggled);
 
+    connect(CheckBoxInstantMainEQ,
+            &QCheckBox::toggled,
+            this,
+            &DlgPrefMixer::slotInstantMainEQToggled);
+
     // Add drop down lists for current decks and connect num_decks control
     // to slotNumDecksChanged
     m_pNumDecks = new ControlProxy("[Master]", "num_decks", this);
@@ -351,6 +357,13 @@ void DlgPrefMixer::slotSingleEqToggled(bool checked) {
     applySelectionsToDecks();
 }
 
+void DlgPrefMixer::slotInstantMainEQToggled(bool checked) {
+    m_instantMainEq = checked;
+    if (checked) {
+        applyMainEQ();
+    }
+}
+
 QUrl DlgPrefMixer::helpUrl() const {
     return QUrl(MIXXX_MANUAL_EQ_URL);
 }
@@ -397,6 +410,7 @@ void DlgPrefMixer::slotResetToDefaults() {
 
     setDefaultShelves();
     slotMainEQToDefault();
+    CheckBoxInstantMainEQ->setChecked(false);
     slotApply();
 }
 
@@ -566,6 +580,10 @@ void DlgPrefMixer::slotMainEQParameterSliderChanged(int value) {
         return;
     }
     valueLabel->setText(QString::number(value / 100.0));
+
+    if (m_instantMainEq) {
+        applyMainEqParameter(index);
+    }
 }
 
 int DlgPrefMixer::getSliderPosition(double eqFreq, int minValue, int maxValue) {
@@ -640,6 +658,8 @@ void DlgPrefMixer::slotApply() {
             ConfigValue(m_gainAutoReset ? 1 : 0));
     applySelectionsToDecks();
 
+    applyMainEQ();
+
     // EQ shelves //////////////////////////////////////////////////////////////
     if (m_initializing) {
         return;
@@ -759,6 +779,7 @@ void DlgPrefMixer::slotUpdate() {
     slotLoEqSliderChanged();
     slotHiEqSliderChanged();
 
+    CheckBoxInstantMainEQ->setChecked(m_instantMainEq);
     updateMainEQ();
 }
 
@@ -933,7 +954,6 @@ void DlgPrefMixer::updateMainEQ() {
 }
 
 void DlgPrefMixer::slotMainEqEffectChanged(int effectIndex) {
-    // TODO Add GUI hint that EQ changes are applied instantly
     // Clear parameters view first
     qDeleteAll(m_mainEQSliders);
     m_mainEQSliders.clear();
@@ -1003,6 +1023,10 @@ void DlgPrefMixer::slotMainEqEffectChanged(int effectIndex) {
         m_mainEQValues.append(valueLabel);
         slidersGridLayout->addWidget(valueLabel, 2, i + 1, Qt::AlignCenter);
     }
+
+    if (m_instantMainEq) {
+        applyMainEQ();
+    }
 }
 
 double DlgPrefMixer::getEqFreq(int sliderVal, int minValue, int maxValue) {
diff --git a/src/preferences/dialog/dlgprefmixer.h b/src/preferences/dialog/dlgprefmixer.h
index 8fbef59e91e..ec2521a6ef6 100644
--- a/src/preferences/dialog/dlgprefmixer.h
+++ b/src/preferences/dialog/dlgprefmixer.h
@@ -42,6 +42,7 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
     void slotUpdateXFader();
     void slotHiEqSliderChanged();
     void slotLoEqSliderChanged();
+    void slotInstantMainEQToggled(bool checked);
 
     // Update the Main EQ
     void slotMainEQParameterSliderChanged(int value);
@@ -111,6 +112,7 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
     bool m_eqAutoReset;
     bool m_gainAutoReset;
     bool m_eqBypass;
+    bool m_instantMainEq;
 
     bool m_initializing;
 
diff --git a/src/preferences/dialog/dlgprefmixerdlg.ui b/src/preferences/dialog/dlgprefmixerdlg.ui
index 3a1f98269cf..8fb82b1edef 100644
--- a/src/preferences/dialog/dlgprefmixerdlg.ui
+++ b/src/preferences/dialog/dlgprefmixerdlg.ui
@@ -576,6 +576,18 @@
       <string>Main EQ</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_3">
+
+      <item>
+       <widget class="QCheckBox" name="CheckBoxInstantMainEQ">
+        <property name="toolTip">
+         <string>EQ parameters are applied instantly without clicking Apply</string>
+        </property>
+        <property name="text">
+         <string>Apply EQ parameters instantly</string>
+        </property>
+       </widget>
+      </item>
+
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <item>
@@ -658,6 +670,7 @@
   <tabstop>CheckBoxGainAutoReset</tabstop>
   <tabstop>SliderHiEQ</tabstop>
   <tabstop>SliderLoEQ</tabstop>
+  <tabstop>CheckBoxInstantMainEQ</tabstop>
   <tabstop>comboBoxMainEq</tabstop>
   <tabstop>pbResetMainEq</tabstop>
   <!-- TODO(ronso0)

From 2fdaee3f6b471c532b2f04bd510dcabd336c4b2f Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 2 May 2023 00:08:47 +0200
Subject: [PATCH 018/388] Pref Mixer, main EQ: tweak parameter slider steps and
 value labels

---
 src/preferences/dialog/dlgprefmixer.cpp | 40 +++++++++++++++++++++----
 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index f8e9252fcbd..a593e27fb77 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -579,7 +579,12 @@ void DlgPrefMixer::slotMainEQParameterSliderChanged(int value) {
     VERIFY_OR_DEBUG_ASSERT(valueLabel) {
         return;
     }
-    valueLabel->setText(QString::number(value / 100.0));
+    // hide decimals for large ranges
+    if (slider->property("roundToInt").toBool()) {
+        valueLabel->setText(QString::number(std::round(value / 100.0)));
+    } else {
+        valueLabel->setText(QString::number(value / 100.0));
+    }
 
     if (m_instantMainEq) {
         applyMainEqParameter(index);
@@ -996,8 +1001,20 @@ void DlgPrefMixer::slotMainEqEffectChanged(int effectIndex) {
         slider->setMinimumHeight(90);
         slider->setMinimum(static_cast<int>(param->getMinimum() * 100));
         slider->setMaximum(static_cast<int>(param->getMaximum() * 100));
-        // TODO make steps depend on range: 0.1, 1, 10, 100
-        slider->setSingleStep(1);
+        // Make steps depend on range
+        int step = 1;
+        bool roundToInt = false;
+        const double range = param->getMaximum() - param->getMinimum();
+        if (range > 1000) {
+            step = 100;
+            // Used to round value text to integer
+            roundToInt = true;
+        } else if (range > 100) {
+            step = 10;
+        }
+        slider->setProperty("roundToInt", roundToInt);
+        slider->setSingleStep(step);
+        slider->setPageStep(step * 10);
         slider->setValue(static_cast<int>(param->getDefault() * 100));
         // Set the index as a property because we need it in applyMainEqParameter
         // Ignore scroll events if slider is not focused.
@@ -1018,8 +1035,21 @@ void DlgPrefMixer::slotMainEqEffectChanged(int effectIndex) {
         QLabel* valueLabel = new QLabel(this);
         QString valueText = QString::number((double)slider->value() / 100);
         valueLabel->setText(valueText);
-        // TODO use max required label width so column width doesn't change
-        // when slider is moved. See WEffectParameterNameBase::parameterUpdated()
+
+        // Use max required label width so column width doesn't change
+        // when slider is moved.
+        // Considers decimals only where we actually show them
+        QFontMetrics metrics(font());
+        QString maxValueString = QString::number(
+                roundToInt ? slider->maximum() : slider->maximum() - 0.01);
+        QString minValueString = QString::number(
+                slider->maximum() ? slider->minimum() : slider->minimum() + 0.01);
+        int optWidth = math_max(
+                metrics.size(0, maxValueString).width(),
+                metrics.size(0, minValueString).width());
+        valueLabel->setMinimumWidth(optWidth);
+        valueLabel->setAlignment(Qt::AlignCenter);
+
         m_mainEQValues.append(valueLabel);
         slidersGridLayout->addWidget(valueLabel, 2, i + 1, Qt::AlignCenter);
     }

From b4c880b462b81a599b403892312ad66358604317 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Sat, 29 Apr 2023 12:50:34 +0200
Subject: [PATCH 019/388] Pref Mixer, EQ shelves: add checkbox to apply shelves
 instantly

---
 src/preferences/dialog/dlgprefmixer.cpp   | 29 ++++++++++++++++++++---
 src/preferences/dialog/dlgprefmixer.h     |  6 +++++
 src/preferences/dialog/dlgprefmixerdlg.ui | 12 ++++++++++
 3 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index a593e27fb77..a73e43bac1c 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -72,6 +72,7 @@ DlgPrefMixer::DlgPrefMixer(
           m_eqAutoReset(false),
           m_gainAutoReset(false),
           m_eqBypass(false),
+          m_instantEqShelves(false),
           m_instantMainEq(false),
           m_initializing(true) {
     setupUi(this);
@@ -131,6 +132,11 @@ DlgPrefMixer::DlgPrefMixer(
             this,
             &DlgPrefMixer::slotSingleEqToggled);
 
+    connect(CheckBoxInstantEQShelves,
+            &QCheckBox::toggled,
+            this,
+            &DlgPrefMixer::slotInstantEQShelvesToggled);
+
     connect(CheckBoxInstantMainEQ,
             &QCheckBox::toggled,
             this,
@@ -357,6 +363,13 @@ void DlgPrefMixer::slotSingleEqToggled(bool checked) {
     applySelectionsToDecks();
 }
 
+void DlgPrefMixer::slotInstantEQShelvesToggled(bool checked) {
+    m_instantEqShelves = checked;
+    if (checked) {
+        applyEQShelves();
+    }
+}
+
 void DlgPrefMixer::slotInstantMainEQToggled(bool checked) {
     m_instantMainEq = checked;
     if (checked) {
@@ -408,6 +421,7 @@ void DlgPrefMixer::slotResetToDefaults() {
     CheckBoxEqAutoReset->setChecked(m_eqAutoReset);
     CheckBoxGainAutoReset->setChecked(m_gainAutoReset);
 
+    CheckBoxInstantEQShelves->setChecked(false);
     setDefaultShelves();
     slotMainEQToDefault();
     CheckBoxInstantMainEQ->setChecked(false);
@@ -542,7 +556,9 @@ void DlgPrefMixer::slotHiEqSliderChanged() {
         TextHiEQ->setText(QString("%1 kHz").arg((int)m_highEqFreq / 1000.));
     }
 
-    // TODO Maybe add a 'Apply values immediately" checkbox for instant testing (sweep freq)?
+    if (m_instantEqShelves) {
+        applyEQShelves();
+    }
 }
 
 void DlgPrefMixer::slotLoEqSliderChanged() {
@@ -559,7 +575,9 @@ void DlgPrefMixer::slotLoEqSliderChanged() {
         TextLoEQ->setText(QString("%1 kHz").arg((int)m_lowEqFreq / 1000.));
     }
 
-    // TODO Maybe add a 'Apply values immediately" checkbox for instant testing (sweep freq)?
+    if (m_instantEqShelves) {
+        applyEQShelves();
+    }
 }
 
 void DlgPrefMixer::slotMainEQParameterSliderChanged(int value) {
@@ -663,9 +681,12 @@ void DlgPrefMixer::slotApply() {
             ConfigValue(m_gainAutoReset ? 1 : 0));
     applySelectionsToDecks();
 
+    applyEQShelves();
+
     applyMainEQ();
+}
 
-    // EQ shelves //////////////////////////////////////////////////////////////
+void DlgPrefMixer::applyEQShelves() {
     if (m_initializing) {
         return;
     }
@@ -757,6 +778,8 @@ void DlgPrefMixer::slotUpdate() {
     double lowEqFreq = 0.0;
     double highEqFreq = 0.0;
 
+    CheckBoxInstantEQShelves->setChecked(m_instantEqShelves);
+
     // Precise takes precedence over coarse.
     lowEqFreq = lowEqCourse.isEmpty() ? lowEqFreq : lowEqCourse.toDouble();
     lowEqFreq = lowEqPrecise.isEmpty() ? lowEqFreq : lowEqPrecise.toDouble();
diff --git a/src/preferences/dialog/dlgprefmixer.h b/src/preferences/dialog/dlgprefmixer.h
index ec2521a6ef6..ab0773e9410 100644
--- a/src/preferences/dialog/dlgprefmixer.h
+++ b/src/preferences/dialog/dlgprefmixer.h
@@ -42,6 +42,8 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
     void slotUpdateXFader();
     void slotHiEqSliderChanged();
     void slotLoEqSliderChanged();
+
+    void slotInstantEQShelvesToggled(bool checked);
     void slotInstantMainEQToggled(bool checked);
 
     // Update the Main EQ
@@ -51,6 +53,7 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
 
   private:
     void drawXfaderDisplay();
+
     void setDefaultShelves();
     double getEqFreq(int value, int minimum, int maximum);
     int getSliderPosition(double eqFreq, int minimum, int maximum);
@@ -58,6 +61,8 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
 
     void applySelectionsToDecks();
 
+    void applyEQShelves();
+
     void setUpMainEQ();
     void updateMainEQ();
     void applyMainEQ();
@@ -112,6 +117,7 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
     bool m_eqAutoReset;
     bool m_gainAutoReset;
     bool m_eqBypass;
+    bool m_instantEqShelves;
     bool m_instantMainEq;
 
     bool m_initializing;
diff --git a/src/preferences/dialog/dlgprefmixerdlg.ui b/src/preferences/dialog/dlgprefmixerdlg.ui
index 8fb82b1edef..5b8ab8519b3 100644
--- a/src/preferences/dialog/dlgprefmixerdlg.ui
+++ b/src/preferences/dialog/dlgprefmixerdlg.ui
@@ -336,6 +336,17 @@
      </property>
      <layout class="QVBoxLayout" name="vBoxLayout_1">
 
+      <item>
+       <widget class="QCheckBox" name="CheckBoxInstantEQShelves">
+        <property name="toolTip">
+         <string>EQ shelves are applied instantly without clicking Apply</string>
+        </property>
+        <property name="text">
+         <string>Apply EQ shelves instantly</string>
+        </property>
+       </widget>
+      </item>
+
       <item>
        <widget class="QWidget" name="GroupHiEQ" native="true">
         <layout class="QVBoxLayout" name="vBoxLayout_2">
@@ -668,6 +679,7 @@
   <tabstop>CheckBoxBypass</tabstop>
   <tabstop>CheckBoxEqAutoReset</tabstop>
   <tabstop>CheckBoxGainAutoReset</tabstop>
+  <tabstop>CheckBoxInstantEQShelves</tabstop>
   <tabstop>SliderHiEQ</tabstop>
   <tabstop>SliderLoEQ</tabstop>
   <tabstop>CheckBoxInstantMainEQ</tabstop>

From 21d5f5e8f29d201bb915caa83d5f9489a691689e Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Mon, 1 May 2023 23:10:46 +0200
Subject: [PATCH 020/388] Pref Mixer, EQ shelves: fix update, improve
 precision, avoid round trip errors

Increase slider range (int, linear) for more precision when calculating the corresponding EQ frequency
(double, exponential) and vice versa.
Previously there was a round-trip rounding issue that would decrease certain high EQ frequencies on each update
until they'd settle at certain values that are appearantly not affected. This was also noticeable when recalling
the defaults (250 Hz, 2500 Hz), which resulted in 2484 Hz and 246 Hz.
---
 src/preferences/dialog/dlgprefmixer.cpp   | 33 +++++++++--------------
 src/preferences/dialog/dlgprefmixerdlg.ui | 26 +++++++-----------
 2 files changed, 23 insertions(+), 36 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index a73e43bac1c..cb198e1d0fa 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -390,8 +390,6 @@ void DlgPrefMixer::setDefaultShelves() {
             getSliderPosition(250,
                     SliderLoEQ->minimum(),
                     SliderLoEQ->maximum()));
-    slotLoEqSliderChanged();
-    slotHiEqSliderChanged();
 }
 
 void DlgPrefMixer::slotResetToDefaults() {
@@ -621,7 +619,7 @@ int DlgPrefMixer::getSliderPosition(double eqFreq, int minValue, int maxValue) {
     double dsliderPos = (eqFreq - kFrequencyLowerLimit) /
             (kFrequencyUpperLimit - kFrequencyLowerLimit);
     dsliderPos = pow(dsliderPos, 1.0 / 4.0) * (maxValue - minValue) + minValue;
-    return static_cast<int>(dsliderPos);
+    return static_cast<int>(std::round(dsliderPos));
 }
 
 void DlgPrefMixer::slotApply() {
@@ -788,25 +786,20 @@ void DlgPrefMixer::slotUpdate() {
 
     if (lowEqFreq == 0.0 || highEqFreq == 0.0 || lowEqFreq == highEqFreq) {
         setDefaultShelves();
-        lowEqFreq = m_pConfig->getValueString(
-                                     ConfigKey(kConfigGroup, "LoEQFrequencyPrecise"))
-                            .toDouble();
-        highEqFreq = m_pConfig->getValueString(
-                                      ConfigKey(kConfigGroup, "HiEQFrequencyPrecise"))
-                             .toDouble();
+        // apply instantly so WYYSIWYG
+        applyEQShelves();
+    } else {
+        SliderHiEQ->setValue(
+                getSliderPosition(highEqFreq,
+                        SliderHiEQ->minimum(),
+                        SliderHiEQ->maximum()));
+
+        SliderLoEQ->setValue(
+                getSliderPosition(lowEqFreq,
+                        SliderLoEQ->minimum(),
+                        SliderLoEQ->maximum()));
     }
 
-    SliderHiEQ->setValue(
-            getSliderPosition(highEqFreq,
-                    SliderHiEQ->minimum(),
-                    SliderHiEQ->maximum()));
-    SliderLoEQ->setValue(
-            getSliderPosition(lowEqFreq,
-                    SliderLoEQ->minimum(),
-                    SliderLoEQ->maximum()));
-    slotLoEqSliderChanged();
-    slotHiEqSliderChanged();
-
     CheckBoxInstantMainEQ->setChecked(m_instantMainEq);
     updateMainEQ();
 }
diff --git a/src/preferences/dialog/dlgprefmixerdlg.ui b/src/preferences/dialog/dlgprefmixerdlg.ui
index 5b8ab8519b3..49b61dc78d3 100644
--- a/src/preferences/dialog/dlgprefmixerdlg.ui
+++ b/src/preferences/dialog/dlgprefmixerdlg.ui
@@ -371,26 +371,23 @@
          <item>
           <widget class="QSlider" name="SliderHiEQ">
            <property name="minimum">
-            <number>80</number>
+            <number>100</number>
            </property>
            <property name="maximum">
-            <number>480</number>
+            <number>100000</number>
            </property>
            <property name="singleStep">
-            <number>1</number>
+            <number>30</number>
            </property>
            <property name="pageStep">
-            <number>1</number>
+            <number>300</number>
            </property>
            <property name="value">
-            <number>80</number>
+            <number>100</number>
            </property>
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
-           <property name="tickInterval">
-            <number>5</number>
-           </property>
           </widget>
          </item>
 
@@ -486,26 +483,23 @@
          <item>
           <widget class="QSlider" name="SliderLoEQ">
            <property name="minimum">
-            <number>80</number>
+            <number>100</number>
            </property>
            <property name="maximum">
-            <number>480</number>
+            <number>100000</number>
            </property>
            <property name="singleStep">
-            <number>1</number>
+            <number>30</number>
            </property>
            <property name="pageStep">
-            <number>1</number>
+            <number>300</number>
            </property>
            <property name="value">
-            <number>80</number>
+            <number>100</number>
            </property>
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
-           <property name="tickInterval">
-            <number>5</number>
-           </property>
           </widget>
          </item>
 

From f6c44357469a5e1b7e554661064ae45e634643c4 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Mon, 1 May 2023 00:04:13 +0200
Subject: [PATCH 021/388] Pref Mixer, deck EQ & QuickEffects: rework update &
 save

load EQ effects from config only during init, load from effects engine for later updates
---
 src/preferences/dialog/dlgprefmixer.cpp | 381 +++++++++++-------------
 src/preferences/dialog/dlgprefmixer.h   |  14 +-
 2 files changed, 186 insertions(+), 209 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index cb198e1d0fa..144924760d3 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -67,7 +67,7 @@ DlgPrefMixer::DlgPrefMixer(
           m_pBackendManager(pEffectsManager->getBackendManager()),
           m_firstSelectorLabel(nullptr),
           m_pNumDecks(nullptr),
-          m_inSlotPopulateDeckEffectSelectors(false),
+          m_ignoreEqQuickEffectBoxSignals(false),
           m_singleEq(true),
           m_eqAutoReset(false),
           m_gainAutoReset(false),
@@ -77,11 +77,6 @@ DlgPrefMixer::DlgPrefMixer(
           m_initializing(true) {
     setupUi(this);
 
-    setUpMainEQ();
-
-    slotUpdate();
-    m_initializing = false;
-
     connect(SliderXFader,
             QOverload<int>::of(&QSlider::valueChanged),
             this,
@@ -125,7 +120,7 @@ DlgPrefMixer::DlgPrefMixer(
     connect(CheckBoxEqOnly,
             &QCheckBox::toggled,
             this,
-            &DlgPrefMixer::slotPopulateDeckEffectSelectors);
+            &DlgPrefMixer::slotPopulateDeckEqSelectors);
 
     connect(CheckBoxSingleEqEffect,
             &QCheckBox::toggled,
@@ -142,27 +137,35 @@ DlgPrefMixer::DlgPrefMixer(
             this,
             &DlgPrefMixer::slotInstantMainEQToggled);
 
-    // Add drop down lists for current decks and connect num_decks control
-    // to slotNumDecksChanged
-    m_pNumDecks = new ControlProxy("[Master]", "num_decks", this);
-    m_pNumDecks->connectValueChanged(this, &DlgPrefMixer::slotNumDecksChanged);
-    slotNumDecksChanged(m_pNumDecks->get());
-
+    // Update the QuickEffect selectors when the effect list was changed
+    // in Effects preferences
     connect(m_pChainPresetManager.data(),
             &EffectChainPresetManager::quickEffectChainPresetListUpdated,
             this,
-            &DlgPrefMixer::slotPopulateDeckEffectSelectors);
+            &DlgPrefMixer::slotPopulateQuickEffectSelectors);
+
+    setUpMainEQ();
+
+    // Update only after all settings are loaded, except EQs and QuickEffecs.
+    // slotNumDecksChanged() needs the correct state of 'Same EQ for all decks".
+    slotUpdate();
+
+    // Add drop down lists for current decks and connect to num_decks control
+    // so new lists are added if new decks are added.
+    m_pNumDecks = new ControlProxy("[Master]", "num_decks", this);
+    m_pNumDecks->connectValueChanged(this, &DlgPrefMixer::slotNumDecksChanged);
+    slotNumDecksChanged(m_pNumDecks->get());
 
     setScrollSafeGuard(SliderXFader);
     setScrollSafeGuard(SliderHiEQ);
     setScrollSafeGuard(SliderLoEQ);
     setScrollSafeGuard(comboBoxMainEq);
 
-    slotUpdate();
-
-    // Save all settings back to config, especially EQs and QuickEffects might
-    // have changed.
+    // This applies the Main EQ and saves default values of previously missing
+    // ConfigKeys. EQ/QuickEffects are already applied by slotNumDecksChanged().
     slotApply();
+
+    m_initializing = false;
 }
 
 DlgPrefMixer::~DlgPrefMixer() {
@@ -173,41 +176,62 @@ DlgPrefMixer::~DlgPrefMixer() {
     m_deckQuickEffectSelectors.clear();
 }
 
+// Create EQ & QuickEffect selectors and deck label for each added deck
 void DlgPrefMixer::slotNumDecksChanged(double numDecks) {
-    int oldDecks = m_deckEqEffectSelectors.size();
     while (m_deckEqEffectSelectors.size() < static_cast<int>(numDecks)) {
         int deckNo = m_deckEqEffectSelectors.size() + 1;
+        QString deckGroup = PlayerManager::groupForDeck(deckNo - 1);
 
         QLabel* label = new QLabel(QObject::tr("Deck %1").arg(deckNo), this);
 
-        // Create the drop down list for deck EQs
+        // Create the EQ selector //////////////////////////////////////////////
         QComboBox* pEqComboBox = new QComboBox(this);
+        setScrollSafeGuard(pEqComboBox);
         m_deckEqEffectSelectors.append(pEqComboBox);
+
+        // Load EQ from from mixxx.cfg, add and select it in the comboboxe
+        // If the ConfigKey exists the EQ is loaded. If the value is empty no
+        // EQ was selected ('---').
+        // If the key doesn't exist the default EQ is loaded.
+        QString configuredEffect = m_pConfig->getValue<QString>(
+                ConfigKey(kConfigGroup, kEffectForGroupPrefix + deckGroup),
+                kDefaultEqId);
+        const EffectManifestPointer pEQManifest =
+                m_pBackendManager->getManifestFromUniqueId(configuredEffect);
+        // We just add the one required item to the box so
+        // applyDeckEQs() can load it.
+        if (pEQManifest) {
+            pEqComboBox->addItem(pEQManifest->name(), QVariant(pEQManifest->uniqueId()));
+        } else {
+            // the previous EQ was 'none' or its uid can't be found
+            pEqComboBox->addItem(kNoEffectString);
+        }
+        pEqComboBox->setCurrentIndex(0);
+
         connect(pEqComboBox,
                 QOverload<int>::of(&QComboBox::currentIndexChanged),
                 this,
                 &DlgPrefMixer::slotEQEffectChangedOnDeck);
-        setScrollSafeGuard(pEqComboBox);
 
-        // Create the drop down list for Quick Effects
+        // Create the QuickEffect selector /////////////////////////////////////
         QComboBox* pQuickEffectComboBox = new QComboBox(this);
+        setScrollSafeGuard(pQuickEffectComboBox);
         m_deckQuickEffectSelectors.append(pQuickEffectComboBox);
         connect(pQuickEffectComboBox,
                 QOverload<int>::of(&QComboBox::currentIndexChanged),
                 this,
                 &DlgPrefMixer::slotQuickEffectChangedOnDeck);
-        setScrollSafeGuard(pQuickEffectComboBox);
-
-        QString deckGroupName = PlayerManager::groupForDeck(deckNo - 1);
-        QString unitGroup = QuickEffectChain::formatEffectChainGroup(deckGroupName);
+        // Change the QuickEffect when it was changed in WEffectChainPresetSelector
+        // or with controllers
+        QString unitGroup = QuickEffectChain::formatEffectChainGroup(deckGroup);
         EffectChainPointer pChain = m_pEffectsManager->getEffectChain(unitGroup);
         connect(pChain.data(),
                 &EffectChain::chainPresetChanged,
                 this,
                 [this, pQuickEffectComboBox](const QString& name) {
-                    m_inSlotPopulateDeckEffectSelectors = true;
+                    m_ignoreEqQuickEffectBoxSignals = true;
                     pQuickEffectComboBox->setCurrentIndex(pQuickEffectComboBox->findText(name));
-                    m_inSlotPopulateDeckEffectSelectors = false;
+                    m_ignoreEqQuickEffectBoxSignals = false;
                 });
 
         if (deckNo == 1) {
@@ -217,7 +241,7 @@ void DlgPrefMixer::slotNumDecksChanged(double numDecks) {
             }
         }
 
-        // Setup the GUI
+        // Add the new widgets
         gridLayout_3->addWidget(label, deckNo, 0);
         gridLayout_3->addWidget(pEqComboBox, deckNo, 1);
         gridLayout_3->addWidget(pQuickEffectComboBox, deckNo, 2);
@@ -229,108 +253,83 @@ void DlgPrefMixer::slotNumDecksChanged(double numDecks) {
                 1,
                 1);
     }
-    slotPopulateDeckEffectSelectors();
-    for (int i = oldDecks; i < static_cast<int>(numDecks); ++i) {
-        // Set the configured effect for box and simpleBox or default
-        // if none is configured
-        QString group = PlayerManager::groupForDeck(i);
-        QString configuredEffect = m_pConfig->getValue(
-                ConfigKey(kConfigGroup, kEffectForGroupPrefix + group),
-                kDefaultEqId);
+    applyDeckEQs();
 
-        const EffectManifestPointer pEQManifest =
-                m_pBackendManager->getManifestFromUniqueId(configuredEffect);
+    // This also selects all currently loaded EQs and QuickEffects
+    slotPopulateDeckEqSelectors();
+    slotPopulateQuickEffectSelectors();
 
-        int selectedEQEffectIndex = 0; // placeholder for no effect
-        if (pEQManifest) {
-            selectedEQEffectIndex = m_deckEqEffectSelectors[i]->findData(
-                    QVariant(pEQManifest->uniqueId()));
-        }
-        m_deckEqEffectSelectors[i]->setCurrentIndex(selectedEQEffectIndex);
-    }
-    applySelectionsToDecks();
+    // Ensure all newly created but unneeded widgets are hidden
     slotSingleEqToggled(m_singleEq);
 }
 
-void DlgPrefMixer::slotPopulateDeckEffectSelectors() {
-    m_inSlotPopulateDeckEffectSelectors = true; // prevents a recursive call
-
-    EffectManifestFilterFnc filterEQ;
-    if (CheckBoxEqOnly->isChecked()) {
-        filterEQ = isMixingEQ;
-    } else {
-        filterEQ = nullptr; // take all
-    }
-
-    populateDeckEqBoxList(m_deckEqEffectSelectors, filterEQ);
-    populateDeckQuickEffectBoxList(m_deckQuickEffectSelectors);
-
-    m_inSlotPopulateDeckEffectSelectors = false;
-}
+void DlgPrefMixer::slotPopulateDeckEqSelectors() {
+    m_ignoreEqQuickEffectBoxSignals = true; // prevents a recursive call
 
-void DlgPrefMixer::populateDeckEqBoxList(
-        const QList<QComboBox*>& boxList,
-        EffectManifestFilterFnc filterFunc) {
+    m_eqEffectsOnly = CheckBoxEqOnly->isChecked();
+    EffectManifestFilterFnc filterFunc = m_eqEffectsOnly ? isMixingEQ : nullptr;
     const QList<EffectManifestPointer> pManifestList = getFilteredManifests(filterFunc);
-    for (QComboBox* box : boxList) {
+    for (QComboBox* box : qAsConst(m_deckEqEffectSelectors)) {
         // Populate comboboxes with all available effects
-        // Save current selection
-        const EffectManifestPointer pCurrentlySelectedManifest =
-                m_pBackendManager->getManifestFromUniqueId(
-                        box->itemData(box->currentIndex()).toString());
+        // Get currently loaded EQ effect
+        int deck = m_deckEqEffectSelectors.indexOf(box);
+        auto pChainSlot = m_pEffectsManager->getEqualizerEffectChain(
+                PlayerManager::groupForDeck(deck));
+        VERIFY_OR_DEBUG_ASSERT(pChainSlot) {
+            return;
+        }
+        auto pEffectSlot = pChainSlot->getEffectSlot(0);
+        VERIFY_OR_DEBUG_ASSERT(pEffectSlot) {
+            return;
+        }
+        const EffectManifestPointer pLoadedManifest =
+                pEffectSlot->getManifest();
 
         box->clear();
-        int currentIndex = -1; // Nothing selected
-
-        // Add empty item at the top: no effect
+        // Add empty item at the top (no effect)
         box->addItem(kNoEffectString);
-        int i = 1;
+        int currentIndex = 0; // store it as default selection
         for (const auto& pManifest : pManifestList) {
             box->addItem(pManifest->name(), QVariant(pManifest->uniqueId()));
-            if (pCurrentlySelectedManifest &&
-                    pCurrentlySelectedManifest.data() == pManifest.data()) {
-                currentIndex = i;
+            if (pLoadedManifest &&
+                    pLoadedManifest.data() == pManifest.data()) {
+                currentIndex = box->count() - 1;
             }
-            ++i;
         }
-        if (pCurrentlySelectedManifest == nullptr) {
-            // Configured effect has no id, clear selection
-            currentIndex = 0;
-        } else if (currentIndex < 0) {
-            // current selection is not part of the new list
-            // So we need to add it
-            box->addItem(pCurrentlySelectedManifest->shortName(),
-                    QVariant(pCurrentlySelectedManifest->uniqueId()));
-            currentIndex = i + 1;
+        if (pLoadedManifest && currentIndex == 0) {
+            // Current selection is not part of the new list so we need to add it
+            box->addItem(pLoadedManifest->displayName(),
+                    QVariant(pLoadedManifest->uniqueId()));
+            currentIndex = box->count() - 1;
         }
         box->setCurrentIndex(currentIndex);
     }
+    m_ignoreEqQuickEffectBoxSignals = false;
 }
 
-void DlgPrefMixer::populateDeckQuickEffectBoxList(
-        const QList<QComboBox*>& boxList) {
+void DlgPrefMixer::slotPopulateQuickEffectSelectors() {
+    m_ignoreEqQuickEffectBoxSignals = true;
+
     QList<EffectChainPresetPointer> presetList =
             m_pChainPresetManager->getQuickEffectPresetsSorted();
 
-    int deck = 0;
-    for (QComboBox* box : boxList) {
+    for (QComboBox* box : qAsConst(m_deckQuickEffectSelectors)) {
+        int deck = m_deckQuickEffectSelectors.indexOf(box);
         box->clear();
-        int currentIndex = -1; // Nothing selected
+        int currentIndex = 0; // preselect empty item '---' as default
 
         QString deckGroupName = PlayerManager::groupForDeck(deck);
         QString unitGroup = QuickEffectChain::formatEffectChainGroup(deckGroupName);
         EffectChainPointer pChain = m_pEffectsManager->getEffectChain(unitGroup);
-        int i = 0;
         for (const auto& pChainPreset : presetList) {
             box->addItem(pChainPreset->name());
             if (pChain->presetName() == pChainPreset->name()) {
-                currentIndex = i;
+                currentIndex = box->count() - 1;
             }
-            ++i;
         }
         box->setCurrentIndex(currentIndex);
-        ++deck;
     }
+    m_ignoreEqQuickEffectBoxSignals = false;
 }
 
 void DlgPrefMixer::slotSingleEqToggled(bool checked) {
@@ -358,9 +357,6 @@ void DlgPrefMixer::slotSingleEqToggled(bool checked) {
             m_firstSelectorLabel->setText(QObject::tr("Deck 1"));
         }
     }
-
-    // TODO move this line to slotApply()
-    applySelectionsToDecks();
 }
 
 void DlgPrefMixer::slotInstantEQShelvesToggled(bool checked) {
@@ -405,11 +401,11 @@ void DlgPrefMixer::slotResetToDefaults() {
     checkBoxReverse->setChecked(false);
 
     // EQ //////////////////////////////////
-    for (const auto& pCombo : std::as_const(m_deckEqEffectSelectors)) {
+    for (const auto& pCombo : qAsConst(m_deckEqEffectSelectors)) {
         pCombo->setCurrentIndex(
                 pCombo->findData(kDefaultEqId));
     }
-    for (const auto& pCombo : std::as_const(m_deckQuickEffectSelectors)) {
+    for (const auto& pCombo : qAsConst(m_deckQuickEffectSelectors)) {
         pCombo->setCurrentIndex(
                 pCombo->findText(kDefaultQuickEffectChainName));
     }
@@ -429,115 +425,130 @@ void DlgPrefMixer::slotResetToDefaults() {
 void DlgPrefMixer::slotEQEffectChangedOnDeck(int effectIndex) {
     QComboBox* c = qobject_cast<QComboBox*>(sender());
     // Check if qobject_cast was successful
-    if (!c || m_inSlotPopulateDeckEffectSelectors) {
+    if (!c || m_ignoreEqQuickEffectBoxSignals) {
         return;
     }
 
-    QList<QComboBox*>* pBoxList = &m_deckEqEffectSelectors;
-    int deckNumber = pBoxList->indexOf(c);
+    int deckNumber = m_deckEqEffectSelectors.indexOf(c);
     // If we are in single-effect mode and the first effect was changed,
     // change the others as well.
     if (deckNumber == 0 && m_singleEq) {
-        for (int otherDeck = 1;
-                otherDeck < static_cast<int>(m_pNumDecks->get());
-                ++otherDeck) {
-            QComboBox* box = (*pBoxList)[otherDeck];
+        for (QComboBox* box : qAsConst(m_deckEqEffectSelectors)) {
+            if (box == c) { // first deck already set, skip
+                continue;
+            }
             box->setCurrentIndex(effectIndex);
         }
     }
-
-    // This is required to remove a previous selected effect that does not
-    // fit to the current 'EQ effects only' checkbox
-    slotPopulateDeckEffectSelectors();
 }
 
 void DlgPrefMixer::slotQuickEffectChangedOnDeck(int effectIndex) {
     QComboBox* c = qobject_cast<QComboBox*>(sender());
     // Check if qobject_cast was successful
-    if (!c || m_inSlotPopulateDeckEffectSelectors) {
+    if (!c || m_ignoreEqQuickEffectBoxSignals) {
         return;
     }
 
-    QList<QComboBox*>* pBoxList = &m_deckQuickEffectSelectors;
-    int deckNumber = pBoxList->indexOf(c);
+    int deckNumber = m_deckQuickEffectSelectors.indexOf(c);
     // If we are in single-effect mode and the first effect was changed,
     // change the others as well.
     if (deckNumber == 0 && m_singleEq) {
-        for (int otherDeck = 1;
-                otherDeck < static_cast<int>(m_pNumDecks->get());
-                ++otherDeck) {
-            QComboBox* box = m_deckQuickEffectSelectors[otherDeck];
+        for (QComboBox* box : qAsConst(m_deckQuickEffectSelectors)) {
+            if (box == c) { // first deck already set, skip
+                continue;
+            }
             box->setCurrentIndex(effectIndex);
         }
     }
 }
 
-void DlgPrefMixer::applySelectionsToDecks() {
-    if (m_inSlotPopulateDeckEffectSelectors) {
-        return;
-    }
+void DlgPrefMixer::applyDeckEQs() {
+    m_ignoreEqQuickEffectBoxSignals = true;
 
-    // EQ effects
-    for (QComboBox* box : std::as_const(m_deckEqEffectSelectors)) {
+    for (const auto& box : qAsConst(m_deckEqEffectSelectors)) {
         int deck = m_deckEqEffectSelectors.indexOf(box);
-        QString deckGroup = PlayerManager::groupForDeck(deck);
-
-        const EffectManifestPointer pManifest =
-                m_pBackendManager->getManifestFromUniqueId(
-                        box->itemData(box->currentIndex()).toString());
+        int effectIndex = box->currentIndex();
 
         bool needLoad = true;
         bool startingUp = m_eqIndiciesOnUpdate.size() < (deck + 1);
         if (!startingUp) {
-            needLoad = box->currentIndex() != m_eqIndiciesOnUpdate[deck];
+            needLoad = effectIndex != m_eqIndiciesOnUpdate[deck];
         }
-        if (needLoad) {
-            auto pChainSlot = m_pEffectsManager->getEqualizerEffectChain(deckGroup);
 
-            VERIFY_OR_DEBUG_ASSERT(pChainSlot) {
-                return;
-            }
+        QString deckGroup = PlayerManager::groupForDeck(deck);
+        auto pChainSlot = m_pEffectsManager->getEqualizerEffectChain(deckGroup);
+        VERIFY_OR_DEBUG_ASSERT(pChainSlot) {
+            return;
+        }
+        auto pEffectSlot = pChainSlot->getEffectSlot(0);
+        VERIFY_OR_DEBUG_ASSERT(pEffectSlot) {
+            return;
+        }
+        pEffectSlot->setEnabled(!m_eqBypass);
 
-            auto pEffectSlot = pChainSlot->getEffectSlot(0);
+        const EffectManifestPointer pManifest =
+                m_pBackendManager->getManifestFromUniqueId(
+                        box->itemData(effectIndex).toString());
+        if (needLoad) {
             pEffectSlot->loadEffectWithDefaults(pManifest);
             if (pManifest && pManifest->isMixingEQ() && !m_eqBypass) {
                 pChainSlot->setFilterWaveform(true);
             } else {
                 pChainSlot->setFilterWaveform(false);
             }
+        }
 
-            if (!startingUp) {
-                m_eqIndiciesOnUpdate[deck] = box->currentIndex();
-            }
-
-            QString configString;
-            if (pManifest) {
-                configString = pManifest->uniqueId();
-            }
-            // TODO store this in effects.xml
-            m_pConfig->set(ConfigKey(kConfigGroup, kEffectForGroupPrefix + deckGroup),
-                    configString);
+        if (startingUp) {
+            m_eqIndiciesOnUpdate.append(effectIndex);
+        } else {
+            m_eqIndiciesOnUpdate[deck] = effectIndex;
+        }
 
-            // This is required to remove a previous selected effect that does not
-            // fit to the current ShowAllEffects checkbox
-            slotPopulateDeckEffectSelectors();
+        QString effectId;
+        if (pManifest) {
+            effectId = pManifest->uniqueId();
         }
+        // TODO store this in effects.xml
+        m_pConfig->set(ConfigKey(kConfigGroup, kEffectForGroupPrefix + deckGroup),
+                effectId);
     }
+    m_ignoreEqQuickEffectBoxSignals = false;
+}
+
+void DlgPrefMixer::applyQuickEffects() {
+    m_ignoreEqQuickEffectBoxSignals = true;
 
-    // Quick effects
     for (const auto& box : qAsConst(m_deckQuickEffectSelectors)) {
         int deck = m_deckQuickEffectSelectors.indexOf(box);
-        QString deckGroup = PlayerManager::groupForDeck(deck);
-        const QString quickEffectGroup = QuickEffectChain::formatEffectChainGroup(deckGroup);
-        EffectChainPointer pChain = m_pEffectsManager->getEffectChain(quickEffectGroup);
-        const QList<EffectChainPresetPointer> presetList =
-                m_pChainPresetManager->getQuickEffectPresetsSorted();
         int effectIndex = box->currentIndex();
-        // TODO handle index < 0 ??
-        if (pChain && effectIndex >= 0 && effectIndex < presetList.size()) {
-            pChain->loadChainPreset(presetList[effectIndex]);
+
+        bool needLoad = true;
+        bool startingUp = m_quickEffectIndiciesOnUpdate.size() < (deck + 1);
+        if (!startingUp) {
+            needLoad = effectIndex != m_quickEffectIndiciesOnUpdate[deck];
+        }
+
+        if (needLoad) {
+            const QString quickEffectGroup = QuickEffectChain::formatEffectChainGroup(
+                    PlayerManager::groupForDeck(deck));
+            EffectChainPointer pChain = m_pEffectsManager->getEffectChain(quickEffectGroup);
+            VERIFY_OR_DEBUG_ASSERT(pChain) {
+                return;
+            }
+            const QList<EffectChainPresetPointer> presetList =
+                    m_pChainPresetManager->getQuickEffectPresetsSorted();
+            if (effectIndex >= 0 && effectIndex < presetList.size()) {
+                pChain->loadChainPreset(presetList[effectIndex]);
+            }
+        }
+
+        if (startingUp) {
+            m_quickEffectIndiciesOnUpdate.append(effectIndex);
+        } else {
+            m_quickEffectIndiciesOnUpdate[deck] = effectIndex;
         }
     }
+    m_ignoreEqQuickEffectBoxSignals = false;
 }
 
 void DlgPrefMixer::slotHiEqSliderChanged() {
@@ -642,42 +653,19 @@ void DlgPrefMixer::slotApply() {
     m_pConfig->set(ConfigKey(EngineXfader::kXfaderConfigKey, "xFaderReverse"),
             ConfigValue(checkBoxReverse->isChecked() ? 1 : 0));
 
-    // Bypass EQ ///////////////////////////////////////////////////////////////
-    m_pConfig->set(ConfigKey(kConfigGroup, kEnableEqs), ConfigValue(m_eqBypass ? "no" : "yes"));
-    // Disable/enable EQ effect processing for all decks by setting the appropriate
-    // controls to 0 or 1 ("[EqualizerRackX_EffectUnitDeck_Effect1],enabled")
-    for (const auto& box : qAsConst(m_deckEqEffectSelectors)) {
-        int deck = m_deckEqEffectSelectors.indexOf(box);
-        QString deckGroup = PlayerManager::groupForDeck(deck);
-        QString eqGroup = EqualizerEffectChain::formatEffectSlotGroup(
-                PlayerManager::groupForDeck(deck));
-        ControlObject::set(ConfigKey(eqGroup, "enabled"), m_eqBypass ? 0 : 1);
-
-        auto pChainSlot = m_pEffectsManager->getEqualizerEffectChain(deckGroup);
-        VERIFY_OR_DEBUG_ASSERT(pChainSlot) {
-            return;
-        }
-        const EffectManifestPointer pManifest =
-                m_pBackendManager->getManifestFromUniqueId(
-                        box->itemData(box->currentIndex()).toString());
-        if (pManifest && pManifest->isMixingEQ() && !m_eqBypass) {
-            pChainSlot->setFilterWaveform(true);
-        } else {
-            pChainSlot->setFilterWaveform(false);
-        }
-    }
-
-    // EQ & QuickEffect comboboxes /////////////////////////////////////////////
+    // EQ & QuickEffect settings ///////////////////////////////////////////////
+    m_pConfig->set(ConfigKey(kConfigGroup, kEnableEqs),
+            ConfigValue(m_eqBypass ? QString("yes") : QString("no")));
     m_pConfig->set(ConfigKey(kConfigGroup, kSingleEq),
             m_singleEq ? QString("yes") : QString("no"));
     m_pConfig->set(ConfigKey(kConfigGroup, kEqsOnly),
             ConfigValue(CheckBoxEqOnly->isChecked() ? "yes" : "no"));
-
     m_pConfig->set(ConfigKey(kConfigGroup, "EqAutoReset"),
             ConfigValue(m_eqAutoReset ? 1 : 0));
     m_pConfig->set(ConfigKey(kConfigGroup, "GainAutoReset"),
             ConfigValue(m_gainAutoReset ? 1 : 0));
-    applySelectionsToDecks();
+    applyDeckEQs();
+    applyQuickEffects();
 
     applyEQShelves();
 
@@ -734,22 +722,15 @@ void DlgPrefMixer::slotUpdate() {
 
     // EQs & QuickEffects //////////////////////////////////////////////////////
     m_singleEq = m_pConfig->getValue(ConfigKey(kConfigGroup, kSingleEq), "yes") == "yes";
-    slotPopulateDeckEffectSelectors();
+    if (!m_initializing) {
+        slotPopulateDeckEqSelectors();
+        slotPopulateQuickEffectSelectors();
+    }
     if (m_initializing || CheckBoxSingleEqEffect->isChecked() != m_singleEq) {
         CheckBoxSingleEqEffect->setChecked(m_singleEq);
         slotSingleEqToggled(m_singleEq);
     }
 
-    // TODO populate these index lists in each populateDeck..Boxes()
-    m_eqIndiciesOnUpdate.clear();
-    for (const auto& box : std::as_const(m_deckEqEffectSelectors)) {
-        m_eqIndiciesOnUpdate.append(box->currentIndex());
-    }
-    m_quickEffectIndiciesOnUpdate.clear();
-    for (const auto& box : std::as_const(m_deckQuickEffectSelectors)) {
-        m_quickEffectIndiciesOnUpdate.append(box->currentIndex());
-    }
-
     m_eqAutoReset = static_cast<bool>(
             m_pConfig->getValueString(ConfigKey(kConfigGroup, "EqAutoReset"))
                     .toInt());
@@ -909,7 +890,7 @@ void DlgPrefMixer::slotBypassEqToggled(bool checked) {
     m_eqBypass = checked;
 
     // De/activate deck EQ comboboxes
-    for (const auto& box : std::as_const(m_deckEqEffectSelectors)) {
+    for (const auto& box : qAsConst(m_deckEqEffectSelectors)) {
         box->setEnabled(!m_eqBypass);
     }
     // TODO Also disable relevant checkboxes
diff --git a/src/preferences/dialog/dlgprefmixer.h b/src/preferences/dialog/dlgprefmixer.h
index ab0773e9410..504b41c75d3 100644
--- a/src/preferences/dialog/dlgprefmixer.h
+++ b/src/preferences/dialog/dlgprefmixer.h
@@ -37,7 +37,8 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
     void slotBypassEqToggled(bool checked);
     // Create, populate and show/hide EQ & QuickEffect selectors, considering the
     // number of decks and the 'Single EQ' checkbox
-    void slotPopulateDeckEffectSelectors();
+    void slotPopulateDeckEqSelectors();
+    void slotPopulateQuickEffectSelectors();
 
     void slotUpdateXFader();
     void slotHiEqSliderChanged();
@@ -59,7 +60,8 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
     int getSliderPosition(double eqFreq, int minimum, int maximum);
     void validateEQShelves();
 
-    void applySelectionsToDecks();
+    void applyDeckEQs();
+    void applyQuickEffects();
 
     void applyEQShelves();
 
@@ -71,12 +73,6 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
     typedef bool (*EffectManifestFilterFnc)(EffectManifest* pManifest);
     const QList<EffectManifestPointer> getFilteredManifests(
             EffectManifestFilterFnc filterFunc) const;
-    void populateDeckEqBoxList(
-            const QList<QComboBox*>& boxList,
-            EffectManifestFilterFnc filterFunc);
-    void populateDeckQuickEffectBoxList(
-            const QList<QComboBox*>& boxList);
-
 
     UserSettingsPointer m_pConfig;
 
@@ -104,7 +100,7 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
     QList<QComboBox*> m_deckQuickEffectSelectors;
     ControlProxy* m_pNumDecks;
 
-    bool m_inSlotPopulateDeckEffectSelectors;
+    bool m_ignoreEqQuickEffectBoxSignals;
 
     // Members needed for the Main EQ
     QList<QSlider*> m_mainEQSliders;

From c4e4fe1de76356deffce63f9f86dee21c81fa3aa Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Sat, 24 Jun 2023 14:40:30 +0200
Subject: [PATCH 022/388] Pref Mixer, deck EQ & QuickEffects: disable non-EQ
 items if 'EQs only' is checked

---
 src/preferences/dialog/dlgprefmixer.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index 144924760d3..a70d0ee0825 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -2,6 +2,7 @@
 
 #include <QButtonGroup>
 #include <QHBoxLayout>
+#include <QStandardItemModel>
 #include <QString>
 #include <QWidget>
 
@@ -301,6 +302,12 @@ void DlgPrefMixer::slotPopulateDeckEqSelectors() {
             box->addItem(pLoadedManifest->displayName(),
                     QVariant(pLoadedManifest->uniqueId()));
             currentIndex = box->count() - 1;
+            // Deactivate item to hopefully clarify the item is not an EQ
+            const QStandardItemModel* pModel =
+                    qobject_cast<QStandardItemModel*>(box->model());
+            DEBUG_ASSERT(pModel);
+            auto pItem = pModel->item(currentIndex);
+            pItem->setFlags(pItem->flags() & ~Qt::ItemIsEnabled);
         }
         box->setCurrentIndex(currentIndex);
     }

From f1e1a6a2c6cf96a2fbe6e5fd01c820aa902e2031 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Thu, 29 Jun 2023 03:54:15 +0200
Subject: [PATCH 023/388] Pref Mixer: add tooltips for deck & main EQ effects

---
 src/preferences/dialog/dlgprefmixer.cpp | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index a70d0ee0825..11e6070b903 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -292,9 +292,16 @@ void DlgPrefMixer::slotPopulateDeckEqSelectors() {
         int currentIndex = 0; // store it as default selection
         for (const auto& pManifest : pManifestList) {
             box->addItem(pManifest->name(), QVariant(pManifest->uniqueId()));
+            int i = box->count() - 1;
+            // <b> makes the effect name bold. Also, like <span> it serves as hack
+            // to get Qt to treat the string as rich text so it automatically wraps long lines.
+            box->setItemData(i,
+                    QVariant(QStringLiteral("<b>") + pManifest->name() +
+                            QStringLiteral("</b><br/>") + pManifest->description()),
+                    Qt::ToolTipRole);
             if (pLoadedManifest &&
                     pLoadedManifest.data() == pManifest.data()) {
-                currentIndex = box->count() - 1;
+                currentIndex = i;
             }
         }
         if (pLoadedManifest && currentIndex == 0) {
@@ -302,11 +309,16 @@ void DlgPrefMixer::slotPopulateDeckEqSelectors() {
             box->addItem(pLoadedManifest->displayName(),
                     QVariant(pLoadedManifest->uniqueId()));
             currentIndex = box->count() - 1;
+            box->setItemData(currentIndex,
+                    QVariant(QStringLiteral("<b>") + pLoadedManifest->name() +
+                            QStringLiteral("</b><br/>") + pLoadedManifest->description()),
+                    Qt::ToolTipRole);
             // Deactivate item to hopefully clarify the item is not an EQ
             const QStandardItemModel* pModel =
                     qobject_cast<QStandardItemModel*>(box->model());
             DEBUG_ASSERT(pModel);
             auto pItem = pModel->item(currentIndex);
+            DEBUG_ASSERT(pItem);
             pItem->setFlags(pItem->flags() & ~Qt::ItemIsEnabled);
         }
         box->setCurrentIndex(currentIndex);
@@ -928,6 +940,12 @@ void DlgPrefMixer::setUpMainEQ() {
     comboBoxMainEq->addItem(kNoEffectString);
     for (const auto& pManifest : availableMainEQEffects) {
         comboBoxMainEq->addItem(pManifest->name(), QVariant(pManifest->uniqueId()));
+        // <b> makes the effect name bold. Also, like <span> it serves as hack
+        // to get Qt to treat the string as rich text so it automatically wraps long lines.
+        comboBoxMainEq->setItemData(comboBoxMainEq->count() - 1,
+                QVariant(QStringLiteral("<b>") + pManifest->name() +
+                        QStringLiteral("</b><br/>") + pManifest->description()),
+                Qt::ToolTipRole);
     }
     comboBoxMainEq->setCurrentIndex(0);
 }

From 2f5fd9e40975e177c9ce6e58f556be2b87ce5979 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Fri, 30 Jun 2023 09:34:04 +0200
Subject: [PATCH 024/388] Pref Mixer: fix UX when checking 'Same EQ for all
 decks'

---
 src/preferences/dialog/dlgprefmixer.cpp | 151 +++++++++++++++---------
 src/preferences/dialog/dlgprefmixer.h   |   6 +-
 2 files changed, 96 insertions(+), 61 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index 11e6070b903..ce49b2a60da 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -66,7 +66,6 @@ DlgPrefMixer::DlgPrefMixer(
           m_pChainPresetManager(pEffectsManager->getChainPresetManager()),
           m_pEffectsManager(pEffectsManager),
           m_pBackendManager(pEffectsManager->getBackendManager()),
-          m_firstSelectorLabel(nullptr),
           m_pNumDecks(nullptr),
           m_ignoreEqQuickEffectBoxSignals(false),
           m_singleEq(true),
@@ -121,7 +120,7 @@ DlgPrefMixer::DlgPrefMixer(
     connect(CheckBoxEqOnly,
             &QCheckBox::toggled,
             this,
-            &DlgPrefMixer::slotPopulateDeckEqSelectors);
+            &DlgPrefMixer::slotEqOnlyToggled);
 
     connect(CheckBoxSingleEqEffect,
             &QCheckBox::toggled,
@@ -235,13 +234,6 @@ void DlgPrefMixer::slotNumDecksChanged(double numDecks) {
                     m_ignoreEqQuickEffectBoxSignals = false;
                 });
 
-        if (deckNo == 1) {
-            m_firstSelectorLabel = label;
-            if (m_singleEq) {
-                m_firstSelectorLabel->clear();
-            }
-        }
-
         // Add the new widgets
         gridLayout_3->addWidget(label, deckNo, 0);
         gridLayout_3->addWidget(pEqComboBox, deckNo, 1);
@@ -267,9 +259,7 @@ void DlgPrefMixer::slotNumDecksChanged(double numDecks) {
 void DlgPrefMixer::slotPopulateDeckEqSelectors() {
     m_ignoreEqQuickEffectBoxSignals = true; // prevents a recursive call
 
-    m_eqEffectsOnly = CheckBoxEqOnly->isChecked();
-    EffectManifestFilterFnc filterFunc = m_eqEffectsOnly ? isMixingEQ : nullptr;
-    const QList<EffectManifestPointer> pManifestList = getFilteredManifests(filterFunc);
+    const QList<EffectManifestPointer> pManifestList = getDeckEqManifests();
     for (QComboBox* box : qAsConst(m_deckEqEffectSelectors)) {
         // Populate comboboxes with all available effects
         // Get currently loaded EQ effect
@@ -351,29 +341,71 @@ void DlgPrefMixer::slotPopulateQuickEffectSelectors() {
     m_ignoreEqQuickEffectBoxSignals = false;
 }
 
+void DlgPrefMixer::slotEqOnlyToggled(bool checked) {
+    m_eqEffectsOnly = checked;
+    slotPopulateDeckEqSelectors();
+    slotSingleEqToggled(m_singleEq);
+}
+
 void DlgPrefMixer::slotSingleEqToggled(bool checked) {
     m_singleEq = checked;
-    if (m_deckEqEffectSelectors.size()) {
-        int deck1EQIndex = m_deckEqEffectSelectors.at(0)->currentIndex();
+    if (m_deckEqEffectSelectors.isEmpty()) {
+        return;
+    }
+
+    // If single EQ is checked copy the EQ and QuickEffect of deck 1 to the other
+    // selectors. In case deck 1 has a non-EQ effect and 'EQs only' is checked we
+    // need to add it. Then disable EQ selectors except deck 1.
+    // Else enable all selectors and select currently loaded effects.
+    if (m_singleEq) {
+        m_ignoreEqQuickEffectBoxSignals = true;
+        const QString deck1EqId = m_deckEqEffectSelectors[0]->currentData().toString();
+        const EffectManifestPointer pManifest =
+                m_pBackendManager->getManifestFromUniqueId(deck1EqId);
+        int deck1QuickIndex = m_deckQuickEffectSelectors[0]->currentIndex();
+
         for (int i = 2; i < m_deckEqEffectSelectors.size() + 1; ++i) {
-            if (m_singleEq) {
-                m_deckEqEffectSelectors.at(i - 1)->setCurrentIndex(deck1EQIndex);
-                gridLayout_3->itemAtPosition(i, 0)->widget()->hide();
-                gridLayout_3->itemAtPosition(i, 1)->widget()->hide();
-                gridLayout_3->itemAtPosition(i, 2)->widget()->hide();
-            } else {
-                gridLayout_3->itemAtPosition(i, 0)->widget()->show();
-                gridLayout_3->itemAtPosition(i, 1)->widget()->show();
-                gridLayout_3->itemAtPosition(i, 2)->widget()->show();
+            // EQ //////////////////////////////////////////////////////////////
+            int newIndex = 0;
+            QComboBox* eqBox = m_deckEqEffectSelectors[i - 1];
+            int foundIndex = eqBox->findData(deck1EqId);
+            if (foundIndex != -1) {
+                newIndex = foundIndex;
+            } else if (pManifest) {
+                // Current selection is not part of the new list so we need to add it
+                eqBox->addItem(pManifest->displayName(),
+                        QVariant(pManifest->uniqueId()));
+                newIndex = eqBox->count() - 1;
+                eqBox->setItemData(newIndex,
+                        QVariant(QStringLiteral("<b>") + pManifest->name() +
+                                QStringLiteral("</b><br/>") + pManifest->description()),
+                        Qt::ToolTipRole);
+                // Deactivate item to hopefully clarify the item is not an EQ
+                const QStandardItemModel* pModel =
+                        qobject_cast<QStandardItemModel*>(eqBox->model());
+                DEBUG_ASSERT(pModel);
+                auto pItem = pModel->item(newIndex);
+                DEBUG_ASSERT(pItem);
+                pItem->setFlags(pItem->flags() & ~Qt::ItemIsEnabled);
             }
-        }
-    }
+            eqBox->setCurrentIndex(newIndex);
+            eqBox->setDisabled(true);
 
-    if (m_firstSelectorLabel != nullptr) {
-        if (m_singleEq) {
-            m_firstSelectorLabel->clear();
-        } else {
-            m_firstSelectorLabel->setText(QObject::tr("Deck 1"));
+            // QUickEffect /////////////////////////////////////////////////////
+            QComboBox* quickBox = m_deckQuickEffectSelectors[i - 1];
+            quickBox->setCurrentIndex(deck1QuickIndex);
+            quickBox->setDisabled(true);
+        }
+        m_ignoreEqQuickEffectBoxSignals = false;
+    } else {
+        for (int i = 1; i < m_deckEqEffectSelectors.size(); ++i) {
+            QComboBox* eqBox = m_deckEqEffectSelectors[i];
+            eqBox->setEnabled(!m_eqBypass);
+            slotPopulateDeckEqSelectors();
+
+            QComboBox* quickBox = m_deckQuickEffectSelectors[i];
+            quickBox->setEnabled(true);
+            slotPopulateQuickEffectSelectors();
         }
     }
 }
@@ -448,16 +480,10 @@ void DlgPrefMixer::slotEQEffectChangedOnDeck(int effectIndex) {
         return;
     }
 
-    int deckNumber = m_deckEqEffectSelectors.indexOf(c);
     // If we are in single-effect mode and the first effect was changed,
     // change the others as well.
-    if (deckNumber == 0 && m_singleEq) {
-        for (QComboBox* box : qAsConst(m_deckEqEffectSelectors)) {
-            if (box == c) { // first deck already set, skip
-                continue;
-            }
-            box->setCurrentIndex(effectIndex);
-        }
+    if (m_singleEq) {
+        slotSingleEqToggled(true);
     }
 }
 
@@ -468,16 +494,10 @@ void DlgPrefMixer::slotQuickEffectChangedOnDeck(int effectIndex) {
         return;
     }
 
-    int deckNumber = m_deckQuickEffectSelectors.indexOf(c);
     // If we are in single-effect mode and the first effect was changed,
     // change the others as well.
-    if (deckNumber == 0 && m_singleEq) {
-        for (QComboBox* box : qAsConst(m_deckQuickEffectSelectors)) {
-            if (box == c) { // first deck already set, skip
-                continue;
-            }
-            box->setCurrentIndex(effectIndex);
-        }
+    if (m_singleEq) {
+        slotSingleEqToggled(true);
     }
 }
 
@@ -910,9 +930,12 @@ void DlgPrefMixer::slotBypassEqToggled(bool checked) {
 
     // De/activate deck EQ comboboxes
     for (const auto& box : qAsConst(m_deckEqEffectSelectors)) {
-        box->setEnabled(!m_eqBypass);
+        if (m_deckEqEffectSelectors.indexOf(box) == 0) {
+            box->setEnabled(!m_eqBypass);
+        } else {
+            box->setEnabled(!m_eqBypass && !m_singleEq);
+        }
     }
-    // TODO Also disable relevant checkboxes
 }
 
 void DlgPrefMixer::setUpMainEQ() {
@@ -933,8 +956,7 @@ void DlgPrefMixer::setUpMainEQ() {
             this,
             &DlgPrefMixer::slotMainEqEffectChanged);
 
-    const QList<EffectManifestPointer> availableMainEQEffects =
-            getFilteredManifests(isMainEQ);
+    const QList<EffectManifestPointer> availableMainEQEffects = getMainEqManifests();
 
     // Add empty '---' item at the top
     comboBoxMainEq->addItem(kNoEffectString);
@@ -1180,19 +1202,32 @@ void DlgPrefMixer::applyMainEqParameter(int index) {
             ConfigValue(QString::number((double)sValue / 100.0)));
 }
 
-const QList<EffectManifestPointer> DlgPrefMixer::getFilteredManifests(
-        EffectManifestFilterFnc filterFunc) const {
+const QList<EffectManifestPointer> DlgPrefMixer::getDeckEqManifests() const {
     const QList<EffectManifestPointer> allManifests =
             m_pBackendManager->getManifests();
-    if (filterFunc == nullptr) {
-        return allManifests;
+    QList<EffectManifestPointer> eqs;
+    QList<EffectManifestPointer> nonEqs;
+    // Add EQs first, then append non-EQs
+    for (const auto& pManifest : allManifests) {
+        if (isMixingEQ(pManifest.data())) {
+            eqs.append(pManifest);
+        } else if (!m_eqEffectsOnly) {
+            nonEqs.append(pManifest);
+        }
     }
+    // Append non-EQs. No-op if 'EQs only' is unchecked.
+    eqs.append(nonEqs);
+    return eqs;
+}
 
-    QList<EffectManifestPointer> list;
+const QList<EffectManifestPointer> DlgPrefMixer::getMainEqManifests() const {
+    const QList<EffectManifestPointer> allManifests =
+            m_pBackendManager->getManifests();
+    QList<EffectManifestPointer> eqs;
     for (const auto& pManifest : allManifests) {
-        if (filterFunc(pManifest.data())) {
-            list.append(pManifest);
+        if (isMainEQ(pManifest.data())) {
+            eqs.append(pManifest);
         }
     }
-    return list;
+    return eqs;
 }
diff --git a/src/preferences/dialog/dlgprefmixer.h b/src/preferences/dialog/dlgprefmixer.h
index 504b41c75d3..09f22058675 100644
--- a/src/preferences/dialog/dlgprefmixer.h
+++ b/src/preferences/dialog/dlgprefmixer.h
@@ -31,6 +31,7 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
     void slotNumDecksChanged(double numDecks);
     void slotEQEffectChangedOnDeck(int effectIndex);
     void slotQuickEffectChangedOnDeck(int effectIndex);
+    void slotEqOnlyToggled(bool checked);
     void slotSingleEqToggled(bool checked);
     void slotEqAutoResetToggled(bool checked);
     void slotGainAutoResetToggled(bool checked);
@@ -71,8 +72,8 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
     void applyMainEqParameter(int index);
 
     typedef bool (*EffectManifestFilterFnc)(EffectManifest* pManifest);
-    const QList<EffectManifestPointer> getFilteredManifests(
-            EffectManifestFilterFnc filterFunc) const;
+    const QList<EffectManifestPointer> getDeckEqManifests() const;
+    const QList<EffectManifestPointer> getMainEqManifests() const;
 
     UserSettingsPointer m_pConfig;
 
@@ -95,7 +96,6 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
     EffectChainPresetManagerPointer m_pChainPresetManager;
     std::shared_ptr<EffectsManager> m_pEffectsManager;
     EffectsBackendManagerPointer m_pBackendManager;
-    QLabel* m_firstSelectorLabel;
     QList<QComboBox*> m_deckEqEffectSelectors;
     QList<QComboBox*> m_deckQuickEffectSelectors;
     ControlProxy* m_pNumDecks;

From 0d2f73222416c4a0999b94dd4b152c3b00632c5b Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Mon, 1 May 2023 22:35:56 +0200
Subject: [PATCH 025/388] Pref Mixer: migrate bool options from yes|no to 1|0

---
 src/preferences/dialog/dlgprefmixer.cpp | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index ce49b2a60da..c18c7e33e77 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -69,6 +69,7 @@ DlgPrefMixer::DlgPrefMixer(
           m_pNumDecks(nullptr),
           m_ignoreEqQuickEffectBoxSignals(false),
           m_singleEq(true),
+          m_eqEffectsOnly(true),
           m_eqAutoReset(false),
           m_gainAutoReset(false),
           m_eqBypass(false),
@@ -463,8 +464,8 @@ void DlgPrefMixer::slotResetToDefaults() {
     CheckBoxBypass->setChecked(false);
     CheckBoxEqOnly->setChecked(true);
     CheckBoxSingleEqEffect->setChecked(true);
-    CheckBoxEqAutoReset->setChecked(m_eqAutoReset);
-    CheckBoxGainAutoReset->setChecked(m_gainAutoReset);
+    CheckBoxEqAutoReset->setChecked(false);
+    CheckBoxGainAutoReset->setChecked(false);
 
     CheckBoxInstantEQShelves->setChecked(false);
     setDefaultShelves();
@@ -673,8 +674,6 @@ int DlgPrefMixer::getSliderPosition(double eqFreq, int minValue, int maxValue) {
 }
 
 void DlgPrefMixer::slotApply() {
-    // TODO unify ConfigValues to int, migrate yes/no
-
     // xfader //////////////////////////////////////////////////////////////////
     m_mode.set(m_xFaderMode);
     m_curve.set(m_transform);
@@ -694,11 +693,11 @@ void DlgPrefMixer::slotApply() {
 
     // EQ & QuickEffect settings ///////////////////////////////////////////////
     m_pConfig->set(ConfigKey(kConfigGroup, kEnableEqs),
-            ConfigValue(m_eqBypass ? QString("yes") : QString("no")));
+            ConfigValue(m_eqBypass ? 0 : 1));
     m_pConfig->set(ConfigKey(kConfigGroup, kSingleEq),
-            m_singleEq ? QString("yes") : QString("no"));
+            ConfigValue(m_singleEq ? 1 : 0));
     m_pConfig->set(ConfigKey(kConfigGroup, kEqsOnly),
-            ConfigValue(CheckBoxEqOnly->isChecked() ? "yes" : "no"));
+            ConfigValue(m_eqEffectsOnly ? 1 : 0));
     m_pConfig->set(ConfigKey(kConfigGroup, "EqAutoReset"),
             ConfigValue(m_eqAutoReset ? 1 : 0));
     m_pConfig->set(ConfigKey(kConfigGroup, "GainAutoReset"),
@@ -760,7 +759,12 @@ void DlgPrefMixer::slotUpdate() {
     slotUpdateXFader();
 
     // EQs & QuickEffects //////////////////////////////////////////////////////
-    m_singleEq = m_pConfig->getValue(ConfigKey(kConfigGroup, kSingleEq), "yes") == "yes";
+    QString eqsOnly = m_pConfig->getValue(ConfigKey(kConfigGroup, kEqsOnly), "1");
+    m_eqEffectsOnly = eqsOnly == "yes" || eqsOnly == "1";
+    CheckBoxEqOnly->setChecked(m_eqEffectsOnly);
+
+    QString singleEqCfg = m_pConfig->getValue(ConfigKey(kConfigGroup, kSingleEq), "1");
+    m_singleEq = singleEqCfg == "yes" || singleEqCfg == "1";
     if (!m_initializing) {
         slotPopulateDeckEqSelectors();
         slotPopulateQuickEffectSelectors();
@@ -780,8 +784,8 @@ void DlgPrefMixer::slotUpdate() {
                     .toInt());
     CheckBoxGainAutoReset->setChecked(m_gainAutoReset);
 
-    m_eqBypass = m_pConfig->getValue(
-                         ConfigKey(kConfigGroup, kEnableEqs), QString("yes")) == "no";
+    QString eqBaypassCfg = m_pConfig->getValue(ConfigKey(kConfigGroup, kEnableEqs), "1");
+    m_eqBypass = !(eqBaypassCfg == "yes" || eqBaypassCfg == "1");
     CheckBoxBypass->setChecked(m_eqBypass);
     // Deactivate EQ comboboxes when Bypass is enabled
     slotBypassEqToggled(CheckBoxBypass->isChecked());

From 82b3fc0a56d045b1bd6c987caf543872e785a928 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Sat, 29 Apr 2023 12:52:02 +0200
Subject: [PATCH 026/388] Pref Mixer: remove obsolete includes, some comments

---
 src/preferences/dialog/dlgprefmixer.cpp | 9 +++------
 src/preferences/dialog/dlgprefmixer.h   | 4 ----
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index c18c7e33e77..dbaf9a379c1 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -3,8 +3,6 @@
 #include <QButtonGroup>
 #include <QHBoxLayout>
 #include <QStandardItemModel>
-#include <QString>
-#include <QWidget>
 
 #include "control/controlobject.h"
 #include "control/controlproxy.h"
@@ -78,15 +76,14 @@ DlgPrefMixer::DlgPrefMixer(
           m_initializing(true) {
     setupUi(this);
 
+    // Update the crossfader curve graph and other settings when the
+    // crossfader mode is changed or the slider is moved.
     connect(SliderXFader,
             QOverload<int>::of(&QSlider::valueChanged),
             this,
             &DlgPrefMixer::slotUpdateXFader);
     connect(SliderXFader, &QSlider::sliderMoved, this, &DlgPrefMixer::slotUpdateXFader);
     connect(SliderXFader, &QSlider::sliderReleased, this, &DlgPrefMixer::slotUpdateXFader);
-
-    // Update the crossfader curve graph and other settings when the
-    // crossfader mode is changed.
     connect(radioButtonAdditive, &QRadioButton::clicked, this, &DlgPrefMixer::slotUpdateXFader);
     connect(radioButtonConstantPower,
             &QRadioButton::clicked,
@@ -96,7 +93,7 @@ DlgPrefMixer::DlgPrefMixer(
     // Don't allow the xfader graph getting keyboard focus
     graphicsViewXfader->setFocusPolicy(Qt::NoFocus);
 
-    // Connection
+    // EQ shelf sliders
     connect(SliderHiEQ, &QSlider::valueChanged, this, &DlgPrefMixer::slotHiEqSliderChanged);
     connect(SliderHiEQ, &QSlider::sliderMoved, this, &DlgPrefMixer::slotHiEqSliderChanged);
     connect(SliderHiEQ, &QSlider::sliderReleased, this, &DlgPrefMixer::slotHiEqSliderChanged);
diff --git a/src/preferences/dialog/dlgprefmixer.h b/src/preferences/dialog/dlgprefmixer.h
index 09f22058675..04b1407d175 100644
--- a/src/preferences/dialog/dlgprefmixer.h
+++ b/src/preferences/dialog/dlgprefmixer.h
@@ -1,9 +1,5 @@
 #pragma once
 
-#include <QComboBox>
-#include <QWidget>
-#include <functional>
-
 #include "control/controlproxy.h"
 #include "control/pollingcontrolproxy.h"
 #include "effects/effectsmanager.h"

From e82d50bc994a5effaf053d70139b2856147f1753 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Fri, 30 Jun 2023 14:55:52 +0200
Subject: [PATCH 027/388] Pref Mixer: p prefix for widget pointers

---
 src/preferences/dialog/dlgprefmixer.cpp | 170 ++++++++++++------------
 1 file changed, 85 insertions(+), 85 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index dbaf9a379c1..53c60aabdc7 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -258,10 +258,10 @@ void DlgPrefMixer::slotPopulateDeckEqSelectors() {
     m_ignoreEqQuickEffectBoxSignals = true; // prevents a recursive call
 
     const QList<EffectManifestPointer> pManifestList = getDeckEqManifests();
-    for (QComboBox* box : qAsConst(m_deckEqEffectSelectors)) {
+    for (QComboBox* pBox : qAsConst(m_deckEqEffectSelectors)) {
         // Populate comboboxes with all available effects
         // Get currently loaded EQ effect
-        int deck = m_deckEqEffectSelectors.indexOf(box);
+        int deck = m_deckEqEffectSelectors.indexOf(pBox);
         auto pChainSlot = m_pEffectsManager->getEqualizerEffectChain(
                 PlayerManager::groupForDeck(deck));
         VERIFY_OR_DEBUG_ASSERT(pChainSlot) {
@@ -274,16 +274,16 @@ void DlgPrefMixer::slotPopulateDeckEqSelectors() {
         const EffectManifestPointer pLoadedManifest =
                 pEffectSlot->getManifest();
 
-        box->clear();
+        pBox->clear();
         // Add empty item at the top (no effect)
-        box->addItem(kNoEffectString);
+        pBox->addItem(kNoEffectString);
         int currentIndex = 0; // store it as default selection
         for (const auto& pManifest : pManifestList) {
-            box->addItem(pManifest->name(), QVariant(pManifest->uniqueId()));
-            int i = box->count() - 1;
+            pBox->addItem(pManifest->name(), QVariant(pManifest->uniqueId()));
+            int i = pBox->count() - 1;
             // <b> makes the effect name bold. Also, like <span> it serves as hack
             // to get Qt to treat the string as rich text so it automatically wraps long lines.
-            box->setItemData(i,
+            pBox->setItemData(i,
                     QVariant(QStringLiteral("<b>") + pManifest->name() +
                             QStringLiteral("</b><br/>") + pManifest->description()),
                     Qt::ToolTipRole);
@@ -294,22 +294,22 @@ void DlgPrefMixer::slotPopulateDeckEqSelectors() {
         }
         if (pLoadedManifest && currentIndex == 0) {
             // Current selection is not part of the new list so we need to add it
-            box->addItem(pLoadedManifest->displayName(),
+            pBox->addItem(pLoadedManifest->displayName(),
                     QVariant(pLoadedManifest->uniqueId()));
-            currentIndex = box->count() - 1;
-            box->setItemData(currentIndex,
+            currentIndex = pBox->count() - 1;
+            pBox->setItemData(currentIndex,
                     QVariant(QStringLiteral("<b>") + pLoadedManifest->name() +
                             QStringLiteral("</b><br/>") + pLoadedManifest->description()),
                     Qt::ToolTipRole);
             // Deactivate item to hopefully clarify the item is not an EQ
             const QStandardItemModel* pModel =
-                    qobject_cast<QStandardItemModel*>(box->model());
+                    qobject_cast<QStandardItemModel*>(pBox->model());
             DEBUG_ASSERT(pModel);
             auto pItem = pModel->item(currentIndex);
             DEBUG_ASSERT(pItem);
             pItem->setFlags(pItem->flags() & ~Qt::ItemIsEnabled);
         }
-        box->setCurrentIndex(currentIndex);
+        pBox->setCurrentIndex(currentIndex);
     }
     m_ignoreEqQuickEffectBoxSignals = false;
 }
@@ -320,21 +320,21 @@ void DlgPrefMixer::slotPopulateQuickEffectSelectors() {
     QList<EffectChainPresetPointer> presetList =
             m_pChainPresetManager->getQuickEffectPresetsSorted();
 
-    for (QComboBox* box : qAsConst(m_deckQuickEffectSelectors)) {
-        int deck = m_deckQuickEffectSelectors.indexOf(box);
-        box->clear();
+    for (QComboBox* pBox : qAsConst(m_deckQuickEffectSelectors)) {
+        int deck = m_deckQuickEffectSelectors.indexOf(pBox);
+        pBox->clear();
         int currentIndex = 0; // preselect empty item '---' as default
 
         QString deckGroupName = PlayerManager::groupForDeck(deck);
         QString unitGroup = QuickEffectChain::formatEffectChainGroup(deckGroupName);
         EffectChainPointer pChain = m_pEffectsManager->getEffectChain(unitGroup);
         for (const auto& pChainPreset : presetList) {
-            box->addItem(pChainPreset->name());
+            pBox->addItem(pChainPreset->name());
             if (pChain->presetName() == pChainPreset->name()) {
-                currentIndex = box->count() - 1;
+                currentIndex = pBox->count() - 1;
             }
         }
-        box->setCurrentIndex(currentIndex);
+        pBox->setCurrentIndex(currentIndex);
     }
     m_ignoreEqQuickEffectBoxSignals = false;
 }
@@ -450,13 +450,13 @@ void DlgPrefMixer::slotResetToDefaults() {
     checkBoxReverse->setChecked(false);
 
     // EQ //////////////////////////////////
-    for (const auto& pCombo : qAsConst(m_deckEqEffectSelectors)) {
-        pCombo->setCurrentIndex(
-                pCombo->findData(kDefaultEqId));
+    for (const auto& pBox : qAsConst(m_deckEqEffectSelectors)) {
+        pBox->setCurrentIndex(
+                pBox->findData(kDefaultEqId));
     }
-    for (const auto& pCombo : qAsConst(m_deckQuickEffectSelectors)) {
-        pCombo->setCurrentIndex(
-                pCombo->findText(kDefaultQuickEffectChainName));
+    for (const auto& pBox : qAsConst(m_deckQuickEffectSelectors)) {
+        pBox->setCurrentIndex(
+                pBox->findText(kDefaultQuickEffectChainName));
     }
     CheckBoxBypass->setChecked(false);
     CheckBoxEqOnly->setChecked(true);
@@ -502,9 +502,9 @@ void DlgPrefMixer::slotQuickEffectChangedOnDeck(int effectIndex) {
 void DlgPrefMixer::applyDeckEQs() {
     m_ignoreEqQuickEffectBoxSignals = true;
 
-    for (const auto& box : qAsConst(m_deckEqEffectSelectors)) {
-        int deck = m_deckEqEffectSelectors.indexOf(box);
-        int effectIndex = box->currentIndex();
+    for (const auto& pBox : qAsConst(m_deckEqEffectSelectors)) {
+        int deck = m_deckEqEffectSelectors.indexOf(pBox);
+        int effectIndex = pBox->currentIndex();
 
         bool needLoad = true;
         bool startingUp = m_eqIndiciesOnUpdate.size() < (deck + 1);
@@ -525,7 +525,7 @@ void DlgPrefMixer::applyDeckEQs() {
 
         const EffectManifestPointer pManifest =
                 m_pBackendManager->getManifestFromUniqueId(
-                        box->itemData(effectIndex).toString());
+                        pBox->itemData(effectIndex).toString());
         if (needLoad) {
             pEffectSlot->loadEffectWithDefaults(pManifest);
             if (pManifest && pManifest->isMixingEQ() && !m_eqBypass) {
@@ -555,9 +555,9 @@ void DlgPrefMixer::applyDeckEQs() {
 void DlgPrefMixer::applyQuickEffects() {
     m_ignoreEqQuickEffectBoxSignals = true;
 
-    for (const auto& box : qAsConst(m_deckQuickEffectSelectors)) {
-        int deck = m_deckQuickEffectSelectors.indexOf(box);
-        int effectIndex = box->currentIndex();
+    for (const auto& pBox : qAsConst(m_deckQuickEffectSelectors)) {
+        int deck = m_deckQuickEffectSelectors.indexOf(pBox);
+        int effectIndex = pBox->currentIndex();
 
         bool needLoad = true;
         bool startingUp = m_quickEffectIndiciesOnUpdate.size() < (deck + 1);
@@ -632,22 +632,22 @@ void DlgPrefMixer::slotMainEQParameterSliderChanged(int value) {
         return;
     }
 
-    QSlider* slider = qobject_cast<QSlider*>(sender());
-    VERIFY_OR_DEBUG_ASSERT(slider) { // no slider, called from elsewhere
+    QSlider* pSlider = qobject_cast<QSlider*>(sender());
+    VERIFY_OR_DEBUG_ASSERT(pSlider) { // no slider, called from elsewhere
         return;
     }
 
     // Update slider label
-    int index = m_mainEQSliders.indexOf(slider);
-    QLabel* valueLabel = m_mainEQValues[index]; // verify
-    VERIFY_OR_DEBUG_ASSERT(valueLabel) {
+    int index = m_mainEQSliders.indexOf(pSlider);
+    QLabel* pValueLabel = m_mainEQValues[index]; // verify
+    VERIFY_OR_DEBUG_ASSERT(pValueLabel) {
         return;
     }
     // hide decimals for large ranges
-    if (slider->property("roundToInt").toBool()) {
-        valueLabel->setText(QString::number(std::round(value / 100.0)));
+    if (pSlider->property("roundToInt").toBool()) {
+        pValueLabel->setText(QString::number(std::round(value / 100.0)));
     } else {
-        valueLabel->setText(QString::number(value / 100.0));
+        pValueLabel->setText(QString::number(value / 100.0));
     }
 
     if (m_instantMainEq) {
@@ -930,11 +930,11 @@ void DlgPrefMixer::slotBypassEqToggled(bool checked) {
     m_eqBypass = checked;
 
     // De/activate deck EQ comboboxes
-    for (const auto& box : qAsConst(m_deckEqEffectSelectors)) {
-        if (m_deckEqEffectSelectors.indexOf(box) == 0) {
-            box->setEnabled(!m_eqBypass);
+    for (const auto& pBox : qAsConst(m_deckEqEffectSelectors)) {
+        if (m_deckEqEffectSelectors.indexOf(pBox) == 0) {
+            pBox->setEnabled(!m_eqBypass);
         } else {
-            box->setEnabled(!m_eqBypass && !m_singleEq);
+            pBox->setEnabled(!m_eqBypass && !m_singleEq);
         }
     }
 }
@@ -988,8 +988,8 @@ void DlgPrefMixer::updateMainEQ() {
     // slotMainEqEffectChanged(mainEqIndex);
 
     // Load parameters from preferences and set sliders
-    for (QSlider* slider : qAsConst(m_mainEQSliders)) {
-        int paramIndex = slider->property("index").toInt();
+    for (QSlider* pSlider : qAsConst(m_mainEQSliders)) {
+        int paramIndex = pSlider->property("index").toInt();
         QString strValue = m_pConfig->getValueString(ConfigKey(kConfigGroup,
                 kMainEQParameterKey + QString::number(paramIndex + 1)));
 
@@ -998,7 +998,7 @@ void DlgPrefMixer::updateMainEQ() {
         if (!ok) {
             continue;
         }
-        slider->setValue(static_cast<int>(paramValue * 100));
+        pSlider->setValue(static_cast<int>(paramValue * 100));
         // label is updated in  slotMainEQParameterSliderChanged()
     }
 }
@@ -1034,18 +1034,18 @@ void DlgPrefMixer::slotMainEqEffectChanged(int effectIndex) {
         }
         int i = param->index();
 
-        QLabel* centerFreqLabel = new QLabel(this);
+        QLabel* pCenterFreqLabel = new QLabel(this);
         QString labelText = param->name();
-        centerFreqLabel->setText(labelText);
-        m_mainEQLabels.append(centerFreqLabel);
-        slidersGridLayout->addWidget(centerFreqLabel, 0, i + 1, Qt::AlignCenter);
-
-        QSlider* slider = new QSlider(this);
-        setScrollSafeGuard(slider);
-        slider->setProperty("index", QVariant(i));
-        slider->setMinimumHeight(90);
-        slider->setMinimum(static_cast<int>(param->getMinimum() * 100));
-        slider->setMaximum(static_cast<int>(param->getMaximum() * 100));
+        pCenterFreqLabel->setText(labelText);
+        m_mainEQLabels.append(pCenterFreqLabel);
+        slidersGridLayout->addWidget(pCenterFreqLabel, 0, i + 1, Qt::AlignCenter);
+
+        QSlider* pSlider = new QSlider(this);
+        setScrollSafeGuard(pSlider);
+        pSlider->setProperty("index", QVariant(i));
+        pSlider->setMinimumHeight(90);
+        pSlider->setMinimum(static_cast<int>(param->getMinimum() * 100));
+        pSlider->setMaximum(static_cast<int>(param->getMaximum() * 100));
         // Make steps depend on range
         int step = 1;
         bool roundToInt = false;
@@ -1057,46 +1057,46 @@ void DlgPrefMixer::slotMainEqEffectChanged(int effectIndex) {
         } else if (range > 100) {
             step = 10;
         }
-        slider->setProperty("roundToInt", roundToInt);
-        slider->setSingleStep(step);
-        slider->setPageStep(step * 10);
-        slider->setValue(static_cast<int>(param->getDefault() * 100));
+        pSlider->setProperty("roundToInt", roundToInt);
+        pSlider->setSingleStep(step);
+        pSlider->setPageStep(step * 10);
+        pSlider->setValue(static_cast<int>(param->getDefault() * 100));
         // Set the index as a property because we need it in applyMainEqParameter
         // Ignore scroll events if slider is not focused.
         // See eventFilter() for details.
-        slidersGridLayout->addWidget(slider, 1, i + 1, Qt::AlignCenter);
-        m_mainEQSliders.append(slider);
+        slidersGridLayout->addWidget(pSlider, 1, i + 1, Qt::AlignCenter);
+        m_mainEQSliders.append(pSlider);
         // catch drag event
-        connect(slider,
+        connect(pSlider,
                 &QSlider::sliderMoved,
                 this,
                 &DlgPrefMixer::slotMainEQParameterSliderChanged);
         // catch scroll event
-        connect(slider,
+        connect(pSlider,
                 &QSlider::valueChanged,
                 this,
                 &DlgPrefMixer::slotMainEQParameterSliderChanged);
 
-        QLabel* valueLabel = new QLabel(this);
-        QString valueText = QString::number((double)slider->value() / 100);
-        valueLabel->setText(valueText);
+        QLabel* pValueLabel = new QLabel(this);
+        QString valueText = QString::number((double)pSlider->value() / 100);
+        pValueLabel->setText(valueText);
 
         // Use max required label width so column width doesn't change
         // when slider is moved.
         // Considers decimals only where we actually show them
         QFontMetrics metrics(font());
         QString maxValueString = QString::number(
-                roundToInt ? slider->maximum() : slider->maximum() - 0.01);
+                roundToInt ? pSlider->maximum() : pSlider->maximum() - 0.01);
         QString minValueString = QString::number(
-                slider->maximum() ? slider->minimum() : slider->minimum() + 0.01);
+                pSlider->maximum() ? pSlider->minimum() : pSlider->minimum() + 0.01);
         int optWidth = math_max(
                 metrics.size(0, maxValueString).width(),
                 metrics.size(0, minValueString).width());
-        valueLabel->setMinimumWidth(optWidth);
-        valueLabel->setAlignment(Qt::AlignCenter);
+        pValueLabel->setMinimumWidth(optWidth);
+        pValueLabel->setAlignment(Qt::AlignCenter);
 
-        m_mainEQValues.append(valueLabel);
-        slidersGridLayout->addWidget(valueLabel, 2, i + 1, Qt::AlignCenter);
+        m_mainEQValues.append(pValueLabel);
+        slidersGridLayout->addWidget(pValueLabel, 2, i + 1, Qt::AlignCenter);
     }
 
     if (m_instantMainEq) {
@@ -1140,10 +1140,10 @@ void DlgPrefMixer::slotMainEQToDefault() {
         return;
     }
 
-    for (QSlider* slider : qAsConst(m_mainEQSliders)) {
-        int paramIndex = slider->property("index").toInt();
+    for (QSlider* pSlider : qAsConst(m_mainEQSliders)) {
+        int paramIndex = pSlider->property("index").toInt();
         auto pParam = pManifest->parameter(paramIndex);
-        slider->setValue(static_cast<int>(pParam->getDefault() * 100));
+        pSlider->setValue(static_cast<int>(pParam->getDefault() * 100));
     }
 }
 
@@ -1166,8 +1166,8 @@ void DlgPrefMixer::applyMainEQ() {
             ConfigValue(pManifest ? pManifest->uniqueId() : ""));
 
     // apply & store parameters
-    for (QSlider* slider : qAsConst(m_mainEQSliders)) {
-        int index = m_mainEQSliders.indexOf(slider);
+    for (QSlider* pSlider : qAsConst(m_mainEQSliders)) {
+        int index = m_mainEQSliders.indexOf(pSlider);
         applyMainEqParameter(index);
     }
 }
@@ -1178,11 +1178,11 @@ void DlgPrefMixer::applyMainEqParameter(int index) {
         return;
     }
 
-    QSlider* slider = m_mainEQSliders[index];
-    VERIFY_OR_DEBUG_ASSERT(slider) {
+    QSlider* pSlider = m_mainEQSliders[index];
+    VERIFY_OR_DEBUG_ASSERT(pSlider) {
         return;
     }
-    int paramIndex = slider->property("index").toInt();
+    int paramIndex = pSlider->property("index").toInt();
     auto pParameterSlot = pEffectSlot->getEffectParameterSlot(
             EffectManifestParameter::ParameterType::Knob, paramIndex);
     VERIFY_OR_DEBUG_ASSERT(pParameterSlot && pParameterSlot->isLoaded()) {
@@ -1190,9 +1190,9 @@ void DlgPrefMixer::applyMainEqParameter(int index) {
     }
 
     // Calculate parameter value from relative slider position
-    int sValue = slider->value();
-    double paramValue = static_cast<double>(sValue - slider->minimum()) /
-            static_cast<double>(slider->maximum() - slider->minimum());
+    int sValue = pSlider->value();
+    double paramValue = static_cast<double>(sValue - pSlider->minimum()) /
+            static_cast<double>(pSlider->maximum() - pSlider->minimum());
     // Set the parameter
     pParameterSlot->setParameter(paramValue);
 

From d3d18cb00a3bfdc7d5db74a840ecbd8c45e060af Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Sat, 1 Jul 2023 23:47:31 +0200
Subject: [PATCH 028/388] Pref Mixer: use PollingControlProxy for EQ shelve
 controls

---
 src/preferences/dialog/dlgprefmixer.cpp | 4 ++--
 src/preferences/dialog/dlgprefmixer.h   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index 53c60aabdc7..301955dc766 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -57,8 +57,8 @@ DlgPrefMixer::DlgPrefMixer(
           m_reverse(EngineXfader::kXfaderConfigKey, "xFaderReverse"),
           m_crossfader("[Master]", "crossfader"),
           m_xFaderReverse(false),
-          m_COLoFreq(kConfigGroup, QStringLiteral("LoEQFrequency")),
-          m_COHiFreq(kConfigGroup, QStringLiteral("HiEQFrequency")),
+          m_COLoFreq(kConfigGroup, "LoEQFrequency"),
+          m_COHiFreq(kConfigGroup, "HiEQFrequency"),
           m_lowEqFreq(0.0),
           m_highEqFreq(0.0),
           m_pChainPresetManager(pEffectsManager->getChainPresetManager()),
diff --git a/src/preferences/dialog/dlgprefmixer.h b/src/preferences/dialog/dlgprefmixer.h
index 04b1407d175..eca54d0af4b 100644
--- a/src/preferences/dialog/dlgprefmixer.h
+++ b/src/preferences/dialog/dlgprefmixer.h
@@ -85,8 +85,8 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
 
     bool m_xFaderReverse;
 
-    ControlProxy m_COLoFreq;
-    ControlProxy m_COHiFreq;
+    PollingControlProxy m_COLoFreq;
+    PollingControlProxy m_COHiFreq;
     double m_lowEqFreq, m_highEqFreq;
 
     EffectChainPresetManagerPointer m_pChainPresetManager;

From 41c49389bf883bc1dc5cee25b0b23e5d19d0d142 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Sat, 1 Jul 2023 23:50:59 +0200
Subject: [PATCH 029/388] Pref Mixer, EQ shelves: instant apply on change,
 write to config in slotApply()

---
 src/preferences/dialog/dlgprefmixer.cpp   | 28 ++---------------------
 src/preferences/dialog/dlgprefmixer.h     |  2 --
 src/preferences/dialog/dlgprefmixerdlg.ui | 12 ----------
 3 files changed, 2 insertions(+), 40 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index 301955dc766..4ddc440ca34 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -71,7 +71,6 @@ DlgPrefMixer::DlgPrefMixer(
           m_eqAutoReset(false),
           m_gainAutoReset(false),
           m_eqBypass(false),
-          m_instantEqShelves(false),
           m_instantMainEq(false),
           m_initializing(true) {
     setupUi(this);
@@ -125,11 +124,6 @@ DlgPrefMixer::DlgPrefMixer(
             this,
             &DlgPrefMixer::slotSingleEqToggled);
 
-    connect(CheckBoxInstantEQShelves,
-            &QCheckBox::toggled,
-            this,
-            &DlgPrefMixer::slotInstantEQShelvesToggled);
-
     connect(CheckBoxInstantMainEQ,
             &QCheckBox::toggled,
             this,
@@ -408,13 +402,6 @@ void DlgPrefMixer::slotSingleEqToggled(bool checked) {
     }
 }
 
-void DlgPrefMixer::slotInstantEQShelvesToggled(bool checked) {
-    m_instantEqShelves = checked;
-    if (checked) {
-        applyEQShelves();
-    }
-}
-
 void DlgPrefMixer::slotInstantMainEQToggled(bool checked) {
     m_instantMainEq = checked;
     if (checked) {
@@ -464,7 +451,6 @@ void DlgPrefMixer::slotResetToDefaults() {
     CheckBoxEqAutoReset->setChecked(false);
     CheckBoxGainAutoReset->setChecked(false);
 
-    CheckBoxInstantEQShelves->setChecked(false);
     setDefaultShelves();
     slotMainEQToDefault();
     CheckBoxInstantMainEQ->setChecked(false);
@@ -602,9 +588,7 @@ void DlgPrefMixer::slotHiEqSliderChanged() {
         TextHiEQ->setText(QString("%1 kHz").arg((int)m_highEqFreq / 1000.));
     }
 
-    if (m_instantEqShelves) {
-        applyEQShelves();
-    }
+    m_COHiFreq.set(m_highEqFreq);
 }
 
 void DlgPrefMixer::slotLoEqSliderChanged() {
@@ -621,9 +605,7 @@ void DlgPrefMixer::slotLoEqSliderChanged() {
         TextLoEQ->setText(QString("%1 kHz").arg((int)m_lowEqFreq / 1000.));
     }
 
-    if (m_instantEqShelves) {
-        applyEQShelves();
-    }
+    m_COLoFreq.set(m_lowEqFreq);
 }
 
 void DlgPrefMixer::slotMainEQParameterSliderChanged(int value) {
@@ -712,8 +694,6 @@ void DlgPrefMixer::applyEQShelves() {
         return;
     }
 
-    m_COLoFreq.set(m_lowEqFreq);
-    m_COHiFreq.set(m_highEqFreq);
     m_pConfig->set(ConfigKey(kConfigGroup, "HiEQFrequency"),
             ConfigValue(QString::number(static_cast<int>(m_highEqFreq))));
     m_pConfig->set(ConfigKey(kConfigGroup, "HiEQFrequencyPrecise"),
@@ -797,8 +777,6 @@ void DlgPrefMixer::slotUpdate() {
     double lowEqFreq = 0.0;
     double highEqFreq = 0.0;
 
-    CheckBoxInstantEQShelves->setChecked(m_instantEqShelves);
-
     // Precise takes precedence over coarse.
     lowEqFreq = lowEqCourse.isEmpty() ? lowEqFreq : lowEqCourse.toDouble();
     lowEqFreq = lowEqPrecise.isEmpty() ? lowEqFreq : lowEqPrecise.toDouble();
@@ -807,8 +785,6 @@ void DlgPrefMixer::slotUpdate() {
 
     if (lowEqFreq == 0.0 || highEqFreq == 0.0 || lowEqFreq == highEqFreq) {
         setDefaultShelves();
-        // apply instantly so WYYSIWYG
-        applyEQShelves();
     } else {
         SliderHiEQ->setValue(
                 getSliderPosition(highEqFreq,
diff --git a/src/preferences/dialog/dlgprefmixer.h b/src/preferences/dialog/dlgprefmixer.h
index eca54d0af4b..4ee57f8a809 100644
--- a/src/preferences/dialog/dlgprefmixer.h
+++ b/src/preferences/dialog/dlgprefmixer.h
@@ -41,7 +41,6 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
     void slotHiEqSliderChanged();
     void slotLoEqSliderChanged();
 
-    void slotInstantEQShelvesToggled(bool checked);
     void slotInstantMainEQToggled(bool checked);
 
     // Update the Main EQ
@@ -109,7 +108,6 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
     bool m_eqAutoReset;
     bool m_gainAutoReset;
     bool m_eqBypass;
-    bool m_instantEqShelves;
     bool m_instantMainEq;
 
     bool m_initializing;
diff --git a/src/preferences/dialog/dlgprefmixerdlg.ui b/src/preferences/dialog/dlgprefmixerdlg.ui
index 49b61dc78d3..9b393bba568 100644
--- a/src/preferences/dialog/dlgprefmixerdlg.ui
+++ b/src/preferences/dialog/dlgprefmixerdlg.ui
@@ -336,17 +336,6 @@
      </property>
      <layout class="QVBoxLayout" name="vBoxLayout_1">
 
-      <item>
-       <widget class="QCheckBox" name="CheckBoxInstantEQShelves">
-        <property name="toolTip">
-         <string>EQ shelves are applied instantly without clicking Apply</string>
-        </property>
-        <property name="text">
-         <string>Apply EQ shelves instantly</string>
-        </property>
-       </widget>
-      </item>
-
       <item>
        <widget class="QWidget" name="GroupHiEQ" native="true">
         <layout class="QVBoxLayout" name="vBoxLayout_2">
@@ -673,7 +662,6 @@
   <tabstop>CheckBoxBypass</tabstop>
   <tabstop>CheckBoxEqAutoReset</tabstop>
   <tabstop>CheckBoxGainAutoReset</tabstop>
-  <tabstop>CheckBoxInstantEQShelves</tabstop>
   <tabstop>SliderHiEQ</tabstop>
   <tabstop>SliderLoEQ</tabstop>
   <tabstop>CheckBoxInstantMainEQ</tabstop>

From 0a3c57f74100e7386c3c58c2dcc9f4eab3358e6b Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Sun, 2 Jul 2023 11:10:11 +0200
Subject: [PATCH 030/388] Pref Mixer, main EQ: apply instantly, store to config
 in slotApply()

---
 src/preferences/dialog/dlgprefmixer.cpp   | 121 ++++++++--------------
 src/preferences/dialog/dlgprefmixer.h     |   6 +-
 src/preferences/dialog/dlgprefmixerdlg.ui |  12 ---
 3 files changed, 45 insertions(+), 94 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index 4ddc440ca34..704575a1bb9 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -71,7 +71,6 @@ DlgPrefMixer::DlgPrefMixer(
           m_eqAutoReset(false),
           m_gainAutoReset(false),
           m_eqBypass(false),
-          m_instantMainEq(false),
           m_initializing(true) {
     setupUi(this);
 
@@ -124,11 +123,6 @@ DlgPrefMixer::DlgPrefMixer(
             this,
             &DlgPrefMixer::slotSingleEqToggled);
 
-    connect(CheckBoxInstantMainEQ,
-            &QCheckBox::toggled,
-            this,
-            &DlgPrefMixer::slotInstantMainEQToggled);
-
     // Update the QuickEffect selectors when the effect list was changed
     // in Effects preferences
     connect(m_pChainPresetManager.data(),
@@ -402,13 +396,6 @@ void DlgPrefMixer::slotSingleEqToggled(bool checked) {
     }
 }
 
-void DlgPrefMixer::slotInstantMainEQToggled(bool checked) {
-    m_instantMainEq = checked;
-    if (checked) {
-        applyMainEQ();
-    }
-}
-
 QUrl DlgPrefMixer::helpUrl() const {
     return QUrl(MIXXX_MANUAL_EQ_URL);
 }
@@ -452,8 +439,7 @@ void DlgPrefMixer::slotResetToDefaults() {
     CheckBoxGainAutoReset->setChecked(false);
 
     setDefaultShelves();
-    slotMainEQToDefault();
-    CheckBoxInstantMainEQ->setChecked(false);
+    comboBoxMainEq->setCurrentIndex(0); // '---' no EQ
     slotApply();
 }
 
@@ -609,6 +595,8 @@ void DlgPrefMixer::slotLoEqSliderChanged() {
 }
 
 void DlgPrefMixer::slotMainEQParameterSliderChanged(int value) {
+    // apply parameter, but don't write to config, yet, so
+    // Cancel will reset to the previous state
     EffectSlotPointer pEffectSlot(m_pEffectMainEQ);
     if (pEffectSlot.isNull()) {
         return;
@@ -632,9 +620,18 @@ void DlgPrefMixer::slotMainEQParameterSliderChanged(int value) {
         pValueLabel->setText(QString::number(value / 100.0));
     }
 
-    if (m_instantMainEq) {
-        applyMainEqParameter(index);
+    int paramIndex = pSlider->property("index").toInt();
+    auto pParameterSlot = pEffectSlot->getEffectParameterSlot(
+            EffectManifestParameter::ParameterType::Knob, paramIndex);
+    VERIFY_OR_DEBUG_ASSERT(pParameterSlot && pParameterSlot->isLoaded()) {
+        return;
     }
+    // Calculate parameter value from relative slider position
+    int sValue = pSlider->value();
+    double paramValue = static_cast<double>(sValue - pSlider->minimum()) /
+            static_cast<double>(pSlider->maximum() - pSlider->minimum());
+    // Set the parameter
+    pParameterSlot->setParameter(paramValue);
 }
 
 int DlgPrefMixer::getSliderPosition(double eqFreq, int minValue, int maxValue) {
@@ -686,7 +683,7 @@ void DlgPrefMixer::slotApply() {
 
     applyEQShelves();
 
-    applyMainEQ();
+    storeMainEQ();
 }
 
 void DlgPrefMixer::applyEQShelves() {
@@ -797,7 +794,6 @@ void DlgPrefMixer::slotUpdate() {
                         SliderLoEQ->maximum()));
     }
 
-    CheckBoxInstantMainEQ->setChecked(m_instantMainEq);
     updateMainEQ();
 }
 
@@ -961,7 +957,6 @@ void DlgPrefMixer::updateMainEQ() {
     }
     // set index and create required sliders and labels
     comboBoxMainEq->setCurrentIndex(mainEqIndex);
-    // slotMainEqEffectChanged(mainEqIndex);
 
     // Load parameters from preferences and set sliders
     for (QSlider* pSlider : qAsConst(m_mainEQSliders)) {
@@ -980,6 +975,11 @@ void DlgPrefMixer::updateMainEQ() {
 }
 
 void DlgPrefMixer::slotMainEqEffectChanged(int effectIndex) {
+    EffectSlotPointer pEffectSlot(m_pEffectMainEQ);
+    VERIFY_OR_DEBUG_ASSERT(!pEffectSlot.isNull()) {
+        return;
+    }
+
     // Clear parameters view first
     qDeleteAll(m_mainEQSliders);
     m_mainEQSliders.clear();
@@ -992,13 +992,13 @@ void DlgPrefMixer::slotMainEqEffectChanged(int effectIndex) {
             m_pBackendManager->getManifestFromUniqueId(
                     comboBoxMainEq->itemData(effectIndex).toString());
 
-    if (pManifest == nullptr) {
-        pbResetMainEq->hide();
-    } else {
-        pbResetMainEq->show();
-    }
+    pEffectSlot->loadEffectWithDefaults(pManifest);
 
-    if (m_pEffectMainEQ.isNull() || !pManifest) {
+    if (pManifest) {
+        pbResetMainEq->show();
+    } else {
+        pbResetMainEq->hide();
+        // no effect, no sliders, nothing to do
         return;
     }
 
@@ -1037,9 +1037,8 @@ void DlgPrefMixer::slotMainEqEffectChanged(int effectIndex) {
         pSlider->setSingleStep(step);
         pSlider->setPageStep(step * 10);
         pSlider->setValue(static_cast<int>(param->getDefault() * 100));
-        // Set the index as a property because we need it in applyMainEqParameter
-        // Ignore scroll events if slider is not focused.
-        // See eventFilter() for details.
+        // Store the index as a property because we need it in
+        // slotMainEQParameterSliderChanged() and storeMainEQ()
         slidersGridLayout->addWidget(pSlider, 1, i + 1, Qt::AlignCenter);
         m_mainEQSliders.append(pSlider);
         // catch drag event
@@ -1074,10 +1073,6 @@ void DlgPrefMixer::slotMainEqEffectChanged(int effectIndex) {
         m_mainEQValues.append(pValueLabel);
         slidersGridLayout->addWidget(pValueLabel, 2, i + 1, Qt::AlignCenter);
     }
-
-    if (m_instantMainEq) {
-        applyMainEQ();
-    }
 }
 
 double DlgPrefMixer::getEqFreq(int sliderVal, int minValue, int maxValue) {
@@ -1123,60 +1118,32 @@ void DlgPrefMixer::slotMainEQToDefault() {
     }
 }
 
-void DlgPrefMixer::applyMainEQ() {
-    EffectSlotPointer pEffectSlot(m_pEffectMainEQ);
-    VERIFY_OR_DEBUG_ASSERT(!pEffectSlot.isNull()) {
-        return;
-    }
-
-    // load & store effect
+void DlgPrefMixer::storeMainEQ() {
+    // store effect
     const EffectManifestPointer pManifest =
             m_pBackendManager->getManifestFromUniqueId(
                     comboBoxMainEq->currentData().toString());
-    if (pManifest) {
-        pEffectSlot->loadEffectWithDefaults(pManifest);
-        pEffectSlot->setEnabled(true);
-    }
 
     m_pConfig->set(ConfigKey(kConfigGroup, kEffectGroupForMaster),
             ConfigValue(pManifest ? pManifest->uniqueId() : ""));
 
-    // apply & store parameters
-    for (QSlider* pSlider : qAsConst(m_mainEQSliders)) {
-        int index = m_mainEQSliders.indexOf(pSlider);
-        applyMainEqParameter(index);
-    }
-}
-
-void DlgPrefMixer::applyMainEqParameter(int index) {
-    EffectSlotPointer pEffectSlot(m_pEffectMainEQ);
-    VERIFY_OR_DEBUG_ASSERT(!pEffectSlot.isNull()) {
-        return;
+    // clear all previous parameter values so we have no residues
+    const QList<ConfigKey> micerKeys = m_pConfig->getKeysWithGroup(kConfigGroup);
+    for (const auto& key : micerKeys) {
+        if (key.item.contains(kMainEQParameterKey)) {
+            m_pConfig->remove(key);
+        }
     }
 
-    QSlider* pSlider = m_mainEQSliders[index];
-    VERIFY_OR_DEBUG_ASSERT(pSlider) {
-        return;
-    }
-    int paramIndex = pSlider->property("index").toInt();
-    auto pParameterSlot = pEffectSlot->getEffectParameterSlot(
-            EffectManifestParameter::ParameterType::Knob, paramIndex);
-    VERIFY_OR_DEBUG_ASSERT(pParameterSlot && pParameterSlot->isLoaded()) {
-        return;
+    // store current parameters
+    for (QSlider* pSlider : qAsConst(m_mainEQSliders)) {
+        int paramIndex = pSlider->property("index").toInt();
+        double paramValue = static_cast<double>(pSlider->value() / 100);
+        // TODO store this in effects.xml
+        m_pConfig->set(ConfigKey(kConfigGroup,
+                               kMainEQParameterKey + QString::number(paramIndex + 1)),
+                ConfigValue(QString::number(paramValue)));
     }
-
-    // Calculate parameter value from relative slider position
-    int sValue = pSlider->value();
-    double paramValue = static_cast<double>(sValue - pSlider->minimum()) /
-            static_cast<double>(pSlider->maximum() - pSlider->minimum());
-    // Set the parameter
-    pParameterSlot->setParameter(paramValue);
-
-    // TODO store this in effects.xml
-    m_pConfig->set(ConfigKey(kConfigGroup,
-                           kMainEQParameterKey + QString::number(index + 1)),
-            // TODO we could as well simply read the parameter label
-            ConfigValue(QString::number((double)sValue / 100.0)));
 }
 
 const QList<EffectManifestPointer> DlgPrefMixer::getDeckEqManifests() const {
diff --git a/src/preferences/dialog/dlgprefmixer.h b/src/preferences/dialog/dlgprefmixer.h
index 4ee57f8a809..93ca8067625 100644
--- a/src/preferences/dialog/dlgprefmixer.h
+++ b/src/preferences/dialog/dlgprefmixer.h
@@ -41,8 +41,6 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
     void slotHiEqSliderChanged();
     void slotLoEqSliderChanged();
 
-    void slotInstantMainEQToggled(bool checked);
-
     // Update the Main EQ
     void slotMainEQParameterSliderChanged(int value);
     void slotMainEQToDefault();
@@ -63,8 +61,7 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
 
     void setUpMainEQ();
     void updateMainEQ();
-    void applyMainEQ();
-    void applyMainEqParameter(int index);
+    void storeMainEQ();
 
     typedef bool (*EffectManifestFilterFnc)(EffectManifest* pManifest);
     const QList<EffectManifestPointer> getDeckEqManifests() const;
@@ -108,7 +105,6 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
     bool m_eqAutoReset;
     bool m_gainAutoReset;
     bool m_eqBypass;
-    bool m_instantMainEq;
 
     bool m_initializing;
 
diff --git a/src/preferences/dialog/dlgprefmixerdlg.ui b/src/preferences/dialog/dlgprefmixerdlg.ui
index 9b393bba568..d6a598230ed 100644
--- a/src/preferences/dialog/dlgprefmixerdlg.ui
+++ b/src/preferences/dialog/dlgprefmixerdlg.ui
@@ -571,17 +571,6 @@
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_3">
 
-      <item>
-       <widget class="QCheckBox" name="CheckBoxInstantMainEQ">
-        <property name="toolTip">
-         <string>EQ parameters are applied instantly without clicking Apply</string>
-        </property>
-        <property name="text">
-         <string>Apply EQ parameters instantly</string>
-        </property>
-       </widget>
-      </item>
-
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <item>
@@ -664,7 +653,6 @@
   <tabstop>CheckBoxGainAutoReset</tabstop>
   <tabstop>SliderHiEQ</tabstop>
   <tabstop>SliderLoEQ</tabstop>
-  <tabstop>CheckBoxInstantMainEQ</tabstop>
   <tabstop>comboBoxMainEq</tabstop>
   <tabstop>pbResetMainEq</tabstop>
   <!-- TODO(ronso0)

From 37bddabedc8a49695497fdcdf16571f742f6f6f3 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Mon, 3 Jul 2023 16:35:26 +0200
Subject: [PATCH 031/388] Pref Mixer: fix main EQ parameter precision

---
 src/preferences/dialog/dlgprefmixer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index 704575a1bb9..6e3c1949434 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -1138,11 +1138,11 @@ void DlgPrefMixer::storeMainEQ() {
     // store current parameters
     for (QSlider* pSlider : qAsConst(m_mainEQSliders)) {
         int paramIndex = pSlider->property("index").toInt();
-        double paramValue = static_cast<double>(pSlider->value() / 100);
+        double dispValue = static_cast<double>(pSlider->value()) / 100;
         // TODO store this in effects.xml
         m_pConfig->set(ConfigKey(kConfigGroup,
                                kMainEQParameterKey + QString::number(paramIndex + 1)),
-                ConfigValue(QString::number(paramValue)));
+                ConfigValue(QString::number(dispValue)));
     }
 }
 

From 742ca3dd50d7c1fca292351c541df5db2a0c04f4 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Mon, 3 Jul 2023 17:33:30 +0200
Subject: [PATCH 032/388] Pref Mixer: fix EQ shelves display precision

---
 src/preferences/dialog/dlgprefmixer.cpp | 24 ++++++++++++------------
 src/preferences/dialog/dlgprefmixer.h   |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index 6e3c1949434..eee764592d9 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -569,9 +569,9 @@ void DlgPrefMixer::slotHiEqSliderChanged() {
             SliderHiEQ->maximum());
     validateEQShelves();
     if (m_highEqFreq < 1000) {
-        TextHiEQ->setText(QString("%1 Hz").arg((int)m_highEqFreq));
+        TextHiEQ->setText(QString("%1 Hz").arg(std::round(m_highEqFreq)));
     } else {
-        TextHiEQ->setText(QString("%1 kHz").arg((int)m_highEqFreq / 1000.));
+        TextHiEQ->setText(QString("%1 kHz").arg(std::round(m_highEqFreq) / 1000.));
     }
 
     m_COHiFreq.set(m_highEqFreq);
@@ -586,9 +586,9 @@ void DlgPrefMixer::slotLoEqSliderChanged() {
             SliderLoEQ->maximum());
     validateEQShelves();
     if (m_lowEqFreq < 1000) {
-        TextLoEQ->setText(QString("%1 Hz").arg((int)m_lowEqFreq));
+        TextLoEQ->setText(QString("%1 Hz").arg(std::round(m_lowEqFreq)));
     } else {
-        TextLoEQ->setText(QString("%1 kHz").arg((int)m_lowEqFreq / 1000.));
+        TextLoEQ->setText(QString("%1 kHz").arg(std::round(m_lowEqFreq) / 1000.));
     }
 
     m_COLoFreq.set(m_lowEqFreq);
@@ -681,22 +681,22 @@ void DlgPrefMixer::slotApply() {
     applyDeckEQs();
     applyQuickEffects();
 
-    applyEQShelves();
+    storeEqShelves();
 
     storeMainEQ();
 }
 
-void DlgPrefMixer::applyEQShelves() {
+void DlgPrefMixer::storeEqShelves() {
     if (m_initializing) {
         return;
     }
 
     m_pConfig->set(ConfigKey(kConfigGroup, "HiEQFrequency"),
-            ConfigValue(QString::number(static_cast<int>(m_highEqFreq))));
+            ConfigValue(QString::number(static_cast<int>(std::round(m_highEqFreq)))));
     m_pConfig->set(ConfigKey(kConfigGroup, "HiEQFrequencyPrecise"),
             ConfigValue(QString::number(m_highEqFreq, 'f')));
     m_pConfig->set(ConfigKey(kConfigGroup, "LoEQFrequency"),
-            ConfigValue(QString::number(static_cast<int>(m_lowEqFreq))));
+            ConfigValue(QString::number(static_cast<int>(std::round(m_lowEqFreq)))));
     m_pConfig->set(ConfigKey(kConfigGroup, "LoEQFrequencyPrecise"),
             ConfigValue(QString::number(m_lowEqFreq, 'f')));
 }
@@ -765,19 +765,19 @@ void DlgPrefMixer::slotUpdate() {
     slotBypassEqToggled(CheckBoxBypass->isChecked());
 
     // EQ shelves //////////////////////////////////////////////////////////////
-    QString highEqCourse = m_pConfig->getValueString(ConfigKey(kConfigGroup, "HiEQFrequency"));
+    QString highEqCoarse = m_pConfig->getValueString(ConfigKey(kConfigGroup, "HiEQFrequency"));
     QString highEqPrecise = m_pConfig->getValueString(
             ConfigKey(kConfigGroup, "HiEQFrequencyPrecise"));
-    QString lowEqCourse = m_pConfig->getValueString(ConfigKey(kConfigGroup, "LoEQFrequency"));
+    QString lowEqCoarse = m_pConfig->getValueString(ConfigKey(kConfigGroup, "LoEQFrequency"));
     QString lowEqPrecise = m_pConfig->getValueString(
             ConfigKey(kConfigGroup, "LoEQFrequencyPrecise"));
     double lowEqFreq = 0.0;
     double highEqFreq = 0.0;
 
     // Precise takes precedence over coarse.
-    lowEqFreq = lowEqCourse.isEmpty() ? lowEqFreq : lowEqCourse.toDouble();
+    lowEqFreq = lowEqCoarse.isEmpty() ? lowEqFreq : lowEqCoarse.toDouble();
     lowEqFreq = lowEqPrecise.isEmpty() ? lowEqFreq : lowEqPrecise.toDouble();
-    highEqFreq = highEqCourse.isEmpty() ? highEqFreq : highEqCourse.toDouble();
+    highEqFreq = highEqCoarse.isEmpty() ? highEqFreq : highEqCoarse.toDouble();
     highEqFreq = highEqPrecise.isEmpty() ? highEqFreq : highEqPrecise.toDouble();
 
     if (lowEqFreq == 0.0 || highEqFreq == 0.0 || lowEqFreq == highEqFreq) {
diff --git a/src/preferences/dialog/dlgprefmixer.h b/src/preferences/dialog/dlgprefmixer.h
index 93ca8067625..048ed32b498 100644
--- a/src/preferences/dialog/dlgprefmixer.h
+++ b/src/preferences/dialog/dlgprefmixer.h
@@ -57,7 +57,7 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
     void applyDeckEQs();
     void applyQuickEffects();
 
-    void applyEQShelves();
+    void storeEqShelves();
 
     void setUpMainEQ();
     void updateMainEQ();

From 88a7f37ed55609595d9753a54256176c1d1e2d45 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Thu, 6 Jul 2023 02:06:45 +0200
Subject: [PATCH 033/388] move EQ corner ConfigKey strings to effects/defs.h,
 adjust Pref Mixer

also don't store coarse EQ frequency corners in config anymore
---
 .../backends/builtin/bessel4lvmixeqeffect.cpp |  5 +-
 .../backends/builtin/bessel8lvmixeqeffect.cpp |  5 +-
 .../builtin/biquadfullkilleqeffect.cpp        |  5 +-
 .../builtin/linkwitzriley8eqeffect.cpp        |  5 +-
 .../builtin/threebandbiquadeqeffect.cpp       |  5 +-
 src/effects/defs.h                            |  4 +
 src/effects/effectsmanager.cpp                |  4 +-
 src/preferences/dialog/dlgprefmixer.cpp       | 74 +++++++++----------
 src/test/nativeeffects_test.cpp               |  4 +-
 9 files changed, 57 insertions(+), 54 deletions(-)

diff --git a/src/effects/backends/builtin/bessel4lvmixeqeffect.cpp b/src/effects/backends/builtin/bessel4lvmixeqeffect.cpp
index 31fe55a00b1..4c44cf93290 100644
--- a/src/effects/backends/builtin/bessel4lvmixeqeffect.cpp
+++ b/src/effects/backends/builtin/bessel4lvmixeqeffect.cpp
@@ -1,6 +1,7 @@
 #include "effects/backends/builtin/bessel4lvmixeqeffect.h"
 
 #include "effects/backends/builtin/equalizer_util.h"
+#include "effects/defs.h"
 #include "util/math.h"
 
 // static
@@ -29,8 +30,8 @@ EffectManifestPointer Bessel4LVMixEQEffect::getManifest() {
 }
 
 Bessel4LVMixEQEffect::Bessel4LVMixEQEffect() {
-    m_pLoFreqCorner = new ControlProxy("[Mixer Profile]", "LoEQFrequency");
-    m_pHiFreqCorner = new ControlProxy("[Mixer Profile]", "HiEQFrequency");
+    m_pLoFreqCorner = new ControlProxy(kMixerProfile, kLowEqFrequency);
+    m_pHiFreqCorner = new ControlProxy(kMixerProfile, kHighEqFrequency);
 }
 
 void Bessel4LVMixEQEffect::loadEngineEffectParameters(
diff --git a/src/effects/backends/builtin/bessel8lvmixeqeffect.cpp b/src/effects/backends/builtin/bessel8lvmixeqeffect.cpp
index ff201f0bd60..01dbdf03db0 100644
--- a/src/effects/backends/builtin/bessel8lvmixeqeffect.cpp
+++ b/src/effects/backends/builtin/bessel8lvmixeqeffect.cpp
@@ -1,6 +1,7 @@
 #include "effects/backends/builtin/bessel8lvmixeqeffect.h"
 
 #include "effects/backends/builtin/equalizer_util.h"
+#include "effects/defs.h"
 #include "util/math.h"
 
 // static
@@ -29,8 +30,8 @@ EffectManifestPointer Bessel8LVMixEQEffect::getManifest() {
 }
 
 Bessel8LVMixEQEffect::Bessel8LVMixEQEffect() {
-    m_pLoFreqCorner = new ControlProxy("[Mixer Profile]", "LoEQFrequency");
-    m_pHiFreqCorner = new ControlProxy("[Mixer Profile]", "HiEQFrequency");
+    m_pLoFreqCorner = new ControlProxy(kMixerProfile, kLowEqFrequency);
+    m_pHiFreqCorner = new ControlProxy(kMixerProfile, kHighEqFrequency);
 }
 
 void Bessel8LVMixEQEffect::loadEngineEffectParameters(
diff --git a/src/effects/backends/builtin/biquadfullkilleqeffect.cpp b/src/effects/backends/builtin/biquadfullkilleqeffect.cpp
index fa3bcb4b35a..469f76f0b8d 100644
--- a/src/effects/backends/builtin/biquadfullkilleqeffect.cpp
+++ b/src/effects/backends/builtin/biquadfullkilleqeffect.cpp
@@ -1,6 +1,7 @@
 #include "effects/backends/builtin/biquadfullkilleqeffect.h"
 
 #include "effects/backends/builtin/equalizer_util.h"
+#include "effects/defs.h"
 #include "util/math.h"
 
 namespace {
@@ -143,8 +144,8 @@ void BiquadFullKillEQEffectGroupState::setFilters(
 }
 
 BiquadFullKillEQEffect::BiquadFullKillEQEffect() {
-    m_pLoFreqCorner = std::make_unique<ControlProxy>("[Mixer Profile]", "LoEQFrequency");
-    m_pHiFreqCorner = std::make_unique<ControlProxy>("[Mixer Profile]", "HiEQFrequency");
+    m_pLoFreqCorner = std::make_unique<ControlProxy>(kMixerProfile, kLowEqFrequency);
+    m_pHiFreqCorner = std::make_unique<ControlProxy>(kMixerProfile, kHighEqFrequency);
 }
 
 void BiquadFullKillEQEffect::loadEngineEffectParameters(
diff --git a/src/effects/backends/builtin/linkwitzriley8eqeffect.cpp b/src/effects/backends/builtin/linkwitzriley8eqeffect.cpp
index 03c020a441c..6fe242a3823 100644
--- a/src/effects/backends/builtin/linkwitzriley8eqeffect.cpp
+++ b/src/effects/backends/builtin/linkwitzriley8eqeffect.cpp
@@ -1,6 +1,7 @@
 #include "effects/backends/builtin/linkwitzriley8eqeffect.h"
 
 #include "effects/backends/builtin/equalizer_util.h"
+#include "effects/defs.h"
 #include "util/math.h"
 
 static constexpr unsigned int kStartupSamplerate = 44100;
@@ -68,8 +69,8 @@ void LinkwitzRiley8EQEffectGroupState::setFilters(int sampleRate, int lowFreq, i
 }
 
 LinkwitzRiley8EQEffect::LinkwitzRiley8EQEffect() {
-    m_pLoFreqCorner = new ControlProxy("[Mixer Profile]", "LoEQFrequency");
-    m_pHiFreqCorner = new ControlProxy("[Mixer Profile]", "HiEQFrequency");
+    m_pLoFreqCorner = new ControlProxy(kMixerProfile, kLowEqFrequency);
+    m_pHiFreqCorner = new ControlProxy(kMixerProfile, kHighEqFrequency);
 }
 
 void LinkwitzRiley8EQEffect::loadEngineEffectParameters(
diff --git a/src/effects/backends/builtin/threebandbiquadeqeffect.cpp b/src/effects/backends/builtin/threebandbiquadeqeffect.cpp
index 76f44906a2c..2b5eff4e6a1 100644
--- a/src/effects/backends/builtin/threebandbiquadeqeffect.cpp
+++ b/src/effects/backends/builtin/threebandbiquadeqeffect.cpp
@@ -1,6 +1,7 @@
 #include "effects/backends/builtin/threebandbiquadeqeffect.h"
 
 #include "effects/backends/builtin/equalizer_util.h"
+#include "effects/defs.h"
 #include "util/math.h"
 
 namespace {
@@ -117,8 +118,8 @@ void ThreeBandBiquadEQEffectGroupState::setFilters(
 }
 
 ThreeBandBiquadEQEffect::ThreeBandBiquadEQEffect() {
-    m_pLoFreqCorner = std::make_unique<ControlProxy>("[Mixer Profile]", "LoEQFrequency");
-    m_pHiFreqCorner = std::make_unique<ControlProxy>("[Mixer Profile]", "HiEQFrequency");
+    m_pLoFreqCorner = std::make_unique<ControlProxy>(kMixerProfile, kLowEqFrequency);
+    m_pHiFreqCorner = std::make_unique<ControlProxy>(kMixerProfile, kHighEqFrequency);
 }
 
 void ThreeBandBiquadEQEffect::loadEngineEffectParameters(
diff --git a/src/effects/defs.h b/src/effects/defs.h
index d1ba49b8590..b714915b80f 100644
--- a/src/effects/defs.h
+++ b/src/effects/defs.h
@@ -40,6 +40,10 @@ constexpr int kNumEffectsPerUnit = 4;
 
 const QString kNoEffectString = QStringLiteral("---");
 
+const QString kMixerProfile = QStringLiteral("[Mixer Profile]");
+const QString kHighEqFrequency = QStringLiteral("HiEQFrequency");
+const QString kLowEqFrequency = QStringLiteral("LoEQFrequency");
+
 // NOTE: Setting this to true will enable string manipulation and calls to
 // qDebug() in the audio engine thread. That may cause audio dropouts, so only
 // enable this when debugging the effects system.
diff --git a/src/effects/effectsmanager.cpp b/src/effects/effectsmanager.cpp
index d9076ec53f1..76edf192aff 100644
--- a/src/effects/effectsmanager.cpp
+++ b/src/effects/effectsmanager.cpp
@@ -26,8 +26,8 @@ EffectsManager::EffectsManager(
         std::shared_ptr<ChannelHandleFactory> pChannelHandleFactory)
         : m_pConfig(pConfig),
           m_pChannelHandleFactory(pChannelHandleFactory),
-          m_loEqFreq(ConfigKey("[Mixer Profile]", "LoEQFrequency"), 0., 22040),
-          m_hiEqFreq(ConfigKey("[Mixer Profile]", "HiEQFrequency"), 0., 22040) {
+          m_loEqFreq(ConfigKey(kMixerProfile, kLowEqFrequency), 0., 22040),
+          m_hiEqFreq(ConfigKey(kMixerProfile, kHighEqFrequency), 0., 22040) {
     qRegisterMetaType<EffectChainMixMode>("EffectChainMixMode");
 
     m_pBackendManager = EffectsBackendManagerPointer(new EffectsBackendManager());
diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index eee764592d9..8fcc6de7fa3 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -18,7 +18,6 @@
 #include "util/rescaler.h"
 
 namespace {
-const QString kConfigGroup = QStringLiteral("[Mixer Profile]");
 const QString kEffectForGroupPrefix = QStringLiteral("EffectForGroup_");
 const QString kEffectGroupForMaster = QStringLiteral("EffectForGroup_[Master]");
 const QString kEnableEqs = QStringLiteral("EnableEQs");
@@ -30,6 +29,13 @@ const QString kDefaultEqId = BiquadFullKillEQEffect::getId() + " " +
 const QString kDefaultQuickEffectChainName = QStringLiteral("Filter");
 const QString kDefaultMainEqId = QString();
 
+const ConfigKey kHighEqFreqKey = ConfigKey(kMixerProfile, kHighEqFrequency);
+const ConfigKey kHighEqFreqPreciseKey =
+        ConfigKey(kMixerProfile, QStringLiteral("HiEQFrequencyPrecise"));
+const ConfigKey kLowEqFreqKey = ConfigKey(kMixerProfile, kLowEqFrequency);
+const ConfigKey kLowEqFreqPreciseKey =
+        ConfigKey(kMixerProfile, QStringLiteral("LoEQFrequencyPrecise"));
+
 constexpr int kFrequencyUpperLimit = 20050;
 constexpr int kFrequencyLowerLimit = 16;
 
@@ -57,8 +63,8 @@ DlgPrefMixer::DlgPrefMixer(
           m_reverse(EngineXfader::kXfaderConfigKey, "xFaderReverse"),
           m_crossfader("[Master]", "crossfader"),
           m_xFaderReverse(false),
-          m_COLoFreq(kConfigGroup, "LoEQFrequency"),
-          m_COHiFreq(kConfigGroup, "HiEQFrequency"),
+          m_COLoFreq(kLowEqFreqKey),
+          m_COHiFreq(kHighEqFreqKey),
           m_lowEqFreq(0.0),
           m_highEqFreq(0.0),
           m_pChainPresetManager(pEffectsManager->getChainPresetManager()),
@@ -180,7 +186,7 @@ void DlgPrefMixer::slotNumDecksChanged(double numDecks) {
         // EQ was selected ('---').
         // If the key doesn't exist the default EQ is loaded.
         QString configuredEffect = m_pConfig->getValue<QString>(
-                ConfigKey(kConfigGroup, kEffectForGroupPrefix + deckGroup),
+                ConfigKey(kMixerProfile, kEffectForGroupPrefix + deckGroup),
                 kDefaultEqId);
         const EffectManifestPointer pEQManifest =
                 m_pBackendManager->getManifestFromUniqueId(configuredEffect);
@@ -518,7 +524,7 @@ void DlgPrefMixer::applyDeckEQs() {
             effectId = pManifest->uniqueId();
         }
         // TODO store this in effects.xml
-        m_pConfig->set(ConfigKey(kConfigGroup, kEffectForGroupPrefix + deckGroup),
+        m_pConfig->set(ConfigKey(kMixerProfile, kEffectForGroupPrefix + deckGroup),
                 effectId);
     }
     m_ignoreEqQuickEffectBoxSignals = false;
@@ -668,15 +674,15 @@ void DlgPrefMixer::slotApply() {
             ConfigValue(checkBoxReverse->isChecked() ? 1 : 0));
 
     // EQ & QuickEffect settings ///////////////////////////////////////////////
-    m_pConfig->set(ConfigKey(kConfigGroup, kEnableEqs),
+    m_pConfig->set(ConfigKey(kMixerProfile, kEnableEqs),
             ConfigValue(m_eqBypass ? 0 : 1));
-    m_pConfig->set(ConfigKey(kConfigGroup, kSingleEq),
+    m_pConfig->set(ConfigKey(kMixerProfile, kSingleEq),
             ConfigValue(m_singleEq ? 1 : 0));
-    m_pConfig->set(ConfigKey(kConfigGroup, kEqsOnly),
+    m_pConfig->set(ConfigKey(kMixerProfile, kEqsOnly),
             ConfigValue(m_eqEffectsOnly ? 1 : 0));
-    m_pConfig->set(ConfigKey(kConfigGroup, "EqAutoReset"),
+    m_pConfig->set(ConfigKey(kMixerProfile, "EqAutoReset"),
             ConfigValue(m_eqAutoReset ? 1 : 0));
-    m_pConfig->set(ConfigKey(kConfigGroup, "GainAutoReset"),
+    m_pConfig->set(ConfigKey(kMixerProfile, "GainAutoReset"),
             ConfigValue(m_gainAutoReset ? 1 : 0));
     applyDeckEQs();
     applyQuickEffects();
@@ -691,14 +697,8 @@ void DlgPrefMixer::storeEqShelves() {
         return;
     }
 
-    m_pConfig->set(ConfigKey(kConfigGroup, "HiEQFrequency"),
-            ConfigValue(QString::number(static_cast<int>(std::round(m_highEqFreq)))));
-    m_pConfig->set(ConfigKey(kConfigGroup, "HiEQFrequencyPrecise"),
-            ConfigValue(QString::number(m_highEqFreq, 'f')));
-    m_pConfig->set(ConfigKey(kConfigGroup, "LoEQFrequency"),
-            ConfigValue(QString::number(static_cast<int>(std::round(m_lowEqFreq)))));
-    m_pConfig->set(ConfigKey(kConfigGroup, "LoEQFrequencyPrecise"),
-            ConfigValue(QString::number(m_lowEqFreq, 'f')));
+    m_pConfig->set(kHighEqFreqPreciseKey, ConfigValue(QString::number(m_highEqFreq, 'f')));
+    m_pConfig->set(kLowEqFreqPreciseKey, ConfigValue(QString::number(m_lowEqFreq, 'f')));
 }
 
 // Update the widgets with values from config
@@ -733,11 +733,11 @@ void DlgPrefMixer::slotUpdate() {
     slotUpdateXFader();
 
     // EQs & QuickEffects //////////////////////////////////////////////////////
-    QString eqsOnly = m_pConfig->getValue(ConfigKey(kConfigGroup, kEqsOnly), "1");
+    QString eqsOnly = m_pConfig->getValue(ConfigKey(kMixerProfile, kEqsOnly), "1");
     m_eqEffectsOnly = eqsOnly == "yes" || eqsOnly == "1";
     CheckBoxEqOnly->setChecked(m_eqEffectsOnly);
 
-    QString singleEqCfg = m_pConfig->getValue(ConfigKey(kConfigGroup, kSingleEq), "1");
+    QString singleEqCfg = m_pConfig->getValue(ConfigKey(kMixerProfile, kSingleEq), "1");
     m_singleEq = singleEqCfg == "yes" || singleEqCfg == "1";
     if (!m_initializing) {
         slotPopulateDeckEqSelectors();
@@ -748,29 +748,23 @@ void DlgPrefMixer::slotUpdate() {
         slotSingleEqToggled(m_singleEq);
     }
 
-    m_eqAutoReset = static_cast<bool>(
-            m_pConfig->getValueString(ConfigKey(kConfigGroup, "EqAutoReset"))
-                    .toInt());
+    m_eqAutoReset = m_pConfig->getValue<bool>(kEqAutoResetKey, false);
     CheckBoxEqAutoReset->setChecked(m_eqAutoReset);
 
-    m_gainAutoReset = static_cast<bool>(
-            m_pConfig->getValueString(ConfigKey(kConfigGroup, "GainAutoReset"))
-                    .toInt());
+    m_gainAutoReset = m_pConfig->getValue<bool>(kGainAutoResetKey, false);
     CheckBoxGainAutoReset->setChecked(m_gainAutoReset);
 
-    QString eqBaypassCfg = m_pConfig->getValue(ConfigKey(kConfigGroup, kEnableEqs), "1");
-    m_eqBypass = !(eqBaypassCfg == "yes" || eqBaypassCfg == "1");
+    QString eqBaypassCfg = m_pConfig->getValueString(kEnableEqsKey);
+    m_eqBypass = !(eqBaypassCfg == "yes" || eqBaypassCfg == "1"); // default false
     CheckBoxBypass->setChecked(m_eqBypass);
     // Deactivate EQ comboboxes when Bypass is enabled
     slotBypassEqToggled(CheckBoxBypass->isChecked());
 
     // EQ shelves //////////////////////////////////////////////////////////////
-    QString highEqCoarse = m_pConfig->getValueString(ConfigKey(kConfigGroup, "HiEQFrequency"));
-    QString highEqPrecise = m_pConfig->getValueString(
-            ConfigKey(kConfigGroup, "HiEQFrequencyPrecise"));
-    QString lowEqCoarse = m_pConfig->getValueString(ConfigKey(kConfigGroup, "LoEQFrequency"));
-    QString lowEqPrecise = m_pConfig->getValueString(
-            ConfigKey(kConfigGroup, "LoEQFrequencyPrecise"));
+    QString highEqCoarse = m_pConfig->getValueString(kHighEqFreqKey);
+    QString highEqPrecise = m_pConfig->getValueString(kHighEqFreqPreciseKey);
+    QString lowEqCoarse = m_pConfig->getValueString(kLowEqFreqKey);
+    QString lowEqPrecise = m_pConfig->getValueString(kLowEqFreqPreciseKey);
     double lowEqFreq = 0.0;
     double highEqFreq = 0.0;
 
@@ -947,7 +941,7 @@ void DlgPrefMixer::setUpMainEQ() {
 
 void DlgPrefMixer::updateMainEQ() {
     const QString configuredEffectId =
-            m_pConfig->getValue(ConfigKey(kConfigGroup, kEffectGroupForMaster),
+            m_pConfig->getValue(ConfigKey(kMixerProfile, kEffectGroupForMaster),
                     kDefaultMainEqId);
     const EffectManifestPointer configuredEffectManifest =
             m_pBackendManager->getManifestFromUniqueId(configuredEffectId);
@@ -961,7 +955,7 @@ void DlgPrefMixer::updateMainEQ() {
     // Load parameters from preferences and set sliders
     for (QSlider* pSlider : qAsConst(m_mainEQSliders)) {
         int paramIndex = pSlider->property("index").toInt();
-        QString strValue = m_pConfig->getValueString(ConfigKey(kConfigGroup,
+        QString strValue = m_pConfig->getValueString(ConfigKey(kMixerProfile,
                 kMainEQParameterKey + QString::number(paramIndex + 1)));
 
         bool ok;
@@ -1124,12 +1118,12 @@ void DlgPrefMixer::storeMainEQ() {
             m_pBackendManager->getManifestFromUniqueId(
                     comboBoxMainEq->currentData().toString());
 
-    m_pConfig->set(ConfigKey(kConfigGroup, kEffectGroupForMaster),
+    m_pConfig->set(ConfigKey(kMixerProfile, kEffectGroupForMaster),
             ConfigValue(pManifest ? pManifest->uniqueId() : ""));
 
     // clear all previous parameter values so we have no residues
-    const QList<ConfigKey> micerKeys = m_pConfig->getKeysWithGroup(kConfigGroup);
-    for (const auto& key : micerKeys) {
+    const QList<ConfigKey> mixerKeys = m_pConfig->getKeysWithGroup(kMixerProfile);
+    for (const auto& key : mixerKeys) {
         if (key.item.contains(kMainEQParameterKey)) {
             m_pConfig->remove(key);
         }
@@ -1140,7 +1134,7 @@ void DlgPrefMixer::storeMainEQ() {
         int paramIndex = pSlider->property("index").toInt();
         double dispValue = static_cast<double>(pSlider->value()) / 100;
         // TODO store this in effects.xml
-        m_pConfig->set(ConfigKey(kConfigGroup,
+        m_pConfig->set(ConfigKey(kMixerProfile,
                                kMainEQParameterKey + QString::number(paramIndex + 1)),
                 ConfigValue(QString::number(dispValue)));
     }
diff --git a/src/test/nativeeffects_test.cpp b/src/test/nativeeffects_test.cpp
index 442a326ae94..dd8e274d462 100644
--- a/src/test/nativeeffects_test.cpp
+++ b/src/test/nativeeffects_test.cpp
@@ -67,10 +67,10 @@ void benchmarkBuiltInEffectDefaultParameters(const mixxx::EngineParameters& engi
 #define DECLARE_EFFECT_BENCHMARK(EffectName)                                         \
     TEST_F(EffectsBenchmarkTest, BM_BuiltInEffects_DefaultParameters_##EffectName) { \
         ControlPotmeter loEqFrequency(                                               \
-                ConfigKey("[Mixer Profile]", "LoEQFrequency"), 0., 22040);           \
+                ConfigKey(kMixerProfile, kHighEqFrequency), 0., 22040);              \
         loEqFrequency.setDefaultValue(250.0);                                        \
         ControlPotmeter hiEqFrequency(                                               \
-                ConfigKey("[Mixer Profile]", "HiEQFrequency"), 0., 22040);           \
+                ConfigKey(kMixerProfile, kLowEqFrequency), 0., 22040);               \
         hiEqFrequency.setDefaultValue(2500.0);                                       \
         mixxx::EngineParameters engineParameters(                                    \
                 mixxx::audio::SampleRate(44100),                                     \

From 21667b6668bdc1203e9cf0f067ab54f06f2e570c Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Thu, 6 Jul 2023 02:12:53 +0200
Subject: [PATCH 034/388] Pref Mixer: constants for ConfigKeys

---
 src/preferences/dialog/dlgprefmixer.cpp | 31 +++++++++++--------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index 8fcc6de7fa3..7dabc645ece 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -20,10 +20,12 @@
 namespace {
 const QString kEffectForGroupPrefix = QStringLiteral("EffectForGroup_");
 const QString kEffectGroupForMaster = QStringLiteral("EffectForGroup_[Master]");
-const QString kEnableEqs = QStringLiteral("EnableEQs");
-const QString kEqsOnly = QStringLiteral("EQsOnly");
-const QString kSingleEq = QStringLiteral("SingleEQEffect");
 const QString kMainEQParameterKey = QStringLiteral("EffectForGroup_[Master]_parameter");
+const ConfigKey kEnableEqsKey = ConfigKey(kMixerProfile, QStringLiteral("EnableEQs"));
+const ConfigKey kEqsOnlyKey = ConfigKey(kMixerProfile, QStringLiteral("EQsOnly"));
+const ConfigKey kSingleEqKey = ConfigKey(kMixerProfile, QStringLiteral("SingleEQEffect"));
+const ConfigKey kEqAutoResetKey = ConfigKey(kMixerProfile, QStringLiteral("EqAutoReset"));
+const ConfigKey kGainAutoResetKey = ConfigKey(kMixerProfile, QStringLiteral("GainAutoReset"));
 const QString kDefaultEqId = BiquadFullKillEQEffect::getId() + " " +
         EffectsBackend::backendTypeToString(EffectBackendType::BuiltIn);
 const QString kDefaultQuickEffectChainName = QStringLiteral("Filter");
@@ -674,16 +676,11 @@ void DlgPrefMixer::slotApply() {
             ConfigValue(checkBoxReverse->isChecked() ? 1 : 0));
 
     // EQ & QuickEffect settings ///////////////////////////////////////////////
-    m_pConfig->set(ConfigKey(kMixerProfile, kEnableEqs),
-            ConfigValue(m_eqBypass ? 0 : 1));
-    m_pConfig->set(ConfigKey(kMixerProfile, kSingleEq),
-            ConfigValue(m_singleEq ? 1 : 0));
-    m_pConfig->set(ConfigKey(kMixerProfile, kEqsOnly),
-            ConfigValue(m_eqEffectsOnly ? 1 : 0));
-    m_pConfig->set(ConfigKey(kMixerProfile, "EqAutoReset"),
-            ConfigValue(m_eqAutoReset ? 1 : 0));
-    m_pConfig->set(ConfigKey(kMixerProfile, "GainAutoReset"),
-            ConfigValue(m_gainAutoReset ? 1 : 0));
+    m_pConfig->set(kEnableEqsKey, ConfigValue(m_eqBypass ? 0 : 1));
+    m_pConfig->set(kSingleEqKey, ConfigValue(m_singleEq ? 1 : 0));
+    m_pConfig->set(kEqsOnlyKey, ConfigValue(m_eqEffectsOnly ? 1 : 0));
+    m_pConfig->set(kEqAutoResetKey, ConfigValue(m_eqAutoReset ? 1 : 0));
+    m_pConfig->set(kGainAutoResetKey, ConfigValue(m_gainAutoReset ? 1 : 0));
     applyDeckEQs();
     applyQuickEffects();
 
@@ -733,12 +730,12 @@ void DlgPrefMixer::slotUpdate() {
     slotUpdateXFader();
 
     // EQs & QuickEffects //////////////////////////////////////////////////////
-    QString eqsOnly = m_pConfig->getValue(ConfigKey(kMixerProfile, kEqsOnly), "1");
-    m_eqEffectsOnly = eqsOnly == "yes" || eqsOnly == "1";
+    QString eqsOnly = m_pConfig->getValueString(kEqsOnlyKey);
+    m_eqEffectsOnly = eqsOnly != "no" && eqsOnly != "0"; // default true
     CheckBoxEqOnly->setChecked(m_eqEffectsOnly);
 
-    QString singleEqCfg = m_pConfig->getValue(ConfigKey(kMixerProfile, kSingleEq), "1");
-    m_singleEq = singleEqCfg == "yes" || singleEqCfg == "1";
+    QString singleEqCfg = m_pConfig->getValueString(kSingleEqKey);
+    m_singleEq = singleEqCfg != "no" && singleEqCfg != "0"; // default true
     if (!m_initializing) {
         slotPopulateDeckEqSelectors();
         slotPopulateQuickEffectSelectors();

From 2f8534f1496ac9d1f2c0053ba2f56f7e38ad77e8 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Thu, 6 Jul 2023 00:25:51 +0200
Subject: [PATCH 035/388] Pref Mixer: get default QuickEffect name from its
 effect manifest

---
 src/preferences/dialog/dlgprefmixer.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index 7dabc645ece..27186fce2c0 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -8,6 +8,7 @@
 #include "control/controlproxy.h"
 #include "defs_urls.h"
 #include "effects/backends/builtin/biquadfullkilleqeffect.h"
+#include "effects/backends/builtin/filtereffect.h"
 #include "effects/chains/equalizereffectchain.h"
 #include "effects/chains/quickeffectchain.h"
 #include "effects/effectslot.h"
@@ -28,7 +29,7 @@ const ConfigKey kEqAutoResetKey = ConfigKey(kMixerProfile, QStringLiteral("EqAut
 const ConfigKey kGainAutoResetKey = ConfigKey(kMixerProfile, QStringLiteral("GainAutoReset"));
 const QString kDefaultEqId = BiquadFullKillEQEffect::getId() + " " +
         EffectsBackend::backendTypeToString(EffectBackendType::BuiltIn);
-const QString kDefaultQuickEffectChainName = QStringLiteral("Filter");
+const QString kDefaultQuickEffectChainName = FilterEffect::getManifest()->name();
 const QString kDefaultMainEqId = QString();
 
 const ConfigKey kHighEqFreqKey = ConfigKey(kMixerProfile, kHighEqFrequency);

From 26b952c572ec0a16987bf9a8e1bcede6495db35d Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Thu, 6 Jul 2023 00:48:13 +0200
Subject: [PATCH 036/388] use PollingControlProxy for EQ corner frequency
 controls

---
 .../backends/builtin/bessel4lvmixeqeffect.cpp  | 12 +++++-------
 .../backends/builtin/bessel4lvmixeqeffect.h    |  6 +++---
 .../backends/builtin/bessel8lvmixeqeffect.cpp  | 12 +++++-------
 .../backends/builtin/bessel8lvmixeqeffect.h    |  6 +++---
 .../builtin/biquadfullkilleqeffect.cpp         | 18 +++++++++---------
 .../backends/builtin/biquadfullkilleqeffect.h  |  6 +++---
 .../builtin/linkwitzriley8eqeffect.cpp         | 16 +++++++---------
 .../backends/builtin/linkwitzriley8eqeffect.h  |  6 +++---
 .../builtin/threebandbiquadeqeffect.cpp        | 14 +++++++-------
 .../backends/builtin/threebandbiquadeqeffect.h |  6 +++---
 10 files changed, 48 insertions(+), 54 deletions(-)

diff --git a/src/effects/backends/builtin/bessel4lvmixeqeffect.cpp b/src/effects/backends/builtin/bessel4lvmixeqeffect.cpp
index 4c44cf93290..e721faf1a46 100644
--- a/src/effects/backends/builtin/bessel4lvmixeqeffect.cpp
+++ b/src/effects/backends/builtin/bessel4lvmixeqeffect.cpp
@@ -29,9 +29,9 @@ EffectManifestPointer Bessel4LVMixEQEffect::getManifest() {
     return pManifest;
 }
 
-Bessel4LVMixEQEffect::Bessel4LVMixEQEffect() {
-    m_pLoFreqCorner = new ControlProxy(kMixerProfile, kLowEqFrequency);
-    m_pHiFreqCorner = new ControlProxy(kMixerProfile, kHighEqFrequency);
+Bessel4LVMixEQEffect::Bessel4LVMixEQEffect()
+        : m_pLoFreqCorner(kMixerProfile, kLowEqFrequency),
+          m_pHiFreqCorner(kMixerProfile, kHighEqFrequency) {
 }
 
 void Bessel4LVMixEQEffect::loadEngineEffectParameters(
@@ -45,8 +45,6 @@ void Bessel4LVMixEQEffect::loadEngineEffectParameters(
 }
 
 Bessel4LVMixEQEffect::~Bessel4LVMixEQEffect() {
-    delete m_pLoFreqCorner;
-    delete m_pHiFreqCorner;
 }
 
 void Bessel4LVMixEQEffect::processChannel(
@@ -87,7 +85,7 @@ void Bessel4LVMixEQEffect::processChannel(
                 fLow,
                 fMid,
                 fHigh,
-                m_pLoFreqCorner->get(),
-                m_pHiFreqCorner->get());
+                m_pLoFreqCorner.get(),
+                m_pHiFreqCorner.get());
     }
 }
diff --git a/src/effects/backends/builtin/bessel4lvmixeqeffect.h b/src/effects/backends/builtin/bessel4lvmixeqeffect.h
index e906aa19682..85fbda079ae 100644
--- a/src/effects/backends/builtin/bessel4lvmixeqeffect.h
+++ b/src/effects/backends/builtin/bessel4lvmixeqeffect.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <QMap>
 
-#include "control/controlproxy.h"
+#include "control/pollingcontrolproxy.h"
 #include "effects/backends/builtin/lvmixeqbase.h"
 #include "effects/backends/effectprocessor.h"
 #include "engine/effects/engineeffect.h"
@@ -51,8 +51,8 @@ class Bessel4LVMixEQEffect : public EffectProcessorImpl<Bessel4LVMixEQEffectGrou
     EngineEffectParameterPointer m_pKillMid;
     EngineEffectParameterPointer m_pKillHigh;
 
-    ControlProxy* m_pLoFreqCorner;
-    ControlProxy* m_pHiFreqCorner;
+    PollingControlProxy m_pLoFreqCorner;
+    PollingControlProxy m_pHiFreqCorner;
 
     DISALLOW_COPY_AND_ASSIGN(Bessel4LVMixEQEffect);
 };
diff --git a/src/effects/backends/builtin/bessel8lvmixeqeffect.cpp b/src/effects/backends/builtin/bessel8lvmixeqeffect.cpp
index 01dbdf03db0..7e73e9056e6 100644
--- a/src/effects/backends/builtin/bessel8lvmixeqeffect.cpp
+++ b/src/effects/backends/builtin/bessel8lvmixeqeffect.cpp
@@ -29,9 +29,9 @@ EffectManifestPointer Bessel8LVMixEQEffect::getManifest() {
     return pManifest;
 }
 
-Bessel8LVMixEQEffect::Bessel8LVMixEQEffect() {
-    m_pLoFreqCorner = new ControlProxy(kMixerProfile, kLowEqFrequency);
-    m_pHiFreqCorner = new ControlProxy(kMixerProfile, kHighEqFrequency);
+Bessel8LVMixEQEffect::Bessel8LVMixEQEffect()
+        : m_pLoFreqCorner(kMixerProfile, kLowEqFrequency),
+          m_pHiFreqCorner(kMixerProfile, kHighEqFrequency) {
 }
 
 void Bessel8LVMixEQEffect::loadEngineEffectParameters(
@@ -45,8 +45,6 @@ void Bessel8LVMixEQEffect::loadEngineEffectParameters(
 }
 
 Bessel8LVMixEQEffect::~Bessel8LVMixEQEffect() {
-    delete m_pLoFreqCorner;
-    delete m_pHiFreqCorner;
 }
 
 void Bessel8LVMixEQEffect::processChannel(
@@ -87,7 +85,7 @@ void Bessel8LVMixEQEffect::processChannel(
                 fLow,
                 fMid,
                 fHigh,
-                m_pLoFreqCorner->get(),
-                m_pHiFreqCorner->get());
+                m_pLoFreqCorner.get(),
+                m_pHiFreqCorner.get());
     }
 }
diff --git a/src/effects/backends/builtin/bessel8lvmixeqeffect.h b/src/effects/backends/builtin/bessel8lvmixeqeffect.h
index 44be944f8af..a44f8dcffd6 100644
--- a/src/effects/backends/builtin/bessel8lvmixeqeffect.h
+++ b/src/effects/backends/builtin/bessel8lvmixeqeffect.h
@@ -2,7 +2,7 @@
 
 #include <QMap>
 
-#include "control/controlproxy.h"
+#include "control/pollingcontrolproxy.h"
 #include "effects/backends/builtin/lvmixeqbase.h"
 #include "effects/backends/effectprocessor.h"
 #include "engine/effects/engineeffect.h"
@@ -53,8 +53,8 @@ class Bessel8LVMixEQEffect : public EffectProcessorImpl<Bessel8LVMixEQEffectGrou
     EngineEffectParameterPointer m_pKillMid;
     EngineEffectParameterPointer m_pKillHigh;
 
-    ControlProxy* m_pLoFreqCorner;
-    ControlProxy* m_pHiFreqCorner;
+    PollingControlProxy m_pLoFreqCorner;
+    PollingControlProxy m_pHiFreqCorner;
 
     DISALLOW_COPY_AND_ASSIGN(Bessel8LVMixEQEffect);
 };
diff --git a/src/effects/backends/builtin/biquadfullkilleqeffect.cpp b/src/effects/backends/builtin/biquadfullkilleqeffect.cpp
index 469f76f0b8d..463a3d36ce5 100644
--- a/src/effects/backends/builtin/biquadfullkilleqeffect.cpp
+++ b/src/effects/backends/builtin/biquadfullkilleqeffect.cpp
@@ -143,9 +143,9 @@ void BiquadFullKillEQEffectGroupState::setFilters(
     m_lvMixIso->setFilters(sampleRate, lowFreqCorner, highFreqCorner);
 }
 
-BiquadFullKillEQEffect::BiquadFullKillEQEffect() {
-    m_pLoFreqCorner = std::make_unique<ControlProxy>(kMixerProfile, kLowEqFrequency);
-    m_pHiFreqCorner = std::make_unique<ControlProxy>(kMixerProfile, kHighEqFrequency);
+BiquadFullKillEQEffect::BiquadFullKillEQEffect()
+        : m_pLoFreqCorner(kMixerProfile, kLowEqFrequency),
+          m_pHiFreqCorner(kMixerProfile, kHighEqFrequency) {
 }
 
 void BiquadFullKillEQEffect::loadEngineEffectParameters(
@@ -171,10 +171,10 @@ void BiquadFullKillEQEffect::processChannel(
     Q_UNUSED(groupFeatures);
 
     if (pState->m_oldSampleRate != engineParameters.sampleRate() ||
-            (pState->m_loFreqCorner != m_pLoFreqCorner->get()) ||
-            (pState->m_highFreqCorner != m_pHiFreqCorner->get())) {
-        pState->m_loFreqCorner = m_pLoFreqCorner->get();
-        pState->m_highFreqCorner = m_pHiFreqCorner->get();
+            (pState->m_loFreqCorner != m_pLoFreqCorner.get()) ||
+            (pState->m_highFreqCorner != m_pHiFreqCorner.get())) {
+        pState->m_loFreqCorner = m_pLoFreqCorner.get();
+        pState->m_highFreqCorner = m_pHiFreqCorner.get();
         pState->m_oldSampleRate = engineParameters.sampleRate();
         pState->setFilters(engineParameters.sampleRate(),
                 pState->m_loFreqCorner,
@@ -408,7 +408,7 @@ void BiquadFullKillEQEffect::processChannel(
                 fLow,
                 fMid,
                 fHigh,
-                m_pLoFreqCorner->get(),
-                m_pHiFreqCorner->get());
+                m_pLoFreqCorner.get(),
+                m_pHiFreqCorner.get());
     }
 }
diff --git a/src/effects/backends/builtin/biquadfullkilleqeffect.h b/src/effects/backends/builtin/biquadfullkilleqeffect.h
index 795c73386e8..2f3ab30bc72 100644
--- a/src/effects/backends/builtin/biquadfullkilleqeffect.h
+++ b/src/effects/backends/builtin/biquadfullkilleqeffect.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "control/controlproxy.h"
+#include "control/pollingcontrolproxy.h"
 #include "effects/backends/builtin/lvmixeqbase.h"
 #include "effects/backends/effectprocessor.h"
 #include "engine/effects/engineeffect.h"
@@ -96,6 +96,6 @@ class BiquadFullKillEQEffect : public EffectProcessorImpl<BiquadFullKillEQEffect
     EngineEffectParameterPointer m_pKillMid;
     EngineEffectParameterPointer m_pKillHigh;
 
-    std::unique_ptr<ControlProxy> m_pLoFreqCorner;
-    std::unique_ptr<ControlProxy> m_pHiFreqCorner;
+    PollingControlProxy m_pLoFreqCorner;
+    PollingControlProxy m_pHiFreqCorner;
 };
diff --git a/src/effects/backends/builtin/linkwitzriley8eqeffect.cpp b/src/effects/backends/builtin/linkwitzriley8eqeffect.cpp
index 6fe242a3823..687ddd2cb9a 100644
--- a/src/effects/backends/builtin/linkwitzriley8eqeffect.cpp
+++ b/src/effects/backends/builtin/linkwitzriley8eqeffect.cpp
@@ -68,9 +68,9 @@ void LinkwitzRiley8EQEffectGroupState::setFilters(int sampleRate, int lowFreq, i
     m_high2->setFrequencyCorners(sampleRate, highFreq);
 }
 
-LinkwitzRiley8EQEffect::LinkwitzRiley8EQEffect() {
-    m_pLoFreqCorner = new ControlProxy(kMixerProfile, kLowEqFrequency);
-    m_pHiFreqCorner = new ControlProxy(kMixerProfile, kHighEqFrequency);
+LinkwitzRiley8EQEffect::LinkwitzRiley8EQEffect()
+        : m_pLoFreqCorner(kMixerProfile, kLowEqFrequency),
+          m_pHiFreqCorner(kMixerProfile, kHighEqFrequency) {
 }
 
 void LinkwitzRiley8EQEffect::loadEngineEffectParameters(
@@ -84,8 +84,6 @@ void LinkwitzRiley8EQEffect::loadEngineEffectParameters(
 }
 
 LinkwitzRiley8EQEffect::~LinkwitzRiley8EQEffect() {
-    delete m_pLoFreqCorner;
-    delete m_pHiFreqCorner;
 }
 
 void LinkwitzRiley8EQEffect::processChannel(
@@ -109,10 +107,10 @@ void LinkwitzRiley8EQEffect::processChannel(
     }
 
     if (pState->m_oldSampleRate != engineParameters.sampleRate() ||
-            (pState->m_loFreq != static_cast<int>(m_pLoFreqCorner->get())) ||
-            (pState->m_hiFreq != static_cast<int>(m_pHiFreqCorner->get()))) {
-        pState->m_loFreq = static_cast<int>(m_pLoFreqCorner->get());
-        pState->m_hiFreq = static_cast<int>(m_pHiFreqCorner->get());
+            (pState->m_loFreq != static_cast<int>(m_pLoFreqCorner.get())) ||
+            (pState->m_hiFreq != static_cast<int>(m_pHiFreqCorner.get()))) {
+        pState->m_loFreq = static_cast<int>(m_pLoFreqCorner.get());
+        pState->m_hiFreq = static_cast<int>(m_pHiFreqCorner.get());
         pState->m_oldSampleRate = engineParameters.sampleRate();
         pState->setFilters(engineParameters.sampleRate(), pState->m_loFreq, pState->m_hiFreq);
     }
diff --git a/src/effects/backends/builtin/linkwitzriley8eqeffect.h b/src/effects/backends/builtin/linkwitzriley8eqeffect.h
index 4fe1e9a39e1..e1cddb1a42a 100644
--- a/src/effects/backends/builtin/linkwitzriley8eqeffect.h
+++ b/src/effects/backends/builtin/linkwitzriley8eqeffect.h
@@ -2,7 +2,7 @@
 
 #include <QMap>
 
-#include "control/controlproxy.h"
+#include "control/pollingcontrolproxy.h"
 #include "effects/backends/effectprocessor.h"
 #include "engine/effects/engineeffect.h"
 #include "engine/effects/engineeffectparameter.h"
@@ -69,8 +69,8 @@ class LinkwitzRiley8EQEffect : public EffectProcessorImpl<LinkwitzRiley8EQEffect
     EngineEffectParameterPointer m_pKillMid;
     EngineEffectParameterPointer m_pKillHigh;
 
-    ControlProxy* m_pLoFreqCorner;
-    ControlProxy* m_pHiFreqCorner;
+    PollingControlProxy m_pLoFreqCorner;
+    PollingControlProxy m_pHiFreqCorner;
 
     DISALLOW_COPY_AND_ASSIGN(LinkwitzRiley8EQEffect);
 };
diff --git a/src/effects/backends/builtin/threebandbiquadeqeffect.cpp b/src/effects/backends/builtin/threebandbiquadeqeffect.cpp
index 2b5eff4e6a1..f362795e51b 100644
--- a/src/effects/backends/builtin/threebandbiquadeqeffect.cpp
+++ b/src/effects/backends/builtin/threebandbiquadeqeffect.cpp
@@ -117,9 +117,9 @@ void ThreeBandBiquadEQEffectGroupState::setFilters(
             sampleRate, highCenter / 2, kQKillShelve, m_oldHighCut);
 }
 
-ThreeBandBiquadEQEffect::ThreeBandBiquadEQEffect() {
-    m_pLoFreqCorner = std::make_unique<ControlProxy>(kMixerProfile, kLowEqFrequency);
-    m_pHiFreqCorner = std::make_unique<ControlProxy>(kMixerProfile, kHighEqFrequency);
+ThreeBandBiquadEQEffect::ThreeBandBiquadEQEffect()
+        : m_pLoFreqCorner(kMixerProfile, kLowEqFrequency),
+          m_pHiFreqCorner(kMixerProfile, kHighEqFrequency) {
 }
 
 void ThreeBandBiquadEQEffect::loadEngineEffectParameters(
@@ -142,10 +142,10 @@ void ThreeBandBiquadEQEffect::processChannel(
     Q_UNUSED(groupFeatures);
 
     if (pState->m_oldSampleRate != engineParameters.sampleRate() ||
-            (pState->m_loFreqCorner != m_pLoFreqCorner->get()) ||
-            (pState->m_highFreqCorner != m_pHiFreqCorner->get())) {
-        pState->m_loFreqCorner = m_pLoFreqCorner->get();
-        pState->m_highFreqCorner = m_pHiFreqCorner->get();
+            (pState->m_loFreqCorner != m_pLoFreqCorner.get()) ||
+            (pState->m_highFreqCorner != m_pHiFreqCorner.get())) {
+        pState->m_loFreqCorner = m_pLoFreqCorner.get();
+        pState->m_highFreqCorner = m_pHiFreqCorner.get();
         pState->m_oldSampleRate = engineParameters.sampleRate();
         pState->setFilters(engineParameters.sampleRate(),
                 pState->m_loFreqCorner,
diff --git a/src/effects/backends/builtin/threebandbiquadeqeffect.h b/src/effects/backends/builtin/threebandbiquadeqeffect.h
index 282a8382da6..6d6bad756d3 100644
--- a/src/effects/backends/builtin/threebandbiquadeqeffect.h
+++ b/src/effects/backends/builtin/threebandbiquadeqeffect.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "control/controlproxy.h"
+#include "control/pollingcontrolproxy.h"
 #include "effects/backends/effectprocessor.h"
 #include "engine/effects/engineeffect.h"
 #include "engine/effects/engineeffectparameter.h"
@@ -77,6 +77,6 @@ class ThreeBandBiquadEQEffect : public EffectProcessorImpl<ThreeBandBiquadEQEffe
     EngineEffectParameterPointer m_pKillMid;
     EngineEffectParameterPointer m_pKillHigh;
 
-    std::unique_ptr<ControlProxy> m_pLoFreqCorner;
-    std::unique_ptr<ControlProxy> m_pHiFreqCorner;
+    PollingControlProxy m_pLoFreqCorner;
+    PollingControlProxy m_pHiFreqCorner;
 };

From c8d98b241f1dc96ec01f2547753a9f0641791be5 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Thu, 6 Jul 2023 00:54:36 +0200
Subject: [PATCH 037/388] EQ utils: add TODO to update tr string after 2.4
 release

---
 src/effects/backends/builtin/equalizer_util.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/effects/backends/builtin/equalizer_util.h b/src/effects/backends/builtin/equalizer_util.h
index fe4d252ebf3..9398d3609b1 100644
--- a/src/effects/backends/builtin/equalizer_util.h
+++ b/src/effects/backends/builtin/equalizer_util.h
@@ -69,7 +69,7 @@ class EqualizerUtil {
     }
 
     static QString adjustFrequencyShelvesTip() {
-        return QObject::tr(
+        return QObject::tr( // TODO point to new Preferences -> Mixer page
                 "To adjust frequency shelves, go to Preferences -> Equalizers.");
     }
 };

From 930e42a4b8cdcda512d2708c888943ece5203fa0 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Sun, 13 Aug 2023 15:55:09 +0200
Subject: [PATCH 038/388] Pref Mixer: polish comments, remove obsolete TODOs,
 add DEBUG_ASESERT

---
 src/preferences/dialog/dlgprefmixer.cpp | 32 ++++++++++++-------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index 27186fce2c0..47764c52635 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -184,7 +184,7 @@ void DlgPrefMixer::slotNumDecksChanged(double numDecks) {
         setScrollSafeGuard(pEqComboBox);
         m_deckEqEffectSelectors.append(pEqComboBox);
 
-        // Load EQ from from mixxx.cfg, add and select it in the comboboxe
+        // Load EQ from from mixxx.cfg, add and select it in the combobox(es).
         // If the ConfigKey exists the EQ is loaded. If the value is empty no
         // EQ was selected ('---').
         // If the key doesn't exist the default EQ is loaded.
@@ -193,8 +193,7 @@ void DlgPrefMixer::slotNumDecksChanged(double numDecks) {
                 kDefaultEqId);
         const EffectManifestPointer pEQManifest =
                 m_pBackendManager->getManifestFromUniqueId(configuredEffect);
-        // We just add the one required item to the box so
-        // applyDeckEQs() can load it.
+        // We just add the one required item to the box so applyDeckEQs() can load it.
         if (pEQManifest) {
             pEqComboBox->addItem(pEQManifest->name(), QVariant(pEQManifest->uniqueId()));
         } else {
@@ -325,6 +324,7 @@ void DlgPrefMixer::slotPopulateQuickEffectSelectors() {
         QString deckGroupName = PlayerManager::groupForDeck(deck);
         QString unitGroup = QuickEffectChain::formatEffectChainGroup(deckGroupName);
         EffectChainPointer pChain = m_pEffectsManager->getEffectChain(unitGroup);
+        DEBUG_ASSERT(pChain);
         for (const auto& pChainPreset : presetList) {
             pBox->addItem(pChainPreset->name());
             if (pChain->presetName() == pChainPreset->name()) {
@@ -461,6 +461,8 @@ void DlgPrefMixer::slotEQEffectChangedOnDeck(int effectIndex) {
 
     // If we are in single-effect mode and the first effect was changed,
     // change the others as well.
+    // TODO Fictional use case: when user changes EQ effect on a deck other than
+    // deck1 via direct chain controls, we may uncheck single EQ.
     if (m_singleEq) {
         slotSingleEqToggled(true);
     }
@@ -604,8 +606,8 @@ void DlgPrefMixer::slotLoEqSliderChanged() {
 }
 
 void DlgPrefMixer::slotMainEQParameterSliderChanged(int value) {
-    // apply parameter, but don't write to config, yet, so
-    // Cancel will reset to the previous state
+    // Apply parameter, but don't write to config, yet, so Cancel will restore
+    // the saved state.
     EffectSlotPointer pEffectSlot(m_pEffectMainEQ);
     if (pEffectSlot.isNull()) {
         return;
@@ -618,7 +620,7 @@ void DlgPrefMixer::slotMainEQParameterSliderChanged(int value) {
 
     // Update slider label
     int index = m_mainEQSliders.indexOf(pSlider);
-    QLabel* pValueLabel = m_mainEQValues[index]; // verify
+    QLabel* pValueLabel = m_mainEQValues[index];
     VERIFY_OR_DEBUG_ASSERT(pValueLabel) {
         return;
     }
@@ -644,9 +646,6 @@ void DlgPrefMixer::slotMainEQParameterSliderChanged(int value) {
 }
 
 int DlgPrefMixer::getSliderPosition(double eqFreq, int minValue, int maxValue) {
-    // TODO there is some conversion issue with this and getEqFreq():
-    // values above ~15 kHz are lowered with each slotUpdate() until the settle
-    // at a certain value
     if (eqFreq >= kFrequencyUpperLimit) {
         return maxValue;
     } else if (eqFreq <= kFrequencyLowerLimit) {
@@ -699,7 +698,7 @@ void DlgPrefMixer::storeEqShelves() {
     m_pConfig->set(kLowEqFreqPreciseKey, ConfigValue(QString::number(m_lowEqFreq, 'f')));
 }
 
-// Update the widgets with values from config
+// Update the widgets with values from config / EffectsManager
 void DlgPrefMixer::slotUpdate() {
     // xfader //////////////////////////////////////////////////////////////////
     m_transform = m_pConfig->getValue(
@@ -808,7 +807,7 @@ void DlgPrefMixer::drawXfaderDisplay() {
     QPen gridPen(Qt::green);
     QPen graphLinePen(Qt::white);
 
-    // draw grid
+    // Draw grid
     for (int i = 1; i < kGrindXLines; i++) {
         pXfScene->addLine(
                 QLineF(0, i * (sizeY / kGrindXLines), sizeX, i * (sizeY / kGrindXLines)), gridPen);
@@ -947,7 +946,7 @@ void DlgPrefMixer::updateMainEQ() {
     if (configuredEffectManifest) {
         mainEqIndex = comboBoxMainEq->findData(configuredEffectManifest->uniqueId());
     }
-    // set index and create required sliders and labels
+    // Set index and create required sliders and labels
     comboBoxMainEq->setCurrentIndex(mainEqIndex);
 
     // Load parameters from preferences and set sliders
@@ -962,7 +961,7 @@ void DlgPrefMixer::updateMainEQ() {
             continue;
         }
         pSlider->setValue(static_cast<int>(paramValue * 100));
-        // label is updated in  slotMainEQParameterSliderChanged()
+        // Thelabel is updated in slotMainEQParameterSliderChanged()
     }
 }
 
@@ -1038,7 +1037,7 @@ void DlgPrefMixer::slotMainEqEffectChanged(int effectIndex) {
                 &QSlider::sliderMoved,
                 this,
                 &DlgPrefMixer::slotMainEQParameterSliderChanged);
-        // catch scroll event
+        // catch scroll event and slider->setValue()
         connect(pSlider,
                 &QSlider::valueChanged,
                 this,
@@ -1048,9 +1047,8 @@ void DlgPrefMixer::slotMainEqEffectChanged(int effectIndex) {
         QString valueText = QString::number((double)pSlider->value() / 100);
         pValueLabel->setText(valueText);
 
-        // Use max required label width so column width doesn't change
-        // when slider is moved.
-        // Considers decimals only where we actually show them
+        // Use max required label width so column width doesn't change when the
+        // slider is moved. Considers decimals only where we actually show them.
         QFontMetrics metrics(font());
         QString maxValueString = QString::number(
                 roundToInt ? pSlider->maximum() : pSlider->maximum() - 0.01);

From ce925d9f73e6b3bf0be5726028e3e8f512a0a64e Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Fri, 30 Jun 2023 23:09:48 +0200
Subject: [PATCH 039/388] EffectsManager: add getQuickEffectChain() helper

---
 src/effects/effectsmanager.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/effects/effectsmanager.h b/src/effects/effectsmanager.h
index 41a4089627d..0f0fb45091a 100644
--- a/src/effects/effectsmanager.h
+++ b/src/effects/effectsmanager.h
@@ -33,6 +33,10 @@ class EffectsManager {
             const QString& deckGroupName) const {
         return m_equalizerEffectChains.value(deckGroupName);
     }
+    QuickEffectChainPointer getQuickEffectChain(
+            const QString& deckGroupName) const {
+        return m_quickEffectChains.value(deckGroupName);
+    }
     EffectChainPointer getStandardEffectChain(int unitNumber) const;
     EffectChainPointer getOutputEffectChain() const;
 

From d3ca182da34bd07a05db3db47375d7e611230938 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Mon, 14 Aug 2023 01:03:59 +0200
Subject: [PATCH 040/388] Pref Mixer: use EffectsManager::getQuickEffectChain()

---
 src/preferences/dialog/dlgprefmixer.cpp | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index 47764c52635..95331a08b94 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -217,8 +217,8 @@ void DlgPrefMixer::slotNumDecksChanged(double numDecks) {
                 &DlgPrefMixer::slotQuickEffectChangedOnDeck);
         // Change the QuickEffect when it was changed in WEffectChainPresetSelector
         // or with controllers
-        QString unitGroup = QuickEffectChain::formatEffectChainGroup(deckGroup);
-        EffectChainPointer pChain = m_pEffectsManager->getEffectChain(unitGroup);
+        EffectChainPointer pChain = m_pEffectsManager->getQuickEffectChain(deckGroup);
+        DEBUG_ASSERT(pChain);
         connect(pChain.data(),
                 &EffectChain::chainPresetChanged,
                 this,
@@ -321,9 +321,8 @@ void DlgPrefMixer::slotPopulateQuickEffectSelectors() {
         pBox->clear();
         int currentIndex = 0; // preselect empty item '---' as default
 
-        QString deckGroupName = PlayerManager::groupForDeck(deck);
-        QString unitGroup = QuickEffectChain::formatEffectChainGroup(deckGroupName);
-        EffectChainPointer pChain = m_pEffectsManager->getEffectChain(unitGroup);
+        EffectChainPointer pChain = m_pEffectsManager->getQuickEffectChain(
+                PlayerManager::groupForDeck(deck));
         DEBUG_ASSERT(pChain);
         for (const auto& pChainPreset : presetList) {
             pBox->addItem(pChainPreset->name());
@@ -549,12 +548,9 @@ void DlgPrefMixer::applyQuickEffects() {
         }
 
         if (needLoad) {
-            const QString quickEffectGroup = QuickEffectChain::formatEffectChainGroup(
+            EffectChainPointer pChain = m_pEffectsManager->getQuickEffectChain(
                     PlayerManager::groupForDeck(deck));
-            EffectChainPointer pChain = m_pEffectsManager->getEffectChain(quickEffectGroup);
-            VERIFY_OR_DEBUG_ASSERT(pChain) {
-                return;
-            }
+            DEBUG_ASSERT(pChain);
             const QList<EffectChainPresetPointer> presetList =
                     m_pChainPresetManager->getQuickEffectPresetsSorted();
             if (effectIndex >= 0 && effectIndex < presetList.size()) {

From 0437f34b96c7cb03aee5735b33fbf8d9eadf46a5 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Mon, 14 Aug 2023 01:19:01 +0200
Subject: [PATCH 041/388] Pref Mixer: a few DEBUG_ASSERT instead of
 VERIFY_OR_...

---
 src/preferences/dialog/dlgprefmixer.cpp | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index 95331a08b94..f8b3bf02f08 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -260,13 +260,9 @@ void DlgPrefMixer::slotPopulateDeckEqSelectors() {
         int deck = m_deckEqEffectSelectors.indexOf(pBox);
         auto pChainSlot = m_pEffectsManager->getEqualizerEffectChain(
                 PlayerManager::groupForDeck(deck));
-        VERIFY_OR_DEBUG_ASSERT(pChainSlot) {
-            return;
-        }
+        DEBUG_ASSERT(pChainSlot);
         auto pEffectSlot = pChainSlot->getEffectSlot(0);
-        VERIFY_OR_DEBUG_ASSERT(pEffectSlot) {
-            return;
-        }
+        DEBUG_ASSERT(pEffectSlot);
         const EffectManifestPointer pLoadedManifest =
                 pEffectSlot->getManifest();
 
@@ -496,13 +492,9 @@ void DlgPrefMixer::applyDeckEQs() {
 
         QString deckGroup = PlayerManager::groupForDeck(deck);
         auto pChainSlot = m_pEffectsManager->getEqualizerEffectChain(deckGroup);
-        VERIFY_OR_DEBUG_ASSERT(pChainSlot) {
-            return;
-        }
+        DEBUG_ASSERT(pChainSlot);
         auto pEffectSlot = pChainSlot->getEffectSlot(0);
-        VERIFY_OR_DEBUG_ASSERT(pEffectSlot) {
-            return;
-        }
+        DEBUG_ASSERT(pEffectSlot);
         pEffectSlot->setEnabled(!m_eqBypass);
 
         const EffectManifestPointer pManifest =
@@ -900,13 +892,9 @@ void DlgPrefMixer::slotBypassEqToggled(bool checked) {
 
 void DlgPrefMixer::setUpMainEQ() {
     auto pChainSlot = m_pEffectsManager->getOutputEffectChain();
-    VERIFY_OR_DEBUG_ASSERT(pChainSlot) {
-        return;
-    }
+    DEBUG_ASSERT(pChainSlot);
     auto pEffectSlot = pChainSlot->getEffectSlot(0);
-    VERIFY_OR_DEBUG_ASSERT(pEffectSlot) {
-        return;
-    }
+    DEBUG_ASSERT(pEffectSlot);
     m_pEffectMainEQ = pEffectSlot;
 
     connect(pbResetMainEq, &QPushButton::clicked, this, &DlgPrefMixer::slotMainEQToDefault);

From a320ada100a334b6dc4ea1873ae5a206aa55f4fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sat, 12 Aug 2023 23:44:57 +0200
Subject: [PATCH 042/388] Expose [BPM],sync_lock_algorithm option in deck
 preferences.

Unfortunately this is still required to have a reliable transition with non const beat-grids like in 2.3.
---
 src/engine/sync/enginesync.cpp           |  2 +-
 src/engine/sync/enginesync.h             | 24 +++----
 src/preferences/dialog/dlgprefdeck.cpp   | 21 ++++++
 src/preferences/dialog/dlgprefdeckdlg.ui | 81 +++++++++++++++++-------
 4 files changed, 93 insertions(+), 35 deletions(-)

diff --git a/src/engine/sync/enginesync.cpp b/src/engine/sync/enginesync.cpp
index 7049c35499f..cd486c34680 100644
--- a/src/engine/sync/enginesync.cpp
+++ b/src/engine/sync/enginesync.cpp
@@ -254,7 +254,7 @@ Syncable* EngineSync::pickLeader(Syncable* enabling_syncable) {
     }
 
     const SyncLockAlgorithm picker = static_cast<SyncLockAlgorithm>(
-            m_pConfig->getValue<int>(ConfigKey("[BPM]", "sync_lock_algorithm"),
+            m_pConfig->getValue<int>(ConfigKey(BPM_CONFIG_GROUP, SYNC_LOCK_ALGORITHM_CONFIG_KEY),
                     PREFER_IMPLICIT_LEADER));
     switch (picker) {
     case PREFER_IMPLICIT_LEADER:
diff --git a/src/engine/sync/enginesync.h b/src/engine/sync/enginesync.h
index d072d80acb6..19cabda99d6 100644
--- a/src/engine/sync/enginesync.h
+++ b/src/engine/sync/enginesync.h
@@ -9,12 +9,25 @@
 class InternalClock;
 class EngineChannel;
 
+#define BPM_CONFIG_GROUP "[BPM]"
+#define SYNC_LOCK_ALGORITHM_CONFIG_KEY "sync_lock_algorithm"
+
 /// EngineSync is the heart of the Mixxx Sync Lock engine.  It knows which objects
 /// (Decks, Internal Clock, etc) are participating in Sync and what their statuses
 /// are. It also orchestrates sync handoffs between different decks as they play,
 /// stop, or request their status to change.
 class EngineSync : public SyncableListener {
   public:
+    // Remove pick SyncLockAlgorithm when new beatgrid detection
+    // and editing code is committed and we no longer need the lock bpm fallback option.
+    enum SyncLockAlgorithm {
+        // New behavior, which should work if beatgrids are reliable.
+        PREFER_IMPLICIT_LEADER,
+        // Old 2.3 behavior, which works around some issues with bad beatgrid detection, mostly
+        // for auto DJ mode.
+        PREFER_LOCK_BPM
+    };
+
     explicit EngineSync(UserSettingsPointer pConfig);
     ~EngineSync() override;
 
@@ -140,17 +153,6 @@ class EngineSync : public SyncableListener {
         return false;
     }
 
-    // TODO: Remove pick algorithms during 2.4 development phase when new beatgrid detection
-    // and editing code is committed and we no longer need the lock bpm fallback option.
-    // If this code makes it to release we will all be very sad.
-    enum SyncLockAlgorithm {
-        // New behavior, which should work if beatgrids are reliable.
-        PREFER_IMPLICIT_LEADER,
-        // Old 2.3 behavior, which works around some issues with bad beatgrid detection, mostly
-        // for auto DJ mode.
-        PREFER_LOCK_BPM
-    };
-
     FRIEND_TEST(EngineSyncTest, EnableOneDeckInitsLeader);
     FRIEND_TEST(EngineSyncTest, EnableOneDeckInitializesLeader);
     FRIEND_TEST(EngineSyncTest, SyncToNonSyncDeck);
diff --git a/src/preferences/dialog/dlgprefdeck.cpp b/src/preferences/dialog/dlgprefdeck.cpp
index f94174115a9..684193f0479 100644
--- a/src/preferences/dialog/dlgprefdeck.cpp
+++ b/src/preferences/dialog/dlgprefdeck.cpp
@@ -12,6 +12,7 @@
 #include "defs_urls.h"
 #include "engine/controls/ratecontrol.h"
 #include "engine/enginebuffer.h"
+#include "engine/sync/enginesync.h"
 #include "mixer/basetrackplayer.h"
 #include "mixer/playerinfo.h"
 #include "mixer/playermanager.h"
@@ -465,6 +466,16 @@ void DlgPrefDeck::slotUpdate() {
     index = ComboBoxCueMode->findData(static_cast<int>(cueMode));
     ComboBoxCueMode->setCurrentIndex(index);
 
+    const EngineSync::SyncLockAlgorithm syncLockAlgorithm =
+            static_cast<EngineSync::SyncLockAlgorithm>(m_pConfig->getValue<int>(
+                    ConfigKey(BPM_CONFIG_GROUP, SYNC_LOCK_ALGORITHM_CONFIG_KEY),
+                    EngineSync::SyncLockAlgorithm::PREFER_IMPLICIT_LEADER));
+    if (syncLockAlgorithm == EngineSync::SyncLockAlgorithm::PREFER_IMPLICIT_LEADER) {
+        radioButtonImplicitLeader->setChecked(true);
+    } else {
+        radioButtonLockBpm->setChecked(true);
+    }
+
     KeylockMode keylockMode =
             static_cast<KeylockMode>(static_cast<int>(m_keylockModeControls[0]->get()));
     if (keylockMode == KeylockMode::LockCurrentKey) {
@@ -550,6 +561,8 @@ void DlgPrefDeck::slotResetToDefaults() {
     checkBoxResetSpeed->setChecked(false);
     checkBoxResetPitch->setChecked(true);
 
+    radioButtonImplicitLeader->setChecked(true);
+
     radioButtonOriginalKey->setChecked(true);
     radioButtonResetUnlockedKey->setChecked(true);
 }
@@ -729,6 +742,14 @@ void DlgPrefDeck::slotApply() {
     m_pConfig->set(ConfigKey("[Controls]", "SpeedAutoReset"),
                    ConfigValue(configSPAutoReset));
 
+    if (radioButtonImplicitLeader->isChecked()) {
+        m_pConfig->setValue(ConfigKey(BPM_CONFIG_GROUP, SYNC_LOCK_ALGORITHM_CONFIG_KEY),
+                static_cast<int>(EngineSync::SyncLockAlgorithm::PREFER_IMPLICIT_LEADER));
+    } else {
+        m_pConfig->setValue(ConfigKey(BPM_CONFIG_GROUP, SYNC_LOCK_ALGORITHM_CONFIG_KEY),
+                static_cast<int>(EngineSync::SyncLockAlgorithm::PREFER_LOCK_BPM));
+    }
+
     m_pConfig->setValue(ConfigKey("[Controls]", "keylockMode"),
                         static_cast<int>(m_keylockMode));
     // Set key lock behavior for every group
diff --git a/src/preferences/dialog/dlgprefdeckdlg.ui b/src/preferences/dialog/dlgprefdeckdlg.ui
index 1dd6d2de1ac..6abc6180bc1 100644
--- a/src/preferences/dialog/dlgprefdeckdlg.ui
+++ b/src/preferences/dialog/dlgprefdeckdlg.ui
@@ -203,7 +203,7 @@ You can always drag-and-drop tracks on screen to clone a deck.</string>
      <layout class="QGridLayout" name="gridLayout_7">
       <item row="0" column="0">
        <layout class="QGridLayout" name="GridLayoutSpeedOptions">
-        <item row="9" column="2">
+        <item row="11" column="2">
          <widget class="QDoubleSpinBox" name="spinBoxPermanentRateCoarse">
           <property name="toolTip">
            <string>Permanent rate change when left-clicking</string>
@@ -231,7 +231,7 @@ You can always drag-and-drop tracks on screen to clone a deck.</string>
           </property>
          </widget>
         </item>
-        <item row="9" column="1">
+        <item row="11" column="1">
          <widget class="QDoubleSpinBox" name="spinBoxPermanentRateFine">
           <property name="toolTip">
            <string>Permanent rate change when right-clicking</string>
@@ -269,7 +269,7 @@ You can always drag-and-drop tracks on screen to clone a deck.</string>
           </property>
          </widget>
         </item>
-        <item row="2" column="2">
+        <item row="3" column="2">
          <widget class="QRadioButton" name="radioButtonCurrentKey">
           <property name="text">
            <string>Current key</string>
@@ -279,7 +279,7 @@ You can always drag-and-drop tracks on screen to clone a deck.</string>
           </attribute>
          </widget>
         </item>
-        <item row="8" column="1">
+        <item row="10" column="1">
          <widget class="QDoubleSpinBox" name="spinBoxTemporaryRateFine">
           <property name="enabled">
            <bool>false</bool>
@@ -310,7 +310,7 @@ You can always drag-and-drop tracks on screen to clone a deck.</string>
           </property>
          </widget>
         </item>
-        <item row="9" column="0">
+        <item row="11" column="0">
          <widget class="QLabel" name="labelSpeedPermanent">
           <property name="text">
            <string>Permanent</string>
@@ -320,7 +320,7 @@ You can always drag-and-drop tracks on screen to clone a deck.</string>
           </property>
          </widget>
         </item>
-        <item row="6" column="1" colspan="2">
+        <item row="7" column="1" colspan="2">
          <layout class="QHBoxLayout" name="horizontalLayout_2">
           <item>
            <widget class="QSlider" name="SliderRateRampSensitivity">
@@ -368,7 +368,7 @@ You can always drag-and-drop tracks on screen to clone a deck.</string>
           </item>
          </layout>
         </item>
-        <item row="8" column="0">
+        <item row="10" column="0">
          <widget class="QLabel" name="labelSpeedTemporary">
           <property name="enabled">
            <bool>false</bool>
@@ -382,6 +382,13 @@ You can always drag-and-drop tracks on screen to clone a deck.</string>
          </widget>
         </item>
         <item row="2" column="0">
+         <widget class="QLabel" name="label">
+          <property name="text">
+           <string>Sync mode (Dynamic tempo tracks)</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0">
          <widget class="QLabel" name="labelKeylockMode">
           <property name="text">
            <string>Keylock mode</string>
@@ -391,7 +398,7 @@ You can always drag-and-drop tracks on screen to clone a deck.</string>
           </property>
          </widget>
         </item>
-        <item row="6" column="0">
+        <item row="7" column="0">
          <widget class="QLabel" name="labelSpeedRampSensitivity">
           <property name="enabled">
            <bool>false</bool>
@@ -404,7 +411,7 @@ You can always drag-and-drop tracks on screen to clone a deck.</string>
           </property>
          </widget>
         </item>
-        <item row="5" column="0">
+        <item row="6" column="0">
          <widget class="QLabel" name="labelSpeedBendBehavior">
           <property name="text">
            <string>Pitch bend behavior</string>
@@ -414,7 +421,7 @@ You can always drag-and-drop tracks on screen to clone a deck.</string>
           </property>
          </widget>
         </item>
-        <item row="2" column="1">
+        <item row="3" column="1">
          <widget class="QRadioButton" name="radioButtonOriginalKey">
           <property name="text">
            <string>Original key</string>
@@ -424,7 +431,7 @@ You can always drag-and-drop tracks on screen to clone a deck.</string>
           </attribute>
          </widget>
         </item>
-        <item row="8" column="2">
+        <item row="10" column="2">
          <widget class="QDoubleSpinBox" name="spinBoxTemporaryRateCoarse">
           <property name="enabled">
            <bool>false</bool>
@@ -469,14 +476,27 @@ You can always drag-and-drop tracks on screen to clone a deck.</string>
           </property>
          </widget>
         </item>
-        <item row="7" column="0">
+        <item row="9" column="0">
          <widget class="QLabel" name="labelSpeedAdjustment">
           <property name="text">
            <string>Adjustment buttons:</string>
           </property>
          </widget>
         </item>
-        <item row="7" column="2">
+        <item row="2" column="1">
+         <widget class="QRadioButton" name="radioButtonImplicitLeader">
+          <property name="toolTip">
+           <string>Apply tempo changes from the implicit leader track (normally the previous track in a transition) to the follower tracks. After the transition, the follower track will continue with the previous leader's very last tempo.</string>
+          </property>
+          <property name="text">
+           <string>Follow implicit leader's tempo</string>
+          </property>
+          <attribute name="buttonGroup">
+           <string notr="true">buttonGroupSyncMode</string>
+          </attribute>
+         </widget>
+        </item>
+        <item row="9" column="2">
          <widget class="QLabel" name="labelSpeedCoarse">
           <property name="enabled">
            <bool>true</bool>
@@ -501,7 +521,7 @@ You can always drag-and-drop tracks on screen to clone a deck.</string>
           </property>
          </widget>
         </item>
-        <item row="7" column="1">
+        <item row="9" column="1">
          <widget class="QLabel" name="labelSpeedFine">
           <property name="enabled">
            <bool>true</bool>
@@ -565,7 +585,7 @@ You can always drag-and-drop tracks on screen to clone a deck.</string>
           </property>
          </widget>
         </item>
-        <item row="5" column="2">
+        <item row="6" column="2">
          <widget class="QRadioButton" name="radioButtonRateRampModeStepping">
           <property name="text">
            <string>Abrupt jump</string>
@@ -575,7 +595,7 @@ You can always drag-and-drop tracks on screen to clone a deck.</string>
           </attribute>
          </widget>
         </item>
-        <item row="5" column="1">
+        <item row="6" column="1">
          <widget class="QRadioButton" name="radioButtonRateRampModeLinear">
           <property name="toolTip">
            <string>Smoothly adjusts deck speed when temporary change buttons are held down</string>
@@ -588,14 +608,14 @@ You can always drag-and-drop tracks on screen to clone a deck.</string>
           </attribute>
          </widget>
         </item>
-        <item row="3" column="0">
+        <item row="4" column="0">
          <widget class="QLabel" name="labelKeyunlockMode">
           <property name="text">
            <string>Keyunlock mode</string>
           </property>
          </widget>
         </item>
-        <item row="3" column="1">
+        <item row="4" column="1">
          <widget class="QRadioButton" name="radioButtonResetUnlockedKey">
           <property name="text">
            <string>Reset key</string>
@@ -605,7 +625,7 @@ You can always drag-and-drop tracks on screen to clone a deck.</string>
           </attribute>
          </widget>
         </item>
-        <item row="3" column="2">
+        <item row="4" column="2">
          <widget class="QRadioButton" name="radioButtonKeepUnlockedKey">
           <property name="text">
            <string>Keep key</string>
@@ -615,7 +635,20 @@ You can always drag-and-drop tracks on screen to clone a deck.</string>
           </attribute>
          </widget>
         </item>
-        <item row="4" column="0">
+        <item row="2" column="2">
+         <widget class="QRadioButton" name="radioButtonLockBpm">
+          <property name="toolTip">
+           <string>During a transition, the tempo of an implicit leader track at the beginning of the transition is kept static. After the transition, the follower track will maintain this original tempo. This technique serves as a workaround to avoid dynamic tempo changes, as seen in rubato-style tracks, during the outro. For instance it prevents the follower track from continuing with a slowed-down tempo of the implicit leader. This corresponds to the behavior before Mixxx 2.4.</string>
+          </property>
+          <property name="text">
+           <string>Use stady tempo</string>
+          </property>
+          <attribute name="buttonGroup">
+           <string notr="true">buttonGroupSyncMode</string>
+          </attribute>
+         </widget>
+        </item>
+        <item row="5" column="0">
          <spacer name="verticalSpacer1">
           <property name="orientation">
            <enum>Qt::Vertical</enum>
@@ -663,6 +696,7 @@ You can always drag-and-drop tracks on screen to clone a deck.</string>
   <tabstop>checkBoxInvertSpeedSlider</tabstop>
   <tabstop>checkBoxResetPitch</tabstop>
   <tabstop>checkBoxResetSpeed</tabstop>
+  <tabstop>radioButtonImplicitLeader</tabstop>
   <tabstop>radioButtonOriginalKey</tabstop>
   <tabstop>radioButtonCurrentKey</tabstop>
   <tabstop>radioButtonResetUnlockedKey</tabstop>
@@ -671,10 +705,10 @@ You can always drag-and-drop tracks on screen to clone a deck.</string>
   <tabstop>radioButtonRateRampModeStepping</tabstop>
   <tabstop>SliderRateRampSensitivity</tabstop>
   <tabstop>SpinBoxRateRampSensitivity</tabstop>
-  <tabstop>spinBoxPermanentRateCoarse</tabstop>
-  <tabstop>spinBoxPermanentRateFine</tabstop>
-  <tabstop>spinBoxTemporaryRateCoarse</tabstop>
   <tabstop>spinBoxTemporaryRateFine</tabstop>
+  <tabstop>spinBoxTemporaryRateCoarse</tabstop>
+  <tabstop>spinBoxPermanentRateFine</tabstop>
+  <tabstop>spinBoxPermanentRateCoarse</tabstop>
  </tabstops>
  <resources/>
  <buttongroups>
@@ -682,5 +716,6 @@ You can always drag-and-drop tracks on screen to clone a deck.</string>
   <buttongroup name="buttonGroupKeyUnlockMode"/>
   <buttongroup name="buttonGroupKeyLockMode"/>
   <buttongroup name="buttonGroupSpeedBendBehavior"/>
+  <buttongroup name="buttonGroupSyncMode"/>
  </buttongroups>
 </ui>

From 92bdfa131430b849ef2c8f72d7cb0e17d82f681b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Mon, 14 Aug 2023 12:22:25 +0200
Subject: [PATCH 043/388] Use Term Soft Leader to match other parts in the code

---
 src/engine/sync/enginesync.cpp           |  4 ++--
 src/engine/sync/enginesync.h             |  2 +-
 src/preferences/dialog/dlgprefdeck.cpp   | 12 ++++++------
 src/preferences/dialog/dlgprefdeckdlg.ui | 12 ++++++------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/engine/sync/enginesync.cpp b/src/engine/sync/enginesync.cpp
index cd486c34680..5b1114e1807 100644
--- a/src/engine/sync/enginesync.cpp
+++ b/src/engine/sync/enginesync.cpp
@@ -255,9 +255,9 @@ Syncable* EngineSync::pickLeader(Syncable* enabling_syncable) {
 
     const SyncLockAlgorithm picker = static_cast<SyncLockAlgorithm>(
             m_pConfig->getValue<int>(ConfigKey(BPM_CONFIG_GROUP, SYNC_LOCK_ALGORITHM_CONFIG_KEY),
-                    PREFER_IMPLICIT_LEADER));
+                    PREFER_SOFT_LEADER));
     switch (picker) {
-    case PREFER_IMPLICIT_LEADER:
+    case PREFER_SOFT_LEADER:
         // Always pick a deck for a new leader.
         if (playing_deck_count == 1) {
             return first_playing_deck;
diff --git a/src/engine/sync/enginesync.h b/src/engine/sync/enginesync.h
index 19cabda99d6..43c7b5da7fa 100644
--- a/src/engine/sync/enginesync.h
+++ b/src/engine/sync/enginesync.h
@@ -22,7 +22,7 @@ class EngineSync : public SyncableListener {
     // and editing code is committed and we no longer need the lock bpm fallback option.
     enum SyncLockAlgorithm {
         // New behavior, which should work if beatgrids are reliable.
-        PREFER_IMPLICIT_LEADER,
+        PREFER_SOFT_LEADER,
         // Old 2.3 behavior, which works around some issues with bad beatgrid detection, mostly
         // for auto DJ mode.
         PREFER_LOCK_BPM
diff --git a/src/preferences/dialog/dlgprefdeck.cpp b/src/preferences/dialog/dlgprefdeck.cpp
index 684193f0479..c7245942bfb 100644
--- a/src/preferences/dialog/dlgprefdeck.cpp
+++ b/src/preferences/dialog/dlgprefdeck.cpp
@@ -469,9 +469,9 @@ void DlgPrefDeck::slotUpdate() {
     const EngineSync::SyncLockAlgorithm syncLockAlgorithm =
             static_cast<EngineSync::SyncLockAlgorithm>(m_pConfig->getValue<int>(
                     ConfigKey(BPM_CONFIG_GROUP, SYNC_LOCK_ALGORITHM_CONFIG_KEY),
-                    EngineSync::SyncLockAlgorithm::PREFER_IMPLICIT_LEADER));
-    if (syncLockAlgorithm == EngineSync::SyncLockAlgorithm::PREFER_IMPLICIT_LEADER) {
-        radioButtonImplicitLeader->setChecked(true);
+                    EngineSync::SyncLockAlgorithm::PREFER_SOFT_LEADER));
+    if (syncLockAlgorithm == EngineSync::SyncLockAlgorithm::PREFER_SOFT_LEADER) {
+        radioButtonSoftLeader->setChecked(true);
     } else {
         radioButtonLockBpm->setChecked(true);
     }
@@ -561,7 +561,7 @@ void DlgPrefDeck::slotResetToDefaults() {
     checkBoxResetSpeed->setChecked(false);
     checkBoxResetPitch->setChecked(true);
 
-    radioButtonImplicitLeader->setChecked(true);
+    radioButtonSoftLeader->setChecked(true);
 
     radioButtonOriginalKey->setChecked(true);
     radioButtonResetUnlockedKey->setChecked(true);
@@ -742,9 +742,9 @@ void DlgPrefDeck::slotApply() {
     m_pConfig->set(ConfigKey("[Controls]", "SpeedAutoReset"),
                    ConfigValue(configSPAutoReset));
 
-    if (radioButtonImplicitLeader->isChecked()) {
+    if (radioButtonSoftLeader->isChecked()) {
         m_pConfig->setValue(ConfigKey(BPM_CONFIG_GROUP, SYNC_LOCK_ALGORITHM_CONFIG_KEY),
-                static_cast<int>(EngineSync::SyncLockAlgorithm::PREFER_IMPLICIT_LEADER));
+                static_cast<int>(EngineSync::SyncLockAlgorithm::PREFER_SOFT_LEADER));
     } else {
         m_pConfig->setValue(ConfigKey(BPM_CONFIG_GROUP, SYNC_LOCK_ALGORITHM_CONFIG_KEY),
                 static_cast<int>(EngineSync::SyncLockAlgorithm::PREFER_LOCK_BPM));
diff --git a/src/preferences/dialog/dlgprefdeckdlg.ui b/src/preferences/dialog/dlgprefdeckdlg.ui
index 6abc6180bc1..8b90bc7902f 100644
--- a/src/preferences/dialog/dlgprefdeckdlg.ui
+++ b/src/preferences/dialog/dlgprefdeckdlg.ui
@@ -484,12 +484,12 @@ You can always drag-and-drop tracks on screen to clone a deck.</string>
          </widget>
         </item>
         <item row="2" column="1">
-         <widget class="QRadioButton" name="radioButtonImplicitLeader">
+         <widget class="QRadioButton" name="radioButtonSoftLeader">
           <property name="toolTip">
-           <string>Apply tempo changes from the implicit leader track (normally the previous track in a transition) to the follower tracks. After the transition, the follower track will continue with the previous leader's very last tempo.</string>
+           <string>Apply tempo changes from a soft leading track (normally the previous track in a transition) to the follower tracks. After the transition, the follower track will continue with the previous leader's very last tempo.</string>
           </property>
           <property name="text">
-           <string>Follow implicit leader's tempo</string>
+           <string>Follow soft leader's tempo</string>
           </property>
           <attribute name="buttonGroup">
            <string notr="true">buttonGroupSyncMode</string>
@@ -638,10 +638,10 @@ You can always drag-and-drop tracks on screen to clone a deck.</string>
         <item row="2" column="2">
          <widget class="QRadioButton" name="radioButtonLockBpm">
           <property name="toolTip">
-           <string>During a transition, the tempo of an implicit leader track at the beginning of the transition is kept static. After the transition, the follower track will maintain this original tempo. This technique serves as a workaround to avoid dynamic tempo changes, as seen in rubato-style tracks, during the outro. For instance it prevents the follower track from continuing with a slowed-down tempo of the implicit leader. This corresponds to the behavior before Mixxx 2.4.</string>
+           <string>The tempo of a previous soft leader track at the beginning of the transition is kept steady. After the transition, the follower track will maintain this original tempo. This technique serves as a workaround to avoid dynamic tempo changes, as seen in rubato-style tracks, during the outro. For instance it prevents the follower track from continuing with a slowed-down tempo of the soft leader. This corresponds to the behavior before Mixxx 2.4.</string>
           </property>
           <property name="text">
-           <string>Use stady tempo</string>
+           <string>Use steady tempo</string>
           </property>
           <attribute name="buttonGroup">
            <string notr="true">buttonGroupSyncMode</string>
@@ -696,7 +696,7 @@ You can always drag-and-drop tracks on screen to clone a deck.</string>
   <tabstop>checkBoxInvertSpeedSlider</tabstop>
   <tabstop>checkBoxResetPitch</tabstop>
   <tabstop>checkBoxResetSpeed</tabstop>
-  <tabstop>radioButtonImplicitLeader</tabstop>
+  <tabstop>radioButtonSoftLeader</tabstop>
   <tabstop>radioButtonOriginalKey</tabstop>
   <tabstop>radioButtonCurrentKey</tabstop>
   <tabstop>radioButtonResetUnlockedKey</tabstop>

From 5298b85b71a1c9e2abdc39ffc9030c86ba1b901b Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Mon, 14 Aug 2023 16:54:49 +0200
Subject: [PATCH 044/388] EQ effects tooltip: point to new Mixer page for
 adjusting the EQ shelves

---
 src/effects/backends/builtin/equalizer_util.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/effects/backends/builtin/equalizer_util.h b/src/effects/backends/builtin/equalizer_util.h
index 9398d3609b1..0cf170aab7c 100644
--- a/src/effects/backends/builtin/equalizer_util.h
+++ b/src/effects/backends/builtin/equalizer_util.h
@@ -69,7 +69,7 @@ class EqualizerUtil {
     }
 
     static QString adjustFrequencyShelvesTip() {
-        return QObject::tr( // TODO point to new Preferences -> Mixer page
-                "To adjust frequency shelves, go to Preferences -> Equalizers.");
+        return QObject::tr(
+                "To adjust frequency shelves, go to Preferences -> Mixer.");
     }
 };

From 8da918586654be0df6973232b7e1a93f60dca7f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Mon, 14 Aug 2023 08:08:50 +0200
Subject: [PATCH 045/388] After disabling Explicit leader, request always
 follower mode and let Mixxx pick a new Soft leader.

This fixes the bug that a stopped or silenced deck can become a Soft leader
---
 src/engine/sync/enginesync.cpp  | 11 +++++++++--
 src/engine/sync/synccontrol.cpp |  2 --
 src/test/enginesynctest.cpp     |  4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/engine/sync/enginesync.cpp b/src/engine/sync/enginesync.cpp
index 7049c35499f..3ca1e0d8c2f 100644
--- a/src/engine/sync/enginesync.cpp
+++ b/src/engine/sync/enginesync.cpp
@@ -60,11 +60,18 @@ void EngineSync::requestSyncMode(Syncable* pSyncable, SyncMode mode) {
     }
     case SyncMode::Follower: {
         // A request for follower mode may be converted into an enabling of soft
-        // leader mode.
-        activateFollower(pSyncable);
+        // leader mode if this still be best choice
+        if (m_pLeaderSyncable == pSyncable) {
+            // Avoid that pickLeader() returns pSyncable with SyncMode::LeaderExplicit
+            m_pLeaderSyncable = nullptr;
+        }
         Syncable* newLeader = pickLeader(pSyncable);
+        if (newLeader != pSyncable) {
+            activateFollower(pSyncable);
+        }
         if (newLeader && newLeader != m_pLeaderSyncable) {
             // if the leader has changed, activate it (this updates m_pLeaderSyncable)
+            // But don't make an an explicit leader soft.
             activateLeader(newLeader, SyncMode::LeaderSoft);
         }
         break;
diff --git a/src/engine/sync/synccontrol.cpp b/src/engine/sync/synccontrol.cpp
index 95dceb7e1a0..17a1738eb89 100644
--- a/src/engine/sync/synccontrol.cpp
+++ b/src/engine/sync/synccontrol.cpp
@@ -519,8 +519,6 @@ void SyncControl::slotSyncLeaderEnabledChangeRequest(double state) {
         // Turning off leader goes back to follower mode.
         switch (mode) {
         case SyncMode::LeaderExplicit:
-            m_pChannel->getEngineBuffer()->requestSyncMode(SyncMode::LeaderSoft);
-            break;
         case SyncMode::LeaderSoft:
             m_pChannel->getEngineBuffer()->requestSyncMode(SyncMode::Follower);
             break;
diff --git a/src/test/enginesynctest.cpp b/src/test/enginesynctest.cpp
index 8a9330958fa..fa0d80d7b86 100644
--- a/src/test/enginesynctest.cpp
+++ b/src/test/enginesynctest.cpp
@@ -582,8 +582,8 @@ TEST_F(EngineSyncTest, SetExplicitLeaderByLights) {
     ProcessBuffer();
 
     EXPECT_TRUE(isFollower(m_sInternalClockGroup));
-    EXPECT_TRUE(isSoftLeader(m_sGroup1));
-    EXPECT_TRUE(isFollower(m_sGroup2));
+    EXPECT_TRUE(isSoftLeader(m_sGroup2));
+    EXPECT_TRUE(isFollower(m_sGroup1));
 }
 
 TEST_F(EngineSyncTest, SetExplicitLeaderByLightsNoTracks) {

From 636434bc6fa801e49e8e51406a93d1c0546d8d03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Tue, 15 Aug 2023 07:39:31 +0200
Subject: [PATCH 046/388] Extend tooltips

---
 src/preferences/dialog/dlgprefdeckdlg.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/preferences/dialog/dlgprefdeckdlg.ui b/src/preferences/dialog/dlgprefdeckdlg.ui
index 8b90bc7902f..3d7bf59867f 100644
--- a/src/preferences/dialog/dlgprefdeckdlg.ui
+++ b/src/preferences/dialog/dlgprefdeckdlg.ui
@@ -486,7 +486,7 @@ You can always drag-and-drop tracks on screen to clone a deck.</string>
         <item row="2" column="1">
          <widget class="QRadioButton" name="radioButtonSoftLeader">
           <property name="toolTip">
-           <string>Apply tempo changes from a soft leading track (normally the previous track in a transition) to the follower tracks. After the transition, the follower track will continue with the previous leader's very last tempo.</string>
+           <string>Apply tempo changes from a soft leading track (normally the previous track in a transition) to the follower tracks. After the transition, the follower track will continue with the previous leader's very last tempo. Changes from explicit selected leaders are always applied.</string>
           </property>
           <property name="text">
            <string>Follow soft leader's tempo</string>
@@ -638,7 +638,7 @@ You can always drag-and-drop tracks on screen to clone a deck.</string>
         <item row="2" column="2">
          <widget class="QRadioButton" name="radioButtonLockBpm">
           <property name="toolTip">
-           <string>The tempo of a previous soft leader track at the beginning of the transition is kept steady. After the transition, the follower track will maintain this original tempo. This technique serves as a workaround to avoid dynamic tempo changes, as seen in rubato-style tracks, during the outro. For instance it prevents the follower track from continuing with a slowed-down tempo of the soft leader. This corresponds to the behavior before Mixxx 2.4.</string>
+           <string>The tempo of a previous soft leader track at the beginning of the transition is kept steady. After the transition, the follower track will maintain this original tempo. This technique serves as a workaround to avoid dynamic tempo changes, as seen in rubato-style tracks, during the outro. For instance it prevents the follower track from continuing with a slowed-down tempo of the soft leader. This corresponds to the behavior before Mixxx 2.4. Changes from explicit selected leaders are always applied.</string>
           </property>
           <property name="text">
            <string>Use steady tempo</string>

From 5ee1c710ce92bcefd862cd63caccb0f45124c722 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Tue, 22 Aug 2023 00:49:57 +0200
Subject: [PATCH 047/388] Improve tooltips

Co-authored-by: ronso0 <ronso0@mixxx.org>
---
 src/preferences/dialog/dlgprefdeckdlg.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/preferences/dialog/dlgprefdeckdlg.ui b/src/preferences/dialog/dlgprefdeckdlg.ui
index 3d7bf59867f..c5fbeda455f 100644
--- a/src/preferences/dialog/dlgprefdeckdlg.ui
+++ b/src/preferences/dialog/dlgprefdeckdlg.ui
@@ -486,7 +486,7 @@ You can always drag-and-drop tracks on screen to clone a deck.</string>
         <item row="2" column="1">
          <widget class="QRadioButton" name="radioButtonSoftLeader">
           <property name="toolTip">
-           <string>Apply tempo changes from a soft leading track (normally the previous track in a transition) to the follower tracks. After the transition, the follower track will continue with the previous leader's very last tempo. Changes from explicit selected leaders are always applied.</string>
+           <string>Apply tempo changes from a soft-leading track (usually the leaving track in a transition) to the follower tracks. After the transition, the follower track will continue with the previous leader's very last tempo. Changes from explicit selected leaders are always applied.</string>
           </property>
           <property name="text">
            <string>Follow soft leader's tempo</string>
@@ -638,7 +638,7 @@ You can always drag-and-drop tracks on screen to clone a deck.</string>
         <item row="2" column="2">
          <widget class="QRadioButton" name="radioButtonLockBpm">
           <property name="toolTip">
-           <string>The tempo of a previous soft leader track at the beginning of the transition is kept steady. After the transition, the follower track will maintain this original tempo. This technique serves as a workaround to avoid dynamic tempo changes, as seen in rubato-style tracks, during the outro. For instance it prevents the follower track from continuing with a slowed-down tempo of the soft leader. This corresponds to the behavior before Mixxx 2.4. Changes from explicit selected leaders are always applied.</string>
+           <string>The tempo of a previous soft leader track at the beginning of the transition is kept steady. After the transition, the follower track will maintain this original tempo. This technique serves as a workaround to avoid dynamic tempo changes, as seen during the outro of rubato-style tracks. For instance, it prevents the follower track from continuing with a slowed-down tempo of the soft leader. This corresponds to the behavior before Mixxx 2.4. Changes from explicit selected leaders are always applied.</string>
           </property>
           <property name="text">
            <string>Use steady tempo</string>

From 366f6cc93865561b7611096585d1c3215350068a Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Sat, 26 Aug 2023 20:10:28 +0200
Subject: [PATCH 048/388] EffectsChainPreset: initialize m_readOnly in all
 constructors

---
 src/effects/presets/effectchainpreset.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/effects/presets/effectchainpreset.cpp b/src/effects/presets/effectchainpreset.cpp
index 0d3dda3250d..0df63a6342f 100644
--- a/src/effects/presets/effectchainpreset.cpp
+++ b/src/effects/presets/effectchainpreset.cpp
@@ -50,7 +50,8 @@ EffectChainPreset::EffectChainPreset(const QDomElement& chainElement) {
 EffectChainPreset::EffectChainPreset(const EffectChain* chain)
         : m_name(chain->presetName()),
           m_mixMode(chain->mixMode()),
-          m_dSuper(chain->getSuperParameter()) {
+          m_dSuper(chain->getSuperParameter()),
+          m_readOnly(false) {
     for (const auto& pEffectSlot : chain->getEffectSlots()) {
         m_effectPresets.append(EffectPresetPointer(new EffectPreset(pEffectSlot)));
     }
@@ -59,14 +60,16 @@ EffectChainPreset::EffectChainPreset(const EffectChain* chain)
 EffectChainPreset::EffectChainPreset(EffectManifestPointer pManifest)
         : m_name(pManifest->displayName()),
           m_mixMode(EffectChainMixMode::DrySlashWet),
-          m_dSuper(pManifest->metaknobDefault()) {
+          m_dSuper(pManifest->metaknobDefault()),
+          m_readOnly(false) {
     m_effectPresets.append(EffectPresetPointer(new EffectPreset(pManifest)));
 }
 
 EffectChainPreset::EffectChainPreset(EffectPresetPointer pEffectPreset)
         : m_name(pEffectPreset->id()),
           m_mixMode(EffectChainMixMode::DrySlashWet),
-          m_dSuper(pEffectPreset->metaParameter()) {
+          m_dSuper(pEffectPreset->metaParameter()),
+          m_readOnly(false) {
     m_effectPresets.append(pEffectPreset);
 }
 

From 46f2f91b033ee97d82872cb1f3cff30505c10f3e Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Sat, 26 Aug 2023 20:11:30 +0200
Subject: [PATCH 049/388] WEffectChainPresetButton: add 'Rename Preset' action

---
 src/widget/weffectchainpresetbutton.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/widget/weffectchainpresetbutton.cpp b/src/widget/weffectchainpresetbutton.cpp
index e4cb5d3128b..e9acc8f17de 100644
--- a/src/widget/weffectchainpresetbutton.cpp
+++ b/src/widget/weffectchainpresetbutton.cpp
@@ -71,6 +71,11 @@ void WEffectChainPresetButton::populateMenu() {
             m_pChainPresetManager->updatePreset(m_pChain);
         });
     }
+    if (!presetIsReadOnly && !m_pChain->presetName().isEmpty()) {
+        m_pMenu->addAction(tr("Rename Preset"), this, [this]() {
+            m_pChainPresetManager->renamePreset(m_pChain->presetName());
+        });
+    }
     m_pMenu->addAction(tr("Save As New Preset..."), this, [this]() {
         m_pChainPresetManager->savePresetAndReload(m_pChain);
     });

From 9010f9ca9e258707e943c8f64c095d61f207d46f Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 29 Aug 2023 22:36:17 +0200
Subject: [PATCH 050/388] Pref Effects: reload preset lists only if preset
 actions succeeded

---
 .../presets/effectchainpresetmanager.cpp      | 16 ++++++++-----
 .../presets/effectchainpresetmanager.h        |  4 ++--
 src/preferences/dialog/dlgprefeffects.cpp     | 23 ++++++++++++++-----
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/effects/presets/effectchainpresetmanager.cpp b/src/effects/presets/effectchainpresetmanager.cpp
index 3a6ea926515..a9965ff8e56 100644
--- a/src/effects/presets/effectchainpresetmanager.cpp
+++ b/src/effects/presets/effectchainpresetmanager.cpp
@@ -104,13 +104,14 @@ EffectChainPresetPointer EffectChainPresetManager::quickEffectPresetAtIndex(
     return m_quickEffectChainPresetsSorted.at(index);
 }
 
-void EffectChainPresetManager::importPreset() {
+bool EffectChainPresetManager::importPreset() {
     QStringList fileNames = QFileDialog::getOpenFileNames(nullptr,
             tr("Import effect chain preset"),
             QDir::homePath(),
             tr("Mixxx Effect Chain Presets") + QStringLiteral(" (*") +
                     kXmlFileExtension + QStringLiteral(")"));
 
+    bool presetsImported = false;
     QString importFailedText = tr("Error importing effect chain preset");
     QString importFailedInformativeText = tr("Error importing effect chain preset \"%1\"");
     for (int i = 0; i < fileNames.size(); ++i) {
@@ -186,11 +187,13 @@ void EffectChainPresetManager::importPreset() {
             m_quickEffectChainPresetsSorted.append(pPreset);
             emit effectChainPresetListUpdated();
             emit quickEffectChainPresetListUpdated();
+            presetsImported = true;
         } else {
             QMessageBox::critical(
                     nullptr, importFailedText, importFailedInformativeText.arg(filePath));
         }
     }
+    return presetsImported;
 }
 
 void EffectChainPresetManager::exportPreset(const QString& chainPresetName) {
@@ -242,9 +245,9 @@ void EffectChainPresetManager::exportPreset(const QString& chainPresetName) {
     file.close();
 }
 
-void EffectChainPresetManager::renamePreset(const QString& oldName) {
+bool EffectChainPresetManager::renamePreset(const QString& oldName) {
     VERIFY_OR_DEBUG_ASSERT(m_effectChainPresets.contains(oldName)) {
-        return;
+        return false;
     }
     if (m_effectChainPresets.value(oldName)->isReadOnly()) {
         QMessageBox msgBox;
@@ -254,7 +257,7 @@ void EffectChainPresetManager::renamePreset(const QString& oldName) {
                         .arg(oldName));
         msgBox.setIcon(QMessageBox::Warning);
         msgBox.exec();
-        return;
+        return false;
     }
 
     QString newName;
@@ -272,7 +275,7 @@ void EffectChainPresetManager::renamePreset(const QString& oldName) {
                 &okay)
                           .trimmed();
         if (!okay) {
-            return;
+            return false;
         }
 
         if (newName.isEmpty()) {
@@ -299,7 +302,7 @@ void EffectChainPresetManager::renamePreset(const QString& oldName) {
         m_effectChainPresets.take(newName);
         pPreset->setName(oldName);
         m_effectChainPresets.insert(oldName, pPreset);
-        return;
+        return false;
     }
 
     QString directoryPath = m_pConfig->getSettingsPath() + kEffectChainPresetDirectory;
@@ -328,6 +331,7 @@ void EffectChainPresetManager::renamePreset(const QString& oldName) {
         m_quickEffectChainPresetsSorted.replace(index, pPreset);
         emit quickEffectChainPresetListUpdated();
     }
+    return true;
 }
 
 bool EffectChainPresetManager::deletePreset(const QString& chainPresetName) {
diff --git a/src/effects/presets/effectchainpresetmanager.h b/src/effects/presets/effectchainpresetmanager.h
index e01abbd2b51..8bd326b9661 100644
--- a/src/effects/presets/effectchainpresetmanager.h
+++ b/src/effects/presets/effectchainpresetmanager.h
@@ -51,9 +51,9 @@ class EffectChainPresetManager : public QObject {
     int quickEffectPresetIndex(EffectChainPresetPointer pChainPreset) const;
     EffectChainPresetPointer quickEffectPresetAtIndex(int index) const;
 
-    void importPreset();
+    bool importPreset();
     void exportPreset(const QString& chainPresetName);
-    void renamePreset(const QString& oldName);
+    bool renamePreset(const QString& oldName);
     bool deletePreset(const QString& chainPresetName);
 
     void resetToDefaults();
diff --git a/src/preferences/dialog/dlgprefeffects.cpp b/src/preferences/dialog/dlgprefeffects.cpp
index 8df8bd0907b..6d38cc66aee 100644
--- a/src/preferences/dialog/dlgprefeffects.cpp
+++ b/src/preferences/dialog/dlgprefeffects.cpp
@@ -246,8 +246,9 @@ void DlgPrefEffects::slotChainPresetSelected(const QModelIndex& selected) {
 }
 
 void DlgPrefEffects::slotImportPreset() {
-    m_pChainPresetManager->importPreset();
-    loadChainPresetLists();
+    if (m_pChainPresetManager->importPreset()) {
+        loadChainPresetLists();
+    }
 }
 
 void DlgPrefEffects::slotExportPreset() {
@@ -266,12 +267,17 @@ void DlgPrefEffects::slotRenamePreset() {
         return;
     }
     saveChainPresetLists();
+    bool presetsRenamed = false;
     const auto& selectedIndices = m_pFocusedChainList->selectionModel()->selectedIndexes();
     for (const auto& index : selectedIndices) {
         const QString& selectedPresetName = m_pFocusedChainList->model()->data(index).toString();
-        m_pChainPresetManager->renamePreset(selectedPresetName);
+        if (m_pChainPresetManager->renamePreset(selectedPresetName)) {
+            presetsRenamed = true;
+        }
+    }
+    if (presetsRenamed) {
+        loadChainPresetLists();
     }
-    loadChainPresetLists();
 }
 
 void DlgPrefEffects::slotDeletePreset() {
@@ -293,6 +299,7 @@ void DlgPrefEffects::slotDeletePreset() {
             pUnfocusedChainList->model());
     auto unfocusedChainStringList = pUnfocusedModel->stringList();
 
+    bool updateAndSavePresetLists = false;
     const auto& selectedIndices = m_pFocusedChainList->selectionModel()->selectedIndexes();
     for (const auto& index : selectedIndices) {
         QString selectedPresetName =
@@ -300,14 +307,18 @@ void DlgPrefEffects::slotDeletePreset() {
         if (!unfocusedChainStringList.contains(selectedPresetName)) {
             if (m_pChainPresetManager->deletePreset(selectedPresetName)) {
                 focusedChainStringList.removeAll(selectedPresetName);
+                updateAndSavePresetLists = true;
             }
         } else {
             focusedChainStringList.removeAll(selectedPresetName);
+            updateAndSavePresetLists = true;
         }
     }
 
-    pFocusedModel->setStringList(focusedChainStringList);
-    saveChainPresetLists();
+    if (updateAndSavePresetLists) {
+        pFocusedModel->setStringList(focusedChainStringList);
+        saveChainPresetLists();
+    }
 }
 
 bool DlgPrefEffects::eventFilter(QObject* object, QEvent* event) {

From 47e7628010b0f4da76ad50edb286edaf4ea4b64e Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 29 Aug 2023 23:17:52 +0200
Subject: [PATCH 051/388] Pref Effects: fix eventFilter() return value

---
 src/preferences/dialog/dlgprefeffects.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/preferences/dialog/dlgprefeffects.cpp b/src/preferences/dialog/dlgprefeffects.cpp
index 6d38cc66aee..b9d02731f9d 100644
--- a/src/preferences/dialog/dlgprefeffects.cpp
+++ b/src/preferences/dialog/dlgprefeffects.cpp
@@ -354,7 +354,6 @@ bool DlgPrefEffects::eventFilter(QObject* object, QEvent* event) {
                         currIndex,
                         QItemSelectionModel::ClearAndSelect);
             }
-            return true;
         } else if (pEffectList) {
             m_pFocusedEffectList = pEffectList;
             unfocusedEffectList()->selectionModel()->clearSelection();
@@ -366,12 +365,9 @@ bool DlgPrefEffects::eventFilter(QObject* object, QEvent* event) {
                 pEffectList->selectionModel()->clearCurrentIndex();
                 pEffectList->selectRow(currIndex.row());
             }
-            return true;
-        } else {
-            return false;
         }
     }
-    return false;
+    return QWidget::eventFilter(object, event);
 }
 
 QListView* DlgPrefEffects::unfocusedChainList() {

From 52d629d483948816719f1b8db30b4b5036c2193c Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 29 Aug 2023 23:19:19 +0200
Subject: [PATCH 052/388] Pref Effects: fix preset info labels update for
 multi-selection

---
 src/preferences/dialog/dlgprefeffects.cpp | 13 +++++++------
 src/preferences/dialog/dlgprefeffects.h   |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/preferences/dialog/dlgprefeffects.cpp b/src/preferences/dialog/dlgprefeffects.cpp
index b9d02731f9d..e495387a30d 100644
--- a/src/preferences/dialog/dlgprefeffects.cpp
+++ b/src/preferences/dialog/dlgprefeffects.cpp
@@ -86,9 +86,9 @@ void DlgPrefEffects::setupChainListView(QListView* pListView) {
     //TODO: prevent drops of duplicate items
     pListView->setDefaultDropAction(Qt::CopyAction);
     connect(pListView->selectionModel(),
-            &QItemSelectionModel::currentRowChanged,
+            &QItemSelectionModel::selectionChanged,
             this,
-            &DlgPrefEffects::slotChainPresetSelected);
+            &DlgPrefEffects::slotChainPresetSelectionChanged);
     pListView->installEventFilter(this);
 }
 
@@ -205,19 +205,20 @@ void DlgPrefEffects::effectsTableItemSelected(const QModelIndex& selected) {
     effectType->setText(EffectsBackend::translatedBackendName(pManifest->backendType()));
 }
 
-void DlgPrefEffects::slotChainPresetSelected(const QModelIndex& selected) {
+void DlgPrefEffects::slotChainPresetSelectionChanged(const QItemSelection& selected) {
     VERIFY_OR_DEBUG_ASSERT(m_pFocusedChainList) {
         return;
     }
     // Clear the info box and return if the index is invalid, e.g. after clearCurrentIndex()
     // in eventFilter()
-    if (!selected.isValid() ||
-            m_pFocusedChainList->selectionModel()->selectedRows(0).count() > 1) {
+    auto* pSelModel = m_pFocusedChainList->selectionModel();
+    auto selIndices = pSelModel->selectedIndexes();
+    if (selIndices.count() != 1) {
         clearChainInfoDisableButtons();
         return;
     }
 
-    QString chainPresetName = selected.model()->data(selected).toString();
+    QString chainPresetName = selIndices.first().data().toString();
     EffectChainPresetPointer pChainPreset = m_pChainPresetManager->getPreset(chainPresetName);
     if (pChainPreset == nullptr || pChainPreset->isEmpty()) {
         return;
diff --git a/src/preferences/dialog/dlgprefeffects.h b/src/preferences/dialog/dlgprefeffects.h
index 64b4c62f02f..d21824d3c13 100644
--- a/src/preferences/dialog/dlgprefeffects.h
+++ b/src/preferences/dialog/dlgprefeffects.h
@@ -24,7 +24,7 @@ class DlgPrefEffects : public DlgPreferencePage, public Ui::DlgPrefEffectsDlg {
 
   private slots:
     void effectsTableItemSelected(const QModelIndex& selected);
-    void slotChainPresetSelected(const QModelIndex& selected);
+    void slotChainPresetSelectionChanged(const QItemSelection& selected);
     void slotImportPreset();
     void slotExportPreset();
     void slotRenamePreset();

From 0ca9701c921f54c8d23e8a85e20b91ab8b541620 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Thu, 7 Sep 2023 03:17:51 +0200
Subject: [PATCH 053/388] Pref Mixer: constants for xfader ConfigKeys

---
 src/preferences/dialog/dlgprefmixer.cpp | 38 ++++++++++++-------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index f8b3bf02f08..5f1b951db06 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -39,6 +39,15 @@ const ConfigKey kLowEqFreqKey = ConfigKey(kMixerProfile, kLowEqFrequency);
 const ConfigKey kLowEqFreqPreciseKey =
         ConfigKey(kMixerProfile, QStringLiteral("LoEQFrequencyPrecise"));
 
+const ConfigKey kXfaderModeKey = ConfigKey(EngineXfader::kXfaderConfigKey,
+        QStringLiteral("xFaderMode"));
+const ConfigKey kXfaderCurveKey = ConfigKey(EngineXfader::kXfaderConfigKey,
+        QStringLiteral("xFaderCurve"));
+const ConfigKey kXfaderCalibrationKey = ConfigKey(EngineXfader::kXfaderConfigKey,
+        QStringLiteral("xFaderCalibration"));
+const ConfigKey kXfaderReverseKey = ConfigKey(EngineXfader::kXfaderConfigKey,
+        QStringLiteral("xFaderReverse"));
+
 constexpr int kFrequencyUpperLimit = 20050;
 constexpr int kFrequencyLowerLimit = 16;
 
@@ -60,10 +69,10 @@ DlgPrefMixer::DlgPrefMixer(
           m_xFaderMode(MIXXX_XFADER_ADDITIVE),
           m_transform(EngineXfader::kTransformDefault),
           m_cal(0.0),
-          m_mode(EngineXfader::kXfaderConfigKey, "xFaderMode"),
-          m_curve(EngineXfader::kXfaderConfigKey, "xFaderCurve"),
-          m_calibration(EngineXfader::kXfaderConfigKey, "xFaderCalibration"),
-          m_reverse(EngineXfader::kXfaderConfigKey, "xFaderReverse"),
+          m_mode(kXfaderModeKey),
+          m_curve(kXfaderCurveKey),
+          m_calibration(kXfaderCalibrationKey),
+          m_reverse(kXfaderReverseKey),
           m_crossfader("[Master]", "crossfader"),
           m_xFaderReverse(false),
           m_COLoFreq(kLowEqFreqKey),
@@ -656,12 +665,9 @@ void DlgPrefMixer::slotApply() {
         m_crossfader.set(0.0 - position);
         m_xFaderReverse = checkBoxReverse->isChecked();
     }
-    m_pConfig->set(ConfigKey(EngineXfader::kXfaderConfigKey, "xFaderMode"),
-            ConfigValue(m_xFaderMode));
-    m_pConfig->set(ConfigKey(EngineXfader::kXfaderConfigKey, "xFaderCurve"),
-            ConfigValue(QString::number(m_transform)));
-    m_pConfig->set(ConfigKey(EngineXfader::kXfaderConfigKey, "xFaderReverse"),
-            ConfigValue(checkBoxReverse->isChecked() ? 1 : 0));
+    m_pConfig->set(kXfaderModeKey, ConfigValue(m_xFaderMode));
+    m_pConfig->set(kXfaderCurveKey, ConfigValue(QString::number(m_transform)));
+    m_pConfig->set(kXfaderReverseKey, ConfigValue(checkBoxReverse->isChecked() ? 1 : 0));
 
     // EQ & QuickEffect settings ///////////////////////////////////////////////
     m_pConfig->set(kEnableEqsKey, ConfigValue(m_eqBypass ? 0 : 1));
@@ -689,9 +695,7 @@ void DlgPrefMixer::storeEqShelves() {
 // Update the widgets with values from config / EffectsManager
 void DlgPrefMixer::slotUpdate() {
     // xfader //////////////////////////////////////////////////////////////////
-    m_transform = m_pConfig->getValue(
-            ConfigKey(EngineXfader::kXfaderConfigKey, "xFaderCurve"),
-            EngineXfader::kTransformDefault);
+    m_transform = m_pConfig->getValue(kXfaderCurveKey, EngineXfader::kTransformDefault);
 
     // Range SliderXFader 0 .. 100
     double sliderVal = RescalerUtils::oneByXToLinear(
@@ -701,18 +705,14 @@ void DlgPrefMixer::slotUpdate() {
             SliderXFader->maximum());
     SliderXFader->setValue(static_cast<int>(sliderVal + 0.5));
 
-    m_xFaderMode = m_pConfig->getValueString(
-                                    ConfigKey(EngineXfader::kXfaderConfigKey, "xFaderMode"))
-                           .toInt();
+    m_xFaderMode = m_pConfig->getValueString(kXfaderModeKey).toInt();
     if (m_xFaderMode == MIXXX_XFADER_CONSTPWR) {
         radioButtonConstantPower->setChecked(true);
     } else {
         radioButtonAdditive->setChecked(true);
     }
 
-    m_xFaderReverse = m_pConfig->getValueString(
-                                       ConfigKey(EngineXfader::kXfaderConfigKey, "xFaderReverse"))
-                              .toInt() == 1;
+    m_xFaderReverse = m_pConfig->getValueString(kXfaderReverseKey).toInt() == 1;
     checkBoxReverse->setChecked(m_xFaderReverse);
 
     slotUpdateXFader();

From edc5d01f0d2abba3e1feddc8a6c756ff864100ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sun, 10 Sep 2023 00:16:43 +0200
Subject: [PATCH 054/388] Add manual link to Sync mode label in prefrences

---
 src/defs_urls.h                          |  2 ++
 src/preferences/dialog/dlgprefdeck.cpp   | 20 +++++++++-----------
 src/preferences/dialog/dlgprefdeckdlg.ui |  5 ++++-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/defs_urls.h b/src/defs_urls.h
index f61dcd0ac75..e8c14799c3d 100644
--- a/src/defs_urls.h
+++ b/src/defs_urls.h
@@ -53,6 +53,8 @@
     MIXXX_MANUAL_URL "/chapters/preferences.html#library"
 #define MIXXX_MANUAL_CUE_MODES_URL \
     MIXXX_MANUAL_URL "/chapters/user_interface.html#using-cue-modes"
+#define MIXXX_MANUAL_SYNC_MODES_URL \
+    MIXXX_MANUAL_URL "/chapters/user_interface.html#sync-and-rate-controls"
 #define MIXXX_MANUAL_BEATS_URL \
     MIXXX_MANUAL_URL "/chapters/preferences.html#beat-detection"
 #define MIXXX_MANUAL_KEY_URL \
diff --git a/src/preferences/dialog/dlgprefdeck.cpp b/src/preferences/dialog/dlgprefdeck.cpp
index c7245942bfb..a55a661c598 100644
--- a/src/preferences/dialog/dlgprefdeck.cpp
+++ b/src/preferences/dialog/dlgprefdeck.cpp
@@ -268,9 +268,7 @@ DlgPrefDeck::DlgPrefDeck(QWidget* parent,
     }
     setRateRangeForAllDecks(m_iRateRangePercent);
 
-    //
     // Key lock mode
-    //
     connect(buttonGroupKeyLockMode,
             QOverload<QAbstractButton*>::of(&QButtonGroup::buttonClicked),
             this,
@@ -283,9 +281,7 @@ DlgPrefDeck::DlgPrefDeck(QWidget* parent,
         pControl->set(static_cast<double>(m_keylockMode));
     }
 
-    //
     // Key unlock mode
-    //
     connect(buttonGroupKeyUnlockMode,
             QOverload<QAbstractButton*>::of(&QButtonGroup::buttonClicked),
             this,
@@ -298,21 +294,23 @@ DlgPrefDeck::DlgPrefDeck(QWidget* parent,
         pControl->set(static_cast<int>(m_keyunlockMode));
     }
 
-    //
     // Cue Mode
-    //
-
     // Add "(?)" with a manual link to the label
-    labelCueMode->setText(labelCueMode->text() + QStringLiteral(" ") +
+    labelCueMode->setText(labelCueMode->text() + QChar(' ') +
             coloredLinkString(
                     m_pLinkColor,
                     QStringLiteral("(?)"),
                     MIXXX_MANUAL_CUE_MODES_URL));
 
-    //
-    // Speed / Pitch reset configuration
-    //
+    // Sync Mode
+    // Add "(?)" with a manual link to the label
+    labelSyncMode->setText(labelSyncMode->text() + QChar(' ') +
+            coloredLinkString(
+                    m_pLinkColor,
+                    QStringLiteral("(?)"),
+                    MIXXX_MANUAL_SYNC_MODES_URL));
 
+    // Speed / Pitch reset configuration
     // Update "reset speed" and "reset pitch" check boxes
     // TODO: All defaults should only be set in slotResetToDefaults.
     int configSPAutoReset = m_pConfig->getValue<int>(
diff --git a/src/preferences/dialog/dlgprefdeckdlg.ui b/src/preferences/dialog/dlgprefdeckdlg.ui
index c5fbeda455f..7e884e4b982 100644
--- a/src/preferences/dialog/dlgprefdeckdlg.ui
+++ b/src/preferences/dialog/dlgprefdeckdlg.ui
@@ -382,10 +382,13 @@ You can always drag-and-drop tracks on screen to clone a deck.</string>
          </widget>
         </item>
         <item row="2" column="0">
-         <widget class="QLabel" name="label">
+         <widget class="QLabel" name="labelSyncMode">
           <property name="text">
            <string>Sync mode (Dynamic tempo tracks)</string>
           </property>
+          <property name="openExternalLinks">
+           <bool>true</bool>
+          </property>
          </widget>
         </item>
         <item row="3" column="0">

From 4b6e4be673f0b6fed8d2a67d3710244d9e3d0980 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sun, 10 Sep 2023 00:40:57 +0200
Subject: [PATCH 055/388] Extend the sync_leader tooltip

---
 src/skin/legacy/tooltips.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/skin/legacy/tooltips.cpp b/src/skin/legacy/tooltips.cpp
index e199a87d6c8..115ae9bcc2a 100644
--- a/src/skin/legacy/tooltips.cpp
+++ b/src/skin/legacy/tooltips.cpp
@@ -578,7 +578,9 @@ void Tooltips::addStandardTooltips() {
 
     add("sync_leader")
             << tr("Enable Sync Leader")
-            << tr("When enabled, this device will serve as the sync leader for all other decks.");
+            << tr("When enabled, this device will serve as the sync leader for all other decks.")
+            << tr("This is relevant when a dynamic tempo track is loaded to a sync leader."
+                  "In that case, other synced devices will adopt the changing tempo.");
 
     add("rate")
             << tr("Speed Control")

From 7fcf5b273173e26e04aba870a5b94acd3552b324 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Sun, 23 Jul 2023 03:21:02 +0200
Subject: [PATCH 056/388] sound pref: js comment format > ///

---
 src/preferences/dialog/dlgprefsound.cpp     |  90 ++++--------
 src/preferences/dialog/dlgprefsound.h       |  11 +-
 src/preferences/dialog/dlgprefsounditem.cpp |  78 ++++-------
 src/soundio/soundmanagerutil.cpp            | 148 +++++++-------------
 4 files changed, 111 insertions(+), 216 deletions(-)

diff --git a/src/preferences/dialog/dlgprefsound.cpp b/src/preferences/dialog/dlgprefsound.cpp
index d496e29ab7e..b5c3c9856f6 100644
--- a/src/preferences/dialog/dlgprefsound.cpp
+++ b/src/preferences/dialog/dlgprefsound.cpp
@@ -32,10 +32,8 @@ bool soundItemAlreadyExists(const AudioPath& output, const QWidget& widget) {
 
 } // namespace
 
-/**
- * Construct a new sound preferences pane. Initializes and populates all the
- * all the controls to the values obtained from SoundManager.
- */
+/// Construct a new sound preferences pane. Initializes and populates
+/// all the controls to the values obtained from SoundManager.
 DlgPrefSound::DlgPrefSound(QWidget* pParent,
         std::shared_ptr<SoundManager> pSoundManager,
         UserSettingsPointer pSettings)
@@ -263,10 +261,8 @@ DlgPrefSound::DlgPrefSound(QWidget* pParent,
                             MIXXX_WIKI_HARDWARE_COMPATIBILITY_URL)));
 }
 
-/**
- * Slot called when the preferences dialog is opened or this pane is
- * selected.
- */
+/// Slot called when the preferences dialog is opened or this pane is
+/// selected.
 void DlgPrefSound::slotUpdate() {
     // this is unfortunate, because slotUpdate is called every time
     // we change to this pane, we lose changed and unapplied settings
@@ -279,9 +275,7 @@ void DlgPrefSound::slotUpdate() {
     m_settingsModified = false;
 }
 
-/**
- * Slot called when the Apply or OK button is pressed.
- */
+/// Slot called when the Apply or OK button is pressed.
 void DlgPrefSound::slotApply() {
     if (!m_settingsModified) {
         return;
@@ -319,13 +313,11 @@ QUrl DlgPrefSound::helpUrl() const {
     return QUrl(MIXXX_MANUAL_SOUND_URL);
 }
 
-/**
- * Initializes (and creates) all the path items. Each path item widget allows
- * the user to input a sound device name and channel number given a description
- * of what will be done with that info. Inputs and outputs are grouped by tab,
- * and each path item has an identifier (Main, Headphones, ...) and an index,
- * if necessary.
- */
+/// Initializes (and creates) all the path items. Each path item widget allows
+/// the user to input a sound device name and channel number given a description
+/// of what will be done with that info. Inputs and outputs are grouped by tab,
+/// and each path item has an identifier (Master, Headphones, ...) and an index,
+/// if necessary.
 void DlgPrefSound::initializePaths() {
     // Pre-sort paths so they're added in the order they'll appear later on
     // so Tab key order matches order in layout:
@@ -419,18 +411,14 @@ void DlgPrefSound::insertItem(DlgPrefSoundItem *pItem, QVBoxLayout *pLayout) {
     pLayout->insertWidget(pos, pItem);
 }
 
-/**
- * Convenience overload to load settings from the SoundManagerConfig owned by
- * SoundManager.
- */
+/// Convenience overload to load settings from the SoundManagerConfig owned by
+/// SoundManager.
 void DlgPrefSound::loadSettings() {
     loadSettings(m_pSoundManager->getConfig());
 }
 
-/**
- * Loads the settings in the given SoundManagerConfig into the dialog.
- */
-void DlgPrefSound::loadSettings(const SoundManagerConfig &config) {
+/// Loads the settings in the given SoundManagerConfig into the dialog.
+void DlgPrefSound::loadSettings(const SoundManagerConfig& config) {
     m_loading = true; // so settingsChanged ignores all our modifications here
     m_config = config;
     int apiIndex = apiComboBox->findData(m_config.getAPI());
@@ -494,12 +482,10 @@ void DlgPrefSound::loadSettings(const SoundManagerConfig &config) {
     emit loadPaths(m_config);
 }
 
-/**
- * Slot called when the user selects a different API, or the
- * software changes it programmatically (for instance, when it
- * loads a value from SoundManager). Refreshes the device lists
- * for the new API and pushes those to the path items.
- */
+/// Slot called when the user selects a different API, or the
+/// software changes it programmatically (for instance, when it
+/// loads a value from SoundManager). Refreshes the device lists
+/// for the new API and pushes those to the path items.
 void DlgPrefSound::apiChanged(int index) {
     m_config.setAPI(apiComboBox->itemData(index).toString());
     refreshDevices();
@@ -518,10 +504,8 @@ void DlgPrefSound::apiChanged(int index) {
     updateAudioBufferSizes(sampleRateComboBox->currentIndex());
 }
 
-/**
- * Updates the list of APIs, trying to keep the API and device selections
- * constant if possible.
- */
+/// Updates the list of APIs, trying to keep the API and device selections
+/// constant if possible.
 void DlgPrefSound::updateAPIs() {
     QString currentAPI(apiComboBox->itemData(apiComboBox->currentIndex()).toString());
     emit updatingAPI();
@@ -538,10 +522,8 @@ void DlgPrefSound::updateAPIs() {
     emit updatedAPI();
 }
 
-/**
- * Slot called when the sample rate combo box changes to update the
- * sample rate in the config.
- */
+/// Slot called when the sample rate combo box changes to update the
+/// sample rate in the config.
 void DlgPrefSound::sampleRateChanged(int index) {
     m_config.setSampleRate(
             sampleRateComboBox->itemData(index).toUInt());
@@ -550,10 +532,8 @@ void DlgPrefSound::sampleRateChanged(int index) {
     checkLatencyCompensation();
 }
 
-/**
- * Slot called when the latency combo box is changed to update the
- * latency in the config.
- */
+/// Slot called when the latency combo box is changed to update the
+/// latency in the config.
 void DlgPrefSound::audioBufferChanged(int index) {
     m_config.setAudioBufferSizeIndex(
             audioBufferComboBox->itemData(index).toUInt());
@@ -637,10 +617,8 @@ void DlgPrefSound::updateAudioBufferSizes(int sampleRateIndex) {
     }
 }
 
-/**
- * Slot called when device lists go bad to refresh them, or the API
- * just changes and we need to display new devices.
- */
+/// Slot called when device lists go bad to refresh them, or the API
+/// just changes and we need to display new devices.
 void DlgPrefSound::refreshDevices() {
     if (m_config.getAPI() == SoundManagerConfig::kDefaultAPI) {
         m_outputDevices.clear();
@@ -655,11 +633,9 @@ void DlgPrefSound::refreshDevices() {
     emit refreshInputDevices(m_inputDevices);
 }
 
-/**
- * Called when any of the combo boxes in this dialog are changed. Enables the
- * apply button and marks that settings have been changed so that
- * DlgPrefSound::slotApply knows to apply them.
- */
+/// Called when any of the combo boxes in this dialog are changed. Enables the
+/// apply button and marks that settings have been changed so that
+/// DlgPrefSound::slotApply knows to apply them.
 void DlgPrefSound::settingChanged() {
     if (m_loading) {
         return; // doesn't count if we're just loading prefs
@@ -675,18 +651,14 @@ void DlgPrefSound::deviceSettingChanged() {
     m_settingsModified = true;
 }
 
-/**
- * Slot called when the "Query Devices" button is clicked.
- */
+/// Slot called when the "Query Devices" button is clicked.
 void DlgPrefSound::queryClicked() {
     ScopedWaitCursor cursor;
     m_pSoundManager->clearAndQueryDevices();
     updateAPIs();
 }
 
-/**
- * Slot called when the "Reset to Defaults" button is clicked.
- */
+/// Slot called when the "Reset to Defaults" button is clicked.
 void DlgPrefSound::slotResetToDefaults() {
     SoundManagerConfig newConfig(m_pSoundManager.get());
     newConfig.loadDefaults(m_pSoundManager.get(), SoundManagerConfig::ALL);
diff --git a/src/preferences/dialog/dlgprefsound.h b/src/preferences/dialog/dlgprefsound.h
index e337f0f4fe5..57aedd72e9a 100644
--- a/src/preferences/dialog/dlgprefsound.h
+++ b/src/preferences/dialog/dlgprefsound.h
@@ -17,15 +17,10 @@ class SoundDevice;
 class DlgPrefSoundItem;
 class ControlProxy;
 
-/*
- * TODO(bkgood) (n-decks) establish a signal/slot connection with a signal
- * on EngineMixer that emits every time a channel is added, and a slot here
- * that updates the dialog accordingly.
- */
+// TODO(bkgood) (n-decks) establish a signal/slot connection with a signal
+// on EngineMaster that emits every time a channel is added, and a slot here
+// that updates the dialog accordingly.
 
-/**
- * Class representing a preferences pane to configure sound devices for Mixxx.
- */
 class DlgPrefSound : public DlgPreferencePage, public Ui::DlgPrefSoundDlg  {
     Q_OBJECT;
   public:
diff --git a/src/preferences/dialog/dlgprefsounditem.cpp b/src/preferences/dialog/dlgprefsounditem.cpp
index 940d1ecf97c..d2f2250df0a 100644
--- a/src/preferences/dialog/dlgprefsounditem.cpp
+++ b/src/preferences/dialog/dlgprefsounditem.cpp
@@ -6,15 +6,13 @@
 #include "soundio/sounddevice.h"
 #include "soundio/soundmanagerconfig.h"
 
-/**
- * Constructs a new preferences sound item, representing an AudioPath and SoundDevice
- * with a label and two combo boxes.
- * @param type The AudioPathType of the path to be represented
- * @param devices The list of devices for the user to choose from (either a collection
- * of input or output devices).
- * @param isInput true if this is representing an AudioInput, false otherwise
- * @param index the index of the represented AudioPath, if applicable
- */
+/// Constructs a new preferences sound item, representing an AudioPath and SoundDevice
+/// with a label and two combo boxes.
+/// @param type The AudioPathType of the path to be represented
+/// @param devices The list of devices for the user to choose from (either a collection
+/// of input or output devices).
+/// @param isInput true if this is representing an AudioInput, false otherwise
+/// @param index the index of the represented AudioPath, if applicable
 DlgPrefSoundItem::DlgPrefSoundItem(
         QWidget* parent,
         AudioPathType type,
@@ -47,10 +45,8 @@ DlgPrefSoundItem::~DlgPrefSoundItem() {
 
 }
 
-/**
- * Slot called when the parent preferences pane updates its list of sound
- * devices, to update the item widget's list of devices to display.
- */
+/// Slot called when the parent preferences pane updates its list of sound
+/// devices, to update the item widget's list of devices to display.
 void DlgPrefSoundItem::refreshDevices(const QList<SoundDevicePointer>& devices) {
     m_devices = devices;
     SoundDeviceId oldDev = deviceComboBox->itemData(deviceComboBox->currentIndex()).value<SoundDeviceId>();
@@ -72,10 +68,8 @@ void DlgPrefSoundItem::refreshDevices(const QList<SoundDevicePointer>& devices)
     }
 }
 
-/**
- * Slot called when the device combo box selection changes. Updates the channel
- * combo box.
- */
+/// Slot called when the device combo box selection changes. Updates the channel
+/// combo box.
 void DlgPrefSoundItem::deviceChanged(int index) {
     channelComboBox->clear();
     SoundDeviceId selection = deviceComboBox->itemData(index).value<SoundDeviceId>();
@@ -136,13 +130,11 @@ void DlgPrefSoundItem::channelChanged() {
     }
 }
 
-/**
- * Slot called to load the respective AudioPath from a SoundManagerConfig
- * object.
- * @note If there are multiple AudioPaths matching this instance's type
- *       and index (if applicable), then only the first one is used. A more
- *       advanced preferences pane may one day allow multiples.
- */
+/// Slot called to load the respective AudioPath from a SoundManagerConfig
+/// object.
+/// @note If there are multiple AudioPaths matching this instance's type
+///       and index (if applicable), then only the first one is used. A more
+///       advanced preferences pane may one day allow multiples.
 void DlgPrefSoundItem::loadPath(const SoundManagerConfig &config) {
     if (m_isInput) {
         const auto inputDeviceMap = config.getInputs();
@@ -168,11 +160,9 @@ void DlgPrefSoundItem::loadPath(const SoundManagerConfig &config) {
     setDevice(SoundDeviceId()); // this will blank the channel combo box
 }
 
-/**
- * Slot called when the underlying DlgPrefSound wants this Item to
- * record its respective path with the SoundManagerConfig instance at
- * config.
- */
+/// Slot called when the underlying DlgPrefSound wants this Item to
+/// record its respective path with the SoundManagerConfig instance at
+/// config.
 void DlgPrefSoundItem::writePath(SoundManagerConfig* config) const {
     SoundDevicePointer pDevice = getDevice();
     if (!pDevice) {
@@ -199,17 +189,13 @@ void DlgPrefSoundItem::writePath(SoundManagerConfig* config) const {
     }
 }
 
-/**
- * Slot called to tell the Item to save its selections for later use.
- */
+/// Slot called to tell the Item to save its selections for later use.
 void DlgPrefSoundItem::save() {
     m_savedDevice = deviceComboBox->itemData(deviceComboBox->currentIndex()).value<SoundDeviceId>();
     m_savedChannel = channelComboBox->itemData(channelComboBox->currentIndex()).toPoint();
 }
 
-/**
- * Slot called to reload Item with previously saved settings.
- */
+/// Slot called to reload Item with previously saved settings.
 void DlgPrefSoundItem::reload() {
     int newDevice = deviceComboBox->findData(QVariant::fromValue(m_savedDevice));
     if (newDevice > -1) {
@@ -221,10 +207,8 @@ void DlgPrefSoundItem::reload() {
     }
 }
 
-/**
- * Gets the currently selected SoundDevice
- * @returns pointer to SoundDevice, or NULL if the "None" option is selected.
- */
+/// Gets the currently selected SoundDevice
+/// @returns pointer to SoundDevice, or NULL if the "None" option is selected.
 SoundDevicePointer DlgPrefSoundItem::getDevice() const {
     SoundDeviceId selection = deviceComboBox->itemData(deviceComboBox->currentIndex()).value<SoundDeviceId>();
     if (selection == SoundDeviceId()) {
@@ -241,10 +225,8 @@ SoundDevicePointer DlgPrefSoundItem::getDevice() const {
     return SoundDevicePointer();
 }
 
-/**
- * Selects a device in the device combo box given a SoundDevice
- * internal name, or selects "None" if the device isn't found.
- */
+/// Selects a device in the device combo box given a SoundDevice
+/// internal name, or selects "None" if the device isn't found.
 void DlgPrefSoundItem::setDevice(const SoundDeviceId& device) {
     int index = deviceComboBox->findData(QVariant::fromValue(device));
     //qDebug() << "DlgPrefSoundItem::setDevice" << device;
@@ -258,10 +240,8 @@ void DlgPrefSoundItem::setDevice(const SoundDeviceId& device) {
     }
 }
 
-/**
- * Selects a channel in the channel combo box given a channel number,
- * or selects the first channel if the given channel isn't found.
- */
+/// Selects a channel in the channel combo box given a channel number,
+/// or selects the first channel if the given channel isn't found.
 void DlgPrefSoundItem::setChannel(unsigned int channelBase,
                                   unsigned int channels) {
     // Because QComboBox supports QPoint natively (via QVariant) we use a QPoint
@@ -278,9 +258,7 @@ void DlgPrefSoundItem::setChannel(unsigned int channelBase,
     }
 }
 
-/**
- * Checks that a given device can act as a source/input for our type.
- */
+/// Checks that a given device can act as a source/input for our type.
 int DlgPrefSoundItem::hasSufficientChannels(const SoundDevice& device) const {
     unsigned char needed(AudioPath::minChannelsForType(m_type));
 
diff --git a/src/soundio/soundmanagerutil.cpp b/src/soundio/soundmanagerutil.cpp
index 573193f2ae9..93b292ed81b 100644
--- a/src/soundio/soundmanagerutil.cpp
+++ b/src/soundio/soundmanagerutil.cpp
@@ -2,36 +2,28 @@
 
 #include "engine/channels/enginechannel.h"
 
-/**
- * Constructs a ChannelGroup.
- * @param channelBase the first channel in the group.
- * @param channels the number of channels.
- */
+/// Constructs a ChannelGroup.
+/// @param channelBase the first channel in the group.
+/// @param channels the number of channels.
 ChannelGroup::ChannelGroup(unsigned char channelBase, unsigned char channels)
   : m_channelBase(channelBase)
   , m_channels(channels) {
 }
 
-/**
- * @return This ChannelGroup's base channel
- */
+/// @return This ChannelGroup's base channel
 unsigned char ChannelGroup::getChannelBase() const {
     return m_channelBase;
 }
 
-/**
- * @return The number of channels in this ChannelGroup
- */
+/// @return The number of channels in this ChannelGroup
 unsigned char ChannelGroup::getChannelCount() const {
     return m_channels;
 }
 
-/**
- * Checks if another ChannelGroup shares channels with this one.
- * @param other the other ChannelGroup to check for a clash with.
- * @return true if the other and this ChannelGroup share any channels,
- *          false otherwise.
- */
+/// Checks if another ChannelGroup shares channels with this one.
+/// @param other the other ChannelGroup to check for a clash with.
+/// @return true if the other and this ChannelGroup share any channels,
+///          false otherwise.
 bool ChannelGroup::clashesWith(const ChannelGroup &other) const {
     if (m_channels == 0 || other.m_channels == 0) {
         return false; // can't clash if there are no channels in use
@@ -44,59 +36,45 @@ bool ChannelGroup::clashesWith(const ChannelGroup &other) const {
         || m_channelBase == other.m_channelBase;
 }
 
-/**
- * Constructs an AudioPath object (must be called by a child class's
- * constructor, AudioPath is abstract).
- * @param channelBase the first channel on a sound device used by this AudioPath.
- * @param channels the number of channels used.
- */
+/// Constructs an AudioPath object (must be called by a child class's
+/// constructor, AudioPath is abstract).
+/// @param channelBase the first channel on a sound device used by this AudioPath.
+/// @param channels the number of channels used.
 AudioPath::AudioPath(unsigned char channelBase, unsigned char channels)
         : m_channelGroup(channelBase, channels),
           m_type(AudioPathType::Invalid),
           m_index(0) {
 }
 
-/**
- * @return This AudioPath's type
- */
+/// @return This AudioPath's type
 AudioPathType AudioPath::getType() const {
     return m_type;
 }
 
-/**
- * @return This AudioPath's ChannelGroup instance.
- */
+/// @return This AudioPath's ChannelGroup instance.
 ChannelGroup AudioPath::getChannelGroup() const {
     return m_channelGroup;
 }
 
-/**
- * @return This AudioPath's index, or 0 if this AudioPath isn't indexable.
- */
+/// @return This AudioPath's index, or 0 if this AudioPath isn't indexable.
 unsigned char AudioPath::getIndex() const {
     return m_index;
 }
 
-/**
- * Checks if this AudioPath's channels clash with another's
- * (see ChannelGroup::clashesWith).
- */
+/// Checks if this AudioPath's channels clash with another's
+/// (see ChannelGroup::clashesWith).
 bool AudioPath::channelsClash(const AudioPath &other) const {
     return m_channelGroup.clashesWith(other.m_channelGroup);
 }
 
-/**
- * Returns a string describing the AudioPath for user benefit.
- */
+/// Returns a string describing the AudioPath for user benefit.
 QString AudioPath::getString() const {
     return getTrStringFromType(m_type, m_index);
 }
 
-/**
- * Returns a string given an AudioPathType.
- * @note This method is static.
- * @note For user-facing usage, see getTrStringFromType
- */
+/// Returns a string given an AudioPathType.
+/// @note This method is static.
+/// @note For user-facing usage, see getTrStringFromType
 QString AudioPath::getStringFromType(AudioPathType type) {
     switch (type) {
     case AudioPathType::Main:
@@ -128,10 +106,8 @@ QString AudioPath::getStringFromType(AudioPathType type) {
     return QObject::tr("Unknown path type %1").arg(static_cast<int>(type));
 }
 
-/**
- * Returns a translated string given an AudioPathType.
- * @note This method is static.
- */
+/// Returns a translated string given an AudioPathType.
+/// @note This method is static.
 QString AudioPath::getTrStringFromType(AudioPathType type, unsigned char index) {
     switch (type) {
     case AudioPathType::Invalid:
@@ -173,10 +149,8 @@ QString AudioPath::getTrStringFromType(AudioPathType type, unsigned char index)
     return QObject::tr("Unknown path type %1").arg(static_cast<int>(type));
 }
 
-/**
- * Returns an AudioPathType given a string.
- * @note This method is static.
- */
+/// Returns an AudioPathType given a string.
+/// @note This method is static.
 AudioPathType AudioPath::getTypeFromString(QString string) {
     string = string.toLower();
     if (string == AudioPath::getStringFromType(AudioPathType::Main).toLower()) {
@@ -202,10 +176,8 @@ AudioPathType AudioPath::getTypeFromString(QString string) {
     }
 }
 
-/**
- * Defines whether or not an AudioPathType can be indexed.
- * @note This method is static.
- */
+/// Defines whether or not an AudioPathType can be indexed.
+/// @note This method is static.
 bool AudioPath::isIndexed(AudioPathType type) {
     switch (type) {
     case AudioPathType::Bus:
@@ -220,10 +192,8 @@ bool AudioPath::isIndexed(AudioPathType type) {
     return false;
 }
 
-/**
- * Returns an AudioPathType given an int.
- * @note This method is static.
- */
+/// Returns an AudioPathType given an int.
+/// @note This method is static.
 AudioPathType AudioPath::getTypeFromInt(int typeInt) {
     if (typeInt < 0 || typeInt >= static_cast<int>(AudioPathType::Invalid)) {
         return AudioPathType::Invalid;
@@ -247,9 +217,7 @@ unsigned char AudioPath::maxChannelsForType(AudioPathType type) {
     return 2;
 }
 
-/**
- * Constructs an AudioOutput.
- */
+/// Constructs an AudioOutput.
 AudioOutput::AudioOutput(AudioPathType type,
                          unsigned char channelBase,
                          unsigned char channels,
@@ -264,10 +232,8 @@ AudioOutput::AudioOutput(AudioPathType type,
     }
 }
 
-/**
- * Writes this AudioOutput's data to an XML element, preallocated from an XML
- * DOM document.
- */
+/// Writes this AudioOutput's data to an XML element, preallocated from an XML
+/// DOM document.
 QDomElement AudioOutput::toXML(QDomElement *element) const {
     element->setTagName("output");
     element->setAttribute("type", AudioPath::getStringFromType(m_type));
@@ -277,10 +243,8 @@ QDomElement AudioOutput::toXML(QDomElement *element) const {
     return *element;
 }
 
-/**
- * Constructs and returns an AudioOutput given an XML element representing it.
- * @note This method is static.
- */
+/// Constructs and returns an AudioOutput given an XML element representing it.
+/// @note This method is static.
 AudioOutput AudioOutput::fromXML(const QDomElement &xml) {
     AudioPathType type(AudioPath::getTypeFromString(xml.attribute("type")));
     unsigned int index(xml.attribute("index", "0").toUInt());
@@ -296,11 +260,9 @@ AudioOutput AudioOutput::fromXML(const QDomElement &xml) {
     return AudioOutput(type, channel, channels, index);
 }
 
-//static
-/**
- * Enumerates the AudioPathTypes supported by AudioOutput.
- * @note This method is static.
- */
+// static
+/// Enumerates the AudioPathTypes supported by AudioOutput.
+/// @note This method is static.
 QList<AudioPathType> AudioOutput::getSupportedTypes() {
     return QList<AudioPathType>{
             AudioPathType::Main,
@@ -312,10 +274,8 @@ QList<AudioPathType> AudioOutput::getSupportedTypes() {
     };
 }
 
-/**
- * Implements setting the type of an AudioOutput, using
- * AudioOutput::getSupportedTypes.
- */
+/// Implements setting the type of an AudioOutput, using
+/// AudioOutput::getSupportedTypes.
 void AudioOutput::setType(AudioPathType type) {
     if (AudioOutput::getSupportedTypes().contains(type)) {
         m_type = type;
@@ -324,9 +284,7 @@ void AudioOutput::setType(AudioPathType type) {
     }
 }
 
-/**
- * Constructs an AudioInput.
- */
+/// Constructs an AudioInput.
 AudioInput::AudioInput(AudioPathType type,
                        unsigned char channelBase,
                        unsigned char channels,
@@ -345,10 +303,8 @@ AudioInput::~AudioInput() {
 
 }
 
-/**
- * Writes this AudioInput's data to an XML element, preallocated from an XML
- * DOM document.
- */
+/// Writes this AudioInput's data to an XML element, preallocated from an XML
+/// DOM document.
 QDomElement AudioInput::toXML(QDomElement *element) const {
     element->setTagName("input");
     element->setAttribute("type", AudioPath::getStringFromType(m_type));
@@ -358,10 +314,8 @@ QDomElement AudioInput::toXML(QDomElement *element) const {
     return *element;
 }
 
-/**
- * Constructs and returns an AudioInput given an XML element representing it.
- * @note This method is static.
- */
+/// Constructs and returns an AudioInput given an XML element representing it.
+/// @note This method is static.
 AudioInput AudioInput::fromXML(const QDomElement &xml) {
     AudioPathType type(AudioPath::getTypeFromString(xml.attribute("type")));
     unsigned int index(xml.attribute("index", "0").toUInt());
@@ -377,10 +331,8 @@ AudioInput AudioInput::fromXML(const QDomElement &xml) {
     return AudioInput(type, channel, channels, index);
 }
 
-/**
- * Enumerates the AudioPathTypes supported by AudioInput.
- * @note This method is static.
- */
+/// Enumerates the AudioPathTypes supported by AudioInput.
+/// @note This method is static.
 QList<AudioPathType> AudioInput::getSupportedTypes() {
     return QList<AudioPathType>{
 #ifdef __VINYLCONTROL__
@@ -394,10 +346,8 @@ QList<AudioPathType> AudioInput::getSupportedTypes() {
     };
 }
 
-/**
- * Implements setting the type of an AudioInput, using
- * AudioInput::getSupportedTypes.
- */
+/// Implements setting the type of an AudioInput, using
+/// AudioInput::getSupportedTypes.
 void AudioInput::setType(AudioPathType type) {
     if (AudioInput::getSupportedTypes().contains(type)) {
         m_type = type;

From 427bf396b097852d732802435640934e65c3bc3a Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Wed, 23 Aug 2023 01:02:17 +0200
Subject: [PATCH 057/388] SoundDeviceItem: rename member var, invert
 bool/meaning

---
 src/preferences/dialog/dlgprefsounditem.cpp | 27 +++++++++++----------
 src/preferences/dialog/dlgprefsounditem.h   |  2 +-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/preferences/dialog/dlgprefsounditem.cpp b/src/preferences/dialog/dlgprefsounditem.cpp
index d2f2250df0a..6a9e62f1f8b 100644
--- a/src/preferences/dialog/dlgprefsounditem.cpp
+++ b/src/preferences/dialog/dlgprefsounditem.cpp
@@ -23,7 +23,7 @@ DlgPrefSoundItem::DlgPrefSoundItem(
           m_type(type),
           m_index(index),
           m_isInput(isInput),
-          m_inhibitSettingChanged(false) {
+          m_emitSettingChanged(true) {
     setupUi(this);
     typeLabel->setText(AudioPath::getTrStringFromType(type, index));
 
@@ -119,13 +119,13 @@ void DlgPrefSoundItem::deviceChanged(int index) {
         }
     }
 emitAndReturn:
-    if (m_inhibitSettingChanged == false) {
+    if (m_emitSettingChanged) {
         emit settingChanged();
     }
 }
 
 void DlgPrefSoundItem::channelChanged() {
-    if (m_inhibitSettingChanged == false) {
+    if (m_emitSettingChanged) {
         emit settingChanged();
     }
 }
@@ -230,13 +230,13 @@ SoundDevicePointer DlgPrefSoundItem::getDevice() const {
 void DlgPrefSoundItem::setDevice(const SoundDeviceId& device) {
     int index = deviceComboBox->findData(QVariant::fromValue(device));
     //qDebug() << "DlgPrefSoundItem::setDevice" << device;
-    if (index != -1) {
-        m_inhibitSettingChanged = true;
-        deviceComboBox->setCurrentIndex(index);
-        m_inhibitSettingChanged = false;
-    } else {
+    if (index == -1) {
         deviceComboBox->setCurrentIndex(0); // None
         emit settingChanged();
+    } else {
+        m_emitSettingChanged = false;
+        deviceComboBox->setCurrentIndex(index);
+        m_emitSettingChanged = true;
     }
 }
 
@@ -248,13 +248,14 @@ void DlgPrefSoundItem::setChannel(unsigned int channelBase,
     // to store the channel info. x is the channel base and y is the channel
     // count.
     int index = channelComboBox->findData(QPoint(channelBase, channels));
-    if (index != -1) {
-        m_inhibitSettingChanged = true;
-        channelComboBox->setCurrentIndex(index);
-        m_inhibitSettingChanged = false;
-    } else {
+    if (index == -1) {
+        // channel(s) not found
         channelComboBox->setCurrentIndex(0); // 1
         emit settingChanged();
+    } else {
+        m_emitSettingChanged = false;
+        channelComboBox->setCurrentIndex(index);
+        m_emitSettingChanged = true;
     }
 }
 
diff --git a/src/preferences/dialog/dlgprefsounditem.h b/src/preferences/dialog/dlgprefsounditem.h
index 73a3edd2c26..3f369db5756 100644
--- a/src/preferences/dialog/dlgprefsounditem.h
+++ b/src/preferences/dialog/dlgprefsounditem.h
@@ -50,5 +50,5 @@ class DlgPrefSoundItem : public QWidget, public Ui::DlgPrefSoundItem {
     // Because QVariant supports QPoint natively we use a QPoint to store the
     // channel info. x is the channel base and y is the channel count.
     QPoint m_savedChannel;
-    bool m_inhibitSettingChanged;
+    bool m_emitSettingChanged;
 };

From c439051957368c8a5a93aaecfec7415655786ecb Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Wed, 13 Sep 2023 18:03:31 +0200
Subject: [PATCH 058/388] EQ effects: remove empty destructors

---
 src/effects/backends/builtin/bessel4lvmixeqeffect.cpp | 3 ---
 src/effects/backends/builtin/bessel4lvmixeqeffect.h   | 2 +-
 src/effects/backends/builtin/bessel8lvmixeqeffect.cpp | 3 ---
 src/effects/backends/builtin/bessel8lvmixeqeffect.h   | 2 +-
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/effects/backends/builtin/bessel4lvmixeqeffect.cpp b/src/effects/backends/builtin/bessel4lvmixeqeffect.cpp
index e721faf1a46..a8d73c6a18f 100644
--- a/src/effects/backends/builtin/bessel4lvmixeqeffect.cpp
+++ b/src/effects/backends/builtin/bessel4lvmixeqeffect.cpp
@@ -44,9 +44,6 @@ void Bessel4LVMixEQEffect::loadEngineEffectParameters(
     m_pKillHigh = parameters.value("killHigh");
 }
 
-Bessel4LVMixEQEffect::~Bessel4LVMixEQEffect() {
-}
-
 void Bessel4LVMixEQEffect::processChannel(
         Bessel4LVMixEQEffectGroupState* pState,
         const CSAMPLE* pInput,
diff --git a/src/effects/backends/builtin/bessel4lvmixeqeffect.h b/src/effects/backends/builtin/bessel4lvmixeqeffect.h
index 85fbda079ae..ca94b113171 100644
--- a/src/effects/backends/builtin/bessel4lvmixeqeffect.h
+++ b/src/effects/backends/builtin/bessel4lvmixeqeffect.h
@@ -22,7 +22,7 @@ class Bessel4LVMixEQEffectGroupState : public LVMixEQEffectGroupState<EngineFilt
 class Bessel4LVMixEQEffect : public EffectProcessorImpl<Bessel4LVMixEQEffectGroupState> {
   public:
     Bessel4LVMixEQEffect();
-    ~Bessel4LVMixEQEffect() override;
+    ~Bessel4LVMixEQEffect() override = default;
 
     static QString getId();
     static EffectManifestPointer getManifest();
diff --git a/src/effects/backends/builtin/bessel8lvmixeqeffect.cpp b/src/effects/backends/builtin/bessel8lvmixeqeffect.cpp
index 7e73e9056e6..1a867a8b3b8 100644
--- a/src/effects/backends/builtin/bessel8lvmixeqeffect.cpp
+++ b/src/effects/backends/builtin/bessel8lvmixeqeffect.cpp
@@ -44,9 +44,6 @@ void Bessel8LVMixEQEffect::loadEngineEffectParameters(
     m_pKillHigh = parameters.value("killHigh");
 }
 
-Bessel8LVMixEQEffect::~Bessel8LVMixEQEffect() {
-}
-
 void Bessel8LVMixEQEffect::processChannel(
         Bessel8LVMixEQEffectGroupState* pState,
         const CSAMPLE* pInput,
diff --git a/src/effects/backends/builtin/bessel8lvmixeqeffect.h b/src/effects/backends/builtin/bessel8lvmixeqeffect.h
index a44f8dcffd6..83524f9ced1 100644
--- a/src/effects/backends/builtin/bessel8lvmixeqeffect.h
+++ b/src/effects/backends/builtin/bessel8lvmixeqeffect.h
@@ -24,7 +24,7 @@ class Bessel8LVMixEQEffectGroupState : public LVMixEQEffectGroupState<EngineFilt
 class Bessel8LVMixEQEffect : public EffectProcessorImpl<Bessel8LVMixEQEffectGroupState> {
   public:
     Bessel8LVMixEQEffect();
-    ~Bessel8LVMixEQEffect() override;
+    ~Bessel8LVMixEQEffect() override = default;
 
     static QString getId();
     static EffectManifestPointer getManifest();

From e07c3c2b1fae149a4be1e445b4c09b58848e928d Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Thu, 14 Sep 2023 00:42:34 +0200
Subject: [PATCH 059/388] Pref Mixer: use parented_ptr for xfader
 QGraphicsScene, reuse scene

---
 src/preferences/dialog/dlgprefmixer.cpp | 23 ++++++++++++++---------
 src/preferences/dialog/dlgprefmixer.h   |  2 ++
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index 5f1b951db06..33398f5cf61 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -787,9 +787,15 @@ void DlgPrefMixer::drawXfaderDisplay() {
     int sizeY = graphicsViewXfader->height() - 2 * frameWidth;
 
     // Initialize Scene
-    QGraphicsScene* pXfScene = new QGraphicsScene();
-    pXfScene->setSceneRect(0, 0, sizeX, sizeY);
-    pXfScene->setBackgroundBrush(Qt::black);
+    if (m_pxfScene) {
+        m_pxfScene->clear();
+    } else {
+        m_pxfScene = make_parented<QGraphicsScene>(this);
+        // The size of the QGraphicsView doesn't change so we need to do this only once
+        m_pxfScene->setSceneRect(0, 0, sizeX, sizeY);
+        m_pxfScene->setBackgroundBrush(Qt::black);
+        graphicsViewXfader->setScene(m_pxfScene);
+    }
 
     // Initialize QPens
     QPen gridPen(Qt::green);
@@ -797,11 +803,11 @@ void DlgPrefMixer::drawXfaderDisplay() {
 
     // Draw grid
     for (int i = 1; i < kGrindXLines; i++) {
-        pXfScene->addLine(
+        m_pxfScene->addLine(
                 QLineF(0, i * (sizeY / kGrindXLines), sizeX, i * (sizeY / kGrindXLines)), gridPen);
     }
     for (int i = 1; i < kGrindYLines; i++) {
-        pXfScene->addLine(
+        m_pxfScene->addLine(
                 QLineF(i * (sizeX / kGrindYLines), 0, i * (sizeX / kGrindYLines), sizeY), gridPen);
     }
 
@@ -833,9 +839,9 @@ void DlgPrefMixer::drawXfaderDisplay() {
         point2 = QPointF(i + 1, (1. - gain2) * (sizeY)-3);
 
         if (i > 0) {
-            pXfScene->addLine(QLineF(pointTotal, pointTotalPrev), QPen(Qt::red));
-            pXfScene->addLine(QLineF(point1, point1Prev), graphLinePen);
-            pXfScene->addLine(QLineF(point2, point2Prev), graphLinePen);
+            m_pxfScene->addLine(QLineF(pointTotal, pointTotalPrev), QPen(Qt::red));
+            m_pxfScene->addLine(QLineF(point1, point1Prev), graphLinePen);
+            m_pxfScene->addLine(QLineF(point2, point2Prev), graphLinePen);
         }
 
         // Save old values
@@ -844,7 +850,6 @@ void DlgPrefMixer::drawXfaderDisplay() {
         point2Prev = point2;
     }
 
-    graphicsViewXfader->setScene(pXfScene);
     graphicsViewXfader->show();
     graphicsViewXfader->repaint();
 }
diff --git a/src/preferences/dialog/dlgprefmixer.h b/src/preferences/dialog/dlgprefmixer.h
index 048ed32b498..d531977fcc9 100644
--- a/src/preferences/dialog/dlgprefmixer.h
+++ b/src/preferences/dialog/dlgprefmixer.h
@@ -6,6 +6,7 @@
 #include "preferences/dialog/dlgpreferencepage.h"
 #include "preferences/dialog/ui_dlgprefmixerdlg.h"
 #include "preferences/usersettings.h"
+#include "util/parented_ptr.h"
 
 class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
     Q_OBJECT
@@ -80,6 +81,7 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
     PollingControlProxy m_crossfader;
 
     bool m_xFaderReverse;
+    parented_ptr<QGraphicsScene> m_pxfScene;
 
     PollingControlProxy m_COLoFreq;
     PollingControlProxy m_COHiFreq;

From 20bd4faa5d98aa088ae0fe443db375c34b2b70df Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Thu, 14 Sep 2023 12:25:00 +0200
Subject: [PATCH 060/388] Pref Mixer: polish xfader graph, smooth lines, style
 it like it's 2023 (not 1990 ;)

---
 src/preferences/dialog/dlgprefmixer.cpp   | 119 +++++++++++++---------
 src/preferences/dialog/dlgprefmixerdlg.ui |  20 +---
 2 files changed, 73 insertions(+), 66 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index 33398f5cf61..4e3962631d6 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -2,6 +2,7 @@
 
 #include <QButtonGroup>
 #include <QHBoxLayout>
+#include <QPainterPath>
 #include <QStandardItemModel>
 
 #include "control/controlobject.h"
@@ -51,6 +52,9 @@ const ConfigKey kXfaderReverseKey = ConfigKey(EngineXfader::kXfaderConfigKey,
 constexpr int kFrequencyUpperLimit = 20050;
 constexpr int kFrequencyLowerLimit = 16;
 
+constexpr int kXfaderGridHLines = 3;
+constexpr int kXfaderGridVLines = 5;
+
 bool isMixingEQ(EffectManifest* pManifest) {
     return pManifest->isMixingEQ();
 }
@@ -779,77 +783,92 @@ void DlgPrefMixer::slotUpdate() {
 // Draw the crossfader curve graph. Only needs to get drawn when a change
 // has been made.
 void DlgPrefMixer::drawXfaderDisplay() {
-    constexpr int kGrindXLines = 4;
-    constexpr int kGrindYLines = 6;
-
-    int frameWidth = graphicsViewXfader->frameWidth();
-    int sizeX = graphicsViewXfader->width() - 2 * frameWidth;
-    int sizeY = graphicsViewXfader->height() - 2 * frameWidth;
-
-    // Initialize Scene
+    // Initialize or clear scene
     if (m_pxfScene) {
         m_pxfScene->clear();
     } else {
         m_pxfScene = make_parented<QGraphicsScene>(this);
         // The size of the QGraphicsView doesn't change so we need to do this only once
+        graphicsViewXfader->setLineWidth(1); // frame width
+        int sizeX = graphicsViewXfader->width() - 2;
+        int sizeY = graphicsViewXfader->height() - 2;
         m_pxfScene->setSceneRect(0, 0, sizeX, sizeY);
         m_pxfScene->setBackgroundBrush(Qt::black);
+        graphicsViewXfader->setRenderHints(QPainter::Antialiasing);
         graphicsViewXfader->setScene(m_pxfScene);
     }
 
     // Initialize QPens
-    QPen gridPen(Qt::green);
-    QPen graphLinePen(Qt::white);
-
-    // Draw grid
-    for (int i = 1; i < kGrindXLines; i++) {
-        m_pxfScene->addLine(
-                QLineF(0, i * (sizeY / kGrindXLines), sizeX, i * (sizeY / kGrindXLines)), gridPen);
+    QPen gridPen(Qt::darkGray);
+    QPen gainPen(Qt::white);
+    QPen totalPen(Qt::red);
+    // In conjunction with anti-aliasing this gives smooth, solid lines.
+    totalPen.setWidth(2);
+    gainPen.setWidth(2);
+    // For some reason grid lines also appear 2px wide, with the nice side effect
+    // that gain curves now intersect 'exactly'at the grid center line.
+
+    const int sceneW = static_cast<int>(m_pxfScene->width());
+    const int sceneH = static_cast<int>(m_pxfScene->height());
+
+    // Draw grid.
+    // Height is (grid segments * n)+1, so subtract 1 in order to get int coordinates.
+    const double kGridHDist = ((sceneH - 1) / (kXfaderGridHLines + 1));
+    const double kGridVDist = ((sceneW - 1) / (kXfaderGridVLines + 1));
+    for (int i = 1; i <= kXfaderGridHLines; i++) {
+        // Shift by .5 to trick anti-aliasing and get sharp lines (1px instead 2px)
+        const double y = (i * kGridHDist) + .5;
+        m_pxfScene->addLine(QLineF(0, y, sceneW, y), gridPen);
     }
-    for (int i = 1; i < kGrindYLines; i++) {
-        m_pxfScene->addLine(
-                QLineF(i * (sizeX / kGrindYLines), 0, i * (sizeX / kGrindYLines), sizeY), gridPen);
+    for (int i = 1; i <= kXfaderGridVLines; i++) {
+        const double x = (i * kGridVDist) + .5;
+        m_pxfScene->addLine(QLineF(x, 0, x, sceneH), gridPen);
     }
 
-    // Draw graph lines
-    QPointF pointTotal, point1, point2;
-    QPointF pointTotalPrev, point1Prev, point2Prev;
-    int pointCount = sizeX - 4;
-    // reduced by 2 x 1 for border + 2 x 1 for inner distance to border
-    double xfadeStep = 2. / (pointCount - 1);
-    for (int i = 0; i < pointCount; i++) {
-        CSAMPLE_GAIN gain1, gain2;
-        EngineXfader::getXfadeGains((-1. + (xfadeStep * i)),
+    // Draw gain curves
+    // Required to make the curves fit in the view, i.e. not drawn on the left/right edge
+    const int pointCount = sceneW - 2;
+    const int vOffset = 1;
+    const double xfadeStep = 2. / pointCount;
+    // Align the curves with first (top) horizontal gridline.
+    const double scaleFactorToAlignWithGrid = static_cast<double>(
+                                                      kXfaderGridHLines) /
+            (kXfaderGridHLines + 1)
+            // Compensate for the added v-offset required to draw curves inside the view
+            // (not on the edge), especially the thicker, anti-aliased curves.
+            * (static_cast<double>(sceneH - vOffset) / (sceneH));
+    QPolygonF polylineTotal;
+    QPolygonF polylineL;
+    QPolygonF polylineR;
+    for (int x = 1; x <= pointCount + 1; x++) {
+        CSAMPLE_GAIN gainL, gainR;
+        EngineXfader::getXfadeGains((-1. + (xfadeStep * (x - 1))),
                 m_transform,
                 m_cal,
                 m_xFaderMode,
                 checkBoxReverse->isChecked(),
-                &gain1,
-                &gain2);
-
-        double gain = sqrt(gain1 * gain1 + gain2 * gain2);
-        // scale for graph
-        gain1 *= 0.71f;
-        gain2 *= 0.71f;
-        gain *= 0.71f;
-
-        // draw it
-        pointTotal = QPointF(i + 1, (1. - gain) * (sizeY)-3);
-        point1 = QPointF(i + 1, (1. - gain1) * (sizeY)-3);
-        point2 = QPointF(i + 1, (1. - gain2) * (sizeY)-3);
-
-        if (i > 0) {
-            m_pxfScene->addLine(QLineF(pointTotal, pointTotalPrev), QPen(Qt::red));
-            m_pxfScene->addLine(QLineF(point1, point1Prev), graphLinePen);
-            m_pxfScene->addLine(QLineF(point2, point2Prev), graphLinePen);
-        }
+                &gainL,
+                &gainR);
+
+        const double gainTotal = sqrt(gainL * gainL + gainR * gainR) * scaleFactorToAlignWithGrid;
+        const double gainLScaled = gainL * scaleFactorToAlignWithGrid;
+        const double gainRScaled = gainR * scaleFactorToAlignWithGrid;
 
-        // Save old values
-        pointTotalPrev = pointTotal;
-        point1Prev = point1;
-        point2Prev = point2;
+        polylineTotal.append(QPointF(x, (1. - gainTotal) * sceneH - 1));
+        polylineL.append(QPointF(x, (1. - gainLScaled) * sceneH - vOffset));
+        polylineR.append(QPointF(x, (1. - gainRScaled) * sceneH - vOffset));
     }
 
+    QPainterPath pathTotal;
+    QPainterPath pathL;
+    QPainterPath pathR;
+    pathTotal.addPolygon(polylineTotal);
+    pathL.addPolygon(polylineL);
+    pathR.addPolygon(polylineR);
+    m_pxfScene->addPath(pathTotal, totalPen);
+    m_pxfScene->addPath(pathL, gainPen);
+    m_pxfScene->addPath(pathR, gainPen);
+
     graphicsViewXfader->show();
     graphicsViewXfader->repaint();
 }
diff --git a/src/preferences/dialog/dlgprefmixerdlg.ui b/src/preferences/dialog/dlgprefmixerdlg.ui
index d6a598230ed..7b14a2641fc 100644
--- a/src/preferences/dialog/dlgprefmixerdlg.ui
+++ b/src/preferences/dialog/dlgprefmixerdlg.ui
@@ -155,27 +155,15 @@
         <item>
          <widget class="QGraphicsView" name="graphicsViewXfader">
           <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <property name="minimumSize">
+          <property name="fixedSize">
            <size>
-            <width>125</width>
-            <height>80</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>125</width>
-            <height>80</height>
-           </size>
-          </property>
-          <property name="baseSize">
-           <size>
-            <width>300</width>
-            <height>0</height>
+            <width>123</width>
+            <height>83</height>
            </size>
           </property>
           <property name="verticalScrollBarPolicy">

From 17422ed3a5b7ff7f43b99475b691e6511d6d97b0 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 19 Sep 2023 11:00:45 +0200
Subject: [PATCH 061/388] Pref Mixer: don't use indexOf(QComboBox*) in for
 loops

---
 src/preferences/dialog/dlgprefmixer.cpp | 27 +++++++++++++------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index 88771db7184..17c990978d1 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -267,10 +267,10 @@ void DlgPrefMixer::slotPopulateDeckEqSelectors() {
     m_ignoreEqQuickEffectBoxSignals = true; // prevents a recursive call
 
     const QList<EffectManifestPointer> pManifestList = getDeckEqManifests();
-    for (QComboBox* pBox : qAsConst(m_deckEqEffectSelectors)) {
+    for (int deck = 0; deck < m_deckEqEffectSelectors.size(); deck++) {
+        QComboBox* pBox = m_deckEqEffectSelectors[deck];
         // Populate comboboxes with all available effects
         // Get currently loaded EQ effect
-        int deck = m_deckEqEffectSelectors.indexOf(pBox);
         auto pChainSlot = m_pEffectsManager->getEqualizerEffectChain(
                 PlayerManager::groupForDeck(deck));
         DEBUG_ASSERT(pChainSlot);
@@ -367,10 +367,10 @@ void DlgPrefMixer::slotSingleEqToggled(bool checked) {
                 m_pBackendManager->getManifestFromUniqueId(deck1EqId);
         int deck1QuickIndex = m_deckQuickEffectSelectors[0]->currentIndex();
 
-        for (int i = 2; i < m_deckEqEffectSelectors.size() + 1; ++i) {
+        for (int deck = 1; deck < m_deckEqEffectSelectors.size(); ++deck) {
             // EQ //////////////////////////////////////////////////////////////
             int newIndex = 0;
-            QComboBox* eqBox = m_deckEqEffectSelectors[i - 1];
+            QComboBox* eqBox = m_deckEqEffectSelectors[deck];
             int foundIndex = eqBox->findData(deck1EqId);
             if (foundIndex != -1) {
                 newIndex = foundIndex;
@@ -389,24 +389,24 @@ void DlgPrefMixer::slotSingleEqToggled(bool checked) {
                 DEBUG_ASSERT(pModel);
                 auto pItem = pModel->item(newIndex);
                 DEBUG_ASSERT(pItem);
-                pItem->setFlags(pItem->flags() & ~Qt::ItemIsEnabled);
+                pItem->setEnabled(false);
             }
             eqBox->setCurrentIndex(newIndex);
             eqBox->setDisabled(true);
 
             // QUickEffect /////////////////////////////////////////////////////
-            QComboBox* quickBox = m_deckQuickEffectSelectors[i - 1];
+            QComboBox* quickBox = m_deckQuickEffectSelectors[deck];
             quickBox->setCurrentIndex(deck1QuickIndex);
             quickBox->setDisabled(true);
         }
         m_ignoreEqQuickEffectBoxSignals = false;
     } else {
-        for (int i = 1; i < m_deckEqEffectSelectors.size(); ++i) {
-            QComboBox* eqBox = m_deckEqEffectSelectors[i];
+        for (int deck = 1; deck < m_deckEqEffectSelectors.size(); ++deck) {
+            QComboBox* eqBox = m_deckEqEffectSelectors[deck];
             eqBox->setEnabled(!m_eqBypass);
             slotPopulateDeckEqSelectors();
 
-            QComboBox* quickBox = m_deckQuickEffectSelectors[i];
+            QComboBox* quickBox = m_deckQuickEffectSelectors[deck];
             quickBox->setEnabled(true);
             slotPopulateQuickEffectSelectors();
         }
@@ -493,8 +493,8 @@ void DlgPrefMixer::slotQuickEffectChangedOnDeck(int effectIndex) {
 void DlgPrefMixer::applyDeckEQs() {
     m_ignoreEqQuickEffectBoxSignals = true;
 
-    for (const auto& pBox : qAsConst(m_deckEqEffectSelectors)) {
-        int deck = m_deckEqEffectSelectors.indexOf(pBox);
+    for (int deck = 0; deck < m_deckEqEffectSelectors.size(); deck++) {
+        QComboBox* pBox = m_deckEqEffectSelectors[deck];
         int effectIndex = pBox->currentIndex();
 
         bool needLoad = true;
@@ -905,8 +905,9 @@ void DlgPrefMixer::slotBypassEqToggled(bool checked) {
     m_eqBypass = checked;
 
     // De/activate deck EQ comboboxes
-    for (const auto& pBox : qAsConst(m_deckEqEffectSelectors)) {
-        if (m_deckEqEffectSelectors.indexOf(pBox) == 0) {
+    for (int deck = 0; deck < m_deckEqEffectSelectors.size(); deck++) {
+        QComboBox* pBox = m_deckEqEffectSelectors[deck];
+        if (deck == 0) {
             pBox->setEnabled(!m_eqBypass);
         } else {
             pBox->setEnabled(!m_eqBypass && !m_singleEq);

From 5aa6b32d36e25b920a22eb6e690387cc3787156f Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 19 Sep 2023 12:03:10 +0200
Subject: [PATCH 062/388] Pref Mixer: use parented_ptr for all widgets created
 on request

---
 src/preferences/dialog/dlgprefmixer.cpp | 84 ++++++++++++++-----------
 src/preferences/dialog/dlgprefmixer.h   |  8 +--
 2 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index 17c990978d1..43946e9c9d2 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -86,7 +86,9 @@ DlgPrefMixer::DlgPrefMixer(
           m_pChainPresetManager(pEffectsManager->getChainPresetManager()),
           m_pEffectsManager(pEffectsManager),
           m_pBackendManager(pEffectsManager->getBackendManager()),
-          m_pNumDecks(nullptr),
+          m_pNumDecks(make_parented<ControlProxy>(QStringLiteral("[App]"),
+                  QStringLiteral("num_decks"),
+                  this)),
           m_ignoreEqQuickEffectBoxSignals(false),
           m_singleEq(true),
           m_eqEffectsOnly(true),
@@ -160,7 +162,6 @@ DlgPrefMixer::DlgPrefMixer(
 
     // Add drop down lists for current decks and connect to num_decks control
     // so new lists are added if new decks are added.
-    m_pNumDecks = new ControlProxy(QStringLiteral("[App]"), QStringLiteral("num_decks"), this);
     m_pNumDecks->connectValueChanged(this, &DlgPrefMixer::slotNumDecksChanged);
     slotNumDecksChanged(m_pNumDecks->get());
 
@@ -176,24 +177,16 @@ DlgPrefMixer::DlgPrefMixer(
     m_initializing = false;
 }
 
-DlgPrefMixer::~DlgPrefMixer() {
-    qDeleteAll(m_deckEqEffectSelectors);
-    m_deckEqEffectSelectors.clear();
-
-    qDeleteAll(m_deckQuickEffectSelectors);
-    m_deckQuickEffectSelectors.clear();
-}
-
 // Create EQ & QuickEffect selectors and deck label for each added deck
 void DlgPrefMixer::slotNumDecksChanged(double numDecks) {
     while (m_deckEqEffectSelectors.size() < static_cast<int>(numDecks)) {
         int deckNo = m_deckEqEffectSelectors.size() + 1;
         QString deckGroup = PlayerManager::groupForDeck(deckNo - 1);
 
-        QLabel* label = new QLabel(QObject::tr("Deck %1").arg(deckNo), this);
+        auto pLabel = make_parented<QLabel>(QObject::tr("Deck %1").arg(deckNo), this);
 
         // Create the EQ selector //////////////////////////////////////////////
-        QComboBox* pEqComboBox = new QComboBox(this);
+        auto pEqComboBox = make_parented<QComboBox>(this);
         setScrollSafeGuard(pEqComboBox);
         m_deckEqEffectSelectors.append(pEqComboBox);
 
@@ -218,31 +211,34 @@ void DlgPrefMixer::slotNumDecksChanged(double numDecks) {
         connect(pEqComboBox,
                 QOverload<int>::of(&QComboBox::currentIndexChanged),
                 this,
-                &DlgPrefMixer::slotEQEffectChangedOnDeck);
+                &DlgPrefMixer::slotEQEffectSelectionChanged);
 
         // Create the QuickEffect selector /////////////////////////////////////
-        QComboBox* pQuickEffectComboBox = new QComboBox(this);
+        auto pQuickEffectComboBox = make_parented<QComboBox>(this);
         setScrollSafeGuard(pQuickEffectComboBox);
         m_deckQuickEffectSelectors.append(pQuickEffectComboBox);
         connect(pQuickEffectComboBox,
                 QOverload<int>::of(&QComboBox::currentIndexChanged),
                 this,
-                &DlgPrefMixer::slotQuickEffectChangedOnDeck);
+                &DlgPrefMixer::slotQuickEffectSelectionChanged);
         // Change the QuickEffect when it was changed in WEffectChainPresetSelector
         // or with controllers
         EffectChainPointer pChain = m_pEffectsManager->getQuickEffectChain(deckGroup);
         DEBUG_ASSERT(pChain);
+        // TODO(xxx) Connecting the signal to a lambda that capture the parented_ptr
+        // pQuickEffectComboBox and sets the combobox index causes a crash in
+        // applyQuickEffects() even though the signal hasn_t been emitted, yet.
+        // Hence we just capture the deck group and the new preset's name and set
+        // the index in a separate slot for now.
         connect(pChain.data(),
                 &EffectChain::chainPresetChanged,
                 this,
-                [this, pQuickEffectComboBox](const QString& name) {
-                    m_ignoreEqQuickEffectBoxSignals = true;
-                    pQuickEffectComboBox->setCurrentIndex(pQuickEffectComboBox->findText(name));
-                    m_ignoreEqQuickEffectBoxSignals = false;
+                [this, deckGroup](const QString& name) {
+                    slotQuickEffectChangedOnDeck(deckGroup, name);
                 });
 
         // Add the new widgets
-        gridLayout_3->addWidget(label, deckNo, 0);
+        gridLayout_3->addWidget(pLabel, deckNo, 0);
         gridLayout_3->addWidget(pEqComboBox, deckNo, 1);
         gridLayout_3->addWidget(pQuickEffectComboBox, deckNo, 2);
         gridLayout_3->addItem(
@@ -268,7 +264,7 @@ void DlgPrefMixer::slotPopulateDeckEqSelectors() {
 
     const QList<EffectManifestPointer> pManifestList = getDeckEqManifests();
     for (int deck = 0; deck < m_deckEqEffectSelectors.size(); deck++) {
-        QComboBox* pBox = m_deckEqEffectSelectors[deck];
+        auto* pBox = m_deckEqEffectSelectors[deck];
         // Populate comboboxes with all available effects
         // Get currently loaded EQ effect
         auto pChainSlot = m_pEffectsManager->getEqualizerEffectChain(
@@ -325,8 +321,8 @@ void DlgPrefMixer::slotPopulateQuickEffectSelectors() {
     QList<EffectChainPresetPointer> presetList =
             m_pChainPresetManager->getQuickEffectPresetsSorted();
 
-    for (QComboBox* pBox : qAsConst(m_deckQuickEffectSelectors)) {
-        int deck = m_deckQuickEffectSelectors.indexOf(pBox);
+    for (int deck = 0; deck < m_deckQuickEffectSelectors.size(); deck++) {
+        auto* pBox = m_deckQuickEffectSelectors[deck];
         pBox->clear();
         int currentIndex = 0; // preselect empty item '---' as default
 
@@ -370,7 +366,7 @@ void DlgPrefMixer::slotSingleEqToggled(bool checked) {
         for (int deck = 1; deck < m_deckEqEffectSelectors.size(); ++deck) {
             // EQ //////////////////////////////////////////////////////////////
             int newIndex = 0;
-            QComboBox* eqBox = m_deckEqEffectSelectors[deck];
+            auto* eqBox = m_deckEqEffectSelectors[deck];
             int foundIndex = eqBox->findData(deck1EqId);
             if (foundIndex != -1) {
                 newIndex = foundIndex;
@@ -395,18 +391,18 @@ void DlgPrefMixer::slotSingleEqToggled(bool checked) {
             eqBox->setDisabled(true);
 
             // QUickEffect /////////////////////////////////////////////////////
-            QComboBox* quickBox = m_deckQuickEffectSelectors[deck];
+            auto* quickBox = m_deckQuickEffectSelectors[deck];
             quickBox->setCurrentIndex(deck1QuickIndex);
             quickBox->setDisabled(true);
         }
         m_ignoreEqQuickEffectBoxSignals = false;
     } else {
         for (int deck = 1; deck < m_deckEqEffectSelectors.size(); ++deck) {
-            QComboBox* eqBox = m_deckEqEffectSelectors[deck];
+            auto* eqBox = m_deckEqEffectSelectors[deck];
             eqBox->setEnabled(!m_eqBypass);
             slotPopulateDeckEqSelectors();
 
-            QComboBox* quickBox = m_deckQuickEffectSelectors[deck];
+            auto* quickBox = m_deckQuickEffectSelectors[deck];
             quickBox->setEnabled(true);
             slotPopulateQuickEffectSelectors();
         }
@@ -460,7 +456,7 @@ void DlgPrefMixer::slotResetToDefaults() {
     slotApply();
 }
 
-void DlgPrefMixer::slotEQEffectChangedOnDeck(int effectIndex) {
+void DlgPrefMixer::slotEQEffectSelectionChanged(int effectIndex) {
     QComboBox* c = qobject_cast<QComboBox*>(sender());
     // Check if qobject_cast was successful
     if (!c || m_ignoreEqQuickEffectBoxSignals) {
@@ -476,7 +472,7 @@ void DlgPrefMixer::slotEQEffectChangedOnDeck(int effectIndex) {
     }
 }
 
-void DlgPrefMixer::slotQuickEffectChangedOnDeck(int effectIndex) {
+void DlgPrefMixer::slotQuickEffectSelectionChanged(int effectIndex) {
     QComboBox* c = qobject_cast<QComboBox*>(sender());
     // Check if qobject_cast was successful
     if (!c || m_ignoreEqQuickEffectBoxSignals) {
@@ -490,11 +486,27 @@ void DlgPrefMixer::slotQuickEffectChangedOnDeck(int effectIndex) {
     }
 }
 
+/// The Quick Effect was changed via the GUI or controls, update the combobox
+void DlgPrefMixer::slotQuickEffectChangedOnDeck(const QString& deckGroup,
+        const QString& presetName) {
+    int deck;
+    if (PlayerManager::isDeckGroup(deckGroup, &deck)) {
+        deck -= 1; // decks indices are 0-based
+        auto* pBox = m_deckQuickEffectSelectors[deck];
+        VERIFY_OR_DEBUG_ASSERT(pBox) {
+            return;
+        }
+        pBox->blockSignals(true);
+        pBox->setCurrentIndex(pBox->findText(presetName));
+        pBox->blockSignals(false);
+    }
+}
+
 void DlgPrefMixer::applyDeckEQs() {
     m_ignoreEqQuickEffectBoxSignals = true;
 
     for (int deck = 0; deck < m_deckEqEffectSelectors.size(); deck++) {
-        QComboBox* pBox = m_deckEqEffectSelectors[deck];
+        auto* pBox = m_deckEqEffectSelectors[deck];
         int effectIndex = pBox->currentIndex();
 
         bool needLoad = true;
@@ -542,8 +554,8 @@ void DlgPrefMixer::applyDeckEQs() {
 void DlgPrefMixer::applyQuickEffects() {
     m_ignoreEqQuickEffectBoxSignals = true;
 
-    for (const auto& pBox : qAsConst(m_deckQuickEffectSelectors)) {
-        int deck = m_deckQuickEffectSelectors.indexOf(pBox);
+    for (int deck = 0; deck < m_deckQuickEffectSelectors.size(); deck++) {
+        auto* pBox = m_deckQuickEffectSelectors[deck];
         int effectIndex = pBox->currentIndex();
 
         bool needLoad = true;
@@ -906,7 +918,7 @@ void DlgPrefMixer::slotBypassEqToggled(bool checked) {
 
     // De/activate deck EQ comboboxes
     for (int deck = 0; deck < m_deckEqEffectSelectors.size(); deck++) {
-        QComboBox* pBox = m_deckEqEffectSelectors[deck];
+        auto* pBox = m_deckEqEffectSelectors[deck];
         if (deck == 0) {
             pBox->setEnabled(!m_eqBypass);
         } else {
@@ -1010,13 +1022,13 @@ void DlgPrefMixer::slotMainEqEffectChanged(int effectIndex) {
         }
         int i = param->index();
 
-        QLabel* pCenterFreqLabel = new QLabel(this);
+        auto pCenterFreqLabel = make_parented<QLabel>(this);
         QString labelText = param->name();
         pCenterFreqLabel->setText(labelText);
         m_mainEQLabels.append(pCenterFreqLabel);
         slidersGridLayout->addWidget(pCenterFreqLabel, 0, i + 1, Qt::AlignCenter);
 
-        QSlider* pSlider = new QSlider(this);
+        auto pSlider = make_parented<QSlider>(this);
         setScrollSafeGuard(pSlider);
         pSlider->setProperty("index", QVariant(i));
         pSlider->setMinimumHeight(90);
@@ -1052,7 +1064,7 @@ void DlgPrefMixer::slotMainEqEffectChanged(int effectIndex) {
                 this,
                 &DlgPrefMixer::slotMainEQParameterSliderChanged);
 
-        QLabel* pValueLabel = new QLabel(this);
+        auto pValueLabel = make_parented<QLabel>(this);
         QString valueText = QString::number((double)pSlider->value() / 100);
         pValueLabel->setText(valueText);
 
diff --git a/src/preferences/dialog/dlgprefmixer.h b/src/preferences/dialog/dlgprefmixer.h
index d531977fcc9..efb2c77f042 100644
--- a/src/preferences/dialog/dlgprefmixer.h
+++ b/src/preferences/dialog/dlgprefmixer.h
@@ -15,7 +15,6 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
             QWidget* parent,
             std::shared_ptr<EffectsManager> pEffectsManager,
             UserSettingsPointer _config);
-    virtual ~DlgPrefMixer();
 
     QUrl helpUrl() const override;
 
@@ -26,8 +25,9 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
 
   private slots:
     void slotNumDecksChanged(double numDecks);
-    void slotEQEffectChangedOnDeck(int effectIndex);
-    void slotQuickEffectChangedOnDeck(int effectIndex);
+    void slotEQEffectSelectionChanged(int effectIndex);
+    void slotQuickEffectSelectionChanged(int effectIndex);
+    void slotQuickEffectChangedOnDeck(const QString& group, const QString& presetName);
     void slotEqOnlyToggled(bool checked);
     void slotSingleEqToggled(bool checked);
     void slotEqAutoResetToggled(bool checked);
@@ -92,7 +92,7 @@ class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
     EffectsBackendManagerPointer m_pBackendManager;
     QList<QComboBox*> m_deckEqEffectSelectors;
     QList<QComboBox*> m_deckQuickEffectSelectors;
-    ControlProxy* m_pNumDecks;
+    parented_ptr<ControlProxy> m_pNumDecks;
 
     bool m_ignoreEqQuickEffectBoxSignals;
 

From 84ddc774ac686b75698c1b2733ba9a392b5f0815 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 19 Sep 2023 12:07:56 +0200
Subject: [PATCH 063/388] Pref Mixer: contruct combobox tooltips with string
 args

---
 src/preferences/dialog/dlgprefmixer.cpp | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index 43946e9c9d2..44be5e01c13 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -285,8 +285,9 @@ void DlgPrefMixer::slotPopulateDeckEqSelectors() {
             // <b> makes the effect name bold. Also, like <span> it serves as hack
             // to get Qt to treat the string as rich text so it automatically wraps long lines.
             pBox->setItemData(i,
-                    QVariant(QStringLiteral("<b>") + pManifest->name() +
-                            QStringLiteral("</b><br/>") + pManifest->description()),
+                    QVariant(QStringLiteral("<b>%1</b><br/>%2")
+                                     .arg(pManifest->name(),
+                                             pManifest->description())),
                     Qt::ToolTipRole);
             if (pLoadedManifest &&
                     pLoadedManifest.data() == pManifest.data()) {
@@ -299,8 +300,9 @@ void DlgPrefMixer::slotPopulateDeckEqSelectors() {
                     QVariant(pLoadedManifest->uniqueId()));
             currentIndex = pBox->count() - 1;
             pBox->setItemData(currentIndex,
-                    QVariant(QStringLiteral("<b>") + pLoadedManifest->name() +
-                            QStringLiteral("</b><br/>") + pLoadedManifest->description()),
+                    QVariant(QStringLiteral("<b>%1</b><br/>%2")
+                                     .arg(pLoadedManifest->name(),
+                                             pLoadedManifest->description())),
                     Qt::ToolTipRole);
             // Deactivate item to hopefully clarify the item is not an EQ
             const QStandardItemModel* pModel =
@@ -376,8 +378,9 @@ void DlgPrefMixer::slotSingleEqToggled(bool checked) {
                         QVariant(pManifest->uniqueId()));
                 newIndex = eqBox->count() - 1;
                 eqBox->setItemData(newIndex,
-                        QVariant(QStringLiteral("<b>") + pManifest->name() +
-                                QStringLiteral("</b><br/>") + pManifest->description()),
+                        QVariant(QStringLiteral("<b>%1</b><br/>%2")
+                                         .arg(pManifest->name(),
+                                                 pManifest->description())),
                         Qt::ToolTipRole);
                 // Deactivate item to hopefully clarify the item is not an EQ
                 const QStandardItemModel* pModel =
@@ -950,8 +953,9 @@ void DlgPrefMixer::setUpMainEQ() {
         // <b> makes the effect name bold. Also, like <span> it serves as hack
         // to get Qt to treat the string as rich text so it automatically wraps long lines.
         comboBoxMainEq->setItemData(comboBoxMainEq->count() - 1,
-                QVariant(QStringLiteral("<b>") + pManifest->name() +
-                        QStringLiteral("</b><br/>") + pManifest->description()),
+                QVariant(QStringLiteral("<b>%1</b><br/>%2")
+                                 .arg(pManifest->name(),
+                                         pManifest->description())),
                 Qt::ToolTipRole);
     }
     comboBoxMainEq->setCurrentIndex(0);

From 4c1e8677bba24fa5f5a2098b562bf79361e550b4 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 19 Sep 2023 12:19:57 +0200
Subject: [PATCH 064/388] Pref Mixer: qAsConst -> std::as_const

---
 src/preferences/dialog/dlgprefmixer.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index 44be5e01c13..b3e96e921f4 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -440,11 +440,11 @@ void DlgPrefMixer::slotResetToDefaults() {
     checkBoxReverse->setChecked(false);
 
     // EQ //////////////////////////////////
-    for (const auto& pBox : qAsConst(m_deckEqEffectSelectors)) {
+    for (const auto& pBox : std::as_const(m_deckEqEffectSelectors)) {
         pBox->setCurrentIndex(
                 pBox->findData(kDefaultEqId));
     }
-    for (const auto& pBox : qAsConst(m_deckQuickEffectSelectors)) {
+    for (const auto& pBox : std::as_const(m_deckQuickEffectSelectors)) {
         pBox->setCurrentIndex(
                 pBox->findText(kDefaultQuickEffectChainName));
     }
@@ -975,7 +975,7 @@ void DlgPrefMixer::updateMainEQ() {
     comboBoxMainEq->setCurrentIndex(mainEqIndex);
 
     // Load parameters from preferences and set sliders
-    for (QSlider* pSlider : qAsConst(m_mainEQSliders)) {
+    for (QSlider* pSlider : std::as_const(m_mainEQSliders)) {
         int paramIndex = pSlider->property("index").toInt();
         QString strValue = m_pConfig->getValueString(ConfigKey(kMixerProfile,
                 kMainEQParameterKey + QString::number(paramIndex + 1)));
@@ -1126,7 +1126,7 @@ void DlgPrefMixer::slotMainEQToDefault() {
         return;
     }
 
-    for (QSlider* pSlider : qAsConst(m_mainEQSliders)) {
+    for (QSlider* pSlider : std::as_const(m_mainEQSliders)) {
         int paramIndex = pSlider->property("index").toInt();
         auto pParam = pManifest->parameter(paramIndex);
         pSlider->setValue(static_cast<int>(pParam->getDefault() * 100));
@@ -1151,7 +1151,7 @@ void DlgPrefMixer::storeMainEQ() {
     }
 
     // store current parameters
-    for (QSlider* pSlider : qAsConst(m_mainEQSliders)) {
+    for (QSlider* pSlider : std::as_const(m_mainEQSliders)) {
         int paramIndex = pSlider->property("index").toInt();
         double dispValue = static_cast<double>(pSlider->value()) / 100;
         // TODO store this in effects.xml

From c222ed4256647ea93811684bbc053334d308c6dd Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Thu, 21 Sep 2023 20:40:54 +0200
Subject: [PATCH 065/388] Pref Mixer: auto* + simpler combobox item
 deactivation

---
 src/preferences/dialog/dlgprefmixer.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index b3e96e921f4..9998c2a9200 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -308,9 +308,9 @@ void DlgPrefMixer::slotPopulateDeckEqSelectors() {
             const QStandardItemModel* pModel =
                     qobject_cast<QStandardItemModel*>(pBox->model());
             DEBUG_ASSERT(pModel);
-            auto pItem = pModel->item(currentIndex);
+            auto* pItem = pModel->item(currentIndex);
             DEBUG_ASSERT(pItem);
-            pItem->setFlags(pItem->flags() & ~Qt::ItemIsEnabled);
+            pItem->setEnabled(false);
         }
         pBox->setCurrentIndex(currentIndex);
     }
@@ -386,7 +386,7 @@ void DlgPrefMixer::slotSingleEqToggled(bool checked) {
                 const QStandardItemModel* pModel =
                         qobject_cast<QStandardItemModel*>(eqBox->model());
                 DEBUG_ASSERT(pModel);
-                auto pItem = pModel->item(newIndex);
+                auto* pItem = pModel->item(newIndex);
                 DEBUG_ASSERT(pItem);
                 pItem->setEnabled(false);
             }

From 8e571ee12eefbb519eb20b7d32ac7275e9b18832 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Thu, 21 Sep 2023 21:51:14 +0200
Subject: [PATCH 066/388] Pref Mixer: more efficient EQ list splitting EQs /
 non-EQs

Co-authored-by: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com>
---
 src/preferences/dialog/dlgprefmixer.cpp | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index 9998c2a9200..08017296efe 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -1162,21 +1162,15 @@ void DlgPrefMixer::storeMainEQ() {
 }
 
 const QList<EffectManifestPointer> DlgPrefMixer::getDeckEqManifests() const {
-    const QList<EffectManifestPointer> allManifests =
+    QList<EffectManifestPointer> allManifests =
             m_pBackendManager->getManifests();
-    QList<EffectManifestPointer> eqs;
-    QList<EffectManifestPointer> nonEqs;
-    // Add EQs first, then append non-EQs
-    for (const auto& pManifest : allManifests) {
-        if (isMixingEQ(pManifest.data())) {
-            eqs.append(pManifest);
-        } else if (!m_eqEffectsOnly) {
-            nonEqs.append(pManifest);
-        }
+    auto nonEqsStartIt = std::stable_partition(allManifests.begin(),
+            allManifests.end(),
+            [](const auto& pManifest) { return isMixingEQ(pManifest.data()); });
+    if (m_eqEffectsOnly) {
+        allManifests.erase(nonEqsStartIt, allManifests.end());
     }
-    // Append non-EQs. No-op if 'EQs only' is unchecked.
-    eqs.append(nonEqs);
-    return eqs;
+    return allManifests;
 }
 
 const QList<EffectManifestPointer> DlgPrefMixer::getMainEqManifests() const {

From 2132b970410ee89a4862dd702707e7285f9fc16b Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Thu, 21 Sep 2023 21:54:46 +0200
Subject: [PATCH 067/388] Pref Mixer: show effects' display name, separate  EQs
 / non-EQs

---
 src/preferences/dialog/dlgprefmixer.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index 08017296efe..8b3a877dd31 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -280,7 +280,11 @@ void DlgPrefMixer::slotPopulateDeckEqSelectors() {
         pBox->addItem(kNoEffectString);
         int currentIndex = 0; // store it as default selection
         for (const auto& pManifest : pManifestList) {
-            pBox->addItem(pManifest->name(), QVariant(pManifest->uniqueId()));
+            if (pManifest.isNull()) {
+                pBox->insertSeparator(pBox->count());
+                continue;
+            }
+            pBox->addItem(pManifest->displayName(), QVariant(pManifest->uniqueId()));
             int i = pBox->count() - 1;
             // <b> makes the effect name bold. Also, like <span> it serves as hack
             // to get Qt to treat the string as rich text so it automatically wraps long lines.
@@ -1169,6 +1173,10 @@ const QList<EffectManifestPointer> DlgPrefMixer::getDeckEqManifests() const {
             [](const auto& pManifest) { return isMixingEQ(pManifest.data()); });
     if (m_eqEffectsOnly) {
         allManifests.erase(nonEqsStartIt, allManifests.end());
+    } else {
+        // Add a null item between EQs and non-EQs. The combobox fill function
+        // will use this to insert a separator.
+        allManifests.insert(nonEqsStartIt, EffectManifestPointer());
     }
     return allManifests;
 }

From a1937951a6cf10ca904c40eadc12c09609aedff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Wed, 20 Sep 2023 21:23:14 +0200
Subject: [PATCH 068/388] Introduce static CoverArtCache::getCachedCover for
 immediate cache lookups

---
 src/library/basetracktablemodel.cpp | 16 ++++++------
 src/library/coverartcache.cpp       | 39 ++++++++++++++++++++++++-----
 src/library/coverartcache.h         | 37 ++++++++-------------------
 src/library/coverartdelegate.cpp    | 12 ++++-----
 4 files changed, 57 insertions(+), 47 deletions(-)

diff --git a/src/library/basetracktablemodel.cpp b/src/library/basetracktablemodel.cpp
index 9ef7aca66ca..ef29dd3894b 100644
--- a/src/library/basetracktablemodel.cpp
+++ b/src/library/basetracktablemodel.cpp
@@ -546,16 +546,16 @@ QVariant BaseTrackTableModel::composeCoverArtToolTipHtml(
     unsigned int absoluteHeightOfCoverartToolTip = static_cast<int>(
             pViewScreen->availableGeometry().height() *
             kRelativeHeightOfCoverartToolTip);
-    // Get image from cover art cache
-    CoverArtCache* pCache = CoverArtCache::instance();
-    QPixmap pixmap = QPixmap(absoluteHeightOfCoverartToolTip,
-            absoluteHeightOfCoverartToolTip); // Height also used as default for the width, in assumption that covers are squares
-    pixmap = pCache->tryLoadCover(this,
-            getCoverInfo(index),
-            absoluteHeightOfCoverartToolTip,
-            CoverArtCache::Loading::NoSignal);
+    const auto coverInfo = getCoverInfo(index);
+    QPixmap pixmap = CoverArtCache::getCachedCover(
+            coverInfo,
+            absoluteHeightOfCoverartToolTip);
     if (pixmap.isNull()) {
         // Cache miss -> Don't show a tooltip
+        CoverArtCache::requestCover(
+                nullptr,
+                coverInfo,
+                absoluteHeightOfCoverartToolTip);
         return QVariant();
     }
     QByteArray data;
diff --git a/src/library/coverartcache.cpp b/src/library/coverartcache.cpp
index 5891cc3d82b..e04e70c4286 100644
--- a/src/library/coverartcache.cpp
+++ b/src/library/coverartcache.cpp
@@ -46,8 +46,9 @@ CoverArtCache::CoverArtCache() {
 //static
 void CoverArtCache::requestCover(
         const QObject* pRequester,
+        const TrackPointer& pTrack,
         const CoverInfo& coverInfo,
-        const TrackPointer& pTrack) {
+        int desiredWidth) {
     CoverArtCache* pCache = CoverArtCache::instance();
     VERIFY_OR_DEBUG_ASSERT(pCache) {
         return;
@@ -56,7 +57,7 @@ void CoverArtCache::requestCover(
             pRequester,
             pTrack,
             coverInfo,
-            0, // original size
+            desiredWidth, // original size
             Loading::Default);
 }
 
@@ -69,8 +70,35 @@ void CoverArtCache::requestTrackCover(
     }
     requestCover(
             pRequester,
-            pTrack->getCoverInfoWithLocation(),
-            pTrack);
+            pTrack,
+            pTrack->getCoverInfoWithLocation());
+}
+
+// static
+QPixmap CoverArtCache::getCachedCover(
+        const CoverInfo& coverInfo,
+        int desiredWidth) {
+    if (coverInfo.type == CoverInfo::NONE) {
+        return QPixmap();
+    }
+    const mixxx::cache_key_t requestedCacheKey = coverInfo.cacheKey();
+    QString cacheKey = pixmapCacheKey(requestedCacheKey, desiredWidth);
+
+    QPixmap pixmap;
+    if (QPixmapCache::find(cacheKey, &pixmap)) {
+        if (kLogger.traceEnabled()) {
+            kLogger.trace()
+                    << "requestCover cache hit"
+                    << coverInfo;
+        }
+    } else {
+        if (kLogger.traceEnabled()) {
+            kLogger.trace()
+                    << "requestCover cache miss"
+                    << coverInfo;
+        }
+    }
+    return pixmap;
 }
 
 QPixmap CoverArtCache::tryLoadCover(
@@ -84,8 +112,7 @@ QPixmap CoverArtCache::tryLoadCover(
                 << "requestCover"
                 << pRequester
                 << coverInfo
-                << desiredWidth
-                << loading;
+                << desiredWidth;
     }
     DEBUG_ASSERT(!pTrack ||
                 pTrack->getLocation() == coverInfo.trackLocation);
diff --git a/src/library/coverartcache.h b/src/library/coverartcache.h
index 63e3097d9aa..9f74324fb39 100644
--- a/src/library/coverartcache.h
+++ b/src/library/coverartcache.h
@@ -15,42 +15,24 @@ class CoverArtCache : public QObject, public Singleton<CoverArtCache> {
   public:
     static void requestCover(
             const QObject* pRequester,
-            const CoverInfo& coverInfo) {
-        requestCover(pRequester, coverInfo, TrackPointer());
+            const CoverInfo& coverInfo,
+            int desiredWidth = 0) {
+        requestCover(pRequester, TrackPointer(), coverInfo, desiredWidth);
     }
+
     static void requestTrackCover(
             const QObject* pRequester,
             const TrackPointer& pTrack);
 
-    /* This method is used to request a cover art pixmap.
-     *
-     * @param pRequester : an arbitrary pointer (can be any number you'd like,
-     *      really) that will be provided in the coverFound signal for this
-     *      request. This allows you to match requests with their responses.
-     *
-     * @param onlyCached : if it is 'true', the method will NOT try to load
-     *      covers from the given 'coverLocation' and it will also NOT run the
-     *      search algorithm.
-     *      In this way, the method will just look into CoverCache and return
-     *      a Pixmap if it is already loaded in the QPixmapCache.
-     */
+    static QPixmap getCachedCover(
+            const CoverInfo& coverInfo,
+            int desiredWidth);
+
     enum class Loading {
         CachedOnly,
         NoSignal,
         Default, // signal when done
     };
-    QPixmap tryLoadCover(
-            const QObject* pRequester,
-            const CoverInfo& info,
-            int desiredWidth = 0, // <= 0: original size
-            Loading loading = Loading::Default) {
-        return tryLoadCover(
-                pRequester,
-                TrackPointer(),
-                info,
-                desiredWidth,
-                loading);
-    }
 
     // Only public for testing
     struct FutureResult {
@@ -106,8 +88,9 @@ class CoverArtCache : public QObject, public Singleton<CoverArtCache> {
   private:
     static void requestCover(
             const QObject* pRequester,
+            const TrackPointer& /*optional*/ pTrack,
             const CoverInfo& coverInfo,
-            const TrackPointer& /*optional*/ pTrack);
+            int desiredWidth = 0);
 
     QPixmap tryLoadCover(
             const QObject* pRequester,
diff --git a/src/library/coverartdelegate.cpp b/src/library/coverartdelegate.cpp
index de4d7d504c9..6c11f3312a1 100644
--- a/src/library/coverartdelegate.cpp
+++ b/src/library/coverartdelegate.cpp
@@ -126,11 +126,9 @@ void CoverArtDelegate::paintItem(
             return;
         }
         const double scaleFactor = qobject_cast<QWidget*>(parent())->devicePixelRatioF();
-        QPixmap pixmap = m_pCache->tryLoadCover(this,
+        QPixmap pixmap = CoverArtCache::getCachedCover(
                 coverInfo,
-                static_cast<int>(option.rect.width() * scaleFactor),
-                m_inhibitLazyLoading ? CoverArtCache::Loading::CachedOnly
-                                     : CoverArtCache::Loading::Default);
+                static_cast<int>(option.rect.width() * scaleFactor));
         if (pixmap.isNull()) {
             // Cache miss
             if (m_inhibitLazyLoading) {
@@ -139,8 +137,10 @@ void CoverArtDelegate::paintItem(
                 // non-cache we can request an update.
                 m_cacheMissRows.append(index.row());
             } else {
-                // If we asked for a non-cache image and got a null pixmap,
-                // then our request was queued.
+                CoverArtCache::requestCover(
+                        this,
+                        coverInfo,
+                        static_cast<int>(option.rect.width() * scaleFactor));
                 m_pendingCacheRows.insert(coverInfo.cacheKey(), index.row());
             }
         } else {

From c8f261d08f34c641c2b5f2ad0edd064d035abb21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Thu, 21 Sep 2023 08:16:47 +0200
Subject: [PATCH 069/388] Clean up CoverInfo

---
 src/library/basesqltablemodel.cpp         |  2 +-
 src/library/basetracktablemodel.cpp       |  3 +++
 src/library/coverart.cpp                  | 30 +++--------------------
 src/library/coverart.h                    | 20 +++++++--------
 src/library/coverartcache.cpp             | 24 ++++++++++++------
 src/library/coverartdelegate.cpp          |  1 +
 src/library/coverartutils.cpp             |  4 +--
 src/library/dlgtagfetcher.cpp             |  2 --
 src/library/export/coverartcopyworker.cpp |  7 +++---
 src/test/coverartutils_test.cpp           | 12 ++++-----
 src/test/trackupdate_test.cpp             |  2 +-
 src/widget/wcoverartmenu.cpp              |  2 --
 12 files changed, 46 insertions(+), 63 deletions(-)

diff --git a/src/library/basesqltablemodel.cpp b/src/library/basesqltablemodel.cpp
index 3fa20930289..a9d024b149a 100644
--- a/src/library/basesqltablemodel.cpp
+++ b/src/library/basesqltablemodel.cpp
@@ -804,7 +804,7 @@ CoverInfo BaseSqlTableModel::getCoverInfo(const QModelIndex& index) const {
                          fieldIndex(ColumnCache::
                                          COLUMN_LIBRARYTABLE_COVERART_COLOR))
                     .data());
-    if (coverInfo.hasImage()) {
+    if (coverInfo.hasCacheKey()) {
         coverInfo.type = static_cast<CoverInfo::Type>(
                 index.sibling(index.row(),
                              fieldIndex(ColumnCache::
diff --git a/src/library/basetracktablemodel.cpp b/src/library/basetracktablemodel.cpp
index ef29dd3894b..a4e89ddbbae 100644
--- a/src/library/basetracktablemodel.cpp
+++ b/src/library/basetracktablemodel.cpp
@@ -547,6 +547,9 @@ QVariant BaseTrackTableModel::composeCoverArtToolTipHtml(
             pViewScreen->availableGeometry().height() *
             kRelativeHeightOfCoverartToolTip);
     const auto coverInfo = getCoverInfo(index);
+    if (!coverInfo.hasImage()) {
+        return QPixmap();
+    }
     QPixmap pixmap = CoverArtCache::getCachedCover(
             coverInfo,
             absoluteHeightOfCoverartToolTip);
diff --git a/src/library/coverart.cpp b/src/library/coverart.cpp
index 5814b5fdb52..f6a356b02f5 100644
--- a/src/library/coverart.cpp
+++ b/src/library/coverart.cpp
@@ -68,14 +68,15 @@ CoverInfoRelative::CoverInfoRelative()
           m_legacyHash(defaultLegacyHash()) {
 }
 
-void CoverInfoRelative::setImage(
+void CoverInfoRelative::setImageDigest(
         const QImage& image) {
     color = CoverImageUtils::extractBackgroundColor(image);
     m_imageDigest = CoverImageUtils::calculateDigest(image);
     DEBUG_ASSERT(image.isNull() == m_imageDigest.isEmpty());
     m_legacyHash = calculateLegacyHash(image);
     DEBUG_ASSERT(image.isNull() == (m_legacyHash == defaultLegacyHash()));
-    DEBUG_ASSERT(image.isNull() != hasImage());
+    DEBUG_ASSERT(image.isNull() != hasCacheKey());
+    DEBUG_ASSERT(image.isNull() == (type == NONE));
 }
 
 bool operator==(const CoverInfoRelative& lhs, const CoverInfoRelative& rhs) {
@@ -172,31 +173,6 @@ CoverInfo::LoadedImage CoverInfo::loadImage(TrackPointer pTrack) const {
     return loadedImage;
 }
 
-bool CoverInfo::refreshImageDigest(
-        const QImage& loadedImage) {
-    if (!imageDigest().isEmpty()) {
-        // Assume that a non-empty digest has been calculated from
-        // the corresponding image. Otherwise we would refresh all
-        // digests over and over again.
-        // Invalid legacy hash values are ignored. These will only
-        // be refreshed when opened with a previous version.
-        return false;
-    }
-    QImage image = loadedImage;
-    if (image.isNull()) {
-        image = loadImage(TrackPointer()).image;
-    }
-    if (image.isNull() && type != CoverInfo::NONE) {
-        kLogger.warning()
-                << "Resetting cover info"
-                << *this;
-        reset();
-        return true;
-    }
-    setImage(image);
-    return true;
-}
-
 bool operator==(const CoverInfo& lhs, const CoverInfo& rhs) {
     return static_cast<const CoverInfoRelative&>(lhs) ==
             static_cast<const CoverInfoRelative&>(rhs) &&
diff --git a/src/library/coverart.h b/src/library/coverart.h
index ccb3ab2ebcf..9218be71538 100644
--- a/src/library/coverart.h
+++ b/src/library/coverart.h
@@ -70,8 +70,9 @@ class CoverInfoRelative {
         *this = CoverInfoRelative();
     }
 
-    void setImage(
-            const QImage& image = QImage());
+    void setImageDigest(
+            const QImage& image);
+
     void setImageDigest(
             QByteArray imageDigest,
             quint16 legacyHash = defaultLegacyHash()) {
@@ -79,11 +80,15 @@ class CoverInfoRelative {
         m_legacyHash = legacyHash;
     }
 
+    bool hasCacheKey() const {
+        return !m_imageDigest.isEmpty() || m_legacyHash != defaultLegacyHash();
+    }
+
     bool hasImage() const {
-        return cacheKey() != CoverImageUtils::defaultCacheKey();
+        return type != NONE;
     }
 
-    const QByteArray imageDigest() const {
+    const QByteArray& imageDigest() const {
         return m_imageDigest;
     }
     mixxx::cache_key_t cacheKey() const {
@@ -178,13 +183,6 @@ class CoverInfo : public CoverInfoRelative {
     };
     LoadedImage loadImage(TrackPointer pTrack = {}) const;
 
-    /// Verify the image digest and update it if necessary.
-    /// If the corresponding image has already been loaded it
-    /// could be provided as a parameter to avoid reloading
-    /// if actually needed.
-    bool refreshImageDigest(
-            const QImage& loadedImage = QImage());
-
     QString trackLocation;
 };
 
diff --git a/src/library/coverartcache.cpp b/src/library/coverartcache.cpp
index e04e70c4286..9b677b089f8 100644
--- a/src/library/coverartcache.cpp
+++ b/src/library/coverartcache.cpp
@@ -207,15 +207,23 @@ CoverArtCache::FutureResult CoverArtCache::loadCover(
             signalWhenDone);
     DEBUG_ASSERT(!res.coverInfoUpdated);
 
-    auto loadedImage = coverInfo.loadImage(pTrack);
+    CoverInfo::LoadedImage loadedImage = coverInfo.loadImage(pTrack);
     if (!loadedImage.image.isNull()) {
-        // Refresh hash before resizing the original image!
-        res.coverInfoUpdated = coverInfo.refreshImageDigest(loadedImage.image);
-        if (pTrack && res.coverInfoUpdated) {
-            kLogger.info()
-                    << "Updating cover info of track"
-                    << coverInfo.trackLocation;
-            pTrack->setCoverInfo(coverInfo);
+        if (coverInfo.imageDigest().isEmpty()) {
+            // This happens if we have loaded the cover art via the legacy hash
+            // and during tests.
+            // Refresh hash before resizing the original image!
+            coverInfo.setImageDigest(loadedImage.image);
+            if (pTrack && pTrack->getId().isValid()) {
+                // Update Track if not a temporary track
+                kLogger.info()
+                        << "Updating cover info of track"
+                        << coverInfo.trackLocation;
+                pTrack->setCoverInfo(coverInfo);
+            } else {
+                // perform the track update at the requester 
+            	res.coverInfoUpdated = true;
+            }
         }
 
         // Resize image to requested size
diff --git a/src/library/coverartdelegate.cpp b/src/library/coverartdelegate.cpp
index 6c11f3312a1..50f12a73261 100644
--- a/src/library/coverartdelegate.cpp
+++ b/src/library/coverartdelegate.cpp
@@ -81,6 +81,7 @@ void CoverArtDelegate::slotCoverFound(
         return;
     }
     if (coverInfoUpdated) {
+        // This happens after updating form legacy hash
         const auto pTrack =
                 loadTrackByLocation(coverInfo.trackLocation);
         if (pTrack) {
diff --git a/src/library/coverartutils.cpp b/src/library/coverartutils.cpp
index f604d40c8d4..655fd816fab 100644
--- a/src/library/coverartutils.cpp
+++ b/src/library/coverartutils.cpp
@@ -176,7 +176,7 @@ CoverInfoRelative CoverArtUtils::selectCoverArtForTrack(
         if (!image.isNull()) {
             coverInfoRelative.type = CoverInfo::FILE;
             coverInfoRelative.coverLocation = bestInfo->fileName();
-            coverInfoRelative.setImage(image);
+            coverInfoRelative.setImageDigest(image);
         }
     }
 
@@ -191,7 +191,7 @@ CoverInfoRelative CoverInfoGuesser::guessCoverInfo(
         CoverInfoRelative coverInfo;
         coverInfo.source = CoverInfo::GUESSED;
         coverInfo.type = CoverInfo::METADATA;
-        coverInfo.setImage(embeddedCover);
+        coverInfo.setImageDigest(embeddedCover);
         DEBUG_ASSERT(coverInfo.coverLocation.isNull());
         return coverInfo;
     }
diff --git a/src/library/dlgtagfetcher.cpp b/src/library/dlgtagfetcher.cpp
index ca123c57312..183fb0623f7 100644
--- a/src/library/dlgtagfetcher.cpp
+++ b/src/library/dlgtagfetcher.cpp
@@ -577,9 +577,7 @@ void DlgTagFetcher::slotLoadBytesToLabel(const QByteArray& data) {
     QPixmap fetchedCoverArtPixmap;
     fetchedCoverArtPixmap.loadFromData(data);
     CoverInfo coverInfo;
-    coverInfo.type = CoverInfo::NONE;
     coverInfo.source = CoverInfo::USER_SELECTED;
-    coverInfo.setImage();
 
     loadingProgressBar->setVisible(false);
     statusMessage->setText(tr("Cover art is ready to be applied"));
diff --git a/src/library/export/coverartcopyworker.cpp b/src/library/export/coverartcopyworker.cpp
index 33cdb4a5ca0..a1e3a1b7b76 100644
--- a/src/library/export/coverartcopyworker.cpp
+++ b/src/library/export/coverartcopyworker.cpp
@@ -14,13 +14,13 @@ CoverArtCopyWorker::~CoverArtCopyWorker() {
 }
 
 void CoverArtCopyWorker::run() {
-    m_coverInfo.type = CoverInfo::FILE;
     m_coverInfo.source = CoverInfo::USER_SELECTED;
 
     if (m_selectedCoverArtFilePath.isEmpty()) {
         ImageFileData imageFileData = ImageFileData(m_fetchedCoverArtByteArray);
+        m_coverInfo.type = CoverInfo::FILE;
         m_coverInfo.coverLocation = m_oldCoverArtFilePath;
-        m_coverInfo.setImage(imageFileData);
+        m_coverInfo.setImageDigest(imageFileData);
         copyFile(QString(), m_oldCoverArtFilePath);
         return;
     }
@@ -34,8 +34,9 @@ void CoverArtCopyWorker::run() {
         return;
     }
 
+    m_coverInfo.type = CoverInfo::FILE;
     m_coverInfo.coverLocation = m_selectedCoverArtFilePath;
-    m_coverInfo.setImage(imageFileData);
+    m_coverInfo.setImageDigest(imageFileData);
 
     if (QFileInfo(m_oldCoverArtFilePath).canonicalPath() ==
             selectedCoverFileAccess.info().canonicalLocationPath()) {
diff --git a/src/test/coverartutils_test.cpp b/src/test/coverartutils_test.cpp
index 67ec5866c97..89d51012b36 100644
--- a/src/test/coverartutils_test.cpp
+++ b/src/test/coverartutils_test.cpp
@@ -170,7 +170,7 @@ TEST_F(CoverArtUtilTest, searchImage) {
 
     // looking for cover in an directory with one image will select that one.
     expected2.coverLocation = "foo.jpg";
-    expected2.setImage(QImage(cLoc_foo));
+    expected2.setImageDigest(QImage(cLoc_foo));
     covers << QFileInfo(cLoc_foo);
     CoverInfoRelative res2 = CoverArtUtils::selectCoverArtForTrack(
             mixxx::FileInfo(trackBaseName), trackAlbum, covers);
@@ -238,11 +238,11 @@ TEST_F(CoverArtUtilTest, searchImage) {
         if (cover.baseName() == "other1") {
             expected2.type = CoverInfo::NONE;
             expected2.coverLocation = QString();
-            expected2.setImage();
+            expected2.setImageDigest(QImage());
         } else {
             expected2.type = CoverInfo::FILE;
             expected2.coverLocation = cover.fileName();
-            expected2.setImage(QImage(cover.filePath()));
+            expected2.setImageDigest(QImage(cover.filePath()));
         }
         res2 = CoverArtUtils::selectCoverArtForTrack(
                 mixxx::FileInfo(trackBaseName), trackAlbum, prefCovers);
@@ -270,7 +270,7 @@ TEST_F(CoverArtUtilTest, searchImage) {
 
     res2 = CoverArtUtils::selectCoverArtForTrack(
             mixxx::FileInfo(trackBaseName), trackAlbum, prefCovers);
-    expected2.setImage(QImage(cLoc_coverJPG));
+    expected2.setImageDigest(QImage(cLoc_coverJPG));
     expected2.coverLocation = "cover.JPG";
     EXPECT_EQ(expected2, res2);
 
@@ -287,7 +287,7 @@ TEST_F(CoverArtUtilTest, searchImage) {
     prefCovers.append(QFileInfo(cLoc_albumName));
     res2 = CoverArtUtils::selectCoverArtForTrack(
             mixxx::FileInfo(trackBaseName), trackAlbum, prefCovers);
-    expected2.setImage(QImage(cLoc_albumName));
+    expected2.setImageDigest(QImage(cLoc_albumName));
     expected2.coverLocation = trackAlbum % ".jpg";
     EXPECT_EQ(expected2, res2);
 
@@ -298,7 +298,7 @@ TEST_F(CoverArtUtilTest, searchImage) {
     res2 = CoverArtUtils::selectCoverArtForTrack(
             mixxx::FileInfo(trackBaseName), trackAlbum, prefCovers);
 
-    expected2.setImage(QImage(cLoc_filename));
+    expected2.setImageDigest(QImage(cLoc_filename));
     expected2.coverLocation = trackBaseName % ".jpg";
     EXPECT_EQ(expected2, res2);
 
diff --git a/src/test/trackupdate_test.cpp b/src/test/trackupdate_test.cpp
index fb1e213c29a..22c548ae319 100644
--- a/src/test/trackupdate_test.cpp
+++ b/src/test/trackupdate_test.cpp
@@ -44,7 +44,7 @@ class TrackUpdateTest : public MixxxTest, SoundSourceProviderRegistration {
         auto coverInfo = pTrack->getCoverInfo();
         coverInfo.type = CoverInfo::FILE;
         coverInfo.source = CoverInfo::USER_SELECTED;
-        coverInfo.setImage(QImage(1, 1, QImage::Format_Mono));
+        coverInfo.setImageDigest(QImage(1, 1, QImage::Format_Mono));
         pTrack->setCoverInfo(coverInfo);
         EXPECT_TRUE(pTrack->isDirty());
         return pTrack;
diff --git a/src/widget/wcoverartmenu.cpp b/src/widget/wcoverartmenu.cpp
index 309ef7a2922..63d28a94e8a 100644
--- a/src/widget/wcoverartmenu.cpp
+++ b/src/widget/wcoverartmenu.cpp
@@ -115,9 +115,7 @@ void WCoverArtMenu::slotChange() {
 
 void WCoverArtMenu::slotUnset() {
     CoverInfo coverInfo;
-    coverInfo.type = CoverInfo::NONE;
     coverInfo.source = CoverInfo::USER_SELECTED;
-    coverInfo.setImage();
     qDebug() << "WCoverArtMenu::slotUnset emit" << coverInfo;
     emit coverInfoSelected(coverInfo);
 }

From f9ebc2dcaf073288bffec3eac13f37890228bfde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Thu, 21 Sep 2023 13:52:25 +0200
Subject: [PATCH 070/388] Perform legacy Hash update in a single place

---
 src/library/coverartcache.cpp    |  6 ++++--
 src/library/coverartcache.h      |  3 ++-
 src/library/coverartdelegate.cpp | 30 +++++++++++++++---------------
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/library/coverartcache.cpp b/src/library/coverartcache.cpp
index 9b677b089f8..9f86786b2ec 100644
--- a/src/library/coverartcache.cpp
+++ b/src/library/coverartcache.cpp
@@ -64,14 +64,16 @@ void CoverArtCache::requestCover(
 //static
 void CoverArtCache::requestTrackCover(
         const QObject* pRequester,
-        const TrackPointer& pTrack) {
+        const TrackPointer& pTrack,
+        int desiredWidth) {
     VERIFY_OR_DEBUG_ASSERT(pTrack) {
         return;
     }
     requestCover(
             pRequester,
             pTrack,
-            pTrack->getCoverInfoWithLocation());
+            pTrack->getCoverInfoWithLocation(),
+            desiredWidth);
 }
 
 // static
diff --git a/src/library/coverartcache.h b/src/library/coverartcache.h
index 9f74324fb39..86939747310 100644
--- a/src/library/coverartcache.h
+++ b/src/library/coverartcache.h
@@ -22,7 +22,8 @@ class CoverArtCache : public QObject, public Singleton<CoverArtCache> {
 
     static void requestTrackCover(
             const QObject* pRequester,
-            const TrackPointer& pTrack);
+            const TrackPointer& pTrack,
+            int desiredWidth = 0);
 
     static QPixmap getCachedCover(
             const CoverInfo& coverInfo,
diff --git a/src/library/coverartdelegate.cpp b/src/library/coverartdelegate.cpp
index 50f12a73261..4294f23b00c 100644
--- a/src/library/coverartdelegate.cpp
+++ b/src/library/coverartdelegate.cpp
@@ -80,17 +80,6 @@ void CoverArtDelegate::slotCoverFound(
     if (pRequester != this) {
         return;
     }
-    if (coverInfoUpdated) {
-        // This happens after updating form legacy hash
-        const auto pTrack =
-                loadTrackByLocation(coverInfo.trackLocation);
-        if (pTrack) {
-            kLogger.info()
-                    << "Updating cover info of track"
-                    << coverInfo.trackLocation;
-            pTrack->setCoverInfo(coverInfo);
-        }
-    }
     QList<int> refreshRows = m_pendingCacheRows.values(requestedImageHash);
     m_pendingCacheRows.remove(requestedImageHash);
     if (pixmap.isNull()) {
@@ -138,10 +127,21 @@ void CoverArtDelegate::paintItem(
                 // non-cache we can request an update.
                 m_cacheMissRows.append(index.row());
             } else {
-                CoverArtCache::requestCover(
-                        this,
-                        coverInfo,
-                        static_cast<int>(option.rect.width() * scaleFactor));
+                if (coverInfo.imageDigest().isEmpty()) {
+                    // This happens if we have the legacy hash
+                    // The CoverArtCache will take care of the update
+                    const auto pTrack = loadTrackByLocation(coverInfo.trackLocation);
+                    CoverArtCache::requestTrackCover(
+                            this,
+                            pTrack,
+                            static_cast<int>(option.rect.width() * scaleFactor));
+                } else {
+                    // This is the fast path with an internal temporary track
+                    CoverArtCache::requestCover(
+                            this,
+                            coverInfo,
+                            static_cast<int>(option.rect.width() * scaleFactor));
+                }
                 m_pendingCacheRows.insert(coverInfo.cacheKey(), index.row());
             }
         } else {

From 0559fac11eab68dba9ecd7d126f5eeb8e780f754 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Thu, 21 Sep 2023 14:28:35 +0200
Subject: [PATCH 071/388] Dispose no longer used requestedImageHash and
 coverInfoUpdated

---
 src/library/coverartcache.cpp       | 17 ++++++-----------
 src/library/coverartcache.h         | 11 +++--------
 src/library/coverartdelegate.cpp    |  5 ++---
 src/library/coverartdelegate.h      |  4 +---
 src/library/dlgcoverartfullsize.cpp |  6 +-----
 src/library/dlgcoverartfullsize.h   |  4 +---
 src/library/dlgtagfetcher.cpp       |  6 +-----
 src/library/dlgtagfetcher.h         |  4 +---
 src/library/dlgtrackinfo.cpp        |  6 +-----
 src/library/dlgtrackinfo.h          |  4 +---
 src/test/coverartcache_test.cpp     |  4 ----
 src/widget/wcoverart.cpp            |  6 +-----
 src/widget/wcoverart.h              |  4 +---
 src/widget/wspinnybase.cpp          |  6 +-----
 src/widget/wspinnybase.h            |  4 +---
 15 files changed, 22 insertions(+), 69 deletions(-)

diff --git a/src/library/coverartcache.cpp b/src/library/coverartcache.cpp
index 9f86786b2ec..e7e9dc23fbc 100644
--- a/src/library/coverartcache.cpp
+++ b/src/library/coverartcache.cpp
@@ -123,7 +123,7 @@ QPixmap CoverArtCache::tryLoadCover(
 
     if (coverInfo.type == CoverInfo::NONE) {
         if (loading == Loading::Default) {
-            emit coverFound(pRequester, coverInfo, QPixmap(), requestedCacheKey, false);
+            emit coverFound(pRequester, coverInfo, QPixmap());
         }
         return QPixmap();
     }
@@ -151,7 +151,7 @@ QPixmap CoverArtCache::tryLoadCover(
                     << loading;
         }
         if (loading == Loading::Default) {
-            emit coverFound(pRequester, coverInfo, pixmap, requestedCacheKey, false);
+            emit coverFound(pRequester, coverInfo, pixmap);
         }
         return pixmap;
     }
@@ -207,7 +207,6 @@ CoverArtCache::FutureResult CoverArtCache::loadCover(
             pRequester,
             coverInfo.cacheKey(),
             signalWhenDone);
-    DEBUG_ASSERT(!res.coverInfoUpdated);
 
     CoverInfo::LoadedImage loadedImage = coverInfo.loadImage(pTrack);
     if (!loadedImage.image.isNull()) {
@@ -215,16 +214,14 @@ CoverArtCache::FutureResult CoverArtCache::loadCover(
             // This happens if we have loaded the cover art via the legacy hash
             // and during tests.
             // Refresh hash before resizing the original image!
-            coverInfo.setImageDigest(loadedImage.image);
+            CoverInfo updatedCoverInfo = coverInfo;
+            updatedCoverInfo.setImageDigest(loadedImage.image);
             if (pTrack && pTrack->getId().isValid()) {
                 // Update Track if not a temporary track
                 kLogger.info()
                         << "Updating cover info of track"
                         << coverInfo.trackLocation;
-                pTrack->setCoverInfo(coverInfo);
-            } else {
-                // perform the track update at the requester 
-            	res.coverInfoUpdated = true;
+                pTrack->setCoverInfo(updatedCoverInfo);
             }
         }
 
@@ -307,8 +304,6 @@ void CoverArtCache::coverLoaded() {
         emit coverFound(
                 res.pRequester,
                 std::move(res.coverArt),
-                pixmap,
-                res.requestedCacheKey,
-                res.coverInfoUpdated);
+                pixmap);
     }
 }
diff --git a/src/library/coverartcache.h b/src/library/coverartcache.h
index 86939747310..2fa16f031b5 100644
--- a/src/library/coverartcache.h
+++ b/src/library/coverartcache.h
@@ -40,8 +40,7 @@ class CoverArtCache : public QObject, public Singleton<CoverArtCache> {
         FutureResult()
                 : pRequester(nullptr),
                   requestedCacheKey(CoverImageUtils::defaultCacheKey()),
-                  signalWhenDone(false),
-                  coverInfoUpdated(false) {
+                  signalWhenDone(false) {
         }
         FutureResult(
                 const QObject* pRequestorArg,
@@ -49,8 +48,7 @@ class CoverArtCache : public QObject, public Singleton<CoverArtCache> {
                 bool signalWhenDoneArg)
                 : pRequester(pRequestorArg),
                   requestedCacheKey(requestedCacheKeyArg),
-                  signalWhenDone(signalWhenDoneArg),
-                  coverInfoUpdated(false) {
+                  signalWhenDone(signalWhenDoneArg) {
         }
 
         const QObject* pRequester;
@@ -58,7 +56,6 @@ class CoverArtCache : public QObject, public Singleton<CoverArtCache> {
         bool signalWhenDone;
 
         CoverArt coverArt;
-        bool coverInfoUpdated;
     };
     // Load cover from path indicated in coverInfo. WARNING: This is run in a
     // worker thread.
@@ -77,9 +74,7 @@ class CoverArtCache : public QObject, public Singleton<CoverArtCache> {
     void coverFound(
             const QObject* requester,
             const CoverInfo& coverInfo,
-            const QPixmap& pixmap,
-            mixxx::cache_key_t requestedCacheKey,
-            bool coverInfoUpdated);
+            const QPixmap& pixmap);
 
   protected:
     CoverArtCache();
diff --git a/src/library/coverartdelegate.cpp b/src/library/coverartdelegate.cpp
index 4294f23b00c..9fac4ccbacc 100644
--- a/src/library/coverartdelegate.cpp
+++ b/src/library/coverartdelegate.cpp
@@ -73,13 +73,12 @@ void CoverArtDelegate::slotInhibitLazyLoading(
 void CoverArtDelegate::slotCoverFound(
         const QObject* pRequester,
         const CoverInfo& coverInfo,
-        const QPixmap& pixmap,
-        mixxx::cache_key_t requestedImageHash,
-        bool coverInfoUpdated) {
+        const QPixmap& pixmap) {
     Q_UNUSED(pixmap);
     if (pRequester != this) {
         return;
     }
+    mixxx::cache_key_t requestedImageHash = coverInfo.cacheKey();
     QList<int> refreshRows = m_pendingCacheRows.values(requestedImageHash);
     m_pendingCacheRows.remove(requestedImageHash);
     if (pixmap.isNull()) {
diff --git a/src/library/coverartdelegate.h b/src/library/coverartdelegate.h
index f8e2fb9ae07..53feabb9285 100644
--- a/src/library/coverartdelegate.h
+++ b/src/library/coverartdelegate.h
@@ -48,9 +48,7 @@ class CoverArtDelegate : public TableItemDelegate {
     void slotCoverFound(
             const QObject* pRequester,
             const CoverInfo& coverInfo,
-            const QPixmap& pixmap,
-            mixxx::cache_key_t requestedImageHash,
-            bool coverInfoUpdated);
+            const QPixmap& pixmap);
 
   protected:
     TrackModel* const m_pTrackModel;
diff --git a/src/library/dlgcoverartfullsize.cpp b/src/library/dlgcoverartfullsize.cpp
index 68945ced293..b4bc0698b99 100644
--- a/src/library/dlgcoverartfullsize.cpp
+++ b/src/library/dlgcoverartfullsize.cpp
@@ -160,11 +160,7 @@ void DlgCoverArtFullSize::slotTrackCoverArtUpdated() {
 void DlgCoverArtFullSize::slotCoverFound(
         const QObject* pRequester,
         const CoverInfo& coverInfo,
-        const QPixmap& pixmap,
-        mixxx::cache_key_t requestedCacheKey,
-        bool coverInfoUpdated) {
-    Q_UNUSED(requestedCacheKey);
-    Q_UNUSED(coverInfoUpdated);
+        const QPixmap& pixmap) {
     if (pRequester != this || !m_pLoadedTrack ||
             m_pLoadedTrack->getLocation() != coverInfo.trackLocation) {
         return;
diff --git a/src/library/dlgcoverartfullsize.h b/src/library/dlgcoverartfullsize.h
index b10b1f33259..a6d3229fcae 100644
--- a/src/library/dlgcoverartfullsize.h
+++ b/src/library/dlgcoverartfullsize.h
@@ -35,9 +35,7 @@ class DlgCoverArtFullSize
     void slotCoverFound(
             const QObject* pRequester,
             const CoverInfo& coverInfo,
-            const QPixmap& pixmap,
-            mixxx::cache_key_t requestedCacheKey,
-            bool coverInfoUpdated);
+            const QPixmap& pixmap);
     void slotTrackCoverArtUpdated();
     void adjustImageAndDialogSize();
 
diff --git a/src/library/dlgtagfetcher.cpp b/src/library/dlgtagfetcher.cpp
index 183fb0623f7..08a1a381130 100644
--- a/src/library/dlgtagfetcher.cpp
+++ b/src/library/dlgtagfetcher.cpp
@@ -529,11 +529,7 @@ void DlgTagFetcher::tagSelected() {
 void DlgTagFetcher::slotCoverFound(
         const QObject* pRequester,
         const CoverInfo& coverInfo,
-        const QPixmap& pixmap,
-        mixxx::cache_key_t requestedCacheKey,
-        bool coverInfoUpdated) {
-    Q_UNUSED(requestedCacheKey);
-    Q_UNUSED(coverInfoUpdated);
+        const QPixmap& pixmap) {
     if (pRequester == this &&
             m_pTrack &&
             m_pTrack->getLocation() == coverInfo.trackLocation) {
diff --git a/src/library/dlgtagfetcher.h b/src/library/dlgtagfetcher.h
index 50be9e6ce48..93c6e0103b1 100644
--- a/src/library/dlgtagfetcher.h
+++ b/src/library/dlgtagfetcher.h
@@ -56,9 +56,7 @@ class DlgTagFetcher : public QDialog, public Ui::DlgTagFetcher {
     void slotCoverFound(
             const QObject* pRequester,
             const CoverInfo& coverInfo,
-            const QPixmap& pixmap,
-            mixxx::cache_key_t requestedCacheKey,
-            bool coverInfoUpdated);
+            const QPixmap& pixmap);
     void slotStartFetchCoverArt(const QList<QString>& allUrls);
     void slotLoadBytesToLabel(const QByteArray& data);
     void slotCoverArtLinkNotFound();
diff --git a/src/library/dlgtrackinfo.cpp b/src/library/dlgtrackinfo.cpp
index fd26b4c2a48..baba6852f38 100644
--- a/src/library/dlgtrackinfo.cpp
+++ b/src/library/dlgtrackinfo.cpp
@@ -514,11 +514,7 @@ void DlgTrackInfo::focusField(const QString& property) {
 void DlgTrackInfo::slotCoverFound(
         const QObject* pRequester,
         const CoverInfo& coverInfo,
-        const QPixmap& pixmap,
-        mixxx::cache_key_t requestedCacheKey,
-        bool coverInfoUpdated) {
-    Q_UNUSED(requestedCacheKey);
-    Q_UNUSED(coverInfoUpdated);
+        const QPixmap& pixmap) {
     if (pRequester == this &&
             m_pLoadedTrack &&
             m_pLoadedTrack->getLocation() == coverInfo.trackLocation) {
diff --git a/src/library/dlgtrackinfo.h b/src/library/dlgtrackinfo.h
index b99bd7d1fcf..5aee4fe15cd 100644
--- a/src/library/dlgtrackinfo.h
+++ b/src/library/dlgtrackinfo.h
@@ -74,9 +74,7 @@ class DlgTrackInfo : public QDialog, public Ui::DlgTrackInfo {
     void slotCoverFound(
             const QObject* pRequester,
             const CoverInfo& info,
-            const QPixmap& pixmap,
-            mixxx::cache_key_t requestedCacheKey,
-            bool coverInfoUpdated);
+            const QPixmap& pixmap);
     void slotCoverInfoSelected(const CoverInfoRelative& coverInfo);
     void slotReloadCoverArt();
 
diff --git a/src/test/coverartcache_test.cpp b/src/test/coverartcache_test.cpp
index 52d75b32771..52c7f2470e0 100644
--- a/src/test/coverartcache_test.cpp
+++ b/src/test/coverartcache_test.cpp
@@ -30,9 +30,7 @@ class CoverArtCacheTest : public LibraryTest, public CoverArtCache {
 
         CoverArtCache::FutureResult res;
         res = CoverArtCache::loadCover(nullptr, TrackPointer(), info, 0, false);
-        EXPECT_TRUE(res.coverInfoUpdated);
         EXPECT_EQ(img, res.coverArt.loadedImage.image);
-        EXPECT_EQ(CoverImageUtils::calculateDigest(img), res.coverArt.imageDigest());
         EXPECT_TRUE(res.coverArt.coverLocation.isNull());
     }
 
@@ -50,9 +48,7 @@ class CoverArtCacheTest : public LibraryTest, public CoverArtCache {
 
         CoverArtCache::FutureResult res;
         res = CoverArtCache::loadCover(nullptr, TrackPointer(), info, 0, false);
-        EXPECT_TRUE(res.coverInfoUpdated); // hash updated
         EXPECT_EQ(img, res.coverArt.loadedImage.image);
-        EXPECT_EQ(CoverImageUtils::calculateDigest(img), res.coverArt.imageDigest());
         EXPECT_QSTRING_EQ(info.coverLocation, res.coverArt.coverLocation);
     }
 };
diff --git a/src/widget/wcoverart.cpp b/src/widget/wcoverart.cpp
index cc5d1964ce6..380c669c73c 100644
--- a/src/widget/wcoverart.cpp
+++ b/src/widget/wcoverart.cpp
@@ -151,11 +151,7 @@ void WCoverArt::slotTrackCoverArtUpdated() {
 void WCoverArt::slotCoverFound(
         const QObject* pRequester,
         const CoverInfo& coverInfo,
-        const QPixmap& pixmap,
-        mixxx::cache_key_t requestedCacheKey,
-        bool coverInfoUpdated) {
-    Q_UNUSED(requestedCacheKey);
-    Q_UNUSED(coverInfoUpdated); // CoverArtCache has taken care, updating the Track.
+        const QPixmap& pixmap) {
     if (!m_bEnable) {
         return;
     }
diff --git a/src/widget/wcoverart.h b/src/widget/wcoverart.h
index fcc07fb0661..b9e7bd74662 100644
--- a/src/widget/wcoverart.h
+++ b/src/widget/wcoverart.h
@@ -39,9 +39,7 @@ class WCoverArt : public QWidget, public WBaseWidget, public TrackDropTarget {
     void slotCoverFound(
             const QObject* pRequester,
             const CoverInfo& coverInfo,
-            const QPixmap& pixmap,
-            mixxx::cache_key_t requestedCacheKey,
-            bool coverInfoUpdated);
+            const QPixmap& pixmap);
     void slotCoverInfoSelected(const CoverInfoRelative& coverInfo);
     void slotReloadCoverArt();
     void slotTrackCoverArtUpdated();
diff --git a/src/widget/wspinnybase.cpp b/src/widget/wspinnybase.cpp
index a0800a992ca..c7ff235aed3 100644
--- a/src/widget/wspinnybase.cpp
+++ b/src/widget/wspinnybase.cpp
@@ -290,11 +290,7 @@ void WSpinnyBase::slotTrackCoverArtUpdated() {
 void WSpinnyBase::slotCoverFound(
         const QObject* pRequester,
         const CoverInfo& coverInfo,
-        const QPixmap& pixmap,
-        mixxx::cache_key_t requestedCacheKey,
-        bool coverInfoUpdated) {
-    Q_UNUSED(requestedCacheKey);
-    Q_UNUSED(coverInfoUpdated); // CoverArtCache has taken care, updating the Track.
+        const QPixmap& pixmap) {
     if (pRequester == this &&
             m_pLoadedTrack &&
             m_pLoadedTrack->getLocation() == coverInfo.trackLocation) {
diff --git a/src/widget/wspinnybase.h b/src/widget/wspinnybase.h
index b930f937948..2e330e442d6 100644
--- a/src/widget/wspinnybase.h
+++ b/src/widget/wspinnybase.h
@@ -61,9 +61,7 @@ class WSpinnyBase : public WGLWidget,
     void slotCoverFound(
             const QObject* pRequester,
             const CoverInfo& coverInfo,
-            const QPixmap& pixmap,
-            mixxx::cache_key_t requestedCacheKey,
-            bool coverInfoUpdated);
+            const QPixmap& pixmap);
     void slotCoverInfoSelected(const CoverInfoRelative& coverInfo);
     void slotReloadCoverArt();
     void slotTrackCoverArtUpdated();

From a3e802b1b86ef42151f0c547767fde97c6313730 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Thu, 21 Sep 2023 10:15:04 +0200
Subject: [PATCH 072/388] Introduce CoverArtCache::requestUncachedCover()

---
 src/library/coverartcache.cpp | 19 ++++++++++++++++++-
 src/library/coverartcache.h   |  5 +++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/library/coverartcache.cpp b/src/library/coverartcache.cpp
index e7e9dc23fbc..dd82760cb17 100644
--- a/src/library/coverartcache.cpp
+++ b/src/library/coverartcache.cpp
@@ -57,7 +57,7 @@ void CoverArtCache::requestCover(
             pRequester,
             pTrack,
             coverInfo,
-            desiredWidth, // original size
+            desiredWidth,
             Loading::Default);
 }
 
@@ -103,6 +103,23 @@ QPixmap CoverArtCache::getCachedCover(
     return pixmap;
 }
 
+// static
+void CoverArtCache::requestUncachedCover(
+        const QObject* pRequester,
+        const CoverInfo& coverInfo,
+        int desiredWidth) {
+    CoverArtCache* pCache = CoverArtCache::instance();
+    VERIFY_OR_DEBUG_ASSERT(pCache) {
+        return;
+    }
+    pCache->tryLoadCover(
+            pRequester,
+            TrackPointer(),
+            coverInfo,
+            desiredWidth,
+            Loading::Default);
+}
+
 QPixmap CoverArtCache::tryLoadCover(
         const QObject* pRequester,
         const TrackPointer& pTrack,
diff --git a/src/library/coverartcache.h b/src/library/coverartcache.h
index 2fa16f031b5..331e51c089a 100644
--- a/src/library/coverartcache.h
+++ b/src/library/coverartcache.h
@@ -29,6 +29,11 @@ class CoverArtCache : public QObject, public Singleton<CoverArtCache> {
             const CoverInfo& coverInfo,
             int desiredWidth);
 
+    static void requestUncachedCover(
+            const QObject* pRequester,
+            const CoverInfo& coverInfo,
+            int desiredWidth);
+
     enum class Loading {
         CachedOnly,
         NoSignal,

From 00bd5dda86f06f0ace4cff2a4503561a670a4765 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Fri, 22 Sep 2023 09:58:27 +0200
Subject: [PATCH 073/388] Bypass redundant cache lookup when using "Uncached"
 interface

---
 src/library/basetracktablemodel.cpp |   4 +-
 src/library/coverartcache.cpp       | 105 ++++++++++++----------------
 src/library/coverartcache.h         |  54 +++++++-------
 src/library/coverartdelegate.cpp    |   4 +-
 src/test/coverartcache_test.cpp     |   4 +-
 5 files changed, 73 insertions(+), 98 deletions(-)

diff --git a/src/library/basetracktablemodel.cpp b/src/library/basetracktablemodel.cpp
index a4e89ddbbae..ef5d6716be4 100644
--- a/src/library/basetracktablemodel.cpp
+++ b/src/library/basetracktablemodel.cpp
@@ -554,8 +554,8 @@ QVariant BaseTrackTableModel::composeCoverArtToolTipHtml(
             coverInfo,
             absoluteHeightOfCoverartToolTip);
     if (pixmap.isNull()) {
-        // Cache miss -> Don't show a tooltip
-        CoverArtCache::requestCover(
+        // Cache miss -> Don't show a tooltip, refresh cache
+        CoverArtCache::requestUncachedCover(
                 nullptr,
                 coverInfo,
                 absoluteHeightOfCoverartToolTip);
diff --git a/src/library/coverartcache.cpp b/src/library/coverartcache.cpp
index dd82760cb17..cd2c5c51807 100644
--- a/src/library/coverartcache.cpp
+++ b/src/library/coverartcache.cpp
@@ -44,7 +44,7 @@ CoverArtCache::CoverArtCache() {
 }
 
 //static
-void CoverArtCache::requestCover(
+void CoverArtCache::requestCoverPrivate(
         const QObject* pRequester,
         const TrackPointer& pTrack,
         const CoverInfo& coverInfo,
@@ -53,34 +53,36 @@ void CoverArtCache::requestCover(
     VERIFY_OR_DEBUG_ASSERT(pCache) {
         return;
     }
+    QPixmap pixmap = CoverArtCache::getCachedCover(coverInfo, desiredWidth);
+    if (!pixmap.isNull()) {
+        emit pCache->coverFound(pRequester, coverInfo, pixmap);
+        return;
+    }
     pCache->tryLoadCover(
             pRequester,
             pTrack,
             coverInfo,
-            desiredWidth,
-            Loading::Default);
+            desiredWidth);
 }
 
 //static
 void CoverArtCache::requestTrackCover(
         const QObject* pRequester,
-        const TrackPointer& pTrack,
-        int desiredWidth) {
+        const TrackPointer& pTrack) {
     VERIFY_OR_DEBUG_ASSERT(pTrack) {
         return;
     }
-    requestCover(
+    requestCoverPrivate(
             pRequester,
             pTrack,
-            pTrack->getCoverInfoWithLocation(),
-            desiredWidth);
+            pTrack->getCoverInfoWithLocation());
 }
 
 // static
 QPixmap CoverArtCache::getCachedCover(
         const CoverInfo& coverInfo,
         int desiredWidth) {
-    if (coverInfo.type == CoverInfo::NONE) {
+    if (!coverInfo.hasImage()) {
         return QPixmap();
     }
     const mixxx::cache_key_t requestedCacheKey = coverInfo.cacheKey();
@@ -104,8 +106,9 @@ QPixmap CoverArtCache::getCachedCover(
 }
 
 // static
-void CoverArtCache::requestUncachedCover(
+void CoverArtCache::requestUncachedCoverPrivate(
         const QObject* pRequester,
+        const TrackPointer& pTrack,
         const CoverInfo& coverInfo,
         int desiredWidth) {
     CoverArtCache* pCache = CoverArtCache::instance();
@@ -114,18 +117,31 @@ void CoverArtCache::requestUncachedCover(
     }
     pCache->tryLoadCover(
             pRequester,
-            TrackPointer(),
+            pTrack,
             coverInfo,
-            desiredWidth,
-            Loading::Default);
+            desiredWidth);
 }
 
-QPixmap CoverArtCache::tryLoadCover(
+// static
+void CoverArtCache::requestUncachedCover(
+        const QObject* pRequester,
+        const TrackPointer& pTrack,
+        int desiredWidth) {
+    VERIFY_OR_DEBUG_ASSERT(pTrack) {
+        return;
+    }
+    requestUncachedCoverPrivate(
+            pRequester,
+            pTrack,
+            pTrack->getCoverInfoWithLocation(),
+            desiredWidth);
+}
+
+void CoverArtCache::tryLoadCover(
         const QObject* pRequester,
         const TrackPointer& pTrack,
         const CoverInfo& coverInfo,
-        int desiredWidth,
-        Loading loading) {
+        int desiredWidth) {
     if (kLogger.traceEnabled()) {
         kLogger.trace()
                 << "requestCover"
@@ -136,48 +152,17 @@ QPixmap CoverArtCache::tryLoadCover(
     DEBUG_ASSERT(!pTrack ||
                 pTrack->getLocation() == coverInfo.trackLocation);
 
-    const auto requestedCacheKey = coverInfo.cacheKey();
-
-    if (coverInfo.type == CoverInfo::NONE) {
-        if (loading == Loading::Default) {
-            emit coverFound(pRequester, coverInfo, QPixmap());
-        }
-        return QPixmap();
+    if (!coverInfo.hasImage()) {
+        emit coverFound(pRequester, coverInfo, QPixmap());
+        return;
     }
 
+    const auto requestedCacheKey = coverInfo.cacheKey();
     // keep a list of trackIds for which a future is currently running
     // to avoid loading the same picture again while we are loading it
     QPair<const QObject*, mixxx::cache_key_t> requestId = qMakePair(pRequester, requestedCacheKey);
     if (m_runningRequests.contains(requestId)) {
-        return QPixmap();
-    }
-
-    // If this request comes from CoverDelegate (table view), it'll want to get
-    // a cropped cover which is ready to be drawn in the table view (cover art
-    // column). It's very important to keep the cropped covers in cache because
-    // it avoids having to rescale+crop it ALWAYS (which brings a lot of
-    // performance issues).
-    QString cacheKey = pixmapCacheKey(requestedCacheKey, desiredWidth);
-
-    QPixmap pixmap;
-    if (QPixmapCache::find(cacheKey, &pixmap)) {
-        if (kLogger.traceEnabled()) {
-            kLogger.trace()
-                    << "requestCover cache hit"
-                    << coverInfo
-                    << loading;
-        }
-        if (loading == Loading::Default) {
-            emit coverFound(pRequester, coverInfo, pixmap);
-        }
-        return pixmap;
-    }
-
-    if (loading == Loading::CachedOnly) {
-        if (kLogger.traceEnabled()) {
-            kLogger.trace() << "requestCover cache miss";
-        }
-        return QPixmap();
+        return;
     }
 
     if (kLogger.traceEnabled()) {
@@ -193,14 +178,13 @@ QPixmap CoverArtCache::tryLoadCover(
             pRequester,
             pTrack,
             coverInfo,
-            desiredWidth,
-            loading == Loading::Default);
+            desiredWidth);
     connect(watcher,
             &QFutureWatcher<FutureResult>::finished,
             this,
             &CoverArtCache::coverLoaded);
     watcher->setFuture(future);
-    return QPixmap();
+    return;
 }
 
 //static
@@ -208,22 +192,19 @@ CoverArtCache::FutureResult CoverArtCache::loadCover(
         const QObject* pRequester,
         TrackPointer pTrack,
         CoverInfo coverInfo,
-        int desiredWidth,
-        bool signalWhenDone) {
+        int desiredWidth) {
     if (kLogger.traceEnabled()) {
         kLogger.trace()
                 << "loadCover"
                 << coverInfo
-                << desiredWidth
-                << signalWhenDone;
+                << desiredWidth;
     }
     DEBUG_ASSERT(!pTrack ||
             pTrack->getLocation() == coverInfo.trackLocation);
 
     auto res = FutureResult(
             pRequester,
-            coverInfo.cacheKey(),
-            signalWhenDone);
+            coverInfo.cacheKey());
 
     CoverInfo::LoadedImage loadedImage = coverInfo.loadImage(pTrack);
     if (!loadedImage.image.isNull()) {
@@ -317,7 +298,7 @@ void CoverArtCache::coverLoaded() {
 
     m_runningRequests.remove(qMakePair(res.pRequester, res.requestedCacheKey));
 
-    if (res.signalWhenDone) {
+    if (res.pRequester) {
         emit coverFound(
                 res.pRequester,
                 std::move(res.coverArt),
diff --git a/src/library/coverartcache.h b/src/library/coverartcache.h
index 331e51c089a..db219494da0 100644
--- a/src/library/coverartcache.h
+++ b/src/library/coverartcache.h
@@ -15,15 +15,13 @@ class CoverArtCache : public QObject, public Singleton<CoverArtCache> {
   public:
     static void requestCover(
             const QObject* pRequester,
-            const CoverInfo& coverInfo,
-            int desiredWidth = 0) {
-        requestCover(pRequester, TrackPointer(), coverInfo, desiredWidth);
+            const CoverInfo& coverInfo) {
+        requestCoverPrivate(pRequester, TrackPointer(), coverInfo);
     }
 
     static void requestTrackCover(
             const QObject* pRequester,
-            const TrackPointer& pTrack,
-            int desiredWidth = 0);
+            const TrackPointer& pTrack);
 
     static QPixmap getCachedCover(
             const CoverInfo& coverInfo,
@@ -32,33 +30,30 @@ class CoverArtCache : public QObject, public Singleton<CoverArtCache> {
     static void requestUncachedCover(
             const QObject* pRequester,
             const CoverInfo& coverInfo,
-            int desiredWidth);
+            int desiredWidth) {
+        requestUncachedCoverPrivate(pRequester, TrackPointer(), coverInfo, desiredWidth);
+    }
 
-    enum class Loading {
-        CachedOnly,
-        NoSignal,
-        Default, // signal when done
-    };
+    static void requestUncachedCover(
+            const QObject* pRequester,
+            const TrackPointer& pTrack,
+            int desiredWidth);
 
     // Only public for testing
     struct FutureResult {
         FutureResult()
                 : pRequester(nullptr),
-                  requestedCacheKey(CoverImageUtils::defaultCacheKey()),
-                  signalWhenDone(false) {
+                  requestedCacheKey(CoverImageUtils::defaultCacheKey()) {
         }
         FutureResult(
                 const QObject* pRequestorArg,
-                mixxx::cache_key_t requestedCacheKeyArg,
-                bool signalWhenDoneArg)
+                mixxx::cache_key_t requestedCacheKeyArg)
                 : pRequester(pRequestorArg),
-                  requestedCacheKey(requestedCacheKeyArg),
-                  signalWhenDone(signalWhenDoneArg) {
+                  requestedCacheKey(requestedCacheKeyArg) {
         }
 
         const QObject* pRequester;
         mixxx::cache_key_t requestedCacheKey;
-        bool signalWhenDone;
 
         CoverArt coverArt;
     };
@@ -68,8 +63,7 @@ class CoverArtCache : public QObject, public Singleton<CoverArtCache> {
             const QObject* pRequester,
             TrackPointer pTrack,
             CoverInfo coverInfo,
-            int desiredWidth,
-            bool emitSignals);
+            int desiredWidth);
 
   private slots:
     // Called when loadCover is complete in the main thread.
@@ -87,23 +81,23 @@ class CoverArtCache : public QObject, public Singleton<CoverArtCache> {
     friend class Singleton<CoverArtCache>;
 
   private:
-    static void requestCover(
+    static void requestCoverPrivate(
             const QObject* pRequester,
             const TrackPointer& /*optional*/ pTrack,
             const CoverInfo& coverInfo,
-            int desiredWidth = 0);
+            int desiredWidth = 0); // <= 0: original size
 
-    QPixmap tryLoadCover(
+    static void requestUncachedCoverPrivate(
+            const QObject* pRequester,
+            const TrackPointer& /*optional*/ pTrack,
+            const CoverInfo& coverInfo,
+            int desiredWidth);
+
+    void tryLoadCover(
             const QObject* pRequester,
             const TrackPointer& pTrack,
             const CoverInfo& info,
-            int desiredWidth,
-            Loading loading);
+            int desiredWidth);
 
     QSet<QPair<const QObject*, mixxx::cache_key_t>> m_runningRequests;
 };
-
-inline
-QDebug operator<<(QDebug dbg, CoverArtCache::Loading loading) {
-    return dbg << static_cast<int>(loading);
-}
diff --git a/src/library/coverartdelegate.cpp b/src/library/coverartdelegate.cpp
index 9fac4ccbacc..6c1d43f71ed 100644
--- a/src/library/coverartdelegate.cpp
+++ b/src/library/coverartdelegate.cpp
@@ -130,13 +130,13 @@ void CoverArtDelegate::paintItem(
                     // This happens if we have the legacy hash
                     // The CoverArtCache will take care of the update
                     const auto pTrack = loadTrackByLocation(coverInfo.trackLocation);
-                    CoverArtCache::requestTrackCover(
+                    CoverArtCache::requestUncachedCover(
                             this,
                             pTrack,
                             static_cast<int>(option.rect.width() * scaleFactor));
                 } else {
                     // This is the fast path with an internal temporary track
-                    CoverArtCache::requestCover(
+                    CoverArtCache::requestUncachedCover(
                             this,
                             coverInfo,
                             static_cast<int>(option.rect.width() * scaleFactor));
diff --git a/src/test/coverartcache_test.cpp b/src/test/coverartcache_test.cpp
index 52c7f2470e0..be9017c103d 100644
--- a/src/test/coverartcache_test.cpp
+++ b/src/test/coverartcache_test.cpp
@@ -29,7 +29,7 @@ class CoverArtCacheTest : public LibraryTest, public CoverArtCache {
         info.trackLocation = trackLocation;
 
         CoverArtCache::FutureResult res;
-        res = CoverArtCache::loadCover(nullptr, TrackPointer(), info, 0, false);
+        res = CoverArtCache::loadCover(nullptr, TrackPointer(), info, 0);
         EXPECT_EQ(img, res.coverArt.loadedImage.image);
         EXPECT_TRUE(res.coverArt.coverLocation.isNull());
     }
@@ -47,7 +47,7 @@ class CoverArtCacheTest : public LibraryTest, public CoverArtCache {
         info.trackLocation = trackLocation;
 
         CoverArtCache::FutureResult res;
-        res = CoverArtCache::loadCover(nullptr, TrackPointer(), info, 0, false);
+        res = CoverArtCache::loadCover(nullptr, TrackPointer(), info, 0);
         EXPECT_EQ(img, res.coverArt.loadedImage.image);
         EXPECT_QSTRING_EQ(info.coverLocation, res.coverArt.coverLocation);
     }

From d648d2cc90bd43a6efdd47e4bbc4715f04a45bd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sat, 23 Sep 2023 15:14:54 +0200
Subject: [PATCH 074/388] Use fixed typed int for copletely inlined
 implementation

---
 CMakeLists.txt       |  1 -
 src/util/db/dbid.cpp | 28 -----------------------
 src/util/db/dbid.h   | 53 +++++++++++++++++++++++---------------------
 3 files changed, 28 insertions(+), 54 deletions(-)
 delete mode 100644 src/util/db/dbid.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd6bfe5f3ee..7a26915ccfd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1071,7 +1071,6 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/util/db/dbconnectionpool.cpp
   src/util/db/dbconnectionpooled.cpp
   src/util/db/dbconnectionpooler.cpp
-  src/util/db/dbid.cpp
   src/util/db/fwdsqlquery.cpp
   src/util/db/fwdsqlqueryselectresult.cpp
   src/util/db/sqlite.cpp
diff --git a/src/util/db/dbid.cpp b/src/util/db/dbid.cpp
deleted file mode 100644
index 6fa2469068e..00000000000
--- a/src/util/db/dbid.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "util/db/dbid.h"
-
-
-//static
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-const QMetaType DbId::kVariantType = DbId().toVariant().metaType();
-#else
-const QVariant::Type DbId::kVariantType = DbId().toVariant().type();
-#endif
-
-//static
-DbId::value_type DbId::valueOf(QVariant /*pass-by-value*/ variant) {
-    // The parameter "variant" is passed by value since we need to use
-    // the in place QVariant::convert(). Due to Qt's implicit sharing
-    // the value is only copied if the type is different. The redundant
-    // conversion inside value() is bypassed since the type already
-    // matches. We cannot use value(), only because it returns the
-    // valid id 0 in case of conversion errors.
-    if (variant.convert(kVariantType)) {
-        value_type value = variant.value<value_type>();
-        if (isValidValue(value)) {
-            return value;
-        }
-    }
-    qCritical() << "Invalid database identifier value:"
-            << variant;
-    return kInvalidValue;
-}
diff --git a/src/util/db/dbid.h b/src/util/db/dbid.h
index 1560117f696..41c93e7e3a5 100644
--- a/src/util/db/dbid.h
+++ b/src/util/db/dbid.h
@@ -24,33 +24,27 @@
 class DbId {
 protected:
 public:
-    // Alias for the corresponding native type. It keeps the
-    // implementation of this class flexible if we ever gonna
-    // need to change it from 'int' to 'long' or any other type.
-    typedef int value_type;
-
-    DbId()
-        : m_value(kInvalidValue) {
-        DEBUG_ASSERT(!isValid());
-    }
-    explicit DbId(value_type value)
-        : m_value(value) {
-        DEBUG_ASSERT(isValid() || (kInvalidValue == m_value));
-    }
-    explicit DbId(QVariant variant)
-        : DbId(valueOf(std::move(variant))) {
-    }
+  constexpr DbId()
+          : m_value(kInvalidValue) {
+  }
+  explicit DbId(int value)
+          : m_value(value) {
+      DEBUG_ASSERT(isValid() || (kInvalidValue == m_value));
+  }
+  explicit DbId(const QVariant& variant)
+          : DbId(valueOf(variant)) {
+  }
 
     bool isValid() const {
         return isValidValue(m_value);
     }
 
-    value_type value() const {
+    int value() const {
         return m_value;
     }
 
     std::size_t hash() const {
-        return std::hash<value_type>()(m_value);
+        return std::hash<int>()(m_value);
     }
 
     typedef std::function<std::size_t (const DbId& dbid)> hash_fun_t;
@@ -107,7 +101,7 @@ class DbId {
     }
 
 private:
-  static constexpr value_type kInvalidValue = -1;
+  static constexpr int kInvalidValue = -1;
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
   static const QMetaType kVariantType;
@@ -115,13 +109,22 @@ class DbId {
     static const QVariant::Type kVariantType;
 #endif
 
-    static bool isValidValue(value_type value) {
+  static bool isValidValue(int value) {
         return 0 <= value;
-    }
-
-    static value_type valueOf(QVariant /*pass-by-value*/ variant);
-
-    value_type m_value;
+  }
+
+  static int valueOf(const QVariant& variant) {
+        bool ok;
+        int value = variant.toInt(&ok);
+        if (ok && isValidValue(value)) {
+            return value;
+        }
+        qCritical() << "Invalid database identifier value:"
+                    << variant;
+        return kInvalidValue;
+  }
+
+  int m_value;
 };
 
 Q_DECLARE_TYPEINFO(DbId, Q_MOVABLE_TYPE);

From 2d0855f484c8edaa1972679dc067adc63ea10ce1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Mon, 25 Sep 2023 01:43:57 +0200
Subject: [PATCH 075/388] Fix a race condition in getLocation()

---
 src/track/track.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/track/track.h b/src/track/track.h
index 315eabeba25..17ecb259242 100644
--- a/src/track/track.h
+++ b/src/track/track.h
@@ -89,10 +89,11 @@ class Track : public QObject {
 
     // Returns absolute path to the file, including the filename.
     QString getLocation() const {
-        if (!m_fileAccess.info().hasLocation()) {
+        const auto fileInfo = getFileInfo();
+        if (!fileInfo.hasLocation()) {
             return {};
         }
-        return m_fileAccess.info().location();
+        return fileInfo.location();
     }
 
     /// Set the file type

From 9b13045c74e536fee00e9131bbbbca8f4a26153b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Wed, 27 Sep 2023 00:30:07 +0200
Subject: [PATCH 076/388] Improve condition for updating legacy hashes.

---
 src/library/coverartcache.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/library/coverartcache.cpp b/src/library/coverartcache.cpp
index cd2c5c51807..6e4d7b56969 100644
--- a/src/library/coverartcache.cpp
+++ b/src/library/coverartcache.cpp
@@ -212,10 +212,9 @@ CoverArtCache::FutureResult CoverArtCache::loadCover(
             // This happens if we have loaded the cover art via the legacy hash
             // and during tests.
             // Refresh hash before resizing the original image!
-            CoverInfo updatedCoverInfo = coverInfo;
-            updatedCoverInfo.setImageDigest(loadedImage.image);
-            if (pTrack && pTrack->getId().isValid()) {
-                // Update Track if not a temporary track
+            if (pTrack) {
+                CoverInfo updatedCoverInfo = coverInfo;
+                updatedCoverInfo.setImageDigest(loadedImage.image);
                 kLogger.info()
                         << "Updating cover info of track"
                         << coverInfo.trackLocation;

From deef4585a55d7534a49d2bcd509753c0da481406 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Thu, 28 Sep 2023 08:23:07 +0200
Subject: [PATCH 077/388] Rename requestCoverPrivate() to requestCoverImpl()

---
 src/library/coverartcache.cpp | 4 ++--
 src/library/coverartcache.h   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/library/coverartcache.cpp b/src/library/coverartcache.cpp
index 6e4d7b56969..f307ed6dc23 100644
--- a/src/library/coverartcache.cpp
+++ b/src/library/coverartcache.cpp
@@ -44,7 +44,7 @@ CoverArtCache::CoverArtCache() {
 }
 
 //static
-void CoverArtCache::requestCoverPrivate(
+void CoverArtCache::requestCoverImpl(
         const QObject* pRequester,
         const TrackPointer& pTrack,
         const CoverInfo& coverInfo,
@@ -72,7 +72,7 @@ void CoverArtCache::requestTrackCover(
     VERIFY_OR_DEBUG_ASSERT(pTrack) {
         return;
     }
-    requestCoverPrivate(
+    requestCoverImpl(
             pRequester,
             pTrack,
             pTrack->getCoverInfoWithLocation());
diff --git a/src/library/coverartcache.h b/src/library/coverartcache.h
index db219494da0..1c51c3195bb 100644
--- a/src/library/coverartcache.h
+++ b/src/library/coverartcache.h
@@ -16,7 +16,7 @@ class CoverArtCache : public QObject, public Singleton<CoverArtCache> {
     static void requestCover(
             const QObject* pRequester,
             const CoverInfo& coverInfo) {
-        requestCoverPrivate(pRequester, TrackPointer(), coverInfo);
+        requestCoverImpl(pRequester, TrackPointer(), coverInfo);
     }
 
     static void requestTrackCover(
@@ -81,7 +81,7 @@ class CoverArtCache : public QObject, public Singleton<CoverArtCache> {
     friend class Singleton<CoverArtCache>;
 
   private:
-    static void requestCoverPrivate(
+    static void requestCoverImpl(
             const QObject* pRequester,
             const TrackPointer& /*optional*/ pTrack,
             const CoverInfo& coverInfo,

From 2067b8b61140ed34e31febd8d7a2b56bc9d5c60b Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 19 Sep 2023 23:56:42 +0200
Subject: [PATCH 078/388] Keylock: add test for KeyunlockMode::KeepLockedKey

---
 src/test/enginebuffertest.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/test/enginebuffertest.cpp b/src/test/enginebuffertest.cpp
index 37794c8c371..9497c7395e9 100644
--- a/src/test/enginebuffertest.cpp
+++ b/src/test/enginebuffertest.cpp
@@ -45,6 +45,23 @@ TEST_F(EngineBufferTest, DisableKeylockResetsPitch) {
     ASSERT_EQ(0.0, ControlObject::get(ConfigKey(m_sGroup1, "pitch")));
 }
 
+TEST_F(EngineBufferTest, DisableKeylockKeepsPitch) {
+    // Pitch must not change when unlocking with KeyunlockMode::KeepLockedKey.
+    ControlObject::set(ConfigKey(m_sGroup1, "keylockMode"),
+            1.0); // KeylockMode::LockCurrentKey
+    ControlObject::set(ConfigKey(m_sGroup1, "keyunlockMode"),
+            1.0); // KeyunlockMode::KeepLockedKey
+    ControlObject::set(ConfigKey(m_sGroup1, "file_bpm"), 128.0);
+    ControlObject::set(ConfigKey(m_sGroup1, "keylock"), 1.0);
+    ControlObject::set(ConfigKey(m_sGroup1, "pitch"), 0.5);
+    ProcessBuffer();
+
+    ControlObject::set(ConfigKey(m_sGroup1, "keylock"), 0.0);
+    // We require a buffer process to see that the keylock state has changed.
+    ProcessBuffer();
+    ASSERT_NEAR(0.5, ControlObject::get(ConfigKey(m_sGroup1, "pitch")), 1e-10);
+}
+
 TEST_F(EngineBufferTest, TrackLoadResetsPitch) {
     // When a new track is loaded, the pitch value should be reset.
     config()->set(ConfigKey("[Controls]","SpeedAutoReset"),

From 4138858a492158257383562a729f435c4574164c Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Thu, 28 Sep 2023 09:21:21 +0200
Subject: [PATCH 079/388] DEBUG (Remove!): add pitch_adjust slider to LateNight

---
 .../controls/button_2state_isEqual.xml        |  37 +++++
 res/skins/LateNight/decks/rate_controls.xml   |  90 ++++++++++-
 .../decks/row_5_transportLoopJump.xml         | 152 +++++-------------
 res/skins/LateNight/style_palemoon.qss        |   6 +-
 4 files changed, 169 insertions(+), 116 deletions(-)
 create mode 100644 res/skins/LateNight/controls/button_2state_isEqual.xml

diff --git a/res/skins/LateNight/controls/button_2state_isEqual.xml b/res/skins/LateNight/controls/button_2state_isEqual.xml
new file mode 100644
index 00000000000..63b38626288
--- /dev/null
+++ b/res/skins/LateNight/controls/button_2state_isEqual.xml
@@ -0,0 +1,37 @@
+<!--
+Description:
+  A button that has click or display controls.
+Variables:
+  ObjectName        : object name
+  ToolTipID         : standard Tooltip from mixxx db
+    see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/TooltipIds.cpp
+  Size              : button size
+  state_X_text      : label text for state X
+  state_X_pressed   : background graphic for pressed state X
+  state_X_unpressed : background graphic for unpressed state X
+  Align             : alignment of text
+  ConfigKey         : left-click control
+-->
+<Template>
+  <PushButton>
+    <TooltipId><Variable name="TooltipId"/></TooltipId>
+    <ObjectName><Variable name="ObjectName"/></ObjectName>
+    <Size><Variable name="Size"/></Size>
+    <NumberStates>2</NumberStates>
+    <State>
+      <Number>0</Number>
+      <Text><Variable name="text"/></Text>
+      <Alignment><Variable name="Align"/></Alignment>
+    </State>
+    <State>
+      <Number>1</Number>
+      <Text><Variable name="text"/></Text>
+      <Alignment><Variable name="Align"/></Alignment>
+    </State>
+    <Connection>
+      <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
+      <Transform><IsEqual><Variable name="IsEqual"/></IsEqual></Transform>
+      <ButtonState>LeftButton</ButtonState>
+    </Connection>
+  </PushButton>
+</Template>
diff --git a/res/skins/LateNight/decks/rate_controls.xml b/res/skins/LateNight/decks/rate_controls.xml
index 5312212b48f..33258d8a2e8 100644
--- a/res/skins/LateNight/decks/rate_controls.xml
+++ b/res/skins/LateNight/decks/rate_controls.xml
@@ -17,15 +17,16 @@
       <WidgetGroup>
         <ObjectName>RateContainer</ObjectName>
         <Layout>vertical</Layout>
-        <SizePolicy>min,me</SizePolicy>
+        <SizePolicy>max,me</SizePolicy>
         <Children>
 
           <WidgetGroup><!-- BPM + rate + Tap overlay-->
             <ObjectName>BpmRateTapContainer</ObjectName>
-            <Layout>vertical</Layout>
+            <Layout>horizontal</Layout>
             <SizePolicy>min,me</SizePolicy>
             <MaximumSize>,46</MaximumSize>
             <Children>
+              <WidgetGroup><Size>0me,0min</Size></WidgetGroup>
               <WidgetGroup>
                 <ObjectName>BpmTapContainer</ObjectName>
                 <Layout>stacked</Layout>
@@ -74,6 +75,7 @@
             <Layout>horizontal</Layout>
             <SizePolicy>min,min</SizePolicy>
             <Children>
+              <WidgetGroup><Size>0me,0min</Size></WidgetGroup>
               <PushButton>
                 <TooltipId>sync_enabled</TooltipId>
                 <ObjectName>SyncDeck</ObjectName>
@@ -110,6 +112,90 @@
             <SizePolicy>min,min</SizePolicy>
             <Children>
 
+              <!-- pitch_adjust slider + center indicator -->
+              <WidgetGroup>
+                <ObjectName>RateSliderBox</ObjectName>
+                <Layout>stacked</Layout>
+                <SizePolicy>max,me</SizePolicy>
+                <Children>
+
+                  <WidgetGroup>
+                    <Size>34f,121f</Size>
+                    <Children>
+                      <Label>
+                        <ObjectName>RateCenter</ObjectName>
+                        <Size>5f,5f</Size>
+                        <Pos>2,59</Pos>
+                        <Connection>
+                          <ConfigKey><Variable name="Group"/>,pitch_adjust_set_default</ConfigKey>
+                          <BindProperty>highlight</BindProperty>
+                        </Connection>
+                      </Label>
+                      <SliderComposed>
+                        <ObjectName>RateSlider</ObjectName>
+                        <Size>20f,119f</Size>
+                        <Pos>5,2</Pos>
+                        <TooltipId>pitch_adjust</TooltipId>
+                        <Handle scalemode="STRETCH">skin:/<Variable name="SliderScheme"/>/sliders/knob_pitch_deck.svg</Handle>
+                        <Slider scalemode="STRETCH">skin:/<Variable name="SliderScheme"/>/sliders/slider_pitch_deck.svg</Slider>
+                        <Horizontal>false</Horizontal>
+                        <BarWidth><Variable name="BarWidth"/></BarWidth>
+                        <BarMargins><Variable name="BarMarginPitch"/></BarMargins>
+                        <BarColor><Variable name="BarColorPitch"/></BarColor>
+                        <BarRoundCaps>true</BarRoundCaps>
+                        <BarAxisPos>10.0</BarAxisPos>
+                        <BarUnipolar>false</BarUnipolar>
+                        <Connection>
+                          <ConfigKey><Variable name="Group"/>,pitch_adjust</ConfigKey>
+                        </Connection>
+                      </SliderComposed>
+                    </Children>
+                  </WidgetGroup><!-- Rate slider + center indicator -->
+                </Children>
+              </WidgetGroup>
+
+              <!-- pitch slider + center indicator -->
+              <WidgetGroup>
+                <ObjectName>RateSliderBox</ObjectName>
+                <Layout>stacked</Layout>
+                <SizePolicy>max,me</SizePolicy>
+                <Children>
+
+                  <WidgetGroup>
+                    <Size>34f,121f</Size>
+                    <Children>
+                      <Label>
+                        <ObjectName>RateCenter</ObjectName>
+                        <Size>5f,5f</Size>
+                        <Pos>2,59</Pos>
+                        <Connection>
+                          <ConfigKey><Variable name="Group"/>,pitch_set_default</ConfigKey>
+                          <BindProperty>highlight</BindProperty>
+                        </Connection>
+                      </Label>
+                      <SliderComposed>
+                        <ObjectName>RateSlider</ObjectName>
+                        <Size>20f,119f</Size>
+                        <Pos>5,2</Pos>
+                        <TooltipId>pitch_adjust</TooltipId>
+                        <Handle scalemode="STRETCH">skin:/<Variable name="SliderScheme"/>/sliders/knob_pitch_deck.svg</Handle>
+                        <Slider scalemode="STRETCH">skin:/<Variable name="SliderScheme"/>/sliders/slider_pitch_deck.svg</Slider>
+                        <Horizontal>false</Horizontal>
+                        <BarWidth><Variable name="BarWidth"/></BarWidth>
+                        <BarMargins><Variable name="BarMarginPitch"/></BarMargins>
+                        <BarColor><Variable name="BarColorPitch"/></BarColor>
+                        <BarRoundCaps>true</BarRoundCaps>
+                        <BarAxisPos>10.0</BarAxisPos>
+                        <BarUnipolar>false</BarUnipolar>
+                        <Connection>
+                          <ConfigKey><Variable name="Group"/>,pitch</ConfigKey>
+                        </Connection>
+                      </SliderComposed>
+                    </Children>
+                  </WidgetGroup><!-- Rate slider + center indicator -->
+                </Children>
+              </WidgetGroup>
+
               <WidgetGroup><!-- Rate slider + range displays -->
                 <ObjectName>RateSliderBox</ObjectName>
                 <Layout>stacked</Layout>
diff --git a/res/skins/LateNight/decks/row_5_transportLoopJump.xml b/res/skins/LateNight/decks/row_5_transportLoopJump.xml
index 3ef81e60f83..f7ded27c21a 100644
--- a/res/skins/LateNight/decks/row_5_transportLoopJump.xml
+++ b/res/skins/LateNight/decks/row_5_transportLoopJump.xml
@@ -222,73 +222,64 @@
             </Connection>
           </WidgetGroup><!-- / Intro + Outro -->
 
-          <WidgetGroup><Size>2f,0min</Size></WidgetGroup><!--  = 2-8px wide -->
-          <WidgetGroup><SizePolicy>i,min</SizePolicy><MaximumSize>80,</MaximumSize></WidgetGroup>
+          <WidgetGroup><SizePolicy>me,min</SizePolicy></WidgetGroup>
 
-          <WidgetGroup><!-- Loop buttons + beatloop size spinbox -->
+          <!-- Keylock/unlock controls -->
+          <WidgetGroup>
             <ObjectName>LoopControls</ObjectName>
             <Layout>vertical</Layout>
             <SizePolicy>min,min</SizePolicy>
-            <MinimumSize>78,52</MinimumSize>
-            <MaximumSize>86,52</MaximumSize>
             <Children>
-              <WidgetGroup><!-- loop enable + beatloop size -->
+              <WidgetGroup><!-- Keylock mode -->
                 <ObjectName>AlignLeftTop</ObjectName>
                 <Layout>horizontal</Layout>
                 <SizePolicy>min,max</SizePolicy>
                 <Children>
-                  <Template src="skin:../LateNight/controls/button_2state_right_display.xml">
-                    <SetVariable name="TooltipId">beatloop_activate</SetVariable>
-                    <SetVariable name="ObjectName">LoopActivate</SetVariable>
-                    <SetVariable name="Size">26f,26f</SetVariable>
-                    <SetVariable name="ConfigKey"><Variable name="Group"/>,beatloop_activate</SetVariable>
-                    <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,beatlooproll_activate</SetVariable>
-                    <SetVariable name="ConfigKeyDisp"><Variable name="Group"/>,loop_enabled</SetVariable>
+                  <Label>
+                    <ObjectName>KeylockLabel</ObjectName>
+                    <Size>21f,18f</Size>
+                  </Label>
+                  <Template src="skin:../LateNight/controls/button_2state_isEqual.xml">
+                    <SetVariable name="ObjectName">PassthroughButton</SetVariable>
+                    <SetVariable name="Size">40f,26f</SetVariable>
+                    <SetVariable name="text">Reset</SetVariable>
+                    <SetVariable name="IsEqual">0</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="Group"/>,keylockMode</SetVariable>
+                  </Template>
+                  <Template src="skin:../LateNight/controls/button_2state_isEqual.xml">
+                    <SetVariable name="ObjectName">PassthroughButton</SetVariable>
+                    <SetVariable name="Size">40f,26f</SetVariable>
+                    <SetVariable name="text">Keep</SetVariable>
+                    <SetVariable name="IsEqual">1</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="Group"/>,keylockMode</SetVariable>
                   </Template>
-
-                  <BeatSpinBox>
-                    <TooltipId>beatloop_size</TooltipId>
-                    <ObjectName>Spinbox_<Variable name="BtnType"/></ObjectName>
-                    <SizePolicy>me,min</SizePolicy>
-                    <MinimumSize>46,26</MinimumSize>
-                    <MaximumSize>72,26</MaximumSize>
-                    <Value><Variable name="Group"/>,beatloop_size</Value>
-                    <!-- disabled until 'highlight' property has been added to WBeatSpinBox / wbasewidget.
-                    <Connection>
-                      <ConfigKey><Variable name="Group"/>,track_loaded</ConfigKey>
-                      <BindProperty>highlight</BindProperty>
-                    </Connection> -->
-                  </BeatSpinBox>
                 </Children>
               </WidgetGroup>
 
-              <WidgetGroup>
+              <WidgetGroup><!-- Keyunlock mode -->
                 <ObjectName>AlignLeftTop</ObjectName>
                 <Layout>horizontal</Layout>
                 <SizePolicy>min,max</SizePolicy>
                 <Children>
-                  <Template src="skin:../LateNight/controls/button_2state_right.xml">
-                    <SetVariable name="TooltipId">reloop_toggle</SetVariable>
-                    <SetVariable name="ObjectName">Reloop</SetVariable>
-                    <SetVariable name="Size">26f,26f</SetVariable>
-                    <SetVariable name="ConfigKey"><Variable name="Group"/>,reloop_toggle</SetVariable>
-                    <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,reloop_andstop</SetVariable>
-                  </Template>
-
-                  <Template src="skin:../LateNight/controls/button_1state_right.xml">
-                    <SetVariable name="TooltipId">loop_in</SetVariable>
-                    <SetVariable name="ObjectName">LoopIn</SetVariable>
-                    <SetVariable name="Size">26f,26f</SetVariable>
-                    <SetVariable name="ConfigKey"><Variable name="Group"/>,loop_in</SetVariable>
-                    <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,loop_in_goto</SetVariable>
+                  <Label>
+                    <ObjectName>KeyunlockLabel</ObjectName>
+                    <Size>21f,18f</Size>
+                  </Label>
+                  <Template src="skin:../LateNight/controls/button_2state_isEqual.xml">
+                    <SetVariable name="TooltipId">beatloop_activate</SetVariable>
+                    <SetVariable name="ObjectName">PassthroughButton</SetVariable>
+                    <SetVariable name="Size">40f,26f</SetVariable>
+                    <SetVariable name="text">Reset</SetVariable>
+                    <SetVariable name="IsEqual">0</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="Group"/>,keyunlockMode</SetVariable>
                   </Template>
-
-                  <Template src="skin:../LateNight/controls/button_1state_right.xml">
-                    <SetVariable name="TooltipId">loop_out</SetVariable>
-                    <SetVariable name="ObjectName">LoopOut</SetVariable>
-                    <SetVariable name="Size">26f,26f</SetVariable>
-                    <SetVariable name="ConfigKey"><Variable name="Group"/>,loop_out</SetVariable>
-                    <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,loop_out_goto</SetVariable>
+                  <Template src="skin:../LateNight/controls/button_2state_isEqual.xml">
+                    <SetVariable name="TooltipId">beatloop_activate</SetVariable>
+                    <SetVariable name="ObjectName">PassthroughButton</SetVariable>
+                    <SetVariable name="Size">40f,26f</SetVariable>
+                    <SetVariable name="text">Keep</SetVariable>
+                    <SetVariable name="IsEqual">1</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="Group"/>,keyunlockMode</SetVariable>
                   </Template>
                 </Children>
               </WidgetGroup>
@@ -299,70 +290,7 @@
             </Connection>
           </WidgetGroup><!-- /Loop buttons + beatloop size spinbox -->
 
-          <WidgetGroup><Size>2f,0min</Size></WidgetGroup><!--  = 2-80px wide -->
-          <WidgetGroup><SizePolicy>i,min</SizePolicy><MaximumSize>80,</MaximumSize></WidgetGroup>
-
-          <WidgetGroup><!-- Jump buttons + beatjump size spinbox -->
-            <ObjectName>BeatjumpControls</ObjectName>
-            <Layout>vertical</Layout>
-            <SizePolicy>min,min</SizePolicy>
-            <MinimumSize>52,52</MinimumSize>
-            <MaximumSize>60,52</MaximumSize>
-            <Children>
-              <WidgetGroup><!-- beatjump size -->
-                <ObjectName>AlignLeftTop</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>0min,26f</SizePolicy>
-                <Children>
-                  <!-- put this spacer here so BeatSpinBox expands with HiDPI scaling
-                  <WidgetGroup><Size>0f,26f</Size></WidgetGroup> -->
-                  <BeatSpinBox>
-                    <TooltipId>beatjump_size</TooltipId>
-                    <ObjectName>Spinbox_<Variable name="BtnType"/></ObjectName>
-                    <SizePolicy>me,min</SizePolicy>
-                    <MinimumSize>46,26</MinimumSize>
-                    <MaximumSize>72,26</MaximumSize>
-                    <Value><Variable name="Group"/>,beatjump_size</Value>
-                    <!-- disabled until 'highlight' property has been added to WBeatSpinBox / wbasewidget.
-                    <Connection>
-                      <ConfigKey><Variable name="Group"/>,track_loaded</ConfigKey>
-                      <BindProperty>highlight</BindProperty>
-                    </Connection> -->
-                  </BeatSpinBox>
-                </Children>
-              </WidgetGroup>
-              <WidgetGroup>
-                <ObjectName>AlignLeftTop</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>min,max</SizePolicy>
-                <Children>
-
-                  <Template src="skin:../LateNight/controls/button_1state_right.xml">
-                    <SetVariable name="TooltipId">beatjump_backward</SetVariable>
-                    <SetVariable name="ObjectName">JumpBack</SetVariable>
-                    <SetVariable name="Size">26f,26f</SetVariable>
-                    <SetVariable name="ConfigKey"><Variable name="Group"/>,beatjump_backward</SetVariable>
-                    <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,beatjump_1_backward</SetVariable>
-                  </Template>
-
-                  <Template src="skin:../LateNight/controls/button_1state_right.xml">
-                    <SetVariable name="TooltipId">beatjump_forward</SetVariable>
-                    <SetVariable name="ObjectName">JumpForward</SetVariable>
-                    <SetVariable name="Size">26f,26f</SetVariable>
-                    <SetVariable name="ConfigKey"><Variable name="Group"/>,beatjump_forward</SetVariable>
-                    <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,beatjump_1_forward</SetVariable>
-                  </Template>
-                </Children>
-              </WidgetGroup>
-            </Children>
-            <Connection>
-              <ConfigKey>[Skin],show_beatjump_controls</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup><!-- /Jump buttons + beatjump size spinbox -->
-
           <WidgetGroup><Size>2f,0min</Size></WidgetGroup>
-          <WidgetGroup><SizePolicy>i,min</SizePolicy></WidgetGroup>
         </Children>
       </WidgetGroup><!-- DeckRow_5_LoopCuesTransport -->
     </Children>
diff --git a/res/skins/LateNight/style_palemoon.qss b/res/skins/LateNight/style_palemoon.qss
index 47594d2e8f1..ea6c8af4d5e 100644
--- a/res/skins/LateNight/style_palemoon.qss
+++ b/res/skins/LateNight/style_palemoon.qss
@@ -2301,10 +2301,12 @@ WPushButton#PlayDeck[value="0"] {
       image: url(skin:../LateNight/palemoon/buttons/btn__slip_active_34.svg) no-repeat center center;
     }
 
-  #KeylockButton12[displayValue="0"], #KeylockButton34[displayValue="0"] {
+  #KeylockButton12[displayValue="0"], #KeylockButton34[displayValue="0"],
+  #KeyunlockLabel {
     image: url(skin:../LateNight/palemoon/buttons/btn__keylock.svg) no-repeat center center;
     }
-    #KeylockButton12[displayValue="1"] {
+    #KeylockButton12[displayValue="1"],
+    #KeylockLabel {
       image: url(skin:../LateNight/palemoon/buttons/btn__keylock_active_12.svg) no-repeat center center;
     }
     #KeylockButton34[displayValue="1"] {

From 92c19ac9ade94f46b9a4c9af2f746233b5b7f8b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Fri, 29 Sep 2023 14:22:04 +0200
Subject: [PATCH 080/388] Dispose unused DbId(int value) and DbId::value()

.. in favour of the already existing toString() and toVariant() interface. This hides the internal int value entirely.
---
 src/dialog/dlgreplacecuecolor.cpp             |  2 +-
 src/library/autodj/autodjfeature.cpp          | 11 +++---
 src/library/autodj/autodjfeature.h            |  2 +-
 src/library/basetracktablemodel.h             |  2 +-
 src/library/export/dlglibraryexport.cpp       |  6 +--
 src/library/export/engineprimeexportjob.cpp   | 11 +++---
 .../trackset/crate/cratetablemodel.cpp        | 19 +++++-----
 src/library/trackset/crate/cratetablemodel.h  |  2 +-
 src/test/autodjprocessor_test.cpp             | 38 +++++++++----------
 src/test/dbidtest.cpp                         |  1 -
 src/util/db/dbid.h                            | 10 +----
 11 files changed, 45 insertions(+), 59 deletions(-)

diff --git a/src/dialog/dlgreplacecuecolor.cpp b/src/dialog/dlgreplacecuecolor.cpp
index 7d0e600450a..c67a6bceb1a 100644
--- a/src/dialog/dlgreplacecuecolor.cpp
+++ b/src/dialog/dlgreplacecuecolor.cpp
@@ -393,7 +393,7 @@ void DlgReplaceCueColor::slotApply() {
             break;
         }
         query.bindValue(":id", row.id.toVariant());
-        query.bindValue(":track_id", row.trackId.value());
+        query.bindValue(":track_id", row.trackId.toVariant());
         query.bindValue(":current_color", mixxx::RgbColor::toQVariant(row.color));
         if (!query.exec()) {
             LOG_FAILED_QUERY(query);
diff --git a/src/library/autodj/autodjfeature.cpp b/src/library/autodj/autodjfeature.cpp
index e793d9023be..15a693f7955 100644
--- a/src/library/autodj/autodjfeature.cpp
+++ b/src/library/autodj/autodjfeature.cpp
@@ -187,8 +187,8 @@ bool AutoDJFeature::dragMoveAccept(const QUrl& url) {
 }
 
 // Add a crate to the auto-DJ queue.
-void AutoDJFeature::slotAddCrateToAutoDj(int iCrateId) {
-    m_pTrackCollection->updateAutoDjCrate(CrateId(iCrateId), true);
+void AutoDJFeature::slotAddCrateToAutoDj(CrateId crateId) {
+    m_pTrackCollection->updateAutoDjCrate(crateId, true);
 }
 
 void AutoDJFeature::slotRemoveCrateFromAutoDj() {
@@ -301,9 +301,10 @@ void AutoDJFeature::onRightClickChild(const QPoint& globalPos,
         Crate crate;
         while (nonAutoDjCrates.populateNext(&crate)) {
             auto pAction = std::make_unique<QAction>(crate.getName(), &crateMenu);
-            int iCrateId = crate.getId().value();
-            connect(pAction.get(), &QAction::triggered,
-                    this, [this, iCrateId] { slotAddCrateToAutoDj(iCrateId); });
+            auto crateId = crate.getId();
+            connect(pAction.get(), &QAction::triggered, this, [this, crateId] {
+                slotAddCrateToAutoDj(crateId);
+            });
             crateMenu.addAction(pAction.get());
             pAction.release();
         }
diff --git a/src/library/autodj/autodjfeature.h b/src/library/autodj/autodjfeature.h
index 35ee88e903d..10285ace454 100644
--- a/src/library/autodj/autodjfeature.h
+++ b/src/library/autodj/autodjfeature.h
@@ -86,7 +86,7 @@ class AutoDJFeature : public LibraryFeature {
 
   private slots:
     // Add a crate to the auto-DJ queue.
-    void slotAddCrateToAutoDj(int iCrateId);
+    void slotAddCrateToAutoDj(CrateId crateId);
 
     // Implements the context-menu item.
     void slotRemoveCrateFromAutoDj();
diff --git a/src/library/basetracktablemodel.h b/src/library/basetracktablemodel.h
index 9b258e3dce3..8597ad7f6d6 100644
--- a/src/library/basetracktablemodel.h
+++ b/src/library/basetracktablemodel.h
@@ -170,7 +170,7 @@ class BaseTrackTableModel : public QAbstractTableModel, public TrackModel {
     /// Return the raw data value at the given index.
     ///
     /// Expected types by ColumnCache field (pass-through = not validated):
-    /// COLUMN_LIBRARYTABLE_ID: DbId::value_type (pass-through)
+    /// COLUMN_LIBRARYTABLE_ID: int (pass-through)
     /// COLUMN_LIBRARYTABLE_ARTIST: QString (pass-through)
     /// COLUMN_LIBRARYTABLE_TITLE: QString (pass-through)
     /// COLUMN_LIBRARYTABLE_ALBUM: QString (pass-through)
diff --git a/src/library/export/dlglibraryexport.cpp b/src/library/export/dlglibraryexport.cpp
index 5512faced63..957a49e9693 100644
--- a/src/library/export/dlglibraryexport.cpp
+++ b/src/library/export/dlglibraryexport.cpp
@@ -35,7 +35,7 @@ void populateCrates(
     pListWidget->clear();
     while (crates.populateNext(&crate)) {
         auto pItem = std::make_unique<QListWidgetItem>(crate.getName());
-        pItem->setData(Qt::UserRole, crate.getId().value());
+        pItem->setData(Qt::UserRole, crate.getId().toVariant());
         pListWidget->addItem(pItem.release());
     }
 }
@@ -153,8 +153,8 @@ void DlgLibraryExport::setSelectedCrate(std::optional<CrateId> crateId) {
     m_pCratesList->setEnabled(true);
     for (auto i = 0; i < m_pCratesList->count(); ++i) {
         auto* pItem = m_pCratesList->item(i);
-        const auto currCrateId = pItem->data(Qt::UserRole).toInt();
-        if (currCrateId == crateId->value()) {
+        const auto currCrateId = CrateId(pItem->data(Qt::UserRole));
+        if (currCrateId == crateId) {
             m_pCratesList->setCurrentItem(pItem);
             return;
         }
diff --git a/src/library/export/engineprimeexportjob.cpp b/src/library/export/engineprimeexportjob.cpp
index 03aa3e6f54c..6f3624304e3 100644
--- a/src/library/export/engineprimeexportjob.cpp
+++ b/src/library/export/engineprimeexportjob.cpp
@@ -94,8 +94,7 @@ QString exportFile(const QSharedPointer<EnginePrimeExportRequest> pRequest,
     // chance of filename clashes, and to keep things simple, we will prefix
     // the destination files with the DB track identifier.
     mixxx::FileInfo srcFileInfo = pTrack->getFileInfo();
-    const auto trackId = pTrack->getId().value();
-    QString dstFilename = QString::number(trackId) + " - " + srcFileInfo.fileName();
+    QString dstFilename = pTrack->getId().toString() + " - " + srcFileInfo.fileName();
     QString dstPath = pRequest->musicFilesDir.filePath(dstFilename);
     if (!QFile::exists(dstPath) ||
             srcFileInfo.lastModified() > QFileInfo{dstPath}.lastModified()) {
@@ -549,7 +548,7 @@ void EnginePrimeExportJob::run() {
 
         DEBUG_ASSERT(m_pLastLoadedTrack != nullptr);
 
-        qInfo() << "Exporting track" << m_pLastLoadedTrack->getId().value()
+        qInfo() << "Exporting track" << m_pLastLoadedTrack->getId().toString()
                 << "at" << m_pLastLoadedTrack->getFileInfo().location() << "...";
         try {
             exportTrack(m_pRequest,
@@ -560,7 +559,7 @@ void EnginePrimeExportJob::run() {
                     m_pLastLoadedWaveform.get());
         } catch (std::exception& e) {
             qWarning() << "Failed to export track"
-                       << m_pLastLoadedTrack->getId().value() << ":"
+                       << m_pLastLoadedTrack->getId().toString() << ":"
                        << e.what();
             m_lastErrorMessage = e.what();
             emit failed(m_lastErrorMessage);
@@ -629,7 +628,7 @@ void EnginePrimeExportJob::run() {
             return;
         }
 
-        qInfo() << "Exporting crate" << m_lastLoadedCrate.getId().value() << "...";
+        qInfo() << "Exporting crate" << m_lastLoadedCrate.getId().toString() << "...";
         try {
             exportCrate(
                     pExtRootCrate.get(),
@@ -637,7 +636,7 @@ void EnginePrimeExportJob::run() {
                     m_lastLoadedCrate,
                     m_lastLoadedCrateTrackIds);
         } catch (std::exception& e) {
-            qWarning() << "Failed to add crate" << m_lastLoadedCrate.getId().value()
+            qWarning() << "Failed to add crate" << m_lastLoadedCrate.getId().toString()
                        << ":" << e.what();
             m_lastErrorMessage = e.what();
             emit failed(m_lastErrorMessage);
diff --git a/src/library/trackset/crate/cratetablemodel.cpp b/src/library/trackset/crate/cratetablemodel.cpp
index 43c5a6c59d7..525dea26328 100644
--- a/src/library/trackset/crate/cratetablemodel.cpp
+++ b/src/library/trackset/crate/cratetablemodel.cpp
@@ -12,7 +12,7 @@
 
 namespace {
 
-const QString kModelName = "crate";
+const QString kModelName = QStringLiteral("crate");
 
 } // anonymous namespace
 
@@ -35,9 +35,9 @@ void CrateTableModel::selectCrate(CrateId crateId) {
     QString currSearch = currentSearch();
     if (m_selectedCrate.isValid()) {
         if (!currSearch.trimmed().isEmpty()) {
-            m_searchTexts.insert(m_selectedCrate.value(), currSearch);
+            m_searchTexts.insert(m_selectedCrate, currSearch);
         } else {
-            m_searchTexts.remove(m_selectedCrate.value());
+            m_searchTexts.remove(m_selectedCrate);
         }
     }
 
@@ -77,7 +77,7 @@ void CrateTableModel::selectCrate(CrateId crateId) {
             m_pTrackCollectionManager->internalCollection()->getTrackSource());
 
     // Restore search text
-    setSearch(m_searchTexts.value(m_selectedCrate.value()));
+    setSearch(m_searchTexts.value(m_selectedCrate));
     setDefaultSort(fieldIndex("artist"), Qt::AscendingOrder);
 }
 
@@ -205,18 +205,17 @@ void CrateTableModel::removeTracks(const QModelIndexList& indices) {
 QString CrateTableModel::modelKey(bool noSearch) const {
     if (m_selectedCrate.isValid()) {
         if (noSearch) {
-            return kModelName + QStringLiteral(":") +
-                    QString::number(m_selectedCrate.value());
+            return kModelName + QChar(':') + m_selectedCrate.toString();
         }
-        return kModelName + QStringLiteral(":") +
-                QString::number(m_selectedCrate.value()) +
-                QStringLiteral("#") +
+        return kModelName + QChar(':') +
+                m_selectedCrate.toString() +
+                QChar('#') +
                 currentSearch();
     } else {
         if (noSearch) {
             return kModelName;
         }
-        return kModelName + QStringLiteral("#") +
+        return kModelName + QChar('#') +
                 currentSearch();
     }
 }
diff --git a/src/library/trackset/crate/cratetablemodel.h b/src/library/trackset/crate/cratetablemodel.h
index f146464bf4f..0bc548dca97 100644
--- a/src/library/trackset/crate/cratetablemodel.h
+++ b/src/library/trackset/crate/cratetablemodel.h
@@ -27,5 +27,5 @@ class CrateTableModel final : public TrackSetTableModel {
 
   private:
     CrateId m_selectedCrate;
-    QHash<int, QString> m_searchTexts;
+    QHash<CrateId, QString> m_searchTexts;
 };
diff --git a/src/test/autodjprocessor_test.cpp b/src/test/autodjprocessor_test.cpp
index ff4c02f8448..7c59883a897 100644
--- a/src/test/autodjprocessor_test.cpp
+++ b/src/test/autodjprocessor_test.cpp
@@ -179,11 +179,7 @@ class MockAutoDJProcessor : public AutoDJProcessor {
 
 class AutoDJProcessorTest : public LibraryTest {
   protected:
-    static TrackId nextTrackId(TrackId trackId) {
-        return TrackId(trackId.value() + 1);
-    }
-
-    TrackPointer newTestTrack(TrackId trackId) const {
+    TrackPointer newTestTrack(TrackId trackId = {}) const {
         TrackPointer pTrack(
                 Track::newDummy(getTestDir().filePath(kTrackLocationTest), trackId));
         EXPECT_EQ(
@@ -264,7 +260,7 @@ TEST_F(AutoDJProcessorTest, FullIntroOutro_LongerIntro) {
     // Crossfader starts on the left.
     mixer.crossfader.set(-1.0);
     // Pretend a track is playing on deck 1.
-    TrackPointer pTrack(newTestTrack(nextTrackId(testId)));
+    TrackPointer pTrack = newTestTrack();
     // Pretend that track is 1 minute and 40 seconds long.
     pTrack->setDuration(100);
     // Load track and mark it playing.
@@ -338,7 +334,7 @@ TEST_F(AutoDJProcessorTest, FullIntroOutro_LongerOutro) {
     // Crossfader starts on the left.
     mixer.crossfader.set(-1.0);
     // Pretend a track is playing on deck 1.
-    TrackPointer pTrack(newTestTrack(nextTrackId(testId)));
+    TrackPointer pTrack = newTestTrack();
     // Pretend that track is 1 minute and 40 seconds long.
     pTrack->setDuration(100);
     // Load track and mark it playing.
@@ -418,7 +414,7 @@ TEST_F(AutoDJProcessorTest, FadeAtOutroStart_LongerIntro) {
     // Crossfader starts on the left.
     mixer.crossfader.set(-1.0);
     // Pretend a track is playing on deck 1.
-    TrackPointer pTrack(newTestTrack(nextTrackId(testId)));
+    TrackPointer pTrack = newTestTrack();
     // Pretend that track is 1 minute and 40 seconds long.
     pTrack->setDuration(100);
     // Load track and mark it playing.
@@ -494,7 +490,7 @@ TEST_F(AutoDJProcessorTest, FadeAtOutroStart_LongerOutro) {
     // Crossfader starts on the left.
     mixer.crossfader.set(-1.0);
     // Pretend a track is playing on deck 1.
-    TrackPointer pTrack(newTestTrack(nextTrackId(testId)));
+    TrackPointer pTrack = newTestTrack();
     // Pretend that track is 1 minute and 40 seconds long.
     pTrack->setDuration(100);
     // Load track and mark it playing.
@@ -803,7 +799,7 @@ TEST_F(AutoDJProcessorTest, EnabledSuccess_PlayingDeck1) {
     ASSERT_TRUE(testId.isValid());
 
     // Pretend a track is playing on deck 1.
-    TrackPointer pTrack(newTestTrack(nextTrackId(testId)));
+    TrackPointer pTrack = newTestTrack();
     // Load track and mark it playing.
     deck1.slotLoadTrack(pTrack, true);
     // Indicate the track loaded successfully.
@@ -842,7 +838,7 @@ TEST_F(AutoDJProcessorTest, EnabledSuccess_PlayingDeck1_TrackLoadFailed) {
     ASSERT_TRUE(testId.isValid());
 
     // Pretend a track is playing on deck 1.
-    TrackPointer pTrack(newTestTrack(nextTrackId(testId)));
+    TrackPointer pTrack = newTestTrack();
     // Load track and mark it playing.
     deck1.slotLoadTrack(pTrack, true);
     // Indicate the track loaded successfully.
@@ -898,7 +894,7 @@ TEST_F(AutoDJProcessorTest, EnabledSuccess_PlayingDeck2) {
     ASSERT_TRUE(testId.isValid());
 
     // Pretend a track is playing on deck 2.
-    TrackPointer pTrack(newTestTrack(nextTrackId(testId)));
+    TrackPointer pTrack = newTestTrack();
     // Load track and mark it playing.
     deck2.slotLoadTrack(pTrack, true);
     // Indicate the track loaded successfully.
@@ -938,7 +934,7 @@ TEST_F(AutoDJProcessorTest, EnabledSuccess_PlayingDeck2_TrackLoadFailed) {
     ASSERT_TRUE(testId.isValid());
 
     // Pretend a track is playing on deck 2.
-    TrackPointer pTrack(newTestTrack(nextTrackId(testId)));
+    TrackPointer pTrack = newTestTrack();
     // Load track and mark it playing.
     deck2.slotLoadTrack(pTrack, true);
     // Indicate the track loaded successfully.
@@ -1012,7 +1008,7 @@ TEST_F(AutoDJProcessorTest, FadeToDeck1_LoadOnDeck2_TrackLoadSuccess) {
     // Crossfader starts on the right.
     mixer.crossfader.set(1.0);
     // Pretend a track is playing on deck 2.
-    TrackPointer pTrack(newTestTrack(nextTrackId(testId)));
+    TrackPointer pTrack = newTestTrack();
     // Load track and mark it playing.
     deck2.slotLoadTrack(pTrack, true);
     // Indicate the track loaded successfully.
@@ -1099,7 +1095,7 @@ TEST_F(AutoDJProcessorTest, FadeToDeck1_LoadOnDeck2_TrackLoadFailed) {
     // Crossfader starts on the right.
     mixer.crossfader.set(1.0);
     // Pretend a track is playing on deck 2.
-    TrackPointer pTrack(newTestTrack(nextTrackId(testId)));
+    TrackPointer pTrack = newTestTrack();
     // Load track and mark it playing.
     deck2.slotLoadTrack(pTrack, true);
     // Indicate the track loaded successfully.
@@ -1202,7 +1198,7 @@ TEST_F(AutoDJProcessorTest, FadeToDeck2_LoadOnDeck1_TrackLoadSuccess) {
     // Crossfader starts on the left.
     mixer.crossfader.set(-1.0);
     // Pretend a track is playing on deck 1.
-    TrackPointer pTrack(newTestTrack(nextTrackId(testId)));
+    TrackPointer pTrack = newTestTrack();
     // Load track and mark it playing.
     deck1.slotLoadTrack(pTrack, true);
     // Indicate the track loaded successfully.
@@ -1289,7 +1285,7 @@ TEST_F(AutoDJProcessorTest, FadeToDeck2_LoadOnDeck1_TrackLoadFailed) {
     // Crossfader starts on the left.
     mixer.crossfader.set(-1.0);
     // Pretend a track is playing on deck 1.
-    TrackPointer pTrack(newTestTrack(nextTrackId(testId)));
+    TrackPointer pTrack = newTestTrack();
     // Load track and mark it playing.
     deck1.slotLoadTrack(pTrack, true);
     // Indicate the track loaded successfully.
@@ -1395,7 +1391,7 @@ TEST_F(AutoDJProcessorTest, FadeToDeck2_Long_Transition) {
     // Crossfader starts on the left.
     mixer.crossfader.set(-1.0);
     // Pretend a track is playing on deck 1.
-    TrackPointer pTrack(newTestTrack(nextTrackId(testId)));
+    TrackPointer pTrack = newTestTrack();
     // Load track and mark it playing.
     deck1.slotLoadTrack(pTrack, true);
     // Indicate the track loaded successfully.
@@ -1482,7 +1478,7 @@ TEST_F(AutoDJProcessorTest, FadeToDeck2_Pause_Transition) {
     // Crossfader starts on the left.
     mixer.crossfader.set(-1.0);
     // Pretend a track is playing on deck 1.
-    TrackPointer pTrack(newTestTrack(nextTrackId(testId)));
+    TrackPointer pTrack = newTestTrack();
     // Pretend that track is 2 minutes long.
     pTrack->setDuration(120);
     // Load track and mark it playing.
@@ -1564,7 +1560,7 @@ TEST_F(AutoDJProcessorTest, FadeToDeck2_SeekEnd) {
     // Crossfader starts on the left.
     mixer.crossfader.set(-1.0);
     // Pretend a track is playing on deck 1.
-    TrackPointer pTrack(newTestTrack(nextTrackId(testId)));
+    TrackPointer pTrack = newTestTrack();
     // Load track and mark it playing.
     deck1.slotLoadTrack(pTrack, true);
     // Indicate the track loaded successfully.
@@ -1616,7 +1612,7 @@ TEST_F(AutoDJProcessorTest, FadeToDeck2_SeekBeforeTransition) {
     // Crossfader starts on the left.
     mixer.crossfader.set(-1.0);
     // Pretend a track is playing on deck 1.
-    TrackPointer pTrack(newTestTrack(nextTrackId(testId)));
+    TrackPointer pTrack = newTestTrack();
     // Load track and mark it playing.
     deck1.slotLoadTrack(pTrack, true);
     // Indicate the track loaded successfully.
diff --git a/src/test/dbidtest.cpp b/src/test/dbidtest.cpp
index 2236143789f..bf1f6293018 100644
--- a/src/test/dbidtest.cpp
+++ b/src/test/dbidtest.cpp
@@ -12,7 +12,6 @@ class DbIdTest : public testing::Test {
         DbId actual(variant);
         EXPECT_TRUE(actual.isValid());
         EXPECT_NE(DbId(), actual);
-        EXPECT_EQ(variant.toInt(), static_cast<int>(actual.value()));
         return actual;
     }
 
diff --git a/src/util/db/dbid.h b/src/util/db/dbid.h
index 41c93e7e3a5..0bd3fb0104a 100644
--- a/src/util/db/dbid.h
+++ b/src/util/db/dbid.h
@@ -27,22 +27,14 @@ class DbId {
   constexpr DbId()
           : m_value(kInvalidValue) {
   }
-  explicit DbId(int value)
-          : m_value(value) {
-      DEBUG_ASSERT(isValid() || (kInvalidValue == m_value));
-  }
   explicit DbId(const QVariant& variant)
-          : DbId(valueOf(variant)) {
+          : m_value(valueOf(variant)) {
   }
 
     bool isValid() const {
         return isValidValue(m_value);
     }
 
-    int value() const {
-        return m_value;
-    }
-
     std::size_t hash() const {
         return std::hash<int>()(m_value);
     }

From b48dcf09a64a68481dbf0db8922bc2a7a1afd0a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Mon, 29 May 2023 10:55:40 +0200
Subject: [PATCH 081/388] Shade Make audio latency meter 2 pixel height to
 workaround a bug in the shader

---
 .../audio_latency/audio_latency_usage_back.png   | Bin 0 -> 5904 bytes
 res/skins/Shade/mixer_panel.xml                  |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 res/skins/Shade/audio_latency/audio_latency_usage_back.png

diff --git a/res/skins/Shade/audio_latency/audio_latency_usage_back.png b/res/skins/Shade/audio_latency/audio_latency_usage_back.png
new file mode 100644
index 0000000000000000000000000000000000000000..695885cce42311f07d0a5f2f4c15f0c5cdb3996e
GIT binary patch
literal 5904
zcmeHLc~}!?8jn%|IV#`*i&jHiQI5%-FbRo(91<ZA0V@ctPG%-yAXk%Mf>-NB6~rSd
zYNbLeRXot5AXKPgMOjZgsMsosK}AK2D2nS*b|xUkUDvM9Zl7oWFnMx(-}ife@B96}
z_kCxcSt^N{=<ML>Kq8TxMUi1~_^&7a>2Gg~e@E1x1W6>DC9@I|^>L7atkJ4vm;xp1
zGc_m~HDWRn$@ptYUb?AmoYUg&z1d0qO)hRH4hgo)?DjtAU5xql>$=NDX%jAireO1&
z^)VjZ&xMDlKapgQG=0@-($$V#n^0*!)Y9Se>}%<-?RD#BJ-t;S3>*KE)9S)?EjxaG
z7M%T*)tt9*-_^&>Tfcmfe@lPad(GO+F>Q?$sP%Bn?fl|pEne;w>Dw+PVSzSXai^p1
zCe|rUkAx}C#|q=7h7Ek^Vye9QqB!`%n7Ffkzfl%d{_HFDzv~_3mo(|qb%r*$+MzS*
z`lWbdLc#U&Cn@#znP-?+i*Gc3c&^dh?l#@+#E+EU??rO9Y`u}+nBUYoqV7)GaS6L1
z&^K!%Ki#Q+K=hbr-!GF@4yoT)vEXLuQCm>Bukss?Z|zFhc2dK(b48_Hxt^1v1sBh-
z0`i(}N>eK5yNagedT$(Z+dShJ;|KJppSq@{)+axnlRIKVpx2s#t6j6ImDdjDUoE4{
zlikj`twtIh44($NqyE~q<>SbOncDN8G$#jk)SWmwEt%t`ICeL2M(!oXku9BjE09+I
zCGnkhu)~G=fn-;$U$$4j`Rhe%nBg#&a_bf;VKOhu?EFFG+Q97Ve>L$u0(W2bfXnLk
zXm6rNfBC@0H_1tnolrALRQkC;@3Cac*`n=9Vqxmpuf}ZM$&;UGTe-tKFB;gmA-VL9
z`Pk2UH&(gtUYyhH)L_aPO8c(i_&1cvM^c7%49&|8_~qP|<SUAYC5m$BSy@Bb4cVz=
ztX#KlIs9#_s%iG^42cKm6XD5!@cp&T%lM^@TTZewZer)<8y>~nD|*^+pfF-A=ZdHV
ztcqXAS>Lp!FeCq#)K;2rU#oPj$+~&OpZ{HL&SmMa6Z{)%CKpk;-<+q|F2Y>eiUO-f
zX-9qLcxTjSEkUas9h<sCsH7%Vg?q!(r$LS84(_fB4dyvOJ-uyhg(sqF)6DO;HGAj0
z;l|0b(^TF1vB})@(&hZ<yfdMq4pnDd%Y(Hc9)q5Lv^(eErd`g*7i5rI3f!^^mU$d<
z-a2xgbIp^KRm(1HKE-X}SB~Y{NVX5EDLH(2&dgDqQA68re3-MsZ@+Ox++l(5+zL}p
z*VI+9QTFw}r7vZSFM$p`u<4%i_xLC7ewj;*UUQx-KQ)_uEs)!Oc2WDq>WPC7zz;`?
zjY#~SsXM<dj}~=Q%*&d4?#o!4p!N3Q6HNDMIn-jC;pTmt@Y0mMu_iH%9wus1n0?6k
z3%Zj{_l5<o=TZvqfyMWm>lVIPJRnY)v`<^wHZKb((6XjQJQfIUY#WCfC7i(dezk|T
z*VJcS^fBKZvVB|OZD`Zwdjs0z-Puz=8NHcA>bD3B4V8#OLtl0Q+)w`8Rl>-_!6S}L
zkI$hDwewrD1SyXBxRy4e+#$T!C2jG?A4OANEbw*~W#?>eo~F4Em)>bM@7%F)2ibn!
z7nS=#pZ$?byQ3TdsQ~<~u4?v*D#I5NfO#ryxDC6BJGiuX{iNO5_jcRQaQV^W$eNS>
zaE!@(f5h~z`yG#{Kkcoqf5F?|u<Qt_AX0F`>Ad$9@}?_g&ZnQ%dgZN~V%C{mS5qUO
z|1IOY)9QR3)ltAgyazw5^^!6gf12dDw|bjvtlO7U#9QZhO_8sCI80uWD9fGwz}=Sh
z^f<E-`;eR!?jN$iegHZ|vMATSgzq!Vt!&hz`(0J@mZmuT;4tHQV(>suq;b&ib_c7<
z_Y7`%R5W9VeKmNx&gIMj#|Gc!59i(m%LmtVJEhzff4<G(<Q&tdSlYGGg|mlOR;tpD
zkJS8N(<%JR9-k^x!IqV$`nStF#aLnMuv;lRx-ML-yKS?wXqP#l=8zXXfAigp6$V4u
z<HzkAB0dl5Y}Z~g`gXaJNG{hgyelV)qxrB}Nre!#6r~!K8ay>fBtei-1HtL2o-9S>
zm`X@#uR2H}V~CJ4l_RE$HKAxK7CB3c#?OjLfM=z{JcJT7-a%mG;{-}n50Q;Zg-XXa
z3Mm#|KK`GWrcuZih(29NNfb-Sp=vEkW>eWzIuLHeW-=+`9moPLBICz}Mf6hOBOxVK
zuh;NtG=srFHL$2^t(?Z-@pv>klg4BMI0DdRs`QW%Q0Yb!6g?bas1DZR`HZPmWP%ft
zsx$OL3I$&$_mUIY9&W@ZdmRvC3%yQ{&_wuvjqe8s(3o^O2+)}TlSi|*$5+MTK5Lb(
zS4CV;ni0~_7*sk<seH{srw^a`%HJC;bP4#ykrs#Q)EQbB4WEgs^rNkvY7`kdYo8f9
zl$f%_tw3ZnJSdB2YnzE8v82z2kWr2)H5Lm3ZH+|WKAa{)tFT}Yn1(7)B_4<lXJ)*H
z$L;$J-nbnLxkV^`m>SL?SVUn$3K0MwQNtL*xBLZJ9F8=AP6v1h!~ocI7y+a_DFiUN
zJO-Nw!c3IGw4xHJbb3eyqXZRBPQ`E@4lI?i*&qv`qg*DymZ4HWio#3)43Kd^2x37j
zX@C_)tQNyl8&X(DMNlC)6~qMD0W5?Aa1a=e1_611G$4QtKy-vh=g8O~gUho}5yJ9A
zBqAY&Nu|G<ktiU&Os!Q4DbbiJ!}w|;0aK#!dWaB>!38;NkVEHybPk=xWxWD@jB0gw
z))JfyI+X!hRuGsUfipsQ_Fzg#j?y$Lxn%*5nIEb}A-!6gpjIn{6e1=vVQQ%bvY<E1
z`O#_^BC5dxMiHV=dP`*jB&S)10@~Za|H2fXsy3+pGoDw_K9&%z-k{c|$7*AxX(+6J
zJI|ZIeN1t9lhWz6nW8_~)IZ?_J!u(<+p4vhR{rDB&w55ZokW3Iq#~0o)ys!qLPa4(
z2hBtg%Msu@_AJ4vkV=l?ZL+sUUe050N>>nsSPU5xV1Zl|VB`4-fJ`16kV&~xHo^+v
zplr_T>^ikfZ-BIDh#W5>{G9O;vYaz{oF&VAUPl{JQ9MXLI+IVQQ+kfK_qhL@{m6Js
z8H~~yfRw|Q0c@^}4M;%_1aNsQ6h`rihIl>Y*QeJ1_kLh03^RCKI=%}OA=(K808tnM
zP$+=Qk;*`n3&F1|{@?FMKqIbHFVjyz^m4J7Z=Ik5qSy09L<fk^&}bAGs(n3iUl#Je
z!CBe&HjO_rw}$mthpIK1c=Jrv#~M^`b^iun4?{Etqbi;HZJ}F3dStP>pyM(3%;7f*
z_<aYh@5ZCIY>CeHC%$^y!Jp^>r+)9`o%DS#*L%6%Nr86)zt67sa=nuR?*x9IUH>z=
z99})TKvnpSxB-7KF};84Zv3H!tu$(47-<6WrdJ;e!)FF+B9n9^lH*|F(~tC3z6U;O
zrx%IC?OF$n9OmlneR3*>Pq~Z2LK5s7;ppS)?)qT6nr};dLI=(EAPsfvf6C@)R4@)9
NiNa&Tc1@VE;2&Z6lUo1)

literal 0
HcmV?d00001

diff --git a/res/skins/Shade/mixer_panel.xml b/res/skins/Shade/mixer_panel.xml
index 9d8cf5c3503..aed89678565 100644
--- a/res/skins/Shade/mixer_panel.xml
+++ b/res/skins/Shade/mixer_panel.xml
@@ -524,13 +524,13 @@
 
               <WidgetGroup>
                 <Pos>113,28</Pos>
-                <Size>26,1</Size>
+                <Size>26,2</Size>
                 <Layout>horizontal</Layout>
                 <Children>
                   <VuMeter>
                     <TooltipId>audio_latency_usage</TooltipId>
                     <PathVu>skin:/audio_latency/audio_latency_usage.png</PathVu>
-                    <PathBack>skin:/audio_latency/audio_latency_overload_back.png</PathBack>
+                    <PathBack>skin:/audio_latency/audio_latency_usage_back.png</PathBack>
                     <PeakHoldSize>5</PeakHoldSize>
                     <PeakHoldTime>1000</PeakHoldTime>
                     <PeakFallTime>100</PeakFallTime>

From 99a7d88062cf4f459b39c6c76e42945eb40b2915 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Wed, 31 May 2023 00:48:26 +0200
Subject: [PATCH 082/388] Don't stretch the usage pixamp in GLSL mode. This
 matches the behavior of the other implementations.

---
 src/widget/wvumeterglsl.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/widget/wvumeterglsl.cpp b/src/widget/wvumeterglsl.cpp
index 88ed2baac11..626ed78fb69 100644
--- a/src/widget/wvumeterglsl.cpp
+++ b/src/widget/wvumeterglsl.cpp
@@ -72,7 +72,7 @@ void WVuMeterGLSL::paintGL() {
         const double pixmapHeight = m_pTextureVu->height();
         if (m_bHorizontal) {
             const double widgetPosition = math_clamp(widgetWidth * m_dParameter, 0.0, widgetWidth);
-            QRectF targetRect(0, 0, widgetPosition, widgetHeight);
+            QRectF targetRect(0, 0, widgetPosition, math_min(pixmapHeight, widgetHeight));
 
             const double pixmapPosition = math_clamp(
                     pixmapWidth * m_dParameter, 0.0, pixmapWidth);
@@ -89,7 +89,7 @@ void WVuMeterGLSL::paintGL() {
                 QRectF targetRect(widgetPeakPosition - widgetPeakHoldSize,
                         0,
                         widgetPeakHoldSize,
-                        widgetHeight);
+                        math_min(pixmapHeight, widgetHeight));
 
                 const double pixmapPeakPosition = math_clamp(
                         pixmapWidth * m_dPeakParameter, 0.0, pixmapWidth);

From 5d8e1b7fe934bb7680e0d1baf4e2ed2a52c20ae1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Wed, 31 May 2023 00:54:42 +0200
Subject: [PATCH 083/388] Add a skin warning if the VU-Meter is to small.

---
 src/widget/wvumeterbase.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/widget/wvumeterbase.cpp b/src/widget/wvumeterbase.cpp
index cc9048719a3..34216b9433c 100644
--- a/src/widget/wvumeterbase.cpp
+++ b/src/widget/wvumeterbase.cpp
@@ -77,6 +77,13 @@ void WVuMeterBase::setup(const QDomNode& node, const SkinContext& context) {
         m_iPeakFallTime = DEFAULT_FALLTIME;
     }
 
+    if (height() < 2 || width() < 2) {
+        // This triggers a QT bug and displays a white widget instead.
+        // We warn here, because the skin designer may not use the affected mode.
+        SKIN_WARNING(node, context)
+                << "VuMeterBase needs to have 2 pixel in all extents to be visible on all targets.";
+    }
+
     setFocusPolicy(Qt::NoFocus);
 }
 

From 8602bab9f6b8435053217441ce0cda24d463c9d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Wed, 31 May 2023 00:55:46 +0200
Subject: [PATCH 084/388] Use QOpenGLTexture::ClampToEdge to fix darb border
 issue

---
 src/util/texture.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/util/texture.cpp b/src/util/texture.cpp
index 65763ce6c4e..869063d9038 100644
--- a/src/util/texture.cpp
+++ b/src/util/texture.cpp
@@ -7,7 +7,7 @@ QOpenGLTexture* createTexture(const QImage& image) {
     QOpenGLTexture* pTexture = new QOpenGLTexture(image);
     pTexture->setMinificationFilter(QOpenGLTexture::Linear);
     pTexture->setMagnificationFilter(QOpenGLTexture::Linear);
-    pTexture->setWrapMode(QOpenGLTexture::ClampToBorder);
+    pTexture->setWrapMode(QOpenGLTexture::ClampToEdge);
 
     return pTexture;
 }

From 996534061a4d23f98f585f4a970f45e691b06d55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sat, 30 Sep 2023 01:27:47 +0200
Subject: [PATCH 085/388] Introduce new pickNewLeader() that does not respect
 an existing explicit leader.

---
 src/engine/sync/enginesync.cpp | 48 ++++++++++++++++++++--------------
 src/engine/sync/enginesync.h   |  4 +++
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/src/engine/sync/enginesync.cpp b/src/engine/sync/enginesync.cpp
index 3ca1e0d8c2f..5a6e3b3e0ff 100644
--- a/src/engine/sync/enginesync.cpp
+++ b/src/engine/sync/enginesync.cpp
@@ -59,21 +59,23 @@ void EngineSync::requestSyncMode(Syncable* pSyncable, SyncMode mode) {
         break;
     }
     case SyncMode::Follower: {
-        // A request for follower mode may be converted into an enabling of soft
-        // leader mode if this still be best choice
-        if (m_pLeaderSyncable == pSyncable) {
-            // Avoid that pickLeader() returns pSyncable with SyncMode::LeaderExplicit
-            m_pLeaderSyncable = nullptr;
-        }
-        Syncable* newLeader = pickLeader(pSyncable);
-        if (newLeader != pSyncable) {
+        // This request is also used to verifies and moves a soft leader
+        if (!m_pLeaderSyncable || m_pLeaderSyncable == pSyncable ||
+                m_pLeaderSyncable->getSyncMode() != SyncMode::LeaderExplicit) {
+            // Pick a new leader, in case we would have none after becoming follower
+            Syncable* pNewLeader = pickNewLeader(pSyncable);
+            // Note: A request for follower mode may have been converted into
+            // enabling of soft leader mode if this still be best choice
+            if (pNewLeader) {
+                activateLeader(pNewLeader, SyncMode::LeaderSoft);
+            }
+            if (pNewLeader != pSyncable) {
+                // We have a different leader now, become follower
+                activateFollower(pSyncable);
+            }
+        } else {
             activateFollower(pSyncable);
         }
-        if (newLeader && newLeader != m_pLeaderSyncable) {
-            // if the leader has changed, activate it (this updates m_pLeaderSyncable)
-            // But don't make an an explicit leader soft.
-            activateLeader(newLeader, SyncMode::LeaderSoft);
-        }
         break;
     }
     case SyncMode::None: {
@@ -201,23 +203,29 @@ void EngineSync::deactivateSync(Syncable* pSyncable) {
     }
 
     if (wasLeader) {
-        Syncable* newLeader = pickLeader(nullptr);
+        Syncable* newLeader = pickNewLeader(nullptr);
         if (newLeader != nullptr) {
             activateLeader(newLeader, SyncMode::LeaderSoft);
         }
     }
 }
 
-Syncable* EngineSync::pickLeader(Syncable* enabling_syncable) {
-    if (kLogger.traceEnabled()) {
-        kLogger.trace() << "EngineSync::pickLeader";
-    }
+Syncable* EngineSync::pickLeader(Syncable* pEnablingSyncable) {
     if (m_pLeaderSyncable &&
             m_pLeaderSyncable->getSyncMode() == SyncMode::LeaderExplicit &&
             m_pLeaderSyncable->getBaseBpm().isValid()) {
+        if (kLogger.traceEnabled()) {
+            kLogger.trace() << "EngineSync::pickLeader(): explicit leader found ";
+        }
         return m_pLeaderSyncable;
     }
+    return pickNewLeader(pEnablingSyncable);
+}
 
+Syncable* EngineSync::pickNewLeader(Syncable* pEnablingSyncable) {
+    if (kLogger.traceEnabled()) {
+        kLogger.trace() << "EngineSync::pickNewLeader";
+    }
     // First preference: some other sync deck that is playing.
     // Note, if we are using PREFER_LOCK_BPM we don't use this option.
     Syncable* first_other_playing_deck = nullptr;
@@ -235,7 +243,7 @@ Syncable* EngineSync::pickLeader(Syncable* enabling_syncable) {
             continue;
         }
 
-        if (pSyncable != enabling_syncable) {
+        if (pSyncable != pEnablingSyncable) {
             if (!pSyncable->getChannel()->isPrimaryDeck()) {
                 continue;
             }
@@ -248,7 +256,7 @@ Syncable* EngineSync::pickLeader(Syncable* enabling_syncable) {
             if (playing_deck_count == 0) {
                 first_playing_deck = pSyncable;
             }
-            if (!first_other_playing_deck && pSyncable != enabling_syncable) {
+            if (!first_other_playing_deck && pSyncable != pEnablingSyncable) {
                 first_other_playing_deck = pSyncable;
             }
             playing_deck_count++;
diff --git a/src/engine/sync/enginesync.h b/src/engine/sync/enginesync.h
index d072d80acb6..b5345847c2a 100644
--- a/src/engine/sync/enginesync.h
+++ b/src/engine/sync/enginesync.h
@@ -66,6 +66,10 @@ class EngineSync : public SyncableListener {
     /// Iterate over decks, and based on sync and play status, pick a new Leader.
     /// if enabling_syncable is not null, we treat it as if it were enabled because we may
     /// be in the process of enabling it.
+    Syncable* pickNewLeader(Syncable* enabling_syncable);
+
+    /// Return the explicit leader if the one has been selected or picks a new leader using
+    /// pickNewLeader();
     Syncable* pickLeader(Syncable* enabling_syncable);
 
     /// Find a deck to match against, used in the case where there is no sync Leader.

From f930df89707513d7ce5f9e92136991a3b69d1175 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sat, 30 Sep 2023 01:27:47 +0200
Subject: [PATCH 086/388] Prefer old explicit leader as soft leader after
 disabling it.

---
 src/engine/sync/enginesync.cpp  | 23 +++++++++++++++--------
 src/engine/sync/synccontrol.cpp |  2 ++
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/engine/sync/enginesync.cpp b/src/engine/sync/enginesync.cpp
index 5a6e3b3e0ff..87f256d7cef 100644
--- a/src/engine/sync/enginesync.cpp
+++ b/src/engine/sync/enginesync.cpp
@@ -46,17 +46,24 @@ void EngineSync::requestSyncMode(Syncable* pSyncable, SyncMode mode) {
     // decks that need to change as a result.
     Syncable* oldLeader = m_pLeaderSyncable;
     switch (mode) {
-    case SyncMode::LeaderExplicit:
-    case SyncMode::LeaderSoft: {
+    case SyncMode::LeaderExplicit: {
         if (pSyncable->getBaseBpm().isValid()) {
             activateLeader(pSyncable, mode);
-        } else {
-            // Because we don't have a valid bpm, we can't be the leader
-            // (or else everyone would try to be syncing to zero bpm).
-            // Override and make us a follower instead.
-            activateFollower(pSyncable);
+            break;
         }
-        break;
+        // Because we don't have a valid bpm, we can't be the leader
+        // (or else everyone would try to be syncing to zero bpm).
+        // Fall threough to SyncMode::Follower instead
+        [[fallthrough]];
+    }
+    case SyncMode::LeaderSoft: {
+        if (pSyncable->getBaseBpm().isValid() &&
+                pSyncable->isPlaying() &&
+                pSyncable->isAudible()) {
+            activateLeader(pSyncable, mode);
+            break;
+        }
+        [[fallthrough]];
     }
     case SyncMode::Follower: {
         // This request is also used to verifies and moves a soft leader
diff --git a/src/engine/sync/synccontrol.cpp b/src/engine/sync/synccontrol.cpp
index 17a1738eb89..95dceb7e1a0 100644
--- a/src/engine/sync/synccontrol.cpp
+++ b/src/engine/sync/synccontrol.cpp
@@ -519,6 +519,8 @@ void SyncControl::slotSyncLeaderEnabledChangeRequest(double state) {
         // Turning off leader goes back to follower mode.
         switch (mode) {
         case SyncMode::LeaderExplicit:
+            m_pChannel->getEngineBuffer()->requestSyncMode(SyncMode::LeaderSoft);
+            break;
         case SyncMode::LeaderSoft:
             m_pChannel->getEngineBuffer()->requestSyncMode(SyncMode::Follower);
             break;

From ce35a3f96268c5f9552b15628de50a6730c7b173 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Tue, 3 Oct 2023 18:35:05 +0200
Subject: [PATCH 087/388] Improve
 EngineSyncTest.InternalLeaderSetFollowerSliderMoves

---
 src/test/enginesynctest.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/test/enginesynctest.cpp b/src/test/enginesynctest.cpp
index fa0d80d7b86..1bb5bb71bc1 100644
--- a/src/test/enginesynctest.cpp
+++ b/src/test/enginesynctest.cpp
@@ -401,11 +401,13 @@ TEST_F(EngineSyncTest, InternalLeaderSetFollowerSliderMoves) {
     // If internal is leader, and we turn on a follower, the slider should move.
     auto pButtonLeaderSyncInternal = std::make_unique<ControlProxy>(
             m_sInternalClockGroup, "sync_leader");
-    auto pLeaderSyncSlider =
+    auto pInternalClockBpm =
             std::make_unique<ControlProxy>(m_sInternalClockGroup, "bpm");
 
-    pLeaderSyncSlider->set(100.0);
+    pInternalClockBpm->set(100.0);
+    // Request internal clock to become SyncMode::LeaderExplicit
     pButtonLeaderSyncInternal->set(1);
+    EXPECT_TRUE(isExplicitLeader(m_sInternalClockGroup));
 
     // Set the file bpm of channel 1 to 80 bpm.
     mixxx::BeatsPointer pBeats1 = mixxx::Beats::fromConstTempo(
@@ -417,6 +419,9 @@ TEST_F(EngineSyncTest, InternalLeaderSetFollowerSliderMoves) {
     pButtonLeaderSync1->set(static_cast<double>(SyncMode::Follower));
     ProcessBuffer();
 
+    EXPECT_TRUE(isFollower(m_sGroup1));
+    EXPECT_TRUE(isExplicitLeader(m_sInternalClockGroup));
+
     EXPECT_DOUBLE_EQ(getRateSliderValue(1.25),
             ControlObject::getControl(ConfigKey(m_sGroup1, "rate"))->get());
     EXPECT_DOUBLE_EQ(100.0,

From 5f2e1c0e9b249f79a0374f5e84275c7149cc427d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Tue, 3 Oct 2023 21:42:58 +0200
Subject: [PATCH 088/388] Extend EngineSyncTest.SetExplicitLeaderByLights for
 new Explicit Leader unset behaviour

---
 src/test/enginesynctest.cpp | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/test/enginesynctest.cpp b/src/test/enginesynctest.cpp
index 1bb5bb71bc1..b4f3773b3bb 100644
--- a/src/test/enginesynctest.cpp
+++ b/src/test/enginesynctest.cpp
@@ -581,11 +581,28 @@ TEST_F(EngineSyncTest, SetExplicitLeaderByLights) {
     EXPECT_TRUE(isExplicitLeader(m_sGroup1));
     EXPECT_TRUE(isFollower(m_sGroup2));
 
-    // Now set channel 1 to not-leader. The system will choose deck 2 as the next best
-    // option for soft leader
+    // Now set channel 1 to not-leader.
+    // This will choose automatically a Soft Leader, but prefers the old
+    // explicit leader it is still playing with a valid BPM
     pButtonSyncLeader1->set(0);
     ProcessBuffer();
 
+    EXPECT_TRUE(isFollower(m_sInternalClockGroup));
+    EXPECT_TRUE(isSoftLeader(m_sGroup1));
+    EXPECT_TRUE(isFollower(m_sGroup2));
+
+    // Try again without playing
+    pButtonSyncLeader1->set(1);
+    ProcessBuffer();
+
+    EXPECT_TRUE(isExplicitLeader(m_sGroup1));
+    EXPECT_TRUE(isFollower(m_sGroup2));
+
+    ControlObject::set(ConfigKey(m_sGroup1, "play"), 0.0);
+    pButtonSyncLeader1->set(0);
+    ProcessBuffer();
+
+    // Now the m_sGroup2 should be leader because m_sGroup1 can't lead without playing
     EXPECT_TRUE(isFollower(m_sInternalClockGroup));
     EXPECT_TRUE(isSoftLeader(m_sGroup2));
     EXPECT_TRUE(isFollower(m_sGroup1));

From 8fafbd18961a7243b1767cd162bfc178a64929c1 Mon Sep 17 00:00:00 2001
From: Geraldo Nascimento <geraldogabriel@gmail.com>
Date: Sun, 1 Oct 2023 04:10:04 -0300
Subject: [PATCH 089/388] Pass callback directly to beginTimer instead of a
 string literal. Alternatively, use the anonymous function expressions for
 callbacks with arguments.

---
 res/controllers/Midi_for_light-scripts.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/res/controllers/Midi_for_light-scripts.js b/res/controllers/Midi_for_light-scripts.js
index bcd1a108066..7945223f524 100644
--- a/res/controllers/Midi_for_light-scripts.js
+++ b/res/controllers/Midi_for_light-scripts.js
@@ -84,14 +84,14 @@ midi_for_light.init = function(id) { // called when the MIDI device is opened &
 
     engine.connectControl("[Master]", "crossfader", "midi_for_light.crossfaderChange");
 
-    if (enable_vu_meter_global === true) midi_for_light.vu_meter_timer = engine.beginTimer(40, "midi_for_light.vuMeter()");
+    if (enable_vu_meter_global === true) midi_for_light.vu_meter_timer = engine.beginTimer(40, midi_for_light.vuMeter);
 
     // Check midi_channel if value valid. Possible range is 1 to 16.
     if (midi_channel > 16) midi_channel = 16;
     if (midi_channel < 1) midi_channel = 1;
 
     for (var i = 0; i <= 3; i++) {
-        deck_beat_watchdog_timer[i] = engine.beginTimer(beat_watchdog_time, "midi_for_light.deckBeatWatchdog(" + i + ")");
+        deck_beat_watchdog_timer[i] = engine.beginTimer(beat_watchdog_time, function() { midi_for_light.deckBeatWatchdog(i); });
         engine.connectControl("[Channel" + (i + 1) + "]", "beat_active", "midi_for_light.deckBeatOutputToMidi");
         engine.connectControl("[Channel" + (i + 1) + "]", "volume", "midi_for_light.deckVolumeChange");
         engine.connectControl("[Channel" + (i + 1) + "]", "play", "midi_for_light.deckButtonPlay");
@@ -118,7 +118,7 @@ midi_for_light.deckButtonPlay = function(value, group, control) { // called when
     if (value == 1) { // deck play on
         engine.stopTimer(deck_beat_watchdog_timer[deck]);
         beat_watchdog[deck] = false;
-        deck_beat_watchdog_timer[deck] = engine.beginTimer(beat_watchdog_time, "midi_for_light.deckBeatWatchdog(" + deck + ")");
+        deck_beat_watchdog_timer[deck] = engine.beginTimer(beat_watchdog_time, function() { midi_for_light.deckBeatWatchdog(deck); });
     } else { // deck play stop
         engine.stopTimer(deck_beat_watchdog_timer[deck]);
         beat_watchdog[deck] = true;
@@ -416,7 +416,7 @@ midi_for_light.deckVolumeChange = function(value, group, control) { // deck volu
         midi_for_light.deck_current = deckneu;
         midi.sendShortMsg(0x8F + midi_channel, 0x30, 0x64 + deckneu); // Note C on with 64 and add deck
         midi_for_light.volumeBeatBlockStatus = true;
-        midi_for_light.volumeBeatBlock_timer = engine.beginTimer(1000, "midi_for_light.volumeBeatBlock()");
+        midi_for_light.volumeBeatBlock_timer = engine.beginTimer(1000, midi_for_light.volumeBeatBlock);
     }
 };
 
@@ -441,7 +441,7 @@ midi_for_light.crossfaderChange = function() { // crossfader chenge, check deck
     engine.stopTimer(midi_for_light.volumebeat_on_delay_timer);
     if (engine.getValue("[Master]", "crossfader") > -0.25) { // crossfader more than 25% left;
         if (engine.getValue("[Master]", "crossfader") < 0.25) { // crossfader more then 25% right;
-            midi_for_light.volumebeat_on_delay_timer = engine.beginTimer(3000, "midi_for_light.volumeBeatOnDelay()");
+            midi_for_light.volumebeat_on_delay_timer = engine.beginTimer(3000, midi_for_light.volumeBeatOnDelay);
         }
     }
 
@@ -463,7 +463,7 @@ midi_for_light.crossfaderChange = function() { // crossfader chenge, check deck
         midi_for_light.deck_current = deck;
         midi.sendShortMsg(0x8F + midi_channel, 0x30, 0x64 + deck); // note C on with value 64 + deck
         midi_for_light.crossfader_block = true;
-        midi_for_light.crossfader_change_block_timer = engine.beginTimer(1000, "midi_for_light.crossfaderChangeBlock()");
+        midi_for_light.crossfader_change_block_timer = engine.beginTimer(1000, midi_for_light.crossfaderChangeBlock);
     }
 };
 
@@ -508,7 +508,7 @@ midi_for_light.deckBeatOutputToMidi = function(value, group, control) { // send
     // reset deck beat watchdog
     engine.stopTimer(deck_beat_watchdog_timer[deck]);
     beat_watchdog[deck] = false;
-    deck_beat_watchdog_timer[deck] = engine.beginTimer(beat_watchdog_time, "midi_for_light.deckBeatWatchdog(" + deck + ")");
+    deck_beat_watchdog_timer[deck] = engine.beginTimer(beat_watchdog_time, function() { midi_for_light.deckBeatWatchdog(deck); });
 
     // fit deck bpm to midi range 0-127
     if (deck_bpm <= 0) deck_bpm = 0;

From 7327f1e90ed47c9d0009bdaf4c3f5f880a97d8e0 Mon Sep 17 00:00:00 2001
From: Joerg <JoergAtGithub@worldwartweb.com>
Date: Thu, 5 Oct 2023 20:26:04 +0200
Subject: [PATCH 090/388] Only access modell() when it's not nullptr

---
 src/widget/wlibrarytableview.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/widget/wlibrarytableview.cpp b/src/widget/wlibrarytableview.cpp
index 9b1943cc5d9..93a3ddea314 100644
--- a/src/widget/wlibrarytableview.cpp
+++ b/src/widget/wlibrarytableview.cpp
@@ -274,7 +274,7 @@ void WLibraryTableView::focusInEvent(QFocusEvent* event) {
         // This is especially helpful if the table has only one track, which can
         // not be selected with up/down buttons, either physical or emulated via
         // [Library],MoveVertical controls. See #9548
-        if (model()->rowCount() > 0) {
+        if (model() && model()->rowCount() > 0) {
             if (selectionModel()->hasSelection()) {
                 DEBUG_ASSERT(!selectionModel()->selectedIndexes().isEmpty());
                 if (!currentIndex().isValid() ||

From 32bff37726bf90470bee586dc812ed234238c562 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sun, 8 Oct 2023 08:46:14 +0200
Subject: [PATCH 091/388] Makes some more target_compile_definitions of
 mixxx-lib PUBLIC to fix building of mixxx-test using precompiled headers

---
 CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f3cd60b14f..35c1ad8c443 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1516,7 +1516,7 @@ endif()
 
 # QML Debugging
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-  target_compile_definitions(mixxx-lib PRIVATE QT_QML_DEBUG)
+  target_compile_definitions(mixxx-lib PUBLIC QT_QML_DEBUG)
   message(STATUS "Enabling QML Debugging! This poses a security risk as Mixxx will open a TCP port for debugging")
 endif()
 
@@ -2971,7 +2971,7 @@ if(COREAUDIO)
     src/sources/v1/legacyaudiosourceadapter.cpp
     lib/apple/CAStreamBasicDescription.cpp
   )
-  target_compile_definitions(mixxx-lib PRIVATE __COREAUDIO__)
+  target_compile_definitions(mixxx-lib PUBLIC __COREAUDIO__)
   target_include_directories(mixxx-lib SYSTEM PUBLIC lib/apple)
 endif()
 
@@ -2992,7 +2992,7 @@ if(FAAD)
   )
   target_compile_definitions(mixxx-lib PUBLIC __FAAD__)
   if(MP4v2_FOUND)
-    target_compile_definitions(mixxx-lib PRIVATE __MP4V2__)
+    target_compile_definitions(mixxx-lib PUBLIC __MP4V2__)
     target_link_libraries(mixxx-lib PRIVATE MP4v2::MP4v2)
   else()
     target_link_libraries(mixxx-lib PRIVATE MP4::MP4)

From a5ea142f34d70aafcbb7e837197e50f5c5038a68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sun, 8 Oct 2023 19:26:58 +0200
Subject: [PATCH 092/388] Warn if ccache is not configured for precompiled
 headers

---
 CMakeLists.txt | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c1190d7b2d..7ec9687957d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -536,6 +536,21 @@ else()
       # without this compiler messages in `make` backend would be uncolored
       set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -fdiagnostics-color=${BUILD_COLORS}")
     endif()
+    if(NOT CMAKE_DISABLE_PRECOMPILE_HEADERS)
+      execute_process(
+          COMMAND "${CCACHE_EXECUTABLE}" "--get-config=sloppiness"
+                    WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+                    OUTPUT_VARIABLE CCACHE_CONFIGURED_SLOPPINESS OUTPUT_STRIP_TRAILING_WHITESPACE
+                    ERROR_QUIET)
+      if (NOT CCACHE_CONFIGURED_SLOPPINESS MATCHES "pch_defines" OR
+          NOT CCACHE_CONFIGURED_SLOPPINESS MATCHES "time_macros")
+        message(WARNING
+            "ccache: For use with precompiled headers, the setting \"sloppiness\" needs to "
+            "be set to \"pch_defines,time_macros\". This can be done via the environment variable "
+            "\"CCACHE_SLOPPINESS=pch_defines,time_macros\" or permanent via "
+            "\"ccache --set-config=sloppiness=pch_defines,time_macros\".")
+      endif()
+    endif()
     set( CMAKE_C_COMPILER_LAUNCHER "${CCACHE_EXECUTABLE}" )
     set( CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_EXECUTABLE}" )
   endif()

From 051375a6000979db90e45b240e4d8627401a2525 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Sun, 8 Oct 2023 23:46:00 +0200
Subject: [PATCH 093/388] improve debug/info output of
 BaseSqlTableModel::select()

---
 src/library/basesqltablemodel.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/library/basesqltablemodel.cpp b/src/library/basesqltablemodel.cpp
index 3fa20930289..77fb23e2f1b 100644
--- a/src/library/basesqltablemodel.cpp
+++ b/src/library/basesqltablemodel.cpp
@@ -337,8 +337,8 @@ void BaseSqlTableModel::select() {
     // Both rowInfo and trackIdToRows (might) have been moved and
     // must not be used afterwards!
 
-    qDebug() << this << "select() took" << time.elapsed().debugMillisWithUnit()
-             << m_rowInfo.size();
+    qDebug() << this << "select() returned" << m_rowInfo.size()
+             << "results in" << time.elapsed().debugMillisWithUnit();
 }
 
 void BaseSqlTableModel::setTable(QString tableName,

From 524bcc73df78731d58a10165fb2f36eb0cd07d9e Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Sun, 8 Oct 2023 00:14:49 +0200
Subject: [PATCH 094/388] Search: [text property]:="string" finds only equal
 strings

Co-authored-by: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com>
---
 src/library/searchquery.cpp        | 29 +++++++++++++++++++++++------
 src/library/searchquery.h          |  9 ++++++++-
 src/library/searchqueryparser.cpp  | 23 +++++++++++++++++++----
 src/library/searchqueryparser.h    |  3 ++-
 src/test/searchqueryparsertest.cpp | 26 ++++++++++++++++++++++++++
 5 files changed, 78 insertions(+), 12 deletions(-)

diff --git a/src/library/searchquery.cpp b/src/library/searchquery.cpp
index c2e23e5490f..a7d269f1286 100644
--- a/src/library/searchquery.cpp
+++ b/src/library/searchquery.cpp
@@ -168,10 +168,12 @@ QString NotNode::toSql() const {
 
 TextFilterNode::TextFilterNode(const QSqlDatabase& database,
         const QStringList& sqlColumns,
-        const QString& argument)
+        const QString& argument,
+        const StringMatch matchMode)
         : m_database(database),
           m_sqlColumns(sqlColumns),
-          m_argument(argument) {
+          m_argument(argument),
+          m_matchMode(matchMode) {
     mixxx::DbConnection::makeStringLatinLow(&m_argument);
 }
 
@@ -184,8 +186,14 @@ bool TextFilterNode::match(const TrackPointer& pTrack) const {
 
         QString strValue = value.toString();
         mixxx::DbConnection::makeStringLatinLow(&strValue);
-        if (strValue.contains(m_argument)) {
-            return true;
+        if (m_matchMode == StringMatch::Equals) {
+            if (strValue == m_argument) {
+                return true;
+            }
+        } else {
+            if (strValue.contains(m_argument)) {
+                return true;
+            }
         }
     }
     return false;
@@ -201,8 +209,17 @@ QString TextFilterNode::toSql() const {
             argument.append('_');
         }
     }
-    QString escapedArgument = escaper.escapeString(
-            kSqlLikeMatchAll + argument + kSqlLikeMatchAll);
+    QString escapedArgument;
+    // Using a switch-case without default case to get a compile-time -Wswitch warning
+    switch (m_matchMode) {
+    case StringMatch::Contains:
+        escapedArgument = escaper.escapeString(
+                kSqlLikeMatchAll + argument + kSqlLikeMatchAll);
+        break;
+    case StringMatch::Equals:
+        escapedArgument = escaper.escapeString(argument);
+        break;
+    }
     QStringList searchClauses;
     for (const auto& sqlColumn : m_sqlColumns) {
         searchClauses << QString("%1 LIKE %2").arg(sqlColumn, escapedArgument);
diff --git a/src/library/searchquery.h b/src/library/searchquery.h
index 9f2882f2cf0..522d092a7b9 100644
--- a/src/library/searchquery.h
+++ b/src/library/searchquery.h
@@ -16,6 +16,11 @@
 
 const QString kMissingFieldSearchTerm = "\"\""; // "" searches for an empty string
 
+enum class StringMatch {
+    Contains = 0,
+    Equals,
+};
+
 class QueryNode {
   public:
     QueryNode(const QueryNode&) = delete; // prevent copying
@@ -72,7 +77,8 @@ class TextFilterNode : public QueryNode {
   public:
     TextFilterNode(const QSqlDatabase& database,
             const QStringList& sqlColumns,
-            const QString& argument);
+            const QString& argument,
+            const StringMatch matchMode = StringMatch::Contains);
 
     bool match(const TrackPointer& pTrack) const override;
     QString toSql() const override;
@@ -81,6 +87,7 @@ class TextFilterNode : public QueryNode {
     QSqlDatabase m_database;
     QStringList m_sqlColumns;
     QString m_argument;
+    StringMatch m_matchMode;
 };
 
 class NullOrEmptyTextFilterNode : public QueryNode {
diff --git a/src/library/searchqueryparser.cpp b/src/library/searchqueryparser.cpp
index 032ec1c60b1..d9bc940499d 100644
--- a/src/library/searchqueryparser.cpp
+++ b/src/library/searchqueryparser.cpp
@@ -88,7 +88,11 @@ void SearchQueryParser::setSearchColumns(QStringList searchColumns) {
 }
 
 QString SearchQueryParser::getTextArgument(QString argument,
-                                           QStringList* tokens) const {
+        QStringList* tokens,
+        StringMatch* matchMode) const {
+    if (matchMode != nullptr) {
+        *matchMode = StringMatch::Contains;
+    }
     // If the argument is empty, assume the user placed a space after an
     // advanced search command. Consume another token and treat that as the
     // argument.
@@ -99,6 +103,11 @@ QString SearchQueryParser::getTextArgument(QString argument,
         }
     }
 
+    bool shouldMatchExactly = false;
+    if (argument.startsWith("=")) {
+        argument = argument.mid(1);
+        shouldMatchExactly = true;
+    }
     // Deal with quoted arguments. If this token started with a quote, then
     // search for the closing quote.
     if (argument.startsWith("\"")) {
@@ -128,8 +137,12 @@ QString SearchQueryParser::getTextArgument(QString argument,
             // return it as "" to distinguish it from an unfinished empty string
             argument = kMissingFieldSearchTerm;
         } else {
+            // Found a closing quote.
             // Slice off the quote and everything after.
             argument = argument.left(quote_index);
+            if (matchMode != nullptr && shouldMatchExactly) {
+                *matchMode = StringMatch::Equals;
+            }
         }
     }
 
@@ -155,8 +168,8 @@ void SearchQueryParser::parseTokens(QStringList tokens,
             // TODO(XXX): implement this feature.
         } else if (textFilterMatch.hasMatch()) {
             QString field = textFilterMatch.captured(1);
-            QString argument = getTextArgument(
-                    textFilterMatch.captured(2), &tokens);
+            StringMatch matchMode = StringMatch::Contains;
+            QString argument = getTextArgument(textFilterMatch.captured(2), &tokens, &matchMode);
 
             if (argument == kMissingFieldSearchTerm) {
                 qDebug() << "argument explicit empty";
@@ -176,7 +189,9 @@ void SearchQueryParser::parseTokens(QStringList tokens,
                 } else {
                     pNode = std::make_unique<TextFilterNode>(
                             m_pTrackCollection->database(),
-                            m_fieldToSqlColumns[field], argument);
+                            m_fieldToSqlColumns[field],
+                            argument,
+                            matchMode);
                 }
             }
         } else if (numericFilterMatch.hasMatch()) {
diff --git a/src/library/searchqueryparser.h b/src/library/searchqueryparser.h
index cbfe88e8916..851267a100c 100644
--- a/src/library/searchqueryparser.h
+++ b/src/library/searchqueryparser.h
@@ -30,7 +30,8 @@ class SearchQueryParser {
                      AndNode* pQuery) const;
 
     QString getTextArgument(QString argument,
-                            QStringList* tokens) const;
+            QStringList* tokens,
+            StringMatch* matchMode = nullptr) const;
 
     TrackCollection* m_pTrackCollection;
     QStringList m_queryColumns;
diff --git a/src/test/searchqueryparsertest.cpp b/src/test/searchqueryparsertest.cpp
index 14c4071d576..614c5097d39 100644
--- a/src/test/searchqueryparsertest.cpp
+++ b/src/test/searchqueryparsertest.cpp
@@ -178,6 +178,32 @@ TEST_F(SearchQueryParserTest, TextFilter) {
         qPrintable(pQuery->toSql()));
 }
 
+TEST_F(SearchQueryParserTest, TextFilterEquals) {
+    m_parser.setSearchColumns({"artist", "album"});
+    auto pQuery(m_parser.parseQuery("comment:=\"asdf\"", QString()));
+
+    TrackPointer pTrack(Track::newTemporary());
+    pTrack->setComment("test ASDF test");
+    EXPECT_FALSE(pQuery->match(pTrack));
+    pTrack->setComment("ASDF");
+    EXPECT_TRUE(pQuery->match(pTrack));
+
+    EXPECT_STREQ(
+            qPrintable(QString("comment LIKE 'asdf'")),
+            qPrintable(pQuery->toSql()));
+
+    // Incomplete quoting should use StringMatch::Contains,
+    // i.e. equal to 'comment:asdf'
+    pQuery = m_parser.parseQuery("comment:=\"asdf", QString());
+
+    pTrack->setComment("test ASDF test");
+    EXPECT_TRUE(pQuery->match(pTrack));
+
+    EXPECT_STREQ(
+            qPrintable(QString("comment LIKE '%asdf%'")),
+            qPrintable(pQuery->toSql()));
+}
+
 TEST_F(SearchQueryParserTest, TextFilterEmpty) {
     m_parser.setSearchColumns({"artist", "album"});
     // An empty argument should pass everything.

From d938e9a606e918f407c8a0487e4fc5bda2fd5840 Mon Sep 17 00:00:00 2001
From: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com>
Date: Mon, 9 Oct 2023 17:32:31 +0200
Subject: [PATCH 095/388] refactor: remove unnecessary ~SearchQueryParser

---
 src/library/searchqueryparser.cpp | 3 ---
 src/library/searchqueryparser.h   | 2 --
 2 files changed, 5 deletions(-)

diff --git a/src/library/searchqueryparser.cpp b/src/library/searchqueryparser.cpp
index d9bc940499d..c0c029bf1dc 100644
--- a/src/library/searchqueryparser.cpp
+++ b/src/library/searchqueryparser.cpp
@@ -71,9 +71,6 @@ SearchQueryParser::SearchQueryParser(TrackCollection* pTrackCollection, QStringL
             QString("^[~-]?(%1):(.*)$").arg(m_specialFilters.join("|")));
 }
 
-SearchQueryParser::~SearchQueryParser() {
-}
-
 void SearchQueryParser::setSearchColumns(QStringList searchColumns) {
     m_queryColumns = std::move(searchColumns);
 
diff --git a/src/library/searchqueryparser.h b/src/library/searchqueryparser.h
index 851267a100c..fb32fc1efe3 100644
--- a/src/library/searchqueryparser.h
+++ b/src/library/searchqueryparser.h
@@ -12,8 +12,6 @@ class SearchQueryParser {
   public:
     explicit SearchQueryParser(TrackCollection* pTrackCollection, QStringList searchColumns);
 
-    virtual ~SearchQueryParser();
-
     void setSearchColumns(QStringList searchColumns);
 
     std::unique_ptr<QueryNode> parseQuery(

From ce9128f82a339f59853bd6ffea776d0691c3f867 Mon Sep 17 00:00:00 2001
From: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com>
Date: Mon, 9 Oct 2023 18:21:55 +0200
Subject: [PATCH 096/388] refactor: SearchQueryParser::getTextArgument

---
 src/library/searchqueryparser.cpp | 117 ++++++++++++++++--------------
 src/library/searchqueryparser.h   |  10 ++-
 2 files changed, 71 insertions(+), 56 deletions(-)

diff --git a/src/library/searchqueryparser.cpp b/src/library/searchqueryparser.cpp
index c0c029bf1dc..5270b97ce52 100644
--- a/src/library/searchqueryparser.cpp
+++ b/src/library/searchqueryparser.cpp
@@ -1,8 +1,57 @@
 #include "library/searchqueryparser.h"
 
 #include <QRegularExpression>
+#include <utility>
 
+#include "library/searchquery.h"
 #include "track/keyutils.h"
+#include "util/assert.h"
+
+namespace {
+
+enum class Quoted : bool {
+    Incomplete,
+    Complete,
+};
+
+std::pair<QString, Quoted> consumeQuotedArgument(QString argument,
+        QStringList* tokens) {
+    DEBUG_ASSERT(argument.startsWith("\""));
+
+    argument = argument.mid(1);
+
+    int quote_index = argument.indexOf("\"");
+    while (quote_index == -1 && tokens->length() > 0) {
+        argument += " " + tokens->takeFirst();
+        quote_index = argument.indexOf("\"");
+    }
+
+    if (quote_index == -1) {
+        // No ending quote found. Since we think they are going to close the
+        // quote eventually, treat the entire token list as the argument for
+        // now.
+        return {argument, Quoted::Incomplete};
+    }
+
+    // Stuff the rest of the argument after the quote back into tokens.
+    QString remaining = argument.mid(quote_index + 1).trimmed();
+    if (remaining.size() != 0) {
+        tokens->push_front(remaining);
+    }
+
+    if (quote_index == 0) {
+        // We have found an explicit empty string ""
+        // return it as "" to distinguish it from an unfinished empty string
+        argument = kMissingFieldSearchTerm;
+    } else {
+        // Found a closing quote.
+        // Slice off the quote and everything after.
+        argument = argument.left(quote_index);
+    }
+    return {argument, Quoted::Complete};
+}
+
+} // anonymous namespace
 
 constexpr char kNegatePrefix[] = "-";
 constexpr char kFuzzyPrefix[] = "~";
@@ -84,12 +133,8 @@ void SearchQueryParser::setSearchColumns(QStringList searchColumns) {
     }
 }
 
-QString SearchQueryParser::getTextArgument(QString argument,
-        QStringList* tokens,
-        StringMatch* matchMode) const {
-    if (matchMode != nullptr) {
-        *matchMode = StringMatch::Contains;
-    }
+SearchQueryParser::TextArgumentResult SearchQueryParser::getTextArgument(QString argument,
+        QStringList* tokens) const {
     // If the argument is empty, assume the user placed a space after an
     // advanced search command. Consume another token and treat that as the
     // argument.
@@ -99,51 +144,20 @@ QString SearchQueryParser::getTextArgument(QString argument,
             argument = tokens->takeFirst();
         }
     }
-
-    bool shouldMatchExactly = false;
+    StringMatch mode = StringMatch::Contains;
     if (argument.startsWith("=")) {
+        // strip the '=' from the argument
         argument = argument.mid(1);
-        shouldMatchExactly = true;
+        mode = StringMatch::Equals;
     }
-    // Deal with quoted arguments. If this token started with a quote, then
-    // search for the closing quote.
     if (argument.startsWith("\"")) {
-        argument = argument.mid(1);
-
-        int quote_index = argument.indexOf("\"");
-        while (quote_index == -1 && tokens->length() > 0) {
-            argument += " " + tokens->takeFirst();
-            quote_index = argument.indexOf("\"");
-        }
-
-        if (quote_index == -1) {
-            // No ending quote found. Since we think they are going to close the
-            // quote eventually, treat the entire token list as the argument for
-            // now.
-            return argument;
-        }
-
-        // Stuff the rest of the argument after the quote back into tokens.
-        QString remaining = argument.mid(quote_index+1).trimmed();
-        if (remaining.size() != 0) {
-            tokens->push_front(remaining);
-        }
-
-        if (quote_index == 0) {
-            // We have found an explicit empty string ""
-            // return it as "" to distinguish it from an unfinished empty string
-            argument = kMissingFieldSearchTerm;
-        } else {
-            // Found a closing quote.
-            // Slice off the quote and everything after.
-            argument = argument.left(quote_index);
-            if (matchMode != nullptr && shouldMatchExactly) {
-                *matchMode = StringMatch::Equals;
-            }
-        }
+        Quoted quoted;
+        std::tie(argument, quoted) = consumeQuotedArgument(argument, tokens);
+        mode = quoted == Quoted::Complete && mode == StringMatch::Equals
+                ? StringMatch::Equals
+                : StringMatch::Contains;
     }
-
-    return argument;
+    return {argument, mode};
 }
 
 void SearchQueryParser::parseTokens(QStringList tokens,
@@ -165,8 +179,7 @@ void SearchQueryParser::parseTokens(QStringList tokens,
             // TODO(XXX): implement this feature.
         } else if (textFilterMatch.hasMatch()) {
             QString field = textFilterMatch.captured(1);
-            StringMatch matchMode = StringMatch::Contains;
-            QString argument = getTextArgument(textFilterMatch.captured(2), &tokens, &matchMode);
+            auto [argument, matchMode] = getTextArgument(textFilterMatch.captured(2), &tokens);
 
             if (argument == kMissingFieldSearchTerm) {
                 qDebug() << "argument explicit empty";
@@ -193,9 +206,7 @@ void SearchQueryParser::parseTokens(QStringList tokens,
             }
         } else if (numericFilterMatch.hasMatch()) {
             QString field = numericFilterMatch.captured(1);
-            QString argument = getTextArgument(
-                    numericFilterMatch.captured(2), &tokens)
-                                       .trimmed();
+            QString argument = getTextArgument(numericFilterMatch.captured(2), &tokens).argument;
 
             if (!argument.isEmpty()) {
                 if (argument == kMissingFieldSearchTerm) {
@@ -211,7 +222,7 @@ void SearchQueryParser::parseTokens(QStringList tokens,
             QString field = specialFilterMatch.captured(1);
             QString argument = getTextArgument(
                     specialFilterMatch.captured(2), &tokens)
-                                       .trimmed();
+                                       .argument;
             if (!argument.isEmpty()) {
                 if (field == "key") {
                     mixxx::track::io::key::ChromaticKey key =
@@ -249,7 +260,7 @@ void SearchQueryParser::parseTokens(QStringList tokens,
             }
             // Don't trigger on a lone minus sign.
             if (!token.isEmpty()) {
-                QString argument = getTextArgument(token, &tokens);
+                QString argument = getTextArgument(token, &tokens).argument;
                 // For untagged strings we search the track fields as well
                 // as the crate names the track is in. This allows the user
                 // to use crates like tags
diff --git a/src/library/searchqueryparser.h b/src/library/searchqueryparser.h
index fb32fc1efe3..5aa13b28390 100644
--- a/src/library/searchqueryparser.h
+++ b/src/library/searchqueryparser.h
@@ -27,9 +27,13 @@ class SearchQueryParser {
     void parseTokens(QStringList tokens,
                      AndNode* pQuery) const;
 
-    QString getTextArgument(QString argument,
-            QStringList* tokens,
-            StringMatch* matchMode = nullptr) const;
+    struct TextArgumentResult {
+        QString argument;
+        StringMatch mode;
+    };
+
+    TextArgumentResult getTextArgument(QString argument,
+            QStringList* tokens) const;
 
     TrackCollection* m_pTrackCollection;
     QStringList m_queryColumns;

From e43a50e065874b797a04e6ba11a4d5a38403f9a7 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jholthuis@mixxx.org>
Date: Thu, 12 Oct 2023 23:15:12 +0200
Subject: [PATCH 097/388] ci(packaging): Fail notarization if server returns
 "invalid" status

Otherwise it loops forever until the CI jobs runs into a timeout.
---
 packaging/macos/sign_notarize_staple.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packaging/macos/sign_notarize_staple.sh b/packaging/macos/sign_notarize_staple.sh
index 5628abc1173..2cb698230cd 100755
--- a/packaging/macos/sign_notarize_staple.sh
+++ b/packaging/macos/sign_notarize_staple.sh
@@ -44,6 +44,9 @@ while true; do
     elif [ "${NOTARIZATION_STATUS}" == "success" ]; then
         echo "Notarization succeeded"
         break
+    elif [ "${NOTARIZATION_STATUS}" == "invalid" ]; then
+        echo "Notarization failed with status: ${NOTARIZATION_STATUS}"
+        exit 1
     else
         echo "Notarization status: ${NOTARIZATION_STATUS}"
     fi

From 0f51a46fe5420819f3dae96884fffd6f98fe2892 Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Fri, 13 Oct 2023 17:09:12 +0200
Subject: [PATCH 098/388] draw glsl preroll with patterned texture and minor
 cleanups

---
 src/shaders/patternshader.cpp | 35 +++++++++++++++++++++++++++++++
 src/shaders/patternshader.h   | 39 +++++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+)
 create mode 100644 src/shaders/patternshader.cpp
 create mode 100644 src/shaders/patternshader.h

diff --git a/src/shaders/patternshader.cpp b/src/shaders/patternshader.cpp
new file mode 100644
index 00000000000..793b9ccdf0c
--- /dev/null
+++ b/src/shaders/patternshader.cpp
@@ -0,0 +1,35 @@
+#include "shaders/patternshader.h"
+
+using namespace mixxx;
+
+void PatternShader::init() {
+    QString vertexShaderCode = QStringLiteral(R"--(
+uniform highp mat4 matrix;
+attribute highp vec4 position;
+attribute highp vec2 texcoor;
+varying highp vec2 vTexcoor;
+void main()
+{
+    vTexcoor = texcoor;
+    gl_Position = matrix * position;
+}
+)--");
+
+    QString fragmentShaderCode = QStringLiteral(R"--(
+uniform sampler2D sampler;
+uniform vec2 repetitions;
+varying highp vec2 vTexcoor;
+void main()
+{
+    gl_FragColor = texture2D(sampler, fract(vTexcoor * repetitions));
+}
+)--");
+
+    load(vertexShaderCode, fragmentShaderCode);
+
+    m_matrixLocation = uniformLocation("matrix");
+    m_samplerLocation = uniformLocation("sampler");
+    m_repetitionsLocation = uniformLocation("repetitions");
+    m_positionLocation = attributeLocation("position");
+    m_texcoordLocation = attributeLocation("texcoor");
+}
diff --git a/src/shaders/patternshader.h b/src/shaders/patternshader.h
new file mode 100644
index 00000000000..f78f88a514e
--- /dev/null
+++ b/src/shaders/patternshader.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include "shaders/shader.h"
+
+namespace mixxx {
+class PatternShader;
+}
+
+class mixxx::PatternShader final : public mixxx::Shader {
+  public:
+    PatternShader() = default;
+    ~PatternShader() = default;
+    void init();
+
+    int matrixLocation() const {
+        return m_matrixLocation;
+    }
+    int samplerLocation() const {
+        return m_samplerLocation;
+    }
+    int repetitionsLocation() const {
+        return m_repetitionsLocation;
+    }
+    int positionLocation() const {
+        return m_positionLocation;
+    }
+    int texcoordLocation() const {
+        return m_texcoordLocation;
+    }
+
+  private:
+    int m_matrixLocation;
+    int m_samplerLocation;
+    int m_repetitionsLocation;
+    int m_texcoordLocation;
+    int m_positionLocation;
+
+    DISALLOW_COPY_AND_ASSIGN(PatternShader)
+};

From c6c79316968521308dab31ab707fb62d67fd0d6f Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Fri, 13 Oct 2023 17:23:47 +0200
Subject: [PATCH 099/388] draw glsl preroll with patterned texture and minor
 cleanups

---
 CMakeLists.txt                                |   1 +
 src/shaders/textureshader.cpp                 |  10 +-
 .../allshader/waveformrendererpreroll.cpp     | 172 +++++++++++++-----
 .../allshader/waveformrendererpreroll.h       |  14 +-
 .../allshader/waveformrendermark.cpp          |  24 +--
 5 files changed, 150 insertions(+), 71 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c1190d7b2d..870d2d85fbf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1428,6 +1428,7 @@ else()
   if(QOPENGL)
     target_sources(mixxx-lib PRIVATE
       src/shaders/endoftrackshader.cpp
+      src/shaders/patternshader.cpp
       src/shaders/rgbashader.cpp
       src/shaders/rgbshader.cpp
       src/shaders/shader.cpp
diff --git a/src/shaders/textureshader.cpp b/src/shaders/textureshader.cpp
index a4a188dd886..6d1a31052dc 100644
--- a/src/shaders/textureshader.cpp
+++ b/src/shaders/textureshader.cpp
@@ -4,10 +4,10 @@ using namespace mixxx;
 
 void TextureShader::init() {
     QString vertexShaderCode = QStringLiteral(R"--(
-uniform mat4 matrix;
+uniform highp mat4 matrix;
 attribute highp vec4 position;
-attribute highp vec3 texcoor;
-varying highp vec3 vTexcoor;
+attribute highp vec2 texcoor;
+varying highp vec2 vTexcoor;
 void main()
 {
     vTexcoor = texcoor;
@@ -17,10 +17,10 @@ void main()
 
     QString fragmentShaderCode = QStringLiteral(R"--(
 uniform sampler2D sampler;
-varying highp vec3 vTexcoor;
+varying highp vec2 vTexcoor;
 void main()
 {
-    gl_FragColor = texture2D(sampler, vTexcoor.xy);
+    gl_FragColor = texture2D(sampler, vTexcoor);
 }
 )--");
 
diff --git a/src/waveform/renderers/allshader/waveformrendererpreroll.cpp b/src/waveform/renderers/allshader/waveformrendererpreroll.cpp
index dfcbb067e78..ef11e5b6444 100644
--- a/src/waveform/renderers/allshader/waveformrendererpreroll.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererpreroll.cpp
@@ -1,9 +1,12 @@
 #include "waveform/renderers/allshader/waveformrendererpreroll.h"
 
 #include <QDomNode>
+#include <QOpenGLTexture>
+#include <QPainterPath>
 
 #include "skin/legacy/skincontext.h"
 #include "track/track.h"
+#include "util/texture.h"
 #include "waveform/renderers/allshader/matrixforwidgetgeometry.h"
 #include "waveform/renderers/waveformwidgetrenderer.h"
 #include "widget/wskincolor.h"
@@ -15,6 +18,8 @@ WaveformRendererPreroll::WaveformRendererPreroll(WaveformWidgetRenderer* wavefor
         : WaveformRenderer(waveformWidget) {
 }
 
+WaveformRendererPreroll::~WaveformRendererPreroll() = default;
+
 void WaveformRendererPreroll::setup(
         const QDomNode& node, const SkinContext& context) {
     m_color.setNamedColor(context.selectString(node, "SignalColor"));
@@ -32,8 +37,6 @@ void WaveformRendererPreroll::paintGL() {
         return;
     }
 
-    m_vertices.clear();
-
     const double firstDisplayedPosition = m_waveformRenderer->getFirstDisplayedPosition();
     const double lastDisplayedPosition = m_waveformRenderer->getLastDisplayedPosition();
 
@@ -53,45 +56,68 @@ void WaveformRendererPreroll::paintGL() {
     const int currentVSamplePosition = m_waveformRenderer->getPlayPosVSample();
     const int totalVSamples = m_waveformRenderer->getTotalVSample();
 
-    const float halfBreadth = m_waveformRenderer->getBreadth() / 2.0f;
-    const float halfPolyBreadth = m_waveformRenderer->getBreadth() / 5.0f;
+    const float markerBreadth = m_waveformRenderer->getBreadth() * 0.4f;
 
-    const double polyPixelWidth = 40.0 / vSamplesPerPixel;
+    const float halfBreadth = m_waveformRenderer->getBreadth() * 0.5f;
+    const float halfMarkerBreadth = markerBreadth * 0.5f;
 
-    const int maxNumTriangles =
-            static_cast<int>(
-                    static_cast<double>(m_waveformRenderer->getLength()) /
-                    polyPixelWidth) +
-            2;
-    const int numVerticesPerTriangle = 3;
-    const int reserved = maxNumTriangles * numVerticesPerTriangle;
-    // for most pessimistic case, where we fill the entire display with triangles
-    m_vertices.reserve(reserved);
+    const double markerLength = 40.0 / vSamplesPerPixel;
+
+    // A series of markers will be drawn (by repeating the texture in a pattern)
+    // from the left of the screen up until start (preroll) and from the right
+    // of the screen up until the end (postroll) of the track respectively.
+
+    const float epsilon = 0.5f;
+    if (std::abs(m_markerLength - markerLength) > epsilon ||
+            std::abs(m_markerBreadth - markerBreadth) > epsilon) {
+        // Regenerate the texture with the preroll marker (a triangle) if the size
+        // has changed size last time.
+        generateTexture(markerLength, markerBreadth);
+    }
+
+    if (!m_pTexture) {
+        return;
+    }
+
+    const int matrixLocation = m_shader.matrixLocation();
+    const int samplerLocation = m_shader.samplerLocation();
+    const int vertexLocation = m_shader.positionLocation();
+    const int texcoordLocation = m_shader.texcoordLocation();
+
+    // Set up the shader
+    m_shader.bind();
+
+    m_shader.enableAttributeArray(vertexLocation);
+    m_shader.enableAttributeArray(texcoordLocation);
+
+    const QMatrix4x4 matrix = matrixForWidgetGeometry(m_waveformRenderer, false);
+
+    m_shader.setUniformValue(matrixLocation, matrix);
+    m_shader.setUniformValue(samplerLocation, 0);
+
+    m_pTexture->bind();
 
     if (preRollVisible) {
         // VSample position of the right-most triangle's tip
         const double triangleTipVSamplePosition =
-                numberOfVSamples * playMarkerPosition -
+                playMarkerPosition * numberOfVSamples -
                 currentVSamplePosition;
         // In pixels
         double x = triangleTipVSamplePosition / vSamplesPerPixel;
         const double limit =
                 static_cast<double>(m_waveformRenderer->getLength()) +
-                polyPixelWidth;
+                markerLength;
         if (x >= limit) {
             // Don't draw invisible triangles beyond the right side of the display
-            x -= std::ceil((x - limit) / polyPixelWidth) * polyPixelWidth;
+            x -= std::ceil((x - limit) / markerLength) * markerLength;
         }
 
-        while (x >= 0) {
-            const float x1 = static_cast<float>(x);
-            const float x2 = static_cast<float>(x - polyPixelWidth);
-            m_vertices.addTriangle({x1, halfBreadth},
-                    {x2, halfBreadth - halfPolyBreadth},
-                    {x2, halfBreadth + halfPolyBreadth});
-
-            x -= polyPixelWidth;
-        }
+        drawPattern(0,
+                halfBreadth - halfMarkerBreadth,
+                x,
+                halfBreadth + halfMarkerBreadth,
+                x / markerLength,
+                true);
     }
 
     if (postRollVisible) {
@@ -102,44 +128,94 @@ void WaveformRendererPreroll::paintGL() {
                 remainingVSamples;
         // In pixels
         double x = triangleTipVSamplePosition / vSamplesPerPixel;
-        const double limit = -polyPixelWidth;
+        const double limit = -markerLength;
         if (x <= limit) {
             // Don't draw invisible triangles before the left side of the display
-            x += std::ceil((limit - x) / polyPixelWidth) * polyPixelWidth;
+            x += std::ceil((limit - x) / markerLength) * markerLength;
         }
 
         const double end = static_cast<double>(m_waveformRenderer->getLength());
-        while (x < end) {
-            const float x1 = static_cast<float>(x);
-            const float x2 = static_cast<float>(x + polyPixelWidth);
-            m_vertices.addTriangle({x1, halfBreadth},
-                    {x2, halfBreadth - halfPolyBreadth},
-                    {x2, halfBreadth + halfPolyBreadth});
-            x += polyPixelWidth;
-        }
+        drawPattern(x,
+                halfBreadth - halfMarkerBreadth,
+                end,
+                halfBreadth + halfMarkerBreadth,
+                (end - x) / markerLength,
+                false);
     }
 
-    DEBUG_ASSERT(m_vertices.size() <= reserved);
+    m_pTexture->release();
 
-    const int vertexLocation = m_shader.attributeLocation("position");
-    const int matrixLocation = m_shader.uniformLocation("matrix");
-    const int colorLocation = m_shader.uniformLocation("color");
+    m_shader.disableAttributeArray(vertexLocation);
+    m_shader.disableAttributeArray(texcoordLocation);
+    m_shader.release();
+}
 
-    m_shader.bind();
-    m_shader.enableAttributeArray(vertexLocation);
+void WaveformRendererPreroll::drawPattern(
+        float x1, float y1, float x2, float y2, double repetitions, bool flip) {
+    // Draw a large rectangle with a repeating pattern of the texture
+    const int numVerticesPerTriangle = 3;
+    const int reserved = 2 * numVerticesPerTriangle;
+    const int repetitionsLocation = m_shader.repetitionsLocation();
+    const int vertexLocation = m_shader.positionLocation();
+    const int texcoordLocation = m_shader.texcoordLocation();
 
-    const QMatrix4x4 matrix = matrixForWidgetGeometry(m_waveformRenderer, false);
+    m_vertices.clear();
+    m_texcoords.clear();
+    m_vertices.reserve(reserved);
+    m_texcoords.reserve(reserved);
+    m_vertices.addRectangle(x1, y1, x2, y2);
+    m_texcoords.addRectangle(flip ? 1.f : 0.f, 0.f, flip ? 0.f : 1.f, 1.f);
+
+    m_shader.setUniformValue(repetitionsLocation, QVector2D(repetitions, 1.0));
 
     m_shader.setAttributeArray(
             vertexLocation, GL_FLOAT, m_vertices.constData(), 2);
-
-    m_shader.setUniformValue(matrixLocation, matrix);
-    m_shader.setUniformValue(colorLocation, m_color);
+    m_shader.setAttributeArray(
+            texcoordLocation, GL_FLOAT, m_texcoords.constData(), 2);
 
     glDrawArrays(GL_TRIANGLES, 0, m_vertices.size());
+}
 
-    m_shader.disableAttributeArray(vertexLocation);
-    m_shader.release();
+void WaveformRendererPreroll::generateTexture(float markerLength, float markerBreadth) {
+    const float devicePixelRatio = m_waveformRenderer->getDevicePixelRatio();
+    m_markerLength = markerLength;
+    m_markerBreadth = markerBreadth;
+
+    const int imagePixelW = static_cast<int>(m_markerLength * devicePixelRatio + 0.5f);
+    const int imagePixelH = static_cast<int>(m_markerBreadth * devicePixelRatio + 0.5f);
+    const float imageW = static_cast<float>(imagePixelW) / devicePixelRatio;
+    const float imageH = static_cast<float>(imagePixelH) / devicePixelRatio;
+
+    QImage image(imagePixelW, imagePixelH, QImage::Format_ARGB32_Premultiplied);
+    image.setDevicePixelRatio(devicePixelRatio);
+
+    const float penWidth = 1.5f;
+    const float offset = penWidth / 2.f;
+
+    image.fill(QColor(0, 0, 0, 0).rgba());
+    QPainter painter;
+    painter.begin(&image);
+
+    painter.setWorldMatrixEnabled(false);
+
+    QPen pen(m_color);
+    pen.setWidthF(penWidth);
+    pen.setCapStyle(Qt::RoundCap);
+    painter.setPen(pen);
+    painter.setRenderHints(QPainter::Antialiasing);
+    // Draw base the right, tip to the left
+    QPointF p0{imageW - offset, offset};
+    QPointF p1{imageW - offset, imageH - offset};
+    QPointF p2{offset, imageH / 2.f};
+    QPainterPath path;
+    path.moveTo(p2);
+    path.lineTo(p1);
+    path.lineTo(p0);
+    path.closeSubpath();
+    painter.drawPath(path);
+    painter.end();
+
+    m_pTexture.reset(createTexture(image));
 }
 
 } // namespace allshader
diff --git a/src/waveform/renderers/allshader/waveformrendererpreroll.h b/src/waveform/renderers/allshader/waveformrendererpreroll.h
index b374b424791..51464462533 100644
--- a/src/waveform/renderers/allshader/waveformrendererpreroll.h
+++ b/src/waveform/renderers/allshader/waveformrendererpreroll.h
@@ -1,14 +1,16 @@
 #pragma once
 
 #include <QColor>
+#include <QImage>
 
-#include "shaders/unicolorshader.h"
+#include "shaders/patternshader.h"
 #include "util/class.h"
 #include "waveform/renderers/allshader/vertexdata.h"
 #include "waveform/renderers/allshader/waveformrenderer.h"
 
 class QDomNode;
 class SkinContext;
+class QOpenGLTexture;
 
 namespace allshader {
 class WaveformRendererPreroll;
@@ -17,15 +19,23 @@ class WaveformRendererPreroll;
 class allshader::WaveformRendererPreroll final : public allshader::WaveformRenderer {
   public:
     explicit WaveformRendererPreroll(WaveformWidgetRenderer* waveformWidgetRenderer);
+    ~WaveformRendererPreroll() override;
 
     void setup(const QDomNode& node, const SkinContext& context) override;
     void paintGL() override;
     void initializeGL() override;
 
   private:
-    mixxx::UnicolorShader m_shader;
+    void drawPattern(float x1, float y1, float x2, float y2, double repetitions, bool flip);
+    void generateTexture(float markerLength, float markerBreadth);
+
+    mixxx::PatternShader m_shader;
     QColor m_color;
+    float m_markerBreadth{};
+    float m_markerLength{};
+    std::unique_ptr<QOpenGLTexture> m_pTexture;
     VertexData m_vertices;
+    VertexData m_texcoords;
 
     DISALLOW_COPY_AND_ASSIGN(WaveformRendererPreroll);
 };
diff --git a/src/waveform/renderers/allshader/waveformrendermark.cpp b/src/waveform/renderers/allshader/waveformrendermark.cpp
index 357a0e10d63..d5af7ca25d1 100644
--- a/src/waveform/renderers/allshader/waveformrendermark.cpp
+++ b/src/waveform/renderers/allshader/waveformrendermark.cpp
@@ -10,6 +10,7 @@
 #include "util/color/color.h"
 #include "util/colorcomponents.h"
 #include "util/painterscope.h"
+#include "util/texture.h"
 #include "waveform/renderers/allshader/matrixforwidgetgeometry.h"
 #include "waveform/renderers/allshader/moc_waveformrendermark.cpp"
 #include "waveform/renderers/allshader/rgbadata.h"
@@ -78,10 +79,10 @@ void allshader::WaveformRenderMark::drawTexture(float x, float y, QOpenGLTexture
 
     m_textureShader.bind();
 
-    int matrixLocation = m_textureShader.uniformLocation("matrix");
-    int samplerLocation = m_textureShader.uniformLocation("sampler");
-    int positionLocation = m_textureShader.attributeLocation("position");
-    int texcoordLocation = m_textureShader.attributeLocation("texcoor");
+    const int matrixLocation = m_textureShader.uniformLocation("matrix");
+    const int samplerLocation = m_textureShader.uniformLocation("sampler");
+    const int positionLocation = m_textureShader.attributeLocation("position");
+    const int texcoordLocation = m_textureShader.attributeLocation("texcoor");
 
     m_textureShader.setUniformValue(matrixLocation, matrix);
 
@@ -297,10 +298,7 @@ void allshader::WaveformRenderMark::generatePlayPosMarkTexture(float breadth) {
     }
     painter.end();
 
-    m_pPlayPosMarkTexture.reset(new QOpenGLTexture(image));
-    m_pPlayPosMarkTexture->setMinificationFilter(QOpenGLTexture::Linear);
-    m_pPlayPosMarkTexture->setMagnificationFilter(QOpenGLTexture::Linear);
-    m_pPlayPosMarkTexture->setWrapMode(QOpenGLTexture::ClampToBorder);
+    m_pPlayPosMarkTexture.reset(createTexture(image));
 }
 
 void allshader::WaveformRenderMark::drawTriangle(QPainter* painter,
@@ -407,10 +405,7 @@ void allshader::WaveformRenderMark::generateMarkImage(WaveformMarkPointer pMark,
             //  Also, without this some Qt-internal issue results in an offset
             //  image when calculating the center line of pixmaps in draw().
             pMark->m_image.setDevicePixelRatio(devicePixelRatio);
-            pMark->m_pTexture.reset(new QOpenGLTexture(pMark->m_image));
-            pMark->m_pTexture->setMinificationFilter(QOpenGLTexture::Linear);
-            pMark->m_pTexture->setMagnificationFilter(QOpenGLTexture::Linear);
-            pMark->m_pTexture->setWrapMode(QOpenGLTexture::ClampToBorder);
+            pMark->m_pTexture.reset(createTexture(pMark->m_image));
             return;
         }
     }
@@ -552,8 +547,5 @@ void allshader::WaveformRenderMark::generateMarkImage(WaveformMarkPointer pMark,
         painter.drawText(labelRect, Qt::AlignCenter, label);
     }
 
-    pMark->m_pTexture.reset(new QOpenGLTexture(pMark->m_image));
-    pMark->m_pTexture->setMinificationFilter(QOpenGLTexture::Linear);
-    pMark->m_pTexture->setMagnificationFilter(QOpenGLTexture::Linear);
-    pMark->m_pTexture->setWrapMode(QOpenGLTexture::ClampToBorder);
+    pMark->m_pTexture.reset(createTexture(pMark->m_image));
 }

From 13cd0e6296cd115fbfb84c337ccd05e98bca3c46 Mon Sep 17 00:00:00 2001
From: Owen Williams <owilliams@mixxx.org>
Date: Fri, 13 Oct 2023 11:19:49 -0400
Subject: [PATCH 100/388] Add [Main] to the list of valid groups for HID.

Fixes issues with calls to resolveGroup returning undefined
---
 res/controllers/common-hid-packet-parser.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/controllers/common-hid-packet-parser.js b/res/controllers/common-hid-packet-parser.js
index 7070d3ec4b1..5e3a011a85e 100644
--- a/res/controllers/common-hid-packet-parser.js
+++ b/res/controllers/common-hid-packet-parser.js
@@ -1252,6 +1252,7 @@ class HIDController {
             "[Sampler6]",
             "[Sampler7]",
             "[Sampler8]",
+            "[Main]",
             "[Master]",
             "[PreviewDeck1]",
             "[Effects]",

From bf57357e7575b80a04fd9c9c49f03dbbe4944e3e Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Fri, 13 Oct 2023 23:57:51 +0200
Subject: [PATCH 101/388] float/double

---
 .../allshader/waveformrendererpreroll.cpp     | 23 +++++++++++--------
 .../allshader/waveformrendererpreroll.h       |  2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/waveform/renderers/allshader/waveformrendererpreroll.cpp b/src/waveform/renderers/allshader/waveformrendererpreroll.cpp
index ef11e5b6444..d2b52b6d0b6 100644
--- a/src/waveform/renderers/allshader/waveformrendererpreroll.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererpreroll.cpp
@@ -61,7 +61,7 @@ void WaveformRendererPreroll::paintGL() {
     const float halfBreadth = m_waveformRenderer->getBreadth() * 0.5f;
     const float halfMarkerBreadth = markerBreadth * 0.5f;
 
-    const double markerLength = 40.0 / vSamplesPerPixel;
+    const float markerLength = 40.f / static_cast<float>(vSamplesPerPixel);
 
     // A series of markers will be drawn (by repeating the texture in a pattern)
     // from the left of the screen up until start (preroll) and from the right
@@ -97,22 +97,22 @@ void WaveformRendererPreroll::paintGL() {
 
     m_pTexture->bind();
 
+    const float end = m_waveformRenderer->getLength();
+
     if (preRollVisible) {
         // VSample position of the right-most triangle's tip
         const double triangleTipVSamplePosition =
                 playMarkerPosition * numberOfVSamples -
                 currentVSamplePosition;
         // In pixels
-        double x = triangleTipVSamplePosition / vSamplesPerPixel;
-        const double limit =
-                static_cast<double>(m_waveformRenderer->getLength()) +
-                markerLength;
+        float x = static_cast<float>(triangleTipVSamplePosition / vSamplesPerPixel);
+        const float limit = end + markerLength;
         if (x >= limit) {
             // Don't draw invisible triangles beyond the right side of the display
             x -= std::ceil((x - limit) / markerLength) * markerLength;
         }
 
-        drawPattern(0,
+        drawPattern(0.f,
                 halfBreadth - halfMarkerBreadth,
                 x,
                 halfBreadth + halfMarkerBreadth,
@@ -127,14 +127,13 @@ void WaveformRendererPreroll::paintGL() {
                 playMarkerPosition * numberOfVSamples +
                 remainingVSamples;
         // In pixels
-        double x = triangleTipVSamplePosition / vSamplesPerPixel;
-        const double limit = -markerLength;
+        float x = static_cast<float>(triangleTipVSamplePosition / vSamplesPerPixel);
+        const float limit = -markerLength;
         if (x <= limit) {
             // Don't draw invisible triangles before the left side of the display
             x += std::ceil((limit - x) / markerLength) * markerLength;
         }
 
-        const double end = static_cast<double>(m_waveformRenderer->getLength());
         drawPattern(x,
                 halfBreadth - halfMarkerBreadth,
                 end,
@@ -151,7 +150,7 @@ void WaveformRendererPreroll::paintGL() {
 }
 
 void WaveformRendererPreroll::drawPattern(
-        float x1, float y1, float x2, float y2, double repetitions, bool flip) {
+        float x1, float y1, float x2, float y2, float repetitions, bool flip) {
     // Draw a large rectangle with a repeating pattern of the texture
     const int numVerticesPerTriangle = 3;
     const int reserved = 2 * numVerticesPerTriangle;
@@ -212,6 +211,10 @@ void WaveformRendererPreroll::generateTexture(float markerLength, float markerBr
     path.lineTo(p1);
     path.lineTo(p0);
     path.closeSubpath();
+    QColor fillColor = m_color;
+    fillColor.setAlphaF(0.25);
+    painter.fillPath(path, QBrush(fillColor));
+
     painter.drawPath(path);
     painter.end();
 
diff --git a/src/waveform/renderers/allshader/waveformrendererpreroll.h b/src/waveform/renderers/allshader/waveformrendererpreroll.h
index 51464462533..db2e9f2c2cd 100644
--- a/src/waveform/renderers/allshader/waveformrendererpreroll.h
+++ b/src/waveform/renderers/allshader/waveformrendererpreroll.h
@@ -26,7 +26,7 @@ class allshader::WaveformRendererPreroll final : public allshader::WaveformRende
     void initializeGL() override;
 
   private:
-    void drawPattern(float x1, float y1, float x2, float y2, double repetitions, bool flip);
+    void drawPattern(float x1, float y1, float x2, float y2, float repetitions, bool flip);
     void generateTexture(float markerLength, float markerBreadth);
 
     mixxx::PatternShader m_shader;

From f4bfaf6e8a5a1af5c31bd17e34ce59c45433f687 Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Fri, 13 Oct 2023 23:59:22 +0200
Subject: [PATCH 102/388] translucent fill

---
 src/waveform/renderers/allshader/waveformrendererpreroll.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/waveform/renderers/allshader/waveformrendererpreroll.cpp b/src/waveform/renderers/allshader/waveformrendererpreroll.cpp
index d2b52b6d0b6..29498423dbe 100644
--- a/src/waveform/renderers/allshader/waveformrendererpreroll.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererpreroll.cpp
@@ -212,7 +212,7 @@ void WaveformRendererPreroll::generateTexture(float markerLength, float markerBr
     path.lineTo(p0);
     path.closeSubpath();
     QColor fillColor = m_color;
-    fillColor.setAlphaF(0.25);
+    fillColor.setAlphaF(0.5f);
     painter.fillPath(path, QBrush(fillColor));
 
     painter.drawPath(path);

From 8dbabe4355a2bdecfd765ca40272f44d59804cb7 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jholthuis@mixxx.org>
Date: Wed, 11 Oct 2023 21:59:45 +0200
Subject: [PATCH 103/388] ci(tools): Add support for incremental updates of
 manifest

---
 .github/workflows/build.yml |  4 ++++
 tools/deploy.py             | 35 +++++++++++++++++++++--------------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f5852e2f053..b22849e0303 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -477,6 +477,9 @@ jobs:
     name: "Update manifest file on download server"
     runs-on: ubuntu-latest
     needs: build
+    # Always run this job, even if one or more jobs from the `build` jobs
+    # fail to allow partial updates of the manifest.
+    if: always()
     steps:
       - name: "Check out repository"
         uses: actions/checkout@v4
@@ -501,6 +504,7 @@ jobs:
             export DEPLOY_PATH='snapshots/{git_branch}/manifest.json';
           fi;
           python3 tools/deploy.py generate-manifest
+          --update
           --output-dir 'deploy/'
           --dest-path "${DEPLOY_PATH}"
           --dest-url 'https://downloads.mixxx.org'
diff --git a/tools/deploy.py b/tools/deploy.py
index 407299a9aa5..3d3ca58d420 100644
--- a/tools/deploy.py
+++ b/tools/deploy.py
@@ -40,12 +40,10 @@ def url_exists(url):
 
 def url_download_json(url):
     """Returns the JSON object from the given URL or return None."""
-    try:
-        resp = url_fetch(url)
-        manifest_data = resp.read().decode()
-    except IOError:
-        return None
-
+    resp = url_fetch(url)
+    if resp.status != 200:
+        raise IOError(f"Server responded with HTTP status {resp.status}")
+    manifest_data = resp.read().decode().strip()
     return json.loads(manifest_data)
 
 
@@ -211,7 +209,6 @@ def collect_manifest_data(job_data):
     """Parse the job metadata dict and return the manifest data."""
     job_result = job_data["result"]
     print(f"Build job result: {job_result}")
-    assert job_result == "success"
 
     manifest_data = {}
     for output_name, output_data in job_data["outputs"].items():
@@ -260,12 +257,8 @@ def generate_manifest(args):
     manifest_data = collect_manifest_data(job_data)
     print("Manifest:", json.dumps(manifest_data, indent=2, sort_keys=True))
 
-    # Write the manifest.json for subsequent deployment to the server
-    with open(output_destpath, mode="w") as fp:
-        json.dump(manifest_data, fp, indent=2, sort_keys=True)
-
     # If possible, check if the remote manifest is the same as our local one
-    remote_manifest_data = None
+    remote_manifest_data = {}
     if args.dest_url:
         # Check if generated manifest.json file differs from the one that
         # is currently deployed.
@@ -273,9 +266,18 @@ def generate_manifest(args):
         manifest_url = manifest_url.format_map(format_data)
 
         try:
-            remote_manifest_data = url_fetch(manifest_url)
+            remote_manifest_data = url_download_json(manifest_url) or {}
         except IOError:
-            pass
+            print("Fetching remote manifest failed!")
+
+    if args.update:
+        for key, value in remote_manifest_data.items():
+            if key not in manifest_data:
+                manifest_data[key] = value
+
+    # Write the manifest.json for subsequent deployment to the server
+    with open(output_destpath, mode="w") as fp:
+        json.dump(manifest_data, fp, indent=2, sort_keys=True)
 
     # Skip deployment if the remote manifest is the same as the local one.
     if manifest_data != remote_manifest_data:
@@ -350,6 +352,11 @@ def main(argv=None):
     manifest_parser.add_argument(
         "--dest-url", action="store", help="Destination URL prefix"
     )
+    manifest_parser.add_argument(
+        "--update",
+        action="store_true",
+        help="Fetch the remote manifest and update it ",
+    )
 
     args = parser.parse_args(argv)
 

From f466a63098b33a53e41aa45c9cff670fd96b827f Mon Sep 17 00:00:00 2001
From: Owen Williams <owilliams@mixxx.org>
Date: Sat, 14 Oct 2023 14:39:48 -0400
Subject: [PATCH 104/388] Also add [App] to the list of valid known groups

---
 res/controllers/common-hid-packet-parser.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/controllers/common-hid-packet-parser.js b/res/controllers/common-hid-packet-parser.js
index 5e3a011a85e..9bf78691b12 100644
--- a/res/controllers/common-hid-packet-parser.js
+++ b/res/controllers/common-hid-packet-parser.js
@@ -1240,6 +1240,7 @@ class HIDController {
          * @type {string[]}
          */
         this.valid_groups = [
+            "[App]",
             "[Channel1]",
             "[Channel2]",
             "[Channel3]",

From 06af31de9af063018c2377f2e255c3f40ab8fc5b Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jholthuis@mixxx.org>
Date: Sat, 14 Oct 2023 12:03:03 +0200
Subject: [PATCH 105/388] ci(tools): Use proper logging in `deploy.py` script

---
 tools/deploy.py | 60 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 42 insertions(+), 18 deletions(-)

diff --git a/tools/deploy.py b/tools/deploy.py
index 3d3ca58d420..ac00a2dbaf9 100644
--- a/tools/deploy.py
+++ b/tools/deploy.py
@@ -4,6 +4,7 @@
 import functools
 import hashlib
 import json
+import logging
 import os
 import pathlib
 import shutil
@@ -114,6 +115,8 @@ def slug(text):
 
 
 def prepare_deployment(args):
+    logger = logging.getLogger(__name__)
+
     # Get artifact and build metadata
     file_stat = os.stat(args.file)
     file_sha256 = sha256(args.file)
@@ -155,7 +158,7 @@ def prepare_deployment(args):
     download_slug, package_slug = args.slug
 
     # Build destination path scheme
-    print(f"Destination path pattern: {args.dest_path}")
+    logger.info("Destination path pattern: %s", args.dest_path)
     destpath = args.dest_path.format(
         filename=os.path.basename(args.file),
         filename_without_ext=filename_without_ext,
@@ -166,7 +169,7 @@ def prepare_deployment(args):
         package_slug=package_slug,
         download_slug=download_slug,
     )
-    print(f"Destination path: {destpath}")
+    logger.info("Destination path: %s", destpath)
 
     # Move files to deploy in place and create sha256sum file
     output_destpath = os.path.join(args.output_dir, destpath)
@@ -185,10 +188,8 @@ def prepare_deployment(args):
     )
 
     # Show metadata and files to deploy
-    print("Metadata: ", json.dumps(metadata, indent=2, sort_keys=True))
-    print("Files:")
-    for path in tree(args.output_dir):
-        print(path)
+    logger.info("Metadata: %s", json.dumps(metadata, indent=2, sort_keys=True))
+    logger.info("Files: \n%s", "\n".join(tree(args.output_dir)))
 
     # Write metadata to GitHub Actions step output, so that it can be used for
     # manifest creation in the final job after all builds finished.
@@ -207,15 +208,16 @@ def prepare_deployment(args):
 
 def collect_manifest_data(job_data):
     """Parse the job metadata dict and return the manifest data."""
+    logger = logging.getLogger(__name__)
     job_result = job_data["result"]
-    print(f"Build job result: {job_result}")
+    logger.info("Build job result: %s", job_result)
 
     manifest_data = {}
     for output_name, output_data in job_data["outputs"].items():
         # Filter out unrelated job outputs that don't start with "artifact-".
         prefix, _, artifact_slug = output_name.partition("-")
         if prefix != "artifact" or not artifact_slug:
-            print(f"Ignoring output '{output_name}'...")
+            logger.info("Ignoring output '%s'...", output_name)
             continue
         artifact_data = json.loads(output_data)
 
@@ -232,6 +234,7 @@ def collect_manifest_data(job_data):
 
 
 def generate_manifest(args):
+    logger = logging.getLogger(__name__)
     try:
         commit_id = os.getenv("GITHUB_SHA")
     except KeyError:
@@ -244,9 +247,9 @@ def generate_manifest(args):
     }
 
     # Build destination path scheme
-    print(f"Destination path pattern: {args.dest_path}")
+    logger.info("Destination path pattern: %s", args.dest_path)
     destpath = args.dest_path.format_map(format_data)
-    print(f"Destination path: {destpath}")
+    logger.info("Destination path: %s", destpath)
 
     # Create the deployment directory
     output_destpath = os.path.join(args.output_dir, destpath)
@@ -255,7 +258,6 @@ def generate_manifest(args):
     # Parse the JOB_DATA JSON data, generate the manifest data and print it
     job_data = json.loads(os.environ["JOB_DATA"])
     manifest_data = collect_manifest_data(job_data)
-    print("Manifest:", json.dumps(manifest_data, indent=2, sort_keys=True))
 
     # If possible, check if the remote manifest is the same as our local one
     remote_manifest_data = {}
@@ -268,29 +270,33 @@ def generate_manifest(args):
         try:
             remote_manifest_data = url_download_json(manifest_url) or {}
         except IOError:
-            print("Fetching remote manifest failed!")
+            logger.error("Fetching remote manifest failed!")
 
     if args.update:
         for key, value in remote_manifest_data.items():
             if key not in manifest_data:
                 manifest_data[key] = value
 
+    logger.info(
+        "Manifest: %s", json.dumps(manifest_data, indent=2, sort_keys=True)
+    )
+
     # Write the manifest.json for subsequent deployment to the server
     with open(output_destpath, mode="w") as fp:
         json.dump(manifest_data, fp, indent=2, sort_keys=True)
 
     # Skip deployment if the remote manifest is the same as the local one.
     if manifest_data != remote_manifest_data:
-        print("Remote manifest differs from local version.")
+        logger.info("Remote manifest differs from local version.")
         if os.getenv("CI") == "true":
             with open(os.environ["GITHUB_ENV"], mode="a") as fp:
                 fp.write("MANIFEST_DIRTY=1\n")
     else:
-        print("Remote manifest is the same as local version.")
+        logger.info(
+            "Remote manifest is the same as local version, skipping upload."
+        )
 
-    print("Files:")
-    for path in tree(args.output_dir):
-        print(path)
+    logger.info("Files:\n%s", "\n".join(tree(args.output_dir)))
 
     return 0
 
@@ -299,8 +305,22 @@ def main(argv=None):
     parser = argparse.ArgumentParser()
     subparsers = parser.add_subparsers()
 
+    parent_parser = argparse.ArgumentParser()
+    parent_parser.add_argument(
+        "-v",
+        "--verbose",
+        action="store_const",
+        dest="loglevel",
+        const=logging.DEBUG,
+        default=logging.INFO,
+        help="Fetch the remote manifest and update it ",
+    )
+
     artifact_parser = subparsers.add_parser(
-        "prepare-deployment", help=" artifact metadata from file"
+        "prepare-deployment",
+        help=" artifact metadata from file",
+        parents=[parent_parser],
+        add_help=False,
     )
     artifact_parser.set_defaults(cmd=prepare_deployment)
     artifact_parser.add_argument(
@@ -335,6 +355,8 @@ def main(argv=None):
     manifest_parser = subparsers.add_parser(
         "generate-manifest",
         help="Collect artifact metadata and generate manifest.json file",
+        parents=[parent_parser],
+        add_help=False,
     )
     manifest_parser.set_defaults(cmd=generate_manifest)
     manifest_parser.add_argument(
@@ -360,6 +382,8 @@ def main(argv=None):
 
     args = parser.parse_args(argv)
 
+    logging.basicConfig(level=args.loglevel, format="%(message)s")
+
     if os.path.exists(args.output_dir):
         if not os.path.isdir(args.output_dir):
             raise OSError("Output dir is not a directory!")

From 90cb62a60a4124ba28de6b7dfee9cc189167b960 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Thu, 12 Oct 2023 07:46:43 +0200
Subject: [PATCH 106/388] ci(github): Add time limit to macOS notarization step

This reduces the waiting time in case notarization fails due to an
invalid key.
---
 .github/workflows/build.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b22849e0303..bdab65e470f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -370,6 +370,10 @@ jobs:
       - name: "[macOS] Sign, Notarize, and Staple Package"
         if: runner.os == 'macOS' && env.MACOS_CODESIGN_OPENSSL_PASSWORD != null && env.MACOS_CODESIGN_CERTIFICATE_PASSWORD != null && env.APPLE_APP_SPECIFIC_PASSWORD != null
         run: packaging/macos/sign_notarize_staple.sh build/*.dmg
+        # TODO: This timeout may be a bit too conservative under some
+        # circumstances. Feel free to increase the timeout once the
+        # notarization step is fixed.
+        timeout-minutes: 5
         env:
           APPLE_ID_USERNAME: rryan@mixxx.org
           APPLE_BUNDLE_ID: org.mixxx.mixxx

From b429ea1d29bc86b68c95f8b0839c30b03fe4f3f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sun, 15 Oct 2023 08:01:49 +0200
Subject: [PATCH 107/388] Use cpack_add_component to hide applocal

---
 CMakeLists.txt | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c1190d7b2d..246f4ce043b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3366,14 +3366,6 @@ if(WAVPACK)
   target_link_libraries(mixxx-lib PRIVATE WavPack::wavpack)
 endif()
 
-if (APPLOCAL_COMPONENT_DEFINED)
-    set(CPACK_COMPONENT_applocal_HIDDEN TRUE)
-    # In order to run Mixx from the build directory install applocal components
-    add_custom_command(
-        TARGET mixxx POST_BUILD
-        COMMAND "${CMAKE_COMMAND}" -DCOMPONENT=applocal -DCMAKE_INSTALL_PREFIX="${CMAKE_CURRENT_BINARY_DIR}" -P cmake_install.cmake)
-endif()
-
 # Configure file with build options
 file(RELATIVE_PATH MIXXX_INSTALL_DOCDIR_RELATIVE_TO_DATADIR "${CMAKE_INSTALL_PREFIX}/${MIXXX_INSTALL_DATADIR}" "${CMAKE_INSTALL_PREFIX}/${MIXXX_INSTALL_DOCDIR}")
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/src/config.h" @ONLY)
@@ -3448,6 +3440,17 @@ endif()
 
 include(CPack)
 
+if (APPLOCAL_COMPONENT_DEFINED)
+    cpack_add_component(applocal
+        HIDDEN
+        REQUIRED)
+
+    # In order to run Mixx from the build directory install applocal components
+    add_custom_command(
+        TARGET mixxx POST_BUILD
+        COMMAND "${CMAKE_COMMAND}" -DCOMPONENT=applocal -DCMAKE_INSTALL_PREFIX="${CMAKE_CURRENT_BINARY_DIR}" -P cmake_install.cmake)
+endif()
+
 if(APPLE AND MACOS_BUNDLE)
     set(BUNDLE_NAME "${MIXXX_INSTALL_PREFIX}")
     set(BUNDLE_DIRS "${CMAKE_PREFIX_PATH}/lib")

From 366c0f39f1d5c4ecb0ec3387190ec6eff5b135ea Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Sun, 15 Oct 2023 17:22:39 +0200
Subject: [PATCH 108/388] shader code cleanup, in preroll moved generateTexture
 out of class, using std::array for vertex data

---
 src/shaders/endoftrackshader.cpp              |   6 +-
 src/shaders/endoftrackshader.h                |  14 ++
 src/shaders/patternshader.cpp                 |   8 +-
 src/shaders/patternshader.h                   |  18 +--
 src/shaders/rgbashader.cpp                    |  12 +-
 src/shaders/rgbashader.h                      |  14 ++
 src/shaders/rgbshader.cpp                     |  12 +-
 src/shaders/rgbshader.h                       |  14 ++
 src/shaders/textureshader.cpp                 |  16 +-
 src/shaders/textureshader.h                   |   8 +-
 src/shaders/unicolorshader.cpp                |   4 +
 src/shaders/unicolorshader.h                  |  14 ++
 src/shaders/vinylqualityshader.cpp            |  20 +--
 src/shaders/vinylqualityshader.h              |  17 ++-
 .../allshader/waveformrenderbeat.cpp          |  12 +-
 .../allshader/waveformrendererendoftrack.cpp  |   6 +-
 .../allshader/waveformrendererfiltered.cpp    |   6 +-
 .../allshader/waveformrendererhsv.cpp         |   6 +-
 .../allshader/waveformrendererlrrgb.cpp       |   6 +-
 .../allshader/waveformrendererpreroll.cpp     | 141 +++++++++---------
 .../allshader/waveformrendererpreroll.h       |   5 +-
 .../allshader/waveformrendererrgb.cpp         |   6 +-
 .../allshader/waveformrenderersimple.cpp      |   6 +-
 .../allshader/waveformrendermark.cpp          |  16 +-
 .../allshader/waveformrendermarkrange.cpp     |   8 +-
 src/widget/wspinnyglsl.cpp                    |  36 ++---
 src/widget/wvumeterglsl.cpp                   |  12 +-
 27 files changed, 255 insertions(+), 188 deletions(-)

diff --git a/src/shaders/endoftrackshader.cpp b/src/shaders/endoftrackshader.cpp
index e0103b6ac26..1b5d5dbbbfe 100644
--- a/src/shaders/endoftrackshader.cpp
+++ b/src/shaders/endoftrackshader.cpp
@@ -21,9 +21,13 @@ void main()
 {
     highp float minAlpha = 0.5 * color.w;
     highp float maxAlpha = 0.83 * color.w;
-    gl_FragColor = vec4(color.xyz, mix(minAlpha, maxAlpha, max(0.,vgradient)));
+    gl_FragColor = vec4(color.xyz, mix(minAlpha, maxAlpha, max(0.0, vgradient)));
 }
 )--");
 
     load(vertexShaderCode, fragmentShaderCode);
+
+    m_positionLocation = attributeLocation("position");
+    m_gradientLocation = attributeLocation("gradient");
+    m_colorLocation = uniformLocation("color");
 }
diff --git a/src/shaders/endoftrackshader.h b/src/shaders/endoftrackshader.h
index 86209799f03..2465b83b065 100644
--- a/src/shaders/endoftrackshader.h
+++ b/src/shaders/endoftrackshader.h
@@ -12,6 +12,20 @@ class mixxx::EndOfTrackShader : public mixxx::Shader {
     ~EndOfTrackShader() = default;
     void init();
 
+    int positionLocation() const {
+        return m_positionLocation;
+    }
+    int gradientLocation() const {
+        return m_gradientLocation;
+    }
+    int colorLocation() const {
+        return m_colorLocation;
+    }
+
   private:
+    int m_positionLocation;
+    int m_gradientLocation;
+    int m_colorLocation;
+
     DISALLOW_COPY_AND_ASSIGN(EndOfTrackShader)
 };
diff --git a/src/shaders/patternshader.cpp b/src/shaders/patternshader.cpp
index 793b9ccdf0c..90b1d1781e3 100644
--- a/src/shaders/patternshader.cpp
+++ b/src/shaders/patternshader.cpp
@@ -16,20 +16,20 @@ void main()
 )--");
 
     QString fragmentShaderCode = QStringLiteral(R"--(
-uniform sampler2D sampler;
+uniform sampler2D texture;
 uniform vec2 repetitions;
 varying highp vec2 vTexcoor;
 void main()
 {
-    gl_FragColor = texture2D(sampler, fract(vTexcoor * repetitions));
+    gl_FragColor = texture2D(texture, fract(vTexcoor * repetitions));
 }
 )--");
 
     load(vertexShaderCode, fragmentShaderCode);
 
     m_matrixLocation = uniformLocation("matrix");
-    m_samplerLocation = uniformLocation("sampler");
-    m_repetitionsLocation = uniformLocation("repetitions");
     m_positionLocation = attributeLocation("position");
     m_texcoordLocation = attributeLocation("texcoor");
+    m_textureLocation = uniformLocation("texture");
+    m_repetitionsLocation = uniformLocation("repetitions");
 }
diff --git a/src/shaders/patternshader.h b/src/shaders/patternshader.h
index f78f88a514e..4574248b611 100644
--- a/src/shaders/patternshader.h
+++ b/src/shaders/patternshader.h
@@ -15,25 +15,25 @@ class mixxx::PatternShader final : public mixxx::Shader {
     int matrixLocation() const {
         return m_matrixLocation;
     }
-    int samplerLocation() const {
-        return m_samplerLocation;
-    }
-    int repetitionsLocation() const {
-        return m_repetitionsLocation;
-    }
     int positionLocation() const {
         return m_positionLocation;
     }
     int texcoordLocation() const {
         return m_texcoordLocation;
     }
+    int textureLocation() const {
+        return m_textureLocation;
+    }
+    int repetitionsLocation() const {
+        return m_repetitionsLocation;
+    }
 
   private:
     int m_matrixLocation;
-    int m_samplerLocation;
-    int m_repetitionsLocation;
-    int m_texcoordLocation;
     int m_positionLocation;
+    int m_texcoordLocation;
+    int m_textureLocation;
+    int m_repetitionsLocation;
 
     DISALLOW_COPY_AND_ASSIGN(PatternShader)
 };
diff --git a/src/shaders/rgbashader.cpp b/src/shaders/rgbashader.cpp
index c248d8fcdef..7eb54b6f3ab 100644
--- a/src/shaders/rgbashader.cpp
+++ b/src/shaders/rgbashader.cpp
@@ -7,21 +7,25 @@ void RGBAShader::init() {
 uniform mat4 matrix;
 attribute highp vec4 position;
 attribute highp vec4 color;
-varying highp vec4 vcolor;
+varying highp vec4 vColor;
 void main()
 {
-    vcolor = color;
+    vColor = color;
     gl_Position = matrix * position;
 }
 )--");
 
     QString fragmentShaderCode = QStringLiteral(R"--(
-varying highp vec4 vcolor;
+varying highp vec4 vColor;
 void main()
 {
-    gl_FragColor = vcolor;
+    gl_FragColor = vColor;
 }
 )--");
 
     load(vertexShaderCode, fragmentShaderCode);
+
+    m_matrixLocation = uniformLocation("matrix");
+    m_positionLocation = attributeLocation("position");
+    m_colorLocation = attributeLocation("color");
 }
diff --git a/src/shaders/rgbashader.h b/src/shaders/rgbashader.h
index 33954a9441d..0e8a30383af 100644
--- a/src/shaders/rgbashader.h
+++ b/src/shaders/rgbashader.h
@@ -12,6 +12,20 @@ class mixxx::RGBAShader final : public mixxx::Shader {
     ~RGBAShader() = default;
     void init();
 
+    int matrixLocation() const {
+        return m_matrixLocation;
+    }
+    int positionLocation() const {
+        return m_positionLocation;
+    }
+    int colorLocation() const {
+        return m_colorLocation;
+    }
+
   private:
+    int m_matrixLocation;
+    int m_positionLocation;
+    int m_colorLocation;
+
     DISALLOW_COPY_AND_ASSIGN(RGBAShader)
 };
diff --git a/src/shaders/rgbshader.cpp b/src/shaders/rgbshader.cpp
index 40520d20e75..cbc9da45403 100644
--- a/src/shaders/rgbshader.cpp
+++ b/src/shaders/rgbshader.cpp
@@ -7,21 +7,25 @@ void RGBShader::init() {
 uniform mat4 matrix;
 attribute highp vec4 position;
 attribute highp vec3 color;
-varying highp vec3 vcolor;
+varying highp vec3 vColor;
 void main()
 {
-    vcolor = color;
+    vColor = color;
     gl_Position = matrix * position;
 }
 )--");
 
     QString fragmentShaderCode = QStringLiteral(R"--(
-varying highp vec3 vcolor;
+varying highp vec3 vColor;
 void main()
 {
-    gl_FragColor = vec4(vcolor,1.0);
+    gl_FragColor = vec4(vColor, 1.0);
 }
 )--");
 
     load(vertexShaderCode, fragmentShaderCode);
+
+    m_matrixLocation = uniformLocation("matrix");
+    m_positionLocation = attributeLocation("position");
+    m_colorLocation = attributeLocation("color");
 }
diff --git a/src/shaders/rgbshader.h b/src/shaders/rgbshader.h
index 927bc055a3e..a8a7575ce41 100644
--- a/src/shaders/rgbshader.h
+++ b/src/shaders/rgbshader.h
@@ -12,6 +12,20 @@ class mixxx::RGBShader final : public mixxx::Shader {
     ~RGBShader() = default;
     void init();
 
+    int matrixLocation() const {
+        return m_matrixLocation;
+    }
+    int positionLocation() const {
+        return m_positionLocation;
+    }
+    int colorLocation() const {
+        return m_colorLocation;
+    }
+
   private:
+    int m_matrixLocation;
+    int m_positionLocation;
+    int m_colorLocation;
+
     DISALLOW_COPY_AND_ASSIGN(RGBShader)
 };
diff --git a/src/shaders/textureshader.cpp b/src/shaders/textureshader.cpp
index 6d1a31052dc..d7769250336 100644
--- a/src/shaders/textureshader.cpp
+++ b/src/shaders/textureshader.cpp
@@ -6,28 +6,28 @@ void TextureShader::init() {
     QString vertexShaderCode = QStringLiteral(R"--(
 uniform highp mat4 matrix;
 attribute highp vec4 position;
-attribute highp vec2 texcoor;
-varying highp vec2 vTexcoor;
+attribute highp vec2 texcoord;
+varying highp vec2 vTexcoord;
 void main()
 {
-    vTexcoor = texcoor;
+    vTexcoord = texcoord;
     gl_Position = matrix * position;
 }
 )--");
 
     QString fragmentShaderCode = QStringLiteral(R"--(
-uniform sampler2D sampler;
-varying highp vec2 vTexcoor;
+uniform sampler2D texture;
+varying highp vec2 vTexcoord;
 void main()
 {
-    gl_FragColor = texture2D(sampler, vTexcoor);
+    gl_FragColor = texture2D(texture, vTexcoord);
 }
 )--");
 
     load(vertexShaderCode, fragmentShaderCode);
 
     m_matrixLocation = uniformLocation("matrix");
-    m_samplerLocation = uniformLocation("sampler");
     m_positionLocation = attributeLocation("position");
-    m_texcoordLocation = attributeLocation("texcoor");
+    m_texcoordLocation = attributeLocation("texcoord");
+    m_textureLocation = uniformLocation("texture");
 }
diff --git a/src/shaders/textureshader.h b/src/shaders/textureshader.h
index a1782e7ef00..ec377544331 100644
--- a/src/shaders/textureshader.h
+++ b/src/shaders/textureshader.h
@@ -15,21 +15,21 @@ class mixxx::TextureShader final : public mixxx::Shader {
     int matrixLocation() const {
         return m_matrixLocation;
     }
-    int samplerLocation() const {
-        return m_samplerLocation;
-    }
     int positionLocation() const {
         return m_positionLocation;
     }
     int texcoordLocation() const {
         return m_texcoordLocation;
     }
+    int textureLocation() const {
+        return m_textureLocation;
+    }
 
   private:
     int m_matrixLocation;
-    int m_samplerLocation;
     int m_positionLocation;
     int m_texcoordLocation;
+    int m_textureLocation;
 
     DISALLOW_COPY_AND_ASSIGN(TextureShader)
 };
diff --git a/src/shaders/unicolorshader.cpp b/src/shaders/unicolorshader.cpp
index fc56e1ee756..f77bc5fe695 100644
--- a/src/shaders/unicolorshader.cpp
+++ b/src/shaders/unicolorshader.cpp
@@ -21,4 +21,8 @@ void main()
 )--");
 
     load(vertexShaderCode, fragmentShaderCode);
+
+    m_matrixLocation = uniformLocation("matrix");
+    m_positionLocation = attributeLocation("position");
+    m_colorLocation = uniformLocation("color");
 }
diff --git a/src/shaders/unicolorshader.h b/src/shaders/unicolorshader.h
index 51a708208e2..8e25308abbe 100644
--- a/src/shaders/unicolorshader.h
+++ b/src/shaders/unicolorshader.h
@@ -12,6 +12,20 @@ class mixxx::UnicolorShader final : public mixxx::Shader {
     ~UnicolorShader() = default;
     void init();
 
+    int matrixLocation() const {
+        return m_matrixLocation;
+    }
+    int positionLocation() const {
+        return m_positionLocation;
+    }
+    int colorLocation() const {
+        return m_colorLocation;
+    }
+
   private:
+    int m_matrixLocation;
+    int m_positionLocation;
+    int m_colorLocation;
+
     DISALLOW_COPY_AND_ASSIGN(UnicolorShader)
 };
diff --git a/src/shaders/vinylqualityshader.cpp b/src/shaders/vinylqualityshader.cpp
index 8738d2eb2c0..1968bda6dae 100644
--- a/src/shaders/vinylqualityshader.cpp
+++ b/src/shaders/vinylqualityshader.cpp
@@ -6,30 +6,30 @@ void VinylQualityShader::init() {
     QString vertexShaderCode = QStringLiteral(R"--(
 uniform mat4 matrix;
 attribute highp vec4 position;
-attribute highp vec3 texcoor;
-varying highp vec3 vTexcoor;
+attribute highp vec2 texcoord;
+varying highp vec2 vTexcoord;
 void main()
 {
-    vTexcoor = texcoor;
+    vTexcoord = texcoord;
     gl_Position = matrix * position;
 }
 )--");
 
     QString fragmentShaderCode = QStringLiteral(R"--(
-uniform sampler2D sampler;
-uniform highp vec4 color;
-varying highp vec3 vTexcoor;
+uniform sampler2D texture;
+uniform highp vec3 color;
+varying highp vec2 vTexcoord;
 void main()
 {
-    gl_FragColor = vec4(color.xyz, texture2D(sampler, vTexcoor.xy) * 0.75);
+    gl_FragColor = vec4(color, texture2D(texture, vTexcoord) * 0.75);
 }
 )--");
 
     load(vertexShaderCode, fragmentShaderCode);
 
     m_matrixLocation = uniformLocation("matrix");
-    m_samplerLocation = uniformLocation("sampler");
-    m_colorLocation = uniformLocation("color");
     m_positionLocation = attributeLocation("position");
-    m_texcoordLocation = attributeLocation("texcoor");
+    m_texcoordLocation = attributeLocation("texcoord");
+    m_textureLocation = uniformLocation("texture");
+    m_colorLocation = uniformLocation("color");
 }
diff --git a/src/shaders/vinylqualityshader.h b/src/shaders/vinylqualityshader.h
index 6d02cab1cc4..9fc6d9bfc43 100644
--- a/src/shaders/vinylqualityshader.h
+++ b/src/shaders/vinylqualityshader.h
@@ -15,12 +15,6 @@ class mixxx::VinylQualityShader final : public mixxx::Shader {
     int matrixLocation() const {
         return m_matrixLocation;
     }
-    int samplerLocation() const {
-        return m_samplerLocation;
-    }
-    int colorLocation() const {
-        return m_colorLocation;
-    }
     int positionLocation() const {
         return m_positionLocation;
     }
@@ -28,12 +22,19 @@ class mixxx::VinylQualityShader final : public mixxx::Shader {
         return m_texcoordLocation;
     }
 
+    int textureLocation() const {
+        return m_textureLocation;
+    }
+    int colorLocation() const {
+        return m_colorLocation;
+    }
+
   private:
     int m_matrixLocation;
-    int m_samplerLocation;
-    int m_colorLocation;
     int m_positionLocation;
     int m_texcoordLocation;
+    int m_textureLocation;
+    int m_colorLocation;
 
     DISALLOW_COPY_AND_ASSIGN(VinylQualityShader)
 };
diff --git a/src/waveform/renderers/allshader/waveformrenderbeat.cpp b/src/waveform/renderers/allshader/waveformrenderbeat.cpp
index 0cf593e5763..e5a9c1df91d 100644
--- a/src/waveform/renderers/allshader/waveformrenderbeat.cpp
+++ b/src/waveform/renderers/allshader/waveformrenderbeat.cpp
@@ -105,24 +105,24 @@ void WaveformRenderBeat::paintGL() {
 
     DEBUG_ASSERT(reserved == m_vertices.size());
 
-    const int vertexLocation = m_shader.attributeLocation("position");
-    const int matrixLocation = m_shader.uniformLocation("matrix");
-    const int colorLocation = m_shader.uniformLocation("color");
+    const int positionLocation = m_shader.positionLocation();
+    const int matrixLocation = m_shader.matrixLocation();
+    const int colorLocation = m_shader.colorLocation();
 
     m_shader.bind();
-    m_shader.enableAttributeArray(vertexLocation);
+    m_shader.enableAttributeArray(positionLocation);
 
     const QMatrix4x4 matrix = matrixForWidgetGeometry(m_waveformRenderer, false);
 
     m_shader.setAttributeArray(
-            vertexLocation, GL_FLOAT, m_vertices.constData(), 2);
+            positionLocation, GL_FLOAT, m_vertices.constData(), 2);
 
     m_shader.setUniformValue(matrixLocation, matrix);
     m_shader.setUniformValue(colorLocation, m_color);
 
     glDrawArrays(GL_TRIANGLES, 0, m_vertices.size());
 
-    m_shader.disableAttributeArray(vertexLocation);
+    m_shader.disableAttributeArray(positionLocation);
     m_shader.release();
 }
 
diff --git a/src/waveform/renderers/allshader/waveformrendererendoftrack.cpp b/src/waveform/renderers/allshader/waveformrendererendoftrack.cpp
index 9d495cd2293..4491270415f 100644
--- a/src/waveform/renderers/allshader/waveformrendererendoftrack.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererendoftrack.cpp
@@ -55,9 +55,9 @@ void WaveformRendererEndOfTrack::initializeGL() {
 }
 
 void WaveformRendererEndOfTrack::fillWithGradient(QColor color) {
-    const int colorLocation = m_shader.uniformLocation("color");
-    const int positionLocation = m_shader.attributeLocation("position");
-    const int gradientLocation = m_shader.attributeLocation("gradient");
+    const int colorLocation = m_shader.colorLocation();
+    const int positionLocation = m_shader.positionLocation();
+    const int gradientLocation = m_shader.gradientLocation();
 
     m_shader.bind();
     m_shader.enableAttributeArray(positionLocation);
diff --git a/src/waveform/renderers/allshader/waveformrendererfiltered.cpp b/src/waveform/renderers/allshader/waveformrendererfiltered.cpp
index d3cef826d25..d03a981c696 100644
--- a/src/waveform/renderers/allshader/waveformrendererfiltered.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererfiltered.cpp
@@ -158,9 +158,9 @@ void WaveformRendererFiltered::paintGL() {
 
     const QMatrix4x4 matrix = matrixForWidgetGeometry(m_waveformRenderer, true);
 
-    const int matrixLocation = m_shader.uniformLocation("matrix");
-    const int colorLocation = m_shader.uniformLocation("color");
-    const int positionLocation = m_shader.attributeLocation("position");
+    const int matrixLocation = m_shader.matrixLocation();
+    const int colorLocation = m_shader.colorLocation();
+    const int positionLocation = m_shader.positionLocation();
 
     m_shader.bind();
     m_shader.enableAttributeArray(positionLocation);
diff --git a/src/waveform/renderers/allshader/waveformrendererhsv.cpp b/src/waveform/renderers/allshader/waveformrendererhsv.cpp
index c532aaf6763..593f01eae2b 100644
--- a/src/waveform/renderers/allshader/waveformrendererhsv.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererhsv.cpp
@@ -190,9 +190,9 @@ void WaveformRendererHSV::paintGL() {
 
     const QMatrix4x4 matrix = matrixForWidgetGeometry(m_waveformRenderer, true);
 
-    const int matrixLocation = m_shader.uniformLocation("matrix");
-    const int positionLocation = m_shader.attributeLocation("position");
-    const int colorLocation = m_shader.attributeLocation("color");
+    const int matrixLocation = m_shader.matrixLocation();
+    const int positionLocation = m_shader.positionLocation();
+    const int colorLocation = m_shader.colorLocation();
 
     m_shader.bind();
     m_shader.enableAttributeArray(positionLocation);
diff --git a/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp b/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp
index 87a463da6f6..887c1059ec7 100644
--- a/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp
@@ -205,9 +205,9 @@ void WaveformRendererLRRGB::paintGL() {
 
     const QMatrix4x4 matrix = matrixForWidgetGeometry(m_waveformRenderer, true);
 
-    const int matrixLocation = m_shader.uniformLocation("matrix");
-    const int positionLocation = m_shader.attributeLocation("position");
-    const int colorLocation = m_shader.attributeLocation("color");
+    const int matrixLocation = m_shader.matrixLocation();
+    const int positionLocation = m_shader.positionLocation();
+    const int colorLocation = m_shader.colorLocation();
 
     m_shader.bind();
     m_shader.enableAttributeArray(positionLocation);
diff --git a/src/waveform/renderers/allshader/waveformrendererpreroll.cpp b/src/waveform/renderers/allshader/waveformrendererpreroll.cpp
index 29498423dbe..41c690222ae 100644
--- a/src/waveform/renderers/allshader/waveformrendererpreroll.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererpreroll.cpp
@@ -12,6 +12,53 @@
 #include "widget/wskincolor.h"
 #include "widget/wwidget.h"
 
+namespace {
+QOpenGLTexture* generateTexture(float markerLength,
+        float markerBreadth,
+        float devicePixelRatio,
+        QColor color) {
+    const int imagePixelW = static_cast<int>(markerLength * devicePixelRatio + 0.5f);
+    const int imagePixelH = static_cast<int>(markerBreadth * devicePixelRatio + 0.5f);
+    const float imageW = static_cast<float>(imagePixelW) / devicePixelRatio;
+    const float imageH = static_cast<float>(imagePixelH) / devicePixelRatio;
+
+    QImage image(imagePixelW, imagePixelH, QImage::Format_ARGB32_Premultiplied);
+    image.setDevicePixelRatio(devicePixelRatio);
+
+    const float penWidth = 1.5f;
+    const float offset = penWidth / 2.f;
+
+    image.fill(QColor(0, 0, 0, 0).rgba());
+    QPainter painter;
+    painter.begin(&image);
+
+    painter.setWorldMatrixEnabled(false);
+
+    QPen pen(color);
+    pen.setWidthF(penWidth);
+    pen.setCapStyle(Qt::RoundCap);
+    painter.setPen(pen);
+    painter.setRenderHints(QPainter::Antialiasing);
+    // Draw base the right, tip to the left
+    QPointF p0{imageW - offset, offset};
+    QPointF p1{imageW - offset, imageH - offset};
+    QPointF p2{offset, imageH / 2.f};
+    QPainterPath path;
+    path.moveTo(p2);
+    path.lineTo(p1);
+    path.lineTo(p0);
+    path.closeSubpath();
+    QColor fillColor = color;
+    fillColor.setAlphaF(0.5f);
+    painter.fillPath(path, QBrush(fillColor));
+
+    painter.drawPath(path);
+    painter.end();
+
+    return createTexture(image);
+}
+} // anonymous namespace
+
 namespace allshader {
 
 WaveformRendererPreroll::WaveformRendererPreroll(WaveformWidgetRenderer* waveformWidget)
@@ -72,7 +119,12 @@ void WaveformRendererPreroll::paintGL() {
             std::abs(m_markerBreadth - markerBreadth) > epsilon) {
         // Regenerate the texture with the preroll marker (a triangle) if the size
         // has changed size last time.
-        generateTexture(markerLength, markerBreadth);
+        m_markerLength = markerLength;
+        m_markerBreadth = markerBreadth;
+        m_pTexture.reset(generateTexture(m_markerLength,
+                m_markerBreadth,
+                m_waveformRenderer->getDevicePixelRatio(),
+                m_color));
     }
 
     if (!m_pTexture) {
@@ -80,20 +132,20 @@ void WaveformRendererPreroll::paintGL() {
     }
 
     const int matrixLocation = m_shader.matrixLocation();
-    const int samplerLocation = m_shader.samplerLocation();
-    const int vertexLocation = m_shader.positionLocation();
+    const int textureLocation = m_shader.textureLocation();
+    const int positionLocation = m_shader.positionLocation();
     const int texcoordLocation = m_shader.texcoordLocation();
 
     // Set up the shader
     m_shader.bind();
 
-    m_shader.enableAttributeArray(vertexLocation);
+    m_shader.enableAttributeArray(positionLocation);
     m_shader.enableAttributeArray(texcoordLocation);
 
     const QMatrix4x4 matrix = matrixForWidgetGeometry(m_waveformRenderer, false);
 
     m_shader.setUniformValue(matrixLocation, matrix);
-    m_shader.setUniformValue(samplerLocation, 0);
+    m_shader.setUniformValue(textureLocation, 0);
 
     m_pTexture->bind();
 
@@ -112,12 +164,11 @@ void WaveformRendererPreroll::paintGL() {
             x -= std::ceil((x - limit) / markerLength) * markerLength;
         }
 
-        drawPattern(0.f,
+        drawPattern(x,
                 halfBreadth - halfMarkerBreadth,
-                x,
+                0.f,
                 halfBreadth + halfMarkerBreadth,
-                x / markerLength,
-                true);
+                x / markerLength);
     }
 
     if (postRollVisible) {
@@ -138,87 +189,33 @@ void WaveformRendererPreroll::paintGL() {
                 halfBreadth - halfMarkerBreadth,
                 end,
                 halfBreadth + halfMarkerBreadth,
-                (end - x) / markerLength,
-                false);
+                (end - x) / markerLength);
     }
 
     m_pTexture->release();
 
-    m_shader.disableAttributeArray(vertexLocation);
+    m_shader.disableAttributeArray(positionLocation);
     m_shader.disableAttributeArray(texcoordLocation);
     m_shader.release();
 }
 
 void WaveformRendererPreroll::drawPattern(
-        float x1, float y1, float x2, float y2, float repetitions, bool flip) {
+        float x1, float y1, float x2, float y2, float repetitions) {
     // Draw a large rectangle with a repeating pattern of the texture
-    const int numVerticesPerTriangle = 3;
-    const int reserved = 2 * numVerticesPerTriangle;
     const int repetitionsLocation = m_shader.repetitionsLocation();
-    const int vertexLocation = m_shader.positionLocation();
+    const int positionLocation = m_shader.positionLocation();
     const int texcoordLocation = m_shader.texcoordLocation();
 
-    m_vertices.clear();
-    m_texcoords.clear();
-    m_vertices.reserve(reserved);
-    m_texcoords.reserve(reserved);
-    m_vertices.addRectangle(x1, y1, x2, y2);
-    m_texcoords.addRectangle(flip ? 1.f : 0.f, 0.f, flip ? 0.f : 1.f, 1.f);
-
+    const std::array<float, 8> positionArray = {x1, y1, x2, y1, x1, y2, x2, y2};
+    const std::array<float, 8> texcoordArray = {0.f, 0.f, 1.f, 0.f, 0.f, 1.f, 1.f, 1.f};
     m_shader.setUniformValue(repetitionsLocation, QVector2D(repetitions, 1.0));
 
     m_shader.setAttributeArray(
-            vertexLocation, GL_FLOAT, m_vertices.constData(), 2);
+            positionLocation, GL_FLOAT, positionArray.data(), 2);
     m_shader.setAttributeArray(
-            texcoordLocation, GL_FLOAT, m_texcoords.constData(), 2);
-
-    glDrawArrays(GL_TRIANGLES, 0, m_vertices.size());
-}
-
-void WaveformRendererPreroll::generateTexture(float markerLength, float markerBreadth) {
-    const float devicePixelRatio = m_waveformRenderer->getDevicePixelRatio();
-    m_markerLength = markerLength;
-    m_markerBreadth = markerBreadth;
-
-    const int imagePixelW = static_cast<int>(m_markerLength * devicePixelRatio + 0.5f);
-    const int imagePixelH = static_cast<int>(m_markerBreadth * devicePixelRatio + 0.5f);
-    const float imageW = static_cast<float>(imagePixelW) / devicePixelRatio;
-    const float imageH = static_cast<float>(imagePixelH) / devicePixelRatio;
-
-    QImage image(imagePixelW, imagePixelH, QImage::Format_ARGB32_Premultiplied);
-    image.setDevicePixelRatio(devicePixelRatio);
-
-    const float penWidth = 1.5f;
-    const float offset = penWidth / 2.f;
-
-    image.fill(QColor(0, 0, 0, 0).rgba());
-    QPainter painter;
-    painter.begin(&image);
-
-    painter.setWorldMatrixEnabled(false);
-
-    QPen pen(m_color);
-    pen.setWidthF(penWidth);
-    pen.setCapStyle(Qt::RoundCap);
-    painter.setPen(pen);
-    painter.setRenderHints(QPainter::Antialiasing);
-    // Draw base the right, tip to the left
-    QPointF p0{imageW - offset, offset};
-    QPointF p1{imageW - offset, imageH - offset};
-    QPointF p2{offset, imageH / 2.f};
-    QPainterPath path;
-    path.moveTo(p2);
-    path.lineTo(p1);
-    path.lineTo(p0);
-    path.closeSubpath();
-    QColor fillColor = m_color;
-    fillColor.setAlphaF(0.5f);
-    painter.fillPath(path, QBrush(fillColor));
-
-    painter.drawPath(path);
-    painter.end();
+            texcoordLocation, GL_FLOAT, texcoordArray.data(), 2);
 
-    m_pTexture.reset(createTexture(image));
+    glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 }
 
 } // namespace allshader
diff --git a/src/waveform/renderers/allshader/waveformrendererpreroll.h b/src/waveform/renderers/allshader/waveformrendererpreroll.h
index db2e9f2c2cd..617ca2a0579 100644
--- a/src/waveform/renderers/allshader/waveformrendererpreroll.h
+++ b/src/waveform/renderers/allshader/waveformrendererpreroll.h
@@ -26,16 +26,13 @@ class allshader::WaveformRendererPreroll final : public allshader::WaveformRende
     void initializeGL() override;
 
   private:
-    void drawPattern(float x1, float y1, float x2, float y2, float repetitions, bool flip);
-    void generateTexture(float markerLength, float markerBreadth);
+    void drawPattern(float x1, float y1, float x2, float y2, float repetitions);
 
     mixxx::PatternShader m_shader;
     QColor m_color;
     float m_markerBreadth{};
     float m_markerLength{};
     std::unique_ptr<QOpenGLTexture> m_pTexture;
-    VertexData m_vertices;
-    VertexData m_texcoords;
 
     DISALLOW_COPY_AND_ASSIGN(WaveformRendererPreroll);
 };
diff --git a/src/waveform/renderers/allshader/waveformrendererrgb.cpp b/src/waveform/renderers/allshader/waveformrendererrgb.cpp
index 0f8fafca09f..76d087d697e 100644
--- a/src/waveform/renderers/allshader/waveformrendererrgb.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererrgb.cpp
@@ -204,9 +204,9 @@ void WaveformRendererRGB::paintGL() {
 
     const QMatrix4x4 matrix = matrixForWidgetGeometry(m_waveformRenderer, true);
 
-    const int matrixLocation = m_shader.uniformLocation("matrix");
-    const int positionLocation = m_shader.attributeLocation("position");
-    const int colorLocation = m_shader.attributeLocation("color");
+    const int matrixLocation = m_shader.matrixLocation();
+    const int positionLocation = m_shader.positionLocation();
+    const int colorLocation = m_shader.colorLocation();
 
     m_shader.bind();
     m_shader.enableAttributeArray(positionLocation);
diff --git a/src/waveform/renderers/allshader/waveformrenderersimple.cpp b/src/waveform/renderers/allshader/waveformrenderersimple.cpp
index a10725e4e77..dd8afd012bf 100644
--- a/src/waveform/renderers/allshader/waveformrenderersimple.cpp
+++ b/src/waveform/renderers/allshader/waveformrenderersimple.cpp
@@ -147,9 +147,9 @@ void WaveformRendererSimple::paintGL() {
 
     const QMatrix4x4 matrix = matrixForWidgetGeometry(m_waveformRenderer, true);
 
-    const int matrixLocation = m_shader.uniformLocation("matrix");
-    const int colorLocation = m_shader.uniformLocation("color");
-    const int positionLocation = m_shader.attributeLocation("position");
+    const int matrixLocation = m_shader.matrixLocation();
+    const int colorLocation = m_shader.colorLocation();
+    const int positionLocation = m_shader.positionLocation();
 
     m_shader.bind();
     m_shader.enableAttributeArray(positionLocation);
diff --git a/src/waveform/renderers/allshader/waveformrendermark.cpp b/src/waveform/renderers/allshader/waveformrendermark.cpp
index d5af7ca25d1..8c4bcc96fb4 100644
--- a/src/waveform/renderers/allshader/waveformrendermark.cpp
+++ b/src/waveform/renderers/allshader/waveformrendermark.cpp
@@ -80,9 +80,9 @@ void allshader::WaveformRenderMark::drawTexture(float x, float y, QOpenGLTexture
     m_textureShader.bind();
 
     const int matrixLocation = m_textureShader.uniformLocation("matrix");
-    const int samplerLocation = m_textureShader.uniformLocation("sampler");
+    const int textureLocation = m_textureShader.uniformLocation("texture");
     const int positionLocation = m_textureShader.attributeLocation("position");
-    const int texcoordLocation = m_textureShader.attributeLocation("texcoor");
+    const int texcoordLocation = m_textureShader.attributeLocation("texcoord");
 
     m_textureShader.setUniformValue(matrixLocation, matrix);
 
@@ -93,7 +93,7 @@ void allshader::WaveformRenderMark::drawTexture(float x, float y, QOpenGLTexture
     m_textureShader.setAttributeArray(
             texcoordLocation, GL_FLOAT, texarray, 2);
 
-    m_textureShader.setUniformValue(samplerLocation, 0);
+    m_textureShader.setUniformValue(textureLocation, 0);
 
     texture->bind();
 
@@ -135,9 +135,9 @@ void allshader::WaveformRenderMark::drawMark(const QRectF& rect, QColor color) {
 
     m_rgbaShader.bind();
 
-    int matrixLocation = m_rgbaShader.uniformLocation("matrix");
-    int positionLocation = m_rgbaShader.attributeLocation("position");
-    int colorLocation = m_rgbaShader.attributeLocation("color");
+    const int matrixLocation = m_rgbaShader.matrixLocation();
+    const int positionLocation = m_rgbaShader.positionLocation();
+    const int colorLocation = m_rgbaShader.colorLocation();
 
     m_rgbaShader.setUniformValue(matrixLocation, matrix);
 
@@ -359,7 +359,7 @@ void allshader::WaveformRenderMark::checkCuesUpdated() {
 
     QList<CuePointer> loadedCues = trackInfo->getCuePoints();
     for (const CuePointer& pCue : loadedCues) {
-        int hotCue = pCue->getHotCue();
+        const int hotCue = pCue->getHotCue();
         if (hotCue == Cue::kNoHotCue) {
             continue;
         }
@@ -377,7 +377,7 @@ void allshader::WaveformRenderMark::checkCuesUpdated() {
                 !pMark->fillColor().isValid() ||
                 newColor != pMark->fillColor()) {
             pMark->m_text = newLabel;
-            int dimBrightThreshold = m_waveformRenderer->getDimBrightThreshold();
+            const int dimBrightThreshold = m_waveformRenderer->getDimBrightThreshold();
             pMark->setBaseColor(newColor, dimBrightThreshold);
             generateMarkImage(pMark, m_waveformRenderer->getBreadth());
         }
diff --git a/src/waveform/renderers/allshader/waveformrendermarkrange.cpp b/src/waveform/renderers/allshader/waveformrendermarkrange.cpp
index 1deb113c34a..b392fefab23 100644
--- a/src/waveform/renderers/allshader/waveformrendermarkrange.cpp
+++ b/src/waveform/renderers/allshader/waveformrendermarkrange.cpp
@@ -30,8 +30,8 @@ void allshader::WaveformRenderMarkRange::fillRect(
 
     const float posarray[] = {posx1, posy1, posx2, posy1, posx1, posy2, posx2, posy2};
 
-    int colorLocation = m_shader.uniformLocation("color");
-    int positionLocation = m_shader.attributeLocation("position");
+    const int colorLocation = m_shader.colorLocation();
+    const int positionLocation = m_shader.positionLocation();
 
     m_shader.setUniformValue(colorLocation, color);
 
@@ -65,12 +65,12 @@ void allshader::WaveformRenderMarkRange::paintGL() {
 
     const QMatrix4x4 matrix = matrixForWidgetGeometry(m_waveformRenderer, false);
 
-    int positionLocation = m_shader.attributeLocation("position");
+    const int positionLocation = m_shader.positionLocation();
+    const int matrixLocation = m_shader.matrixLocation();
 
     m_shader.bind();
     m_shader.enableAttributeArray(positionLocation);
 
-    int matrixLocation = m_shader.uniformLocation("matrix");
     m_shader.setUniformValue(matrixLocation, matrix);
 
     for (auto&& markRange : m_markRanges) {
diff --git a/src/widget/wspinnyglsl.cpp b/src/widget/wspinnyglsl.cpp
index c808a65fa8c..97ec46bd086 100644
--- a/src/widget/wspinnyglsl.cpp
+++ b/src/widget/wspinnyglsl.cpp
@@ -97,17 +97,17 @@ void WSpinnyGLSL::paintGL() {
     m_textureShader.bind();
 
     int matrixLocation = m_textureShader.matrixLocation();
-    int samplerLocation = m_textureShader.samplerLocation();
+    int textureLocation = m_textureShader.textureLocation();
     int positionLocation = m_textureShader.positionLocation();
     int texcoordLocation = m_textureShader.texcoordLocation();
 
-    QMatrix4x4 matrix;
+    QMatrix matrix;
     m_textureShader.setUniformValue(matrixLocation, matrix);
 
     m_textureShader.enableAttributeArray(positionLocation);
     m_textureShader.enableAttributeArray(texcoordLocation);
 
-    m_textureShader.setUniformValue(samplerLocation, 0);
+    m_textureShader.setUniformValue(textureLocation, 0);
 
     if (m_pBgTexture) {
         drawTexture(m_pBgTexture.get());
@@ -137,16 +137,16 @@ void WSpinnyGLSL::paintGL() {
     bool paintGhost = m_bGhostPlayback && m_pGhostTextureScaled;
 
     if (paintGhost) {
-        QMatrix4x4 rotate;
-        rotate.rotate(m_fGhostAngle, 0, 0, -1);
+        QMatrix rotate;
+        rotate.rotate(-m_fGhostAngle);
         m_textureShader.setUniformValue(matrixLocation, rotate);
 
         drawTexture(m_pGhostTextureScaled.get());
     }
 
     if (m_pFgTextureScaled) {
-        QMatrix4x4 rotate;
-        rotate.rotate(m_fAngle, 0, 0, -1);
+        QMatrix rotate;
+        rotate.rotate(-m_fAngle);
         m_textureShader.setUniformValue(matrixLocation, rotate);
 
         drawTexture(m_pFgTextureScaled.get());
@@ -185,16 +185,16 @@ void WSpinnyGLSL::drawTexture(QOpenGLTexture* texture) {
     const float posx1 = -posx2;
     const float posy1 = -posy2;
 
-    const float posarray[] = {posx1, posy1, posx2, posy1, posx1, posy2, posx2, posy2};
-    const float texarray[] = {texx1, texy1, texx2, texy1, texx1, texy2, texx2, texy2};
+    const std::array<float, 8> posarray = {posx1, posy1, posx2, posy1, posx1, posy2, posx2, posy2};
+    const std::array<float, 8> texarray = {texx1, texy1, texx2, texy1, texx1, texy2, texx2, texy2};
 
     int positionLocation = m_textureShader.positionLocation();
     int texcoordLocation = m_textureShader.texcoordLocation();
 
     m_textureShader.setAttributeArray(
-            positionLocation, GL_FLOAT, posarray, 2);
+            positionLocation, GL_FLOAT, posarray.data(), 2);
     m_textureShader.setAttributeArray(
-            texcoordLocation, GL_FLOAT, texarray, 2);
+            texcoordLocation, GL_FLOAT, texarray.data(), 2);
 
     texture->bind();
 
@@ -214,29 +214,29 @@ void WSpinnyGLSL::drawVinylQuality() {
     const float posx1 = -1.f;
     const float posy1 = -1.f;
 
-    const float posarray[] = {posx1, posy1, posx2, posy1, posx1, posy2, posx2, posy2};
-    const float texarray[] = {texx1, texy1, texx2, texy1, texx1, texy2, texx2, texy2};
+    const std::array<float, 8> posarray = {posx1, posy1, posx2, posy1, posx1, posy2, posx2, posy2};
+    const std::array<float, 8> texarray = {texx1, texy1, texx2, texy1, texx1, texy2, texx2, texy2};
 
     m_vinylQualityShader.bind();
     int matrixLocation = m_vinylQualityShader.matrixLocation();
     int colorLocation = m_vinylQualityShader.colorLocation();
-    int samplerLocation = m_vinylQualityShader.samplerLocation();
+    int textureLocation = m_vinylQualityShader.textureLocation();
     int positionLocation = m_vinylQualityShader.positionLocation();
     int texcoordLocation = m_vinylQualityShader.texcoordLocation();
 
-    QMatrix4x4 matrix;
+    QMatrix matrix;
     m_vinylQualityShader.setUniformValue(matrixLocation, matrix);
     m_vinylQualityShader.setUniformValue(colorLocation, m_vinylQualityColor);
 
     m_vinylQualityShader.enableAttributeArray(positionLocation);
     m_vinylQualityShader.enableAttributeArray(texcoordLocation);
 
-    m_vinylQualityShader.setUniformValue(samplerLocation, 0);
+    m_vinylQualityShader.setUniformValue(textureLocation, 0);
 
     m_vinylQualityShader.setAttributeArray(
-            positionLocation, GL_FLOAT, posarray, 2);
+            positionLocation, GL_FLOAT, posarray.data(), 2);
     m_vinylQualityShader.setAttributeArray(
-            texcoordLocation, GL_FLOAT, texarray, 2);
+            texcoordLocation, GL_FLOAT, texarray.data(), 2);
 
     m_pQTexture->bind();
 
diff --git a/src/widget/wvumeterglsl.cpp b/src/widget/wvumeterglsl.cpp
index 626ed78fb69..b4d9b6e7210 100644
--- a/src/widget/wvumeterglsl.cpp
+++ b/src/widget/wvumeterglsl.cpp
@@ -46,7 +46,7 @@ void WVuMeterGLSL::paintGL() {
     m_textureShader.bind();
 
     int matrixLocation = m_textureShader.matrixLocation();
-    int samplerLocation = m_textureShader.samplerLocation();
+    int textureLocation = m_textureShader.textureLocation();
     int positionLocation = m_textureShader.positionLocation();
     int texcoordLocation = m_textureShader.texcoordLocation();
 
@@ -57,7 +57,7 @@ void WVuMeterGLSL::paintGL() {
     m_textureShader.enableAttributeArray(positionLocation);
     m_textureShader.enableAttributeArray(texcoordLocation);
 
-    m_textureShader.setUniformValue(samplerLocation, 0);
+    m_textureShader.setUniformValue(textureLocation, 0);
 
     if (m_pTextureBack) {
         QRectF sourceRect(0, 0, m_pPixmapBack->width(), m_pPixmapBack->height());
@@ -163,16 +163,16 @@ void WVuMeterGLSL::drawTexture(QOpenGLTexture* texture,
     const float posx2 = static_cast<float>(targetRect.x() + targetRect.width());
     const float posy2 = static_cast<float>(targetRect.y() + targetRect.height());
 
-    const float posarray[] = {posx1, posy1, posx2, posy1, posx1, posy2, posx2, posy2};
-    const float texarray[] = {texx1, texy1, texx2, texy1, texx1, texy2, texx2, texy2};
+    const std::array<float, 8> posarray = {posx1, posy1, posx2, posy1, posx1, posy2, posx2, posy2};
+    const std::array<float, 8> texarray = {texx1, texy1, texx2, texy1, texx1, texy2, texx2, texy2};
 
     int positionLocation = m_textureShader.positionLocation();
     int texcoordLocation = m_textureShader.texcoordLocation();
 
     m_textureShader.setAttributeArray(
-            positionLocation, GL_FLOAT, posarray, 2);
+            positionLocation, GL_FLOAT, posarray.data(), 2);
     m_textureShader.setAttributeArray(
-            texcoordLocation, GL_FLOAT, texarray, 2);
+            texcoordLocation, GL_FLOAT, texarray.data(), 2);
 
     texture->bind();
 

From 9652fcf53ced9cd8630988d90b859acdfe4979f3 Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Sun, 15 Oct 2023 17:24:57 +0200
Subject: [PATCH 109/388] use Qt::transparent

---
 src/waveform/renderers/allshader/waveformrendererpreroll.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/waveform/renderers/allshader/waveformrendererpreroll.cpp b/src/waveform/renderers/allshader/waveformrendererpreroll.cpp
index 41c690222ae..9c7cb6e5094 100644
--- a/src/waveform/renderers/allshader/waveformrendererpreroll.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererpreroll.cpp
@@ -28,7 +28,7 @@ QOpenGLTexture* generateTexture(float markerLength,
     const float penWidth = 1.5f;
     const float offset = penWidth / 2.f;
 
-    image.fill(QColor(0, 0, 0, 0).rgba());
+    image.fill(Qt::transparent);
     QPainter painter;
     painter.begin(&image);
 

From 2fc87d46e2f81d941a45375bf03f7fbd0c09097b Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Thu, 5 Oct 2023 18:10:21 +0200
Subject: [PATCH 110/388] make decks' xfader assignment persistent

---
 src/engine/channels/enginechannel.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/engine/channels/enginechannel.cpp b/src/engine/channels/enginechannel.cpp
index 5602f04a9c4..75ffcbb24c2 100644
--- a/src/engine/channels/enginechannel.cpp
+++ b/src/engine/channels/enginechannel.cpp
@@ -23,10 +23,11 @@ EngineChannel::EngineChannel(const ChannelHandleAndGroup& handleGroup,
     m_pMainMix = new ControlPushButton(ConfigKey(getGroup(), "main_mix"));
     m_pMainMix->setButtonMode(ControlPushButton::POWERWINDOW);
     m_pMainMix->addAlias(ConfigKey(getGroup(), QStringLiteral("master")));
-    m_pOrientation = new ControlPushButton(ConfigKey(getGroup(), "orientation"));
+    // crossfader assignment is persistent
+    m_pOrientation = new ControlPushButton(
+            ConfigKey(getGroup(), "orientation"), true, defaultOrientation);
     m_pOrientation->setButtonMode(ControlPushButton::TOGGLE);
     m_pOrientation->setStates(3);
-    m_pOrientation->set(defaultOrientation);
     m_pOrientationLeft = new ControlPushButton(ConfigKey(getGroup(), "orientation_left"));
     connect(m_pOrientationLeft, &ControlObject::valueChanged,
             this, &EngineChannel::slotOrientationLeft, Qt::DirectConnection);

From f375ff96a9363351c13fc8511a01eb3ab006b11f Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Mon, 16 Oct 2023 17:43:49 +0200
Subject: [PATCH 111/388] Deere: make 'Large VU meters' persistent

---
 res/skins/Deere/skin.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/skins/Deere/skin.xml b/res/skins/Deere/skin.xml
index 2a68ad0ce05..11ff0eaa8f1 100644
--- a/res/skins/Deere/skin.xml
+++ b/res/skins/Deere/skin.xml
@@ -29,6 +29,7 @@
       <attribute persist="true" config_key="[Skin],show_eq_knobs">1</attribute>
       <attribute persist="true" config_key="[Skin],show_eq_kill_buttons">1</attribute>
       <attribute persist="true" config_key="[Skin],show_xfader">1</attribute>
+      <attribute persist="true" config_key="[Skin],large_vu">0</attribute>
       <!-- Effects -->
       <attribute persist="true" config_key="[Skin],show_effectrack">1</attribute>
       <attribute persist="true" config_key="[Skin],show_4effectunits">0</attribute>

From 5cd6d3431566b5400d5abce11bd7a26e562dc785 Mon Sep 17 00:00:00 2001
From: Owen Williams <owilliams@mixxx.org>
Date: Mon, 16 Oct 2023 12:09:17 -0400
Subject: [PATCH 112/388] Rewrite resolveGroup to remove need for explicit list

---
 res/controllers/common-hid-packet-parser.js | 78 ++++++---------------
 1 file changed, 21 insertions(+), 57 deletions(-)

diff --git a/res/controllers/common-hid-packet-parser.js b/res/controllers/common-hid-packet-parser.js
index 9bf78691b12..5284a5f0d38 100644
--- a/res/controllers/common-hid-packet-parser.js
+++ b/res/controllers/common-hid-packet-parser.js
@@ -1233,40 +1233,6 @@ class HIDController {
          */
         this.deckSwitchMap = {1: 2, 2: 1, 3: 4, 4: 3, undefined: 1};
 
-        /**
-         * Standard target groups available in mixxx.
-         *
-         * This is used by HID packet parser to recognize group parameters we should try sending to mixxx.
-         * @type {string[]}
-         */
-        this.valid_groups = [
-            "[App]",
-            "[Channel1]",
-            "[Channel2]",
-            "[Channel3]",
-            "[Channel4]",
-            "[Sampler1]",
-            "[Sampler2]",
-            "[Sampler3]",
-            "[Sampler4]",
-            "[Sampler5]",
-            "[Sampler6]",
-            "[Sampler7]",
-            "[Sampler8]",
-            "[Main]",
-            "[Master]",
-            "[PreviewDeck1]",
-            "[Effects]",
-            "[Playlist]",
-            "[Flanger]",
-            "[Microphone]",
-            "[EffectRack1_EffectUnit1]",
-            "[EffectRack1_EffectUnit2]",
-            "[EffectRack1_EffectUnit3]",
-            "[EffectRack1_EffectUnit4]",
-            "[InternalClock]"
-        ];
-
         //
         /**
          * Set to value in ms to update Outputs periodically
@@ -1359,34 +1325,36 @@ class HIDController {
         return `[Channel${deck}]`;
     }
     /**
-     * Map virtual deck names to real deck group. If group is already
-     * a real mixxx group value, just return it as it without mapping.
-     * @param {string} group Control group name e.g. "[Channel1]"
+     * Map virtual deck names ("deck, "deck1", "deck2") to real deck group. If group is already a
+     * real mixxx group value, just return it as it without mapping.
+     * @param {string} group Control group name e.g. "[Channel1]" or "deck" or "deck1".
      * @returns {string} Channel
      */
     resolveGroup(group) {
-        const channel_name = /\[Channel[0-9]+\]/;
-        if (group !== undefined && group.match(channel_name)) {
-            return group;
-        }
-        if (this.valid_groups.indexOf(group) !== -1) {
-            return group;
-        }
         if (group === "deck" || group === undefined) {
             if (this.activeDeck === undefined) {
                 return undefined;
             }
             return `[Channel${this.activeDeck}]`;
         }
-        if (this.activeDeck === 1 || this.activeDeck === 2) {
-            if (group === "deck1") { return "[Channel1]"; }
-            if (group === "deck2") { return "[Channel2]"; }
-        }
-        if (this.activeDeck === 3 || this.activeDeck === 4) {
-            if (group === "deck1") { return "[Channel3]"; }
-            if (group === "deck2") { return "[Channel4]"; }
+        if (group === "deck1") {
+            if (this.activeDeck === 1 || this.activeDeck === 2) {
+                return "[Channel1]";
+            }
+            if (this.activeDeck === 3 || this.activeDeck === 4) {
+                return "[Channel3]";
+            }
+            return undefined;
+        } else if (group === "deck2") {
+            if (this.activeDeck === 1 || this.activeDeck === 2) {
+                return "[Channel2]";
+            }
+            if (this.activeDeck === 3 || this.activeDeck === 4) {
+                return "[Channel4]";
+            }
+            return undefined;
         }
-        return undefined;
+        return group;
     }
     /**
      * Find Output control matching give group and name
@@ -1748,11 +1716,7 @@ class HIDController {
                 return `[Channel${this.activeDeck}]`;
             }
         }
-        if (this.valid_groups.indexOf(group) !== -1) {
-            // console.log(`Resolving group ${group}`);
-            return this.resolveGroup(group);
-        }
-        return group;
+        return this.resolveGroup(group);
     }
     /**
      * Get active control name from field

From f6da79db30b855071beecc045ec5f6964b35c6f9 Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Mon, 16 Oct 2023 19:45:11 +0200
Subject: [PATCH 113/388] reverted QMatrix to QMatrix4x4, added comment about
 vec4 position

---
 src/shaders/endoftrackshader.cpp   |  2 +-
 src/shaders/patternshader.cpp      |  2 +-
 src/shaders/rgbashader.cpp         |  2 +-
 src/shaders/rgbshader.cpp          |  2 +-
 src/shaders/textureshader.cpp      |  2 +-
 src/shaders/unicolorshader.cpp     |  2 +-
 src/shaders/vinylqualityshader.cpp |  2 +-
 src/widget/wspinnyglsl.cpp         | 12 ++++++------
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/shaders/endoftrackshader.cpp b/src/shaders/endoftrackshader.cpp
index 1b5d5dbbbfe..f78964d68ab 100644
--- a/src/shaders/endoftrackshader.cpp
+++ b/src/shaders/endoftrackshader.cpp
@@ -4,7 +4,7 @@ using namespace mixxx;
 
 void EndOfTrackShader::init() {
     QString vertexShaderCode = QStringLiteral(R"--(
-attribute highp vec4 position;
+attribute highp vec4 position; // use vec4 here (will be padded) to assign directly to gl_Position
 attribute highp float gradient;
 varying highp float vgradient;
 void main()
diff --git a/src/shaders/patternshader.cpp b/src/shaders/patternshader.cpp
index 90b1d1781e3..7adfe9ccdd8 100644
--- a/src/shaders/patternshader.cpp
+++ b/src/shaders/patternshader.cpp
@@ -5,7 +5,7 @@ using namespace mixxx;
 void PatternShader::init() {
     QString vertexShaderCode = QStringLiteral(R"--(
 uniform highp mat4 matrix;
-attribute highp vec4 position;
+attribute highp vec4 position; // use vec4 here (will be padded) for matrix multiplication
 attribute highp vec2 texcoor;
 varying highp vec2 vTexcoor;
 void main()
diff --git a/src/shaders/rgbashader.cpp b/src/shaders/rgbashader.cpp
index 7eb54b6f3ab..d90866ab20f 100644
--- a/src/shaders/rgbashader.cpp
+++ b/src/shaders/rgbashader.cpp
@@ -5,7 +5,7 @@ using namespace mixxx;
 void RGBAShader::init() {
     QString vertexShaderCode = QStringLiteral(R"--(
 uniform mat4 matrix;
-attribute highp vec4 position;
+attribute highp vec4 position; // use vec4 here (will be padded) for matrix multiplication
 attribute highp vec4 color;
 varying highp vec4 vColor;
 void main()
diff --git a/src/shaders/rgbshader.cpp b/src/shaders/rgbshader.cpp
index cbc9da45403..4ef740582b9 100644
--- a/src/shaders/rgbshader.cpp
+++ b/src/shaders/rgbshader.cpp
@@ -5,7 +5,7 @@ using namespace mixxx;
 void RGBShader::init() {
     QString vertexShaderCode = QStringLiteral(R"--(
 uniform mat4 matrix;
-attribute highp vec4 position;
+attribute highp vec4 position; // use vec4 here (will be padded) for matrix multiplication
 attribute highp vec3 color;
 varying highp vec3 vColor;
 void main()
diff --git a/src/shaders/textureshader.cpp b/src/shaders/textureshader.cpp
index d7769250336..f5363d77169 100644
--- a/src/shaders/textureshader.cpp
+++ b/src/shaders/textureshader.cpp
@@ -5,7 +5,7 @@ using namespace mixxx;
 void TextureShader::init() {
     QString vertexShaderCode = QStringLiteral(R"--(
 uniform highp mat4 matrix;
-attribute highp vec4 position;
+attribute highp vec4 position; // use vec4 here (will be padded) for matrix multiplication
 attribute highp vec2 texcoord;
 varying highp vec2 vTexcoord;
 void main()
diff --git a/src/shaders/unicolorshader.cpp b/src/shaders/unicolorshader.cpp
index f77bc5fe695..8c348d288bd 100644
--- a/src/shaders/unicolorshader.cpp
+++ b/src/shaders/unicolorshader.cpp
@@ -5,7 +5,7 @@ using namespace mixxx;
 void UnicolorShader::init() {
     QString vertexShaderCode = QStringLiteral(R"--(
 uniform mat4 matrix;
-attribute highp vec4 position;
+attribute highp vec4 position; // use vec4 here (will be padded) for matrix multiplication
 void main()
 {
     gl_Position = matrix * position;
diff --git a/src/shaders/vinylqualityshader.cpp b/src/shaders/vinylqualityshader.cpp
index 1968bda6dae..2a1e6bc6e92 100644
--- a/src/shaders/vinylqualityshader.cpp
+++ b/src/shaders/vinylqualityshader.cpp
@@ -5,7 +5,7 @@ using namespace mixxx;
 void VinylQualityShader::init() {
     QString vertexShaderCode = QStringLiteral(R"--(
 uniform mat4 matrix;
-attribute highp vec4 position;
+attribute highp vec4 position; // use vec4 here (will be padded) for matrix multiplication
 attribute highp vec2 texcoord;
 varying highp vec2 vTexcoord;
 void main()
diff --git a/src/widget/wspinnyglsl.cpp b/src/widget/wspinnyglsl.cpp
index 97ec46bd086..09a971879bf 100644
--- a/src/widget/wspinnyglsl.cpp
+++ b/src/widget/wspinnyglsl.cpp
@@ -101,7 +101,7 @@ void WSpinnyGLSL::paintGL() {
     int positionLocation = m_textureShader.positionLocation();
     int texcoordLocation = m_textureShader.texcoordLocation();
 
-    QMatrix matrix;
+    QMatrix4x4 matrix;
     m_textureShader.setUniformValue(matrixLocation, matrix);
 
     m_textureShader.enableAttributeArray(positionLocation);
@@ -137,16 +137,16 @@ void WSpinnyGLSL::paintGL() {
     bool paintGhost = m_bGhostPlayback && m_pGhostTextureScaled;
 
     if (paintGhost) {
-        QMatrix rotate;
-        rotate.rotate(-m_fGhostAngle);
+        QMatrix4x4 rotate;
+        rotate.rotate(-m_fGhostAngle, 0, 0);
         m_textureShader.setUniformValue(matrixLocation, rotate);
 
         drawTexture(m_pGhostTextureScaled.get());
     }
 
     if (m_pFgTextureScaled) {
-        QMatrix rotate;
-        rotate.rotate(-m_fAngle);
+        QMatrix4x4 rotate;
+        rotate.rotate(-m_fAngle, 0, 0);
         m_textureShader.setUniformValue(matrixLocation, rotate);
 
         drawTexture(m_pFgTextureScaled.get());
@@ -224,7 +224,7 @@ void WSpinnyGLSL::drawVinylQuality() {
     int positionLocation = m_vinylQualityShader.positionLocation();
     int texcoordLocation = m_vinylQualityShader.texcoordLocation();
 
-    QMatrix matrix;
+    QMatrix4x4 matrix;
     m_vinylQualityShader.setUniformValue(matrixLocation, matrix);
     m_vinylQualityShader.setUniformValue(colorLocation, m_vinylQualityColor);
 

From 3d8a9a4a635a565b0ed75837d56f17d300d50581 Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Mon, 16 Oct 2023 19:54:39 +0200
Subject: [PATCH 114/388] using std::unique_ptr instead of raw ptr

---
 src/util/texture.cpp                             | 16 ++++++++--------
 src/util/texture.h                               |  8 ++++----
 .../allshader/waveformrendererpreroll.cpp        |  6 +++---
 .../renderers/allshader/waveformrendermark.cpp   |  6 +++---
 src/widget/wspinnyglsl.cpp                       | 12 ++++++------
 src/widget/wvumeterglsl.cpp                      |  4 ++--
 6 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/util/texture.cpp b/src/util/texture.cpp
index 869063d9038..a1235547f5f 100644
--- a/src/util/texture.cpp
+++ b/src/util/texture.cpp
@@ -1,10 +1,10 @@
 #include "util/texture.h"
 
-QOpenGLTexture* createTexture(const QImage& image) {
+std::unique_ptr<QOpenGLTexture> createTexture(const QImage& image) {
     if (image.isNull()) {
-        return nullptr;
+        return std::unique_ptr<QOpenGLTexture>{};
     }
-    QOpenGLTexture* pTexture = new QOpenGLTexture(image);
+    std::unique_ptr<QOpenGLTexture> pTexture{new QOpenGLTexture(image)};
     pTexture->setMinificationFilter(QOpenGLTexture::Linear);
     pTexture->setMagnificationFilter(QOpenGLTexture::Linear);
     pTexture->setWrapMode(QOpenGLTexture::ClampToEdge);
@@ -12,20 +12,20 @@ QOpenGLTexture* createTexture(const QImage& image) {
     return pTexture;
 }
 
-QOpenGLTexture* createTexture(const QPixmap& pixmap) {
+std::unique_ptr<QOpenGLTexture> createTexture(const QPixmap& pixmap) {
     return createTexture(pixmap.toImage());
 }
 
-QOpenGLTexture* createTexture(const QSharedPointer<Paintable>& pPaintable) {
+std::unique_ptr<QOpenGLTexture> createTexture(const QSharedPointer<Paintable>& pPaintable) {
     if (pPaintable.isNull()) {
-        return nullptr;
+        return std::unique_ptr<QOpenGLTexture>{};
     }
     return createTexture(pPaintable->toImage());
 }
 
-QOpenGLTexture* createTexture(const std::shared_ptr<QImage>& pImage) {
+std::unique_ptr<QOpenGLTexture> createTexture(const std::shared_ptr<QImage>& pImage) {
     if (!pImage) {
-        return nullptr;
+        return std::unique_ptr<QOpenGLTexture>{};
     }
     return createTexture(*pImage);
 }
diff --git a/src/util/texture.h b/src/util/texture.h
index 22e3aabde79..053843f8c37 100644
--- a/src/util/texture.h
+++ b/src/util/texture.h
@@ -6,7 +6,7 @@
 
 #include "widget/paintable.h"
 
-QOpenGLTexture* createTexture(const QImage& image);
-QOpenGLTexture* createTexture(const QPixmap& pixmap);
-QOpenGLTexture* createTexture(const QSharedPointer<Paintable>& pPaintable);
-QOpenGLTexture* createTexture(const std::shared_ptr<QImage>& pImage);
+std::unique_ptr<QOpenGLTexture> createTexture(const QImage& image);
+std::unique_ptr<QOpenGLTexture> createTexture(const QPixmap& pixmap);
+std::unique_ptr<QOpenGLTexture> createTexture(const QSharedPointer<Paintable>& pPaintable);
+std::unique_ptr<QOpenGLTexture> createTexture(const std::shared_ptr<QImage>& pImage);
diff --git a/src/waveform/renderers/allshader/waveformrendererpreroll.cpp b/src/waveform/renderers/allshader/waveformrendererpreroll.cpp
index 9c7cb6e5094..b39e73ba1b6 100644
--- a/src/waveform/renderers/allshader/waveformrendererpreroll.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererpreroll.cpp
@@ -13,7 +13,7 @@
 #include "widget/wwidget.h"
 
 namespace {
-QOpenGLTexture* generateTexture(float markerLength,
+std::unique_ptr<QOpenGLTexture> generateTexture(float markerLength,
         float markerBreadth,
         float devicePixelRatio,
         QColor color) {
@@ -121,10 +121,10 @@ void WaveformRendererPreroll::paintGL() {
         // has changed size last time.
         m_markerLength = markerLength;
         m_markerBreadth = markerBreadth;
-        m_pTexture.reset(generateTexture(m_markerLength,
+        m_pTexture = generateTexture(m_markerLength,
                 m_markerBreadth,
                 m_waveformRenderer->getDevicePixelRatio(),
-                m_color));
+                m_color);
     }
 
     if (!m_pTexture) {
diff --git a/src/waveform/renderers/allshader/waveformrendermark.cpp b/src/waveform/renderers/allshader/waveformrendermark.cpp
index 8c4bcc96fb4..aff0e542d59 100644
--- a/src/waveform/renderers/allshader/waveformrendermark.cpp
+++ b/src/waveform/renderers/allshader/waveformrendermark.cpp
@@ -298,7 +298,7 @@ void allshader::WaveformRenderMark::generatePlayPosMarkTexture(float breadth) {
     }
     painter.end();
 
-    m_pPlayPosMarkTexture.reset(createTexture(image));
+    m_pPlayPosMarkTexture = createTexture(image);
 }
 
 void allshader::WaveformRenderMark::drawTriangle(QPainter* painter,
@@ -405,7 +405,7 @@ void allshader::WaveformRenderMark::generateMarkImage(WaveformMarkPointer pMark,
             //  Also, without this some Qt-internal issue results in an offset
             //  image when calculating the center line of pixmaps in draw().
             pMark->m_image.setDevicePixelRatio(devicePixelRatio);
-            pMark->m_pTexture.reset(createTexture(pMark->m_image));
+            pMark->m_pTexture = createTexture(pMark->m_image);
             return;
         }
     }
@@ -547,5 +547,5 @@ void allshader::WaveformRenderMark::generateMarkImage(WaveformMarkPointer pMark,
         painter.drawText(labelRect, Qt::AlignCenter, label);
     }
 
-    pMark->m_pTexture.reset(createTexture(pMark->m_image));
+    pMark->m_pTexture = createTexture(pMark->m_image);
 }
diff --git a/src/widget/wspinnyglsl.cpp b/src/widget/wspinnyglsl.cpp
index 09a971879bf..e42dfcc4e3c 100644
--- a/src/widget/wspinnyglsl.cpp
+++ b/src/widget/wspinnyglsl.cpp
@@ -31,7 +31,7 @@ void WSpinnyGLSL::cleanupGL() {
 void WSpinnyGLSL::coverChanged() {
     if (isContextValid()) {
         makeCurrentIfNeeded();
-        m_pLoadedCoverTextureScaled.reset(createTexture(m_loadedCoverScaled));
+        m_pLoadedCoverTextureScaled = createTexture(m_loadedCoverScaled);
         doneCurrent();
     }
     // otherwise this will happen in initializeGL
@@ -53,11 +53,11 @@ void WSpinnyGLSL::resizeGL(int w, int h) {
 }
 
 void WSpinnyGLSL::updateTextures() {
-    m_pBgTexture.reset(createTexture(m_pBgImage));
-    m_pMaskTexture.reset(createTexture(m_pMaskImage));
-    m_pFgTextureScaled.reset(createTexture(m_fgImageScaled));
-    m_pGhostTextureScaled.reset(createTexture(m_ghostImageScaled));
-    m_pLoadedCoverTextureScaled.reset(createTexture(m_loadedCoverScaled));
+    m_pBgTexture = createTexture(m_pBgImage);
+    m_pMaskTexture = createTexture(m_pMaskImage);
+    m_pFgTextureScaled = createTexture(m_fgImageScaled);
+    m_pGhostTextureScaled = createTexture(m_ghostImageScaled);
+    m_pLoadedCoverTextureScaled = createTexture(m_loadedCoverScaled);
 }
 
 void WSpinnyGLSL::setupVinylSignalQuality() {
diff --git a/src/widget/wvumeterglsl.cpp b/src/widget/wvumeterglsl.cpp
index b4d9b6e7210..2e82b7a9a65 100644
--- a/src/widget/wvumeterglsl.cpp
+++ b/src/widget/wvumeterglsl.cpp
@@ -24,8 +24,8 @@ void WVuMeterGLSL::draw() {
 void WVuMeterGLSL::initializeGL() {
     initializeOpenGLFunctions();
 
-    m_pTextureBack.reset(createTexture(m_pPixmapBack));
-    m_pTextureVu.reset(createTexture(m_pPixmapVu));
+    m_pTextureBack = createTexture(m_pPixmapBack);
+    m_pTextureVu = createTexture(m_pPixmapVu);
     m_textureShader.init();
 }
 

From 783c041b3327891c74332b611d677ee58bcb9b33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Wed, 11 Oct 2023 00:08:27 +0200
Subject: [PATCH 115/388] Use constants instead of macros

---
 src/engine/sync/enginesync.cpp         | 2 +-
 src/engine/sync/enginesync.h           | 6 ++++--
 src/preferences/dialog/dlgprefdeck.cpp | 6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/engine/sync/enginesync.cpp b/src/engine/sync/enginesync.cpp
index 5b1114e1807..d8809338101 100644
--- a/src/engine/sync/enginesync.cpp
+++ b/src/engine/sync/enginesync.cpp
@@ -254,7 +254,7 @@ Syncable* EngineSync::pickLeader(Syncable* enabling_syncable) {
     }
 
     const SyncLockAlgorithm picker = static_cast<SyncLockAlgorithm>(
-            m_pConfig->getValue<int>(ConfigKey(BPM_CONFIG_GROUP, SYNC_LOCK_ALGORITHM_CONFIG_KEY),
+            m_pConfig->getValue<int>(ConfigKey(kBpmConfigGroup, kSyncLockAlgorithmConfigKey),
                     PREFER_SOFT_LEADER));
     switch (picker) {
     case PREFER_SOFT_LEADER:
diff --git a/src/engine/sync/enginesync.h b/src/engine/sync/enginesync.h
index 43c7b5da7fa..a936f9e552d 100644
--- a/src/engine/sync/enginesync.h
+++ b/src/engine/sync/enginesync.h
@@ -2,6 +2,8 @@
 
 #include <gtest/gtest_prod.h>
 
+#include <QString>
+
 #include "audio/types.h"
 #include "engine/sync/syncable.h"
 #include "preferences/usersettings.h"
@@ -9,8 +11,8 @@
 class InternalClock;
 class EngineChannel;
 
-#define BPM_CONFIG_GROUP "[BPM]"
-#define SYNC_LOCK_ALGORITHM_CONFIG_KEY "sync_lock_algorithm"
+const QString kBpmConfigGroup = QStringLiteral("[BPM]");
+const QString kSyncLockAlgorithmConfigKey = QStringLiteral("sync_lock_algorithm");
 
 /// EngineSync is the heart of the Mixxx Sync Lock engine.  It knows which objects
 /// (Decks, Internal Clock, etc) are participating in Sync and what their statuses
diff --git a/src/preferences/dialog/dlgprefdeck.cpp b/src/preferences/dialog/dlgprefdeck.cpp
index a55a661c598..cf0a4224d9d 100644
--- a/src/preferences/dialog/dlgprefdeck.cpp
+++ b/src/preferences/dialog/dlgprefdeck.cpp
@@ -466,7 +466,7 @@ void DlgPrefDeck::slotUpdate() {
 
     const EngineSync::SyncLockAlgorithm syncLockAlgorithm =
             static_cast<EngineSync::SyncLockAlgorithm>(m_pConfig->getValue<int>(
-                    ConfigKey(BPM_CONFIG_GROUP, SYNC_LOCK_ALGORITHM_CONFIG_KEY),
+                    ConfigKey(kBpmConfigGroup, kSyncLockAlgorithmConfigKey),
                     EngineSync::SyncLockAlgorithm::PREFER_SOFT_LEADER));
     if (syncLockAlgorithm == EngineSync::SyncLockAlgorithm::PREFER_SOFT_LEADER) {
         radioButtonSoftLeader->setChecked(true);
@@ -741,10 +741,10 @@ void DlgPrefDeck::slotApply() {
                    ConfigValue(configSPAutoReset));
 
     if (radioButtonSoftLeader->isChecked()) {
-        m_pConfig->setValue(ConfigKey(BPM_CONFIG_GROUP, SYNC_LOCK_ALGORITHM_CONFIG_KEY),
+        m_pConfig->setValue(ConfigKey(kBpmConfigGroup, kSyncLockAlgorithmConfigKey),
                 static_cast<int>(EngineSync::SyncLockAlgorithm::PREFER_SOFT_LEADER));
     } else {
-        m_pConfig->setValue(ConfigKey(BPM_CONFIG_GROUP, SYNC_LOCK_ALGORITHM_CONFIG_KEY),
+        m_pConfig->setValue(ConfigKey(kBpmConfigGroup, kSyncLockAlgorithmConfigKey),
                 static_cast<int>(EngineSync::SyncLockAlgorithm::PREFER_LOCK_BPM));
     }
 

From 227f23b1c904be24c2d1b9e6601603e48f12f661 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Mon, 16 Oct 2023 22:54:50 +0200
Subject: [PATCH 116/388] Mark "selected" as unused

---
 src/preferences/dialog/dlgprefeffects.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/preferences/dialog/dlgprefeffects.cpp b/src/preferences/dialog/dlgprefeffects.cpp
index d66a30a74a9..20fd4ce25be 100644
--- a/src/preferences/dialog/dlgprefeffects.cpp
+++ b/src/preferences/dialog/dlgprefeffects.cpp
@@ -206,6 +206,7 @@ void DlgPrefEffects::effectsTableItemSelected(const QModelIndex& selected) {
 }
 
 void DlgPrefEffects::slotChainPresetSelectionChanged(const QItemSelection& selected) {
+    Q_UNUSED(selected);
     VERIFY_OR_DEBUG_ASSERT(m_pFocusedChainList) {
         return;
     }

From 31b9efeb92d679f8e43ce0f65f32c3c3ff00f96b Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Mon, 16 Oct 2023 23:11:44 +0200
Subject: [PATCH 117/388] Update src/util/texture.cpp

Co-authored-by: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com>
---
 src/util/texture.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/util/texture.cpp b/src/util/texture.cpp
index a1235547f5f..1b59ea586c7 100644
--- a/src/util/texture.cpp
+++ b/src/util/texture.cpp
@@ -4,7 +4,7 @@ std::unique_ptr<QOpenGLTexture> createTexture(const QImage& image) {
     if (image.isNull()) {
         return std::unique_ptr<QOpenGLTexture>{};
     }
-    std::unique_ptr<QOpenGLTexture> pTexture{new QOpenGLTexture(image)};
+    auto pTexture = std::make_unique<QOpenGLTexture>(image);
     pTexture->setMinificationFilter(QOpenGLTexture::Linear);
     pTexture->setMagnificationFilter(QOpenGLTexture::Linear);
     pTexture->setWrapMode(QOpenGLTexture::ClampToEdge);

From 51af7c4fad3b80dd42b4cb68afc27ad9c19d1be3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Mon, 16 Oct 2023 23:28:45 +0200
Subject: [PATCH 118/388] Improve tooltips

Co-authored-by: ronso0 <ronso0@mixxx.org>
---
 src/skin/legacy/tooltips.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/skin/legacy/tooltips.cpp b/src/skin/legacy/tooltips.cpp
index 115ae9bcc2a..0542ea22bd2 100644
--- a/src/skin/legacy/tooltips.cpp
+++ b/src/skin/legacy/tooltips.cpp
@@ -579,7 +579,7 @@ void Tooltips::addStandardTooltips() {
     add("sync_leader")
             << tr("Enable Sync Leader")
             << tr("When enabled, this device will serve as the sync leader for all other decks.")
-            << tr("This is relevant when a dynamic tempo track is loaded to a sync leader."
+            << tr("This is relevant when a dynamic tempo track is loaded to a sync leader deck."
                   "In that case, other synced devices will adopt the changing tempo.");
 
     add("rate")

From 8d28028c4f3cc8b656980f9f73cc60f2d3d4d41d Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 17 Oct 2023 10:44:45 +0200
Subject: [PATCH 119/388] Deere: use decks' waveform colors for sliders (Vol +
 pitch)

---
 res/skins/Deere/deck_tempo_column.xml           | 2 +-
 res/skins/Deere/handle-vertical-purple.svg      | 7 +++----
 res/skins/Deere/handle-volume-deck1.svg         | 6 ++++++
 res/skins/Deere/handle-volume-deck2.svg         | 6 ++++++
 res/skins/Deere/handle-volume-deck3.svg         | 5 +++++
 res/skins/Deere/handle-volume-deck4.svg         | 5 +++++
 res/skins/Deere/mixer.xml                       | 2 +-
 res/skins/Deere/mixer_column_volume_gain.xml    | 2 +-
 res/skins/Deere/mixer_controls_4decks_left.xml  | 4 ++--
 res/skins/Deere/mixer_controls_4decks_right.xml | 4 ++--
 10 files changed, 32 insertions(+), 11 deletions(-)
 create mode 100644 res/skins/Deere/handle-volume-deck1.svg
 create mode 100644 res/skins/Deere/handle-volume-deck2.svg
 create mode 100644 res/skins/Deere/handle-volume-deck3.svg
 create mode 100644 res/skins/Deere/handle-volume-deck4.svg

diff --git a/res/skins/Deere/deck_tempo_column.xml b/res/skins/Deere/deck_tempo_column.xml
index 8c27847e5e1..1792733f9ee 100644
--- a/res/skins/Deere/deck_tempo_column.xml
+++ b/res/skins/Deere/deck_tempo_column.xml
@@ -93,7 +93,7 @@
                 <Size>50f,-1me</Size>
                 <MaximumSize>40,200</MaximumSize>
                 <Slider scalemode="STRETCH">slider-vertical.svg</Slider>
-                <Handle scalemode="STRETCH_ASPECT">handle-vertical-blue.svg</Handle>
+                <Handle scalemode="STRETCH_ASPECT">handle-volume-deck<Variable name="i"/>.svg</Handle>
                 <Connection>
                   <ConfigKey><Variable name="group"/>,rate</ConfigKey>
                 </Connection>
diff --git a/res/skins/Deere/handle-vertical-purple.svg b/res/skins/Deere/handle-vertical-purple.svg
index 1ccd440a239..8bd56dce03e 100644
--- a/res/skins/Deere/handle-vertical-purple.svg
+++ b/res/skins/Deere/handle-vertical-purple.svg
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <svg width="40" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <style/>
- <path d="m1 12v-9c0-1.108 0.892-2 2-2h34c1.108 0 2 0.892 2 2v9c0 1.108-0.892 2-2 2h-34c-1.108 0-2-0.892-2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
- <path d="m35.589 11h-31.178c-0.22768 0-0.41097-0.21148-0.41097-0.47417v-6.0517c0-0.26269 0.18329-0.47417 0.41097-0.47417h31.178c0.22768 0 0.41097 0.21148 0.41097 0.47417v6.0517c0 0.26269-0.18329 0.47417-0.41097 0.47417z" fill="#f2d440"/>
+  <style/>
+  <path d="m1 12v-9c0-1.108 0.892-2 2-2h34c1.108 0 2 0.892 2 2v9c0 1.108-0.892 2-2 2h-34c-1.108 0-2-0.892-2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
+  <path d="m35.589 11h-31.178c-0.22768 0-0.41097-0.21148-0.41097-0.47417v-6.0517c0-0.26269 0.18329-0.47417 0.41097-0.47417h31.178c0.22768 0 0.41097 0.21148 0.41097 0.47417v6.0517c0 0.26269-0.18329 0.47417-0.41097 0.47417z" fill="#d700d7"/>
 </svg>
diff --git a/res/skins/Deere/handle-volume-deck1.svg b/res/skins/Deere/handle-volume-deck1.svg
new file mode 100644
index 00000000000..c595936fb43
--- /dev/null
+++ b/res/skins/Deere/handle-volume-deck1.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="40" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <style/>
+ <path d="m1 12v-9c0-1.108 0.892-2 2-2h34c1.108 0 2 0.892 2 2v9c0 1.108-0.892 2-2 2h-34c-1.108 0-2-0.892-2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
+ <path d="m35.589 11h-31.178c-0.22768 0-0.41097-0.21148-0.41097-0.47417v-6.0517c0-0.26269 0.18329-0.47417 0.41097-0.47417h31.178c0.22768 0 0.41097 0.21148 0.41097 0.47417v6.0517c0 0.26269-0.18329 0.47417-0.41097 0.47417z" fill="#378df7"/>
+</svg>
diff --git a/res/skins/Deere/handle-volume-deck2.svg b/res/skins/Deere/handle-volume-deck2.svg
new file mode 100644
index 00000000000..10f79b79b87
--- /dev/null
+++ b/res/skins/Deere/handle-volume-deck2.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="40" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <style/>
+ <path d="m1 12v-9c0-1.108 0.892-2 2-2h34c1.108 0 2 0.892 2 2v9c0 1.108-0.892 2-2 2h-34c-1.108 0-2-0.892-2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
+ <path d="m35.589 11h-31.178c-0.22768 0-0.41097-0.21148-0.41097-0.47417v-6.0517c0-0.26269 0.18329-0.47417 0.41097-0.47417h31.178c0.22768 0 0.41097 0.21148 0.41097 0.47417v6.0517c0 0.26269-0.18329 0.47417-0.41097 0.47417z" fill="#ffb108"/>
+</svg>
diff --git a/res/skins/Deere/handle-volume-deck3.svg b/res/skins/Deere/handle-volume-deck3.svg
new file mode 100644
index 00000000000..8bd56dce03e
--- /dev/null
+++ b/res/skins/Deere/handle-volume-deck3.svg
@@ -0,0 +1,5 @@
+<svg width="40" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg">
+  <style/>
+  <path d="m1 12v-9c0-1.108 0.892-2 2-2h34c1.108 0 2 0.892 2 2v9c0 1.108-0.892 2-2 2h-34c-1.108 0-2-0.892-2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
+  <path d="m35.589 11h-31.178c-0.22768 0-0.41097-0.21148-0.41097-0.47417v-6.0517c0-0.26269 0.18329-0.47417 0.41097-0.47417h31.178c0.22768 0 0.41097 0.21148 0.41097 0.47417v6.0517c0 0.26269-0.18329 0.47417-0.41097 0.47417z" fill="#d700d7"/>
+</svg>
diff --git a/res/skins/Deere/handle-volume-deck4.svg b/res/skins/Deere/handle-volume-deck4.svg
new file mode 100644
index 00000000000..6ee09a405d6
--- /dev/null
+++ b/res/skins/Deere/handle-volume-deck4.svg
@@ -0,0 +1,5 @@
+<svg width="40" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg">
+  <style/>
+  <path d="m1 12v-9c0-1.108 0.892-2 2-2h34c1.108 0 2 0.892 2 2v9c0 1.108-0.892 2-2 2h-34c-1.108 0-2-0.892-2-2z" fill="#333" stroke="#e0e0e0" stroke-width="2"/>
+  <path d="m35.589 11h-31.178c-0.22768 0-0.41097-0.21148-0.41097-0.47417v-6.0517c0-0.26269 0.18329-0.47417 0.41097-0.47417h31.178c0.22768 0 0.41097 0.21148 0.41097 0.47417v6.0517c0 0.26269-0.18329 0.47417-0.41097 0.47417z" fill="#88b31a"/>
+</svg>
diff --git a/res/skins/Deere/mixer.xml b/res/skins/Deere/mixer.xml
index aef51ded70c..d1b8e6f3a04 100644
--- a/res/skins/Deere/mixer.xml
+++ b/res/skins/Deere/mixer.xml
@@ -176,7 +176,7 @@
                     <Size>1me,40f</Size>
                     <MaximumSize>200,</MaximumSize>
                     <Slider scalemode="STRETCH">slider-crossfader.svg</Slider>
-                    <Handle scalemode="STRETCH_ASPECT">handle-crossfader-orange.svg</Handle>
+                    <Handle scalemode="STRETCH_ASPECT">handle-crossfader-grey.svg</Handle>
                     <Horizontal>true</Horizontal>
                     <Connection>
                       <ConfigKey>[Master],crossfader</ConfigKey>
diff --git a/res/skins/Deere/mixer_column_volume_gain.xml b/res/skins/Deere/mixer_column_volume_gain.xml
index 9e9ae1d57c3..3afab70c722 100644
--- a/res/skins/Deere/mixer_column_volume_gain.xml
+++ b/res/skins/Deere/mixer_column_volume_gain.xml
@@ -30,7 +30,7 @@
         <MinimumSize>40,50</MinimumSize>
         <MaximumSize>40,150</MaximumSize>
         <Slider scalemode="STRETCH">slider-vertical.svg</Slider>
-        <Handle scalemode="STRETCH_ASPECT">handle-vertical-orange.svg</Handle>
+        <Handle scalemode="STRETCH_ASPECT">handle-volume-deck<Variable name="i"/>.svg</Handle>
         <Horizontal>false</Horizontal>
         <Connection>
           <ConfigKey><Variable name="group"/>,volume</ConfigKey>
diff --git a/res/skins/Deere/mixer_controls_4decks_left.xml b/res/skins/Deere/mixer_controls_4decks_left.xml
index 405203976b0..56ac54e09d2 100644
--- a/res/skins/Deere/mixer_controls_4decks_left.xml
+++ b/res/skins/Deere/mixer_controls_4decks_left.xml
@@ -183,7 +183,7 @@
                     <MinimumSize>40,50</MinimumSize>
                     <MaximumSize>40,-1</MaximumSize>
                     <Slider scalemode="STRETCH">slider-vertical.svg</Slider>
-                    <Handle scalemode="STRETCH_ASPECT">handle-vertical-orange.svg</Handle>
+                    <Handle scalemode="STRETCH_ASPECT">handle-volume-deck<Variable name="i"/>.svg</Handle>
                     <Horizontal>false</Horizontal>
                     <Connection>
                       <ConfigKey><Variable name="group"/>,volume</ConfigKey>
@@ -250,7 +250,7 @@
                     <MinimumSize>40,50</MinimumSize>
                     <MaximumSize>40,-1</MaximumSize>
                     <Slider scalemode="STRETCH">slider-vertical.svg</Slider>
-                    <Handle scalemode="STRETCH_ASPECT">handle-vertical-orange.svg</Handle>
+                    <Handle scalemode="STRETCH_ASPECT">handle-volume-deck<Variable name="i"/>.svg</Handle>
                     <Horizontal>false</Horizontal>
                     <Connection>
                       <ConfigKey><Variable name="group"/>,volume</ConfigKey>
diff --git a/res/skins/Deere/mixer_controls_4decks_right.xml b/res/skins/Deere/mixer_controls_4decks_right.xml
index bd77b73f520..25e76a249f9 100644
--- a/res/skins/Deere/mixer_controls_4decks_right.xml
+++ b/res/skins/Deere/mixer_controls_4decks_right.xml
@@ -171,7 +171,7 @@
                     <MinimumSize>40,50</MinimumSize>
                     <MaximumSize>40,-1</MaximumSize>
                     <Slider scalemode="STRETCH">slider-vertical.svg</Slider>
-                    <Handle scalemode="STRETCH_ASPECT">handle-vertical-orange.svg</Handle>
+                    <Handle scalemode="STRETCH_ASPECT">handle-volume-deck<Variable name="i"/>.svg</Handle>
                     <Horizontal>false</Horizontal>
                     <Connection>
                       <ConfigKey><Variable name="group"/>,volume</ConfigKey>
@@ -249,7 +249,7 @@
                     <MinimumSize>40,50</MinimumSize>
                     <MaximumSize>40,-1</MaximumSize>
                     <Slider scalemode="STRETCH">slider-vertical.svg</Slider>
-                    <Handle scalemode="STRETCH_ASPECT">handle-vertical-orange.svg</Handle>
+                    <Handle scalemode="STRETCH_ASPECT">handle-volume-deck<Variable name="i"/>.svg</Handle>
                     <Horizontal>false</Horizontal>
                     <Connection>
                       <ConfigKey><Variable name="group"/>,volume</ConfigKey>

From cf8e5a44ed4738376ca800147a2a9d59ff5dded5 Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Fri, 13 Oct 2023 16:08:40 +0100
Subject: [PATCH 120/388] macOS packaging: Enable app sandbox in
 ad-hoc-packaged bundles too

---
 cmake/modules/BundleInstall.cmake.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmake/modules/BundleInstall.cmake.in b/cmake/modules/BundleInstall.cmake.in
index 6e3217255f7..13e93703456 100644
--- a/cmake/modules/BundleInstall.cmake.in
+++ b/cmake/modules/BundleInstall.cmake.in
@@ -23,6 +23,7 @@ if(DEFINED APPLE_CODESIGN_IDENTITY AND DEFINED APPLE_CODESIGN_ENTITLEMENTS)
       message(STATUS "Ad-hoc signing bundle without hardened runtime")
       execute_process(COMMAND
           codesign --verbose=4 --deep --force
+          --entitlements "${APPLE_CODESIGN_ENTITLEMENTS}"
           --sign "${APPLE_CODESIGN_IDENTITY}"
           "${PATH_TO_SIGN}"
       )

From 32af0deb81a6cc9ff990e090a229fca42a4d37ef Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Wed, 18 Oct 2023 22:01:52 +0200
Subject: [PATCH 121/388] return nullptr instead of null unique_ptr

---
 src/util/texture.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/util/texture.cpp b/src/util/texture.cpp
index a1235547f5f..ecd9e27d511 100644
--- a/src/util/texture.cpp
+++ b/src/util/texture.cpp
@@ -2,7 +2,7 @@
 
 std::unique_ptr<QOpenGLTexture> createTexture(const QImage& image) {
     if (image.isNull()) {
-        return std::unique_ptr<QOpenGLTexture>{};
+        return nullptr;
     }
     std::unique_ptr<QOpenGLTexture> pTexture{new QOpenGLTexture(image)};
     pTexture->setMinificationFilter(QOpenGLTexture::Linear);
@@ -18,14 +18,14 @@ std::unique_ptr<QOpenGLTexture> createTexture(const QPixmap& pixmap) {
 
 std::unique_ptr<QOpenGLTexture> createTexture(const QSharedPointer<Paintable>& pPaintable) {
     if (pPaintable.isNull()) {
-        return std::unique_ptr<QOpenGLTexture>{};
+        return nullptr;
     }
     return createTexture(pPaintable->toImage());
 }
 
 std::unique_ptr<QOpenGLTexture> createTexture(const std::shared_ptr<QImage>& pImage) {
     if (!pImage) {
-        return std::unique_ptr<QOpenGLTexture>{};
+        return nullptr;
     }
     return createTexture(*pImage);
 }

From e39db38375e4be6372dffd6c09ab0be7fd05daf0 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Thu, 19 Oct 2023 15:20:33 +0200
Subject: [PATCH 122/388] Pref Mixer: fix 'Bypass EQ processing' default (off)

---
 src/preferences/dialog/dlgprefmixer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index e021745cc7d..02e9261936f 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -765,10 +765,10 @@ void DlgPrefMixer::slotUpdate() {
     CheckBoxGainAutoReset->setChecked(m_gainAutoReset);
 
     QString eqBaypassCfg = m_pConfig->getValueString(kEnableEqsKey);
-    m_eqBypass = !(eqBaypassCfg == "yes" || eqBaypassCfg == "1"); // default false
+    m_eqBypass = !(eqBaypassCfg == "yes" || eqBaypassCfg == "1" || eqBaypassCfg.isEmpty());
     CheckBoxBypass->setChecked(m_eqBypass);
     // Deactivate EQ comboboxes when Bypass is enabled
-    slotBypassEqToggled(CheckBoxBypass->isChecked());
+    slotBypassEqToggled(m_eqBypass);
 
     // EQ shelves //////////////////////////////////////////////////////////////
     QString highEqCoarse = m_pConfig->getValueString(kHighEqFreqKey);

From 27a67ffd4338f775fe48baf72b6febaabb44777c Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Thu, 19 Oct 2023 16:13:40 +0200
Subject: [PATCH 123/388] Pref Interface: avoid needless skin reload after
 default skin/scheme was picked

fix regression from #11853
---
 src/preferences/dialog/dlgprefinterface.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/preferences/dialog/dlgprefinterface.cpp b/src/preferences/dialog/dlgprefinterface.cpp
index c576d6fff1d..de896fe1f2b 100644
--- a/src/preferences/dialog/dlgprefinterface.cpp
+++ b/src/preferences/dialog/dlgprefinterface.cpp
@@ -252,6 +252,7 @@ void DlgPrefInterface::slotUpdateSchemes() {
         // m_colorScheme to avoid an empty skin preview.
         if (!foundConfigScheme) {
             m_colorScheme = schlist[0];
+            m_colorSchemeOnUpdate = schlist[0];
         }
     }
 }

From 6d98d80fec8049be36ba446a7b97896f5ba6ac7f Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Fri, 20 Oct 2023 01:23:29 +0200
Subject: [PATCH 124/388] Update src/widget/wspinnyglsl.cpp

Co-authored-by: JoergAtGithub <64457745+JoergAtGithub@users.noreply.github.com>
---
 src/widget/wspinnyglsl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/widget/wspinnyglsl.cpp b/src/widget/wspinnyglsl.cpp
index e42dfcc4e3c..a0d4b6d1558 100644
--- a/src/widget/wspinnyglsl.cpp
+++ b/src/widget/wspinnyglsl.cpp
@@ -138,7 +138,7 @@ void WSpinnyGLSL::paintGL() {
 
     if (paintGhost) {
         QMatrix4x4 rotate;
-        rotate.rotate(-m_fGhostAngle, 0, 0);
+        rotate.rotate(m_fGhostAngle, 0, 0, -1);
         m_textureShader.setUniformValue(matrixLocation, rotate);
 
         drawTexture(m_pGhostTextureScaled.get());

From 599c8ccb4cbdd7b586a4bb1aaafafc634f7199b9 Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Fri, 20 Oct 2023 01:23:41 +0200
Subject: [PATCH 125/388] Update src/widget/wspinnyglsl.cpp

Co-authored-by: JoergAtGithub <64457745+JoergAtGithub@users.noreply.github.com>
---
 src/widget/wspinnyglsl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/widget/wspinnyglsl.cpp b/src/widget/wspinnyglsl.cpp
index a0d4b6d1558..cedd6080cfe 100644
--- a/src/widget/wspinnyglsl.cpp
+++ b/src/widget/wspinnyglsl.cpp
@@ -146,7 +146,7 @@ void WSpinnyGLSL::paintGL() {
 
     if (m_pFgTextureScaled) {
         QMatrix4x4 rotate;
-        rotate.rotate(-m_fAngle, 0, 0);
+        rotate.rotate(m_fAngle, 0, 0, -1);
         m_textureShader.setUniformValue(matrixLocation, rotate);
 
         drawTexture(m_pFgTextureScaled.get());

From 1eab6584c5d10f4098e271077f90b4e9a05dd061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Fri, 20 Oct 2023 09:55:28 +0200
Subject: [PATCH 126/388] Output error code and message in case downloading the
 manual fails

---
 CMakeLists.txt | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 246f4ce043b..589d309f65d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2149,11 +2149,15 @@ if(DOWNLOAD_MANUAL AND NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Manual.
     STATUS MANUAL_PDF_DOWNLOAD
     TLS_VERIFY ON
   )
-  if(NOT MANUAL_PDF_DOWNLOAD EQUAL 0)
-    message(FATAL_ERROR "Manual PDF download failed. Either download it yourself "
-      "and move it to '${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Manual.pdf' or "
-      "reconfigure with -DDOWNLOAD_MANUAL=OFF to build without included "
-      "manual.")
+  list(GET MANUAL_PDF_DOWNLOAD 0 MANUAL_PDF_DOWNLOAD_ERROR)
+  if(NOT MANUAL_PDF_DOWNLOAD_ERROR EQUAL 0)
+    list(GET MANUAL_PDF_DOWNLOAD 1 MANUAL_PDF_DOWNLOAD_MESSGAE)
+    message(FATAL_ERROR "Manual PDF download failed with: "
+        "${MANUAL_PDF_DOWNLOAD_MESSGAE} Code: ${MANUAL_PDF_DOWNLOAD_ERROR}. "
+        "Either download it yourself and move it to "
+        "'${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Manual.pdf' or "
+        "reconfigure with -DDOWNLOAD_MANUAL=OFF to build without included "
+        "manual.")
   endif()
   file(RENAME "${CMAKE_CURRENT_BINARY_DIR}/res/Mixxx-Manual.pdf" "${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Manual.pdf")
 endif()

From 906f2c1d6d5cf38e15c7f40bf906c9986404561e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Fri, 20 Oct 2023 12:44:42 +0200
Subject: [PATCH 127/388] Report the CMAKE_VERSION form CMakeList.txt

---
 CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 589d309f65d..9a6663e589b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.16)
 
+message(STATUS "CMAKE_VERSION: ${CMAKE_VERSION}")
+
 # CMAKE_CXX_COMPILER_ID: Distinguish between "AppleClang" and "Clang"
 if(POLICY CMP0025)
   cmake_policy(SET CMP0025 NEW)

From c8e812f84156bab26c52fc2fc888aa5475d52036 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Fri, 20 Oct 2023 13:31:32 +0200
Subject: [PATCH 128/388] Use CMake 3.21 on windows, do work around the
 download failure of the manual.

---
 .github/workflows/build.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bdab65e470f..fdc162aeb1b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -181,14 +181,23 @@ jobs:
 
       - name: "[macOS] Set up cmake"
         uses: jwlawson/actions-setup-cmake@v1.13
-        # Ubuntu 22.04 should use the CMake version from the repos, and Visual
-        # Studio on Windows comes with its own CMake version anyway.
+        # Ubuntu 22.04 should use the CMake version from the repos.
         if: runner.os == 'macOS'
         with:
           # This should always match the minimum required version in
           # our CMakeLists.txt
           cmake-version: "3.19.x"
 
+      - name: "[Windows] Set up cmake"
+        uses: jwlawson/actions-setup-cmake@v1.13
+        # Ubuntu 22.04 should use the CMake version from the repos.
+        if: runner.os == 'Windows'
+        with:
+          # This is a workaround for a SSL false positive in cmake 3.26.4
+          # When downloading the manual. 3.21 is required for installing the
+          # ANGLE Dlls via IMPORTED_RUNTIME_ARTIFACTS
+          cmake-version: "3.21.x"
+
       - name: "[Windows] Set up MSVC Developer Command Prompt"
         if: runner.os == 'Windows'
         uses: ilammy/msvc-dev-cmd@v1

From 9664d414c0f4c4ec2fdc65f2928cb0d43c485983 Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Fri, 20 Oct 2023 21:50:39 +0200
Subject: [PATCH 129/388] use vec4 for color (and use alpha component instead
 of hardcoded value), added missing precision

---
 src/shaders/rgbashader.cpp         | 2 +-
 src/shaders/rgbshader.cpp          | 2 +-
 src/shaders/unicolorshader.cpp     | 2 +-
 src/shaders/vinylqualityshader.cpp | 6 +++---
 src/widget/wspinnyglsl.cpp         | 1 +
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/shaders/rgbashader.cpp b/src/shaders/rgbashader.cpp
index d90866ab20f..3dd3dae0395 100644
--- a/src/shaders/rgbashader.cpp
+++ b/src/shaders/rgbashader.cpp
@@ -4,7 +4,7 @@ using namespace mixxx;
 
 void RGBAShader::init() {
     QString vertexShaderCode = QStringLiteral(R"--(
-uniform mat4 matrix;
+uniform highp mat4 matrix;
 attribute highp vec4 position; // use vec4 here (will be padded) for matrix multiplication
 attribute highp vec4 color;
 varying highp vec4 vColor;
diff --git a/src/shaders/rgbshader.cpp b/src/shaders/rgbshader.cpp
index 4ef740582b9..e9fb26888c1 100644
--- a/src/shaders/rgbshader.cpp
+++ b/src/shaders/rgbshader.cpp
@@ -4,7 +4,7 @@ using namespace mixxx;
 
 void RGBShader::init() {
     QString vertexShaderCode = QStringLiteral(R"--(
-uniform mat4 matrix;
+uniform highp mat4 matrix;
 attribute highp vec4 position; // use vec4 here (will be padded) for matrix multiplication
 attribute highp vec3 color;
 varying highp vec3 vColor;
diff --git a/src/shaders/unicolorshader.cpp b/src/shaders/unicolorshader.cpp
index 8c348d288bd..c9a345ae9fc 100644
--- a/src/shaders/unicolorshader.cpp
+++ b/src/shaders/unicolorshader.cpp
@@ -4,7 +4,7 @@ using namespace mixxx;
 
 void UnicolorShader::init() {
     QString vertexShaderCode = QStringLiteral(R"--(
-uniform mat4 matrix;
+uniform highp mat4 matrix;
 attribute highp vec4 position; // use vec4 here (will be padded) for matrix multiplication
 void main()
 {
diff --git a/src/shaders/vinylqualityshader.cpp b/src/shaders/vinylqualityshader.cpp
index 2a1e6bc6e92..621cad3e7da 100644
--- a/src/shaders/vinylqualityshader.cpp
+++ b/src/shaders/vinylqualityshader.cpp
@@ -4,7 +4,7 @@ using namespace mixxx;
 
 void VinylQualityShader::init() {
     QString vertexShaderCode = QStringLiteral(R"--(
-uniform mat4 matrix;
+uniform highp mat4 matrix;
 attribute highp vec4 position; // use vec4 here (will be padded) for matrix multiplication
 attribute highp vec2 texcoord;
 varying highp vec2 vTexcoord;
@@ -17,11 +17,11 @@ void main()
 
     QString fragmentShaderCode = QStringLiteral(R"--(
 uniform sampler2D texture;
-uniform highp vec3 color;
+uniform highp vec4 color;
 varying highp vec2 vTexcoord;
 void main()
 {
-    gl_FragColor = vec4(color, texture2D(texture, vTexcoord) * 0.75);
+    gl_FragColor = vec4(color.xyz, texture2D(texture, vTexcoord) * color.w);
 }
 )--");
 
diff --git a/src/widget/wspinnyglsl.cpp b/src/widget/wspinnyglsl.cpp
index cedd6080cfe..37361927853 100644
--- a/src/widget/wspinnyglsl.cpp
+++ b/src/widget/wspinnyglsl.cpp
@@ -66,6 +66,7 @@ void WSpinnyGLSL::setupVinylSignalQuality() {
 void WSpinnyGLSL::updateVinylSignalQualityImage(
         const QColor& qual_color, const unsigned char* data) {
     m_vinylQualityColor = qual_color;
+    m_vinylQualityColor.setAlphaF(0.75f);
     if (m_pQTexture) {
         makeCurrentIfNeeded();
         m_pQTexture->bind();

From 8391e9d109150ffd55cc4631508115494e1242f3 Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Thu, 19 Oct 2023 07:54:39 +0200
Subject: [PATCH 130/388] auto-scale and improve align of symbol markers,
 additional changes: reduced code duplication, fixed a small bug with leave
 events not being send to the opengl widgets, use antialiasing for play pos

---
 .../allshader/waveformrendermark.cpp          | 248 +++---------------
 .../renderers/allshader/waveformrendermark.h  |   4 +-
 src/waveform/renderers/waveformmark.cpp       | 227 +++++++++++++++-
 src/waveform/renderers/waveformmark.h         |  21 +-
 src/waveform/renderers/waveformrendermark.cpp | 199 +-------------
 .../widgets/allshader/waveformwidget.cpp      |   5 +
 .../widgets/allshader/waveformwidget.h        |   1 +
 7 files changed, 292 insertions(+), 413 deletions(-)

diff --git a/src/waveform/renderers/allshader/waveformrendermark.cpp b/src/waveform/renderers/allshader/waveformrendermark.cpp
index aff0e542d59..2f2f1523638 100644
--- a/src/waveform/renderers/allshader/waveformrendermark.cpp
+++ b/src/waveform/renderers/allshader/waveformrendermark.cpp
@@ -25,13 +25,9 @@
 // The renderers in this folder are optimized to use GLSL shaders and refrain
 // from using QPainter on the QOpenGLWindow, which causes degredated performance.
 //
-// This renderer does use QPainter, but only to draw on a QImage. This is only
-// done once when needed and the images are then used as textures to be drawn
-// with a GLSL shader.
-
-namespace {
-constexpr int kMaxCueLabelLength = 23;
-} // namespace
+// This renderer does use QPainter (indirectly, in WaveformMark::generateImage), but
+// only to draw on a QImage. This is only done once when needed and the images are
+// then used as textures to be drawn with a GLSL shader.
 
 allshader::WaveformRenderMark::WaveformRenderMark(WaveformWidgetRenderer* waveformWidget)
         : WaveformRenderer(waveformWidget),
@@ -55,9 +51,9 @@ void allshader::WaveformRenderMark::initializeGL() {
     m_textureShader.init();
 
     for (const auto& pMark : m_marks) {
-        generateMarkImage(pMark, m_waveformRenderer->getBreadth());
+        generateMarkImage(pMark);
     }
-    generatePlayPosMarkTexture(m_waveformRenderer->getBreadth());
+    generatePlayPosMarkTexture();
 }
 
 void allshader::WaveformRenderMark::drawTexture(float x, float y, QOpenGLTexture* texture) {
@@ -173,8 +169,8 @@ void allshader::WaveformRenderMark::paintGL() {
             continue;
         }
 
-        if (pMark->m_image.isNull()) {
-            generateMarkImage(pMark, m_waveformRenderer->getBreadth());
+        if (pMark->m_needsUpdate) {
+            generateMarkImage(pMark);
         }
 
         const double samplePosition = pMark->getSamplePosition();
@@ -239,11 +235,14 @@ void allshader::WaveformRenderMark::paintGL() {
     drawTexture(drawOffset, 0.f, m_pPlayPosMarkTexture.get());
 }
 
-void allshader::WaveformRenderMark::generatePlayPosMarkTexture(float breadth) {
+// Generate the texture used to draw the play position marker.
+// Note that in the legacy waveform widgets this is drawn directly
+// in the WaveformWidgetRenderer itself. Doing it here is cleaner.
+void allshader::WaveformRenderMark::generatePlayPosMarkTexture() {
     float imgwidth;
     float imgheight;
 
-    const float height = breadth;
+    const float height = m_waveformRenderer->getBreadth();
     const float devicePixelRatio = m_waveformRenderer->getDevicePixelRatio();
 
     const float lineX = 5.5f;
@@ -261,13 +260,16 @@ void allshader::WaveformRenderMark::generatePlayPosMarkTexture(float breadth) {
     QPainter painter;
 
     painter.begin(&image);
+    painter.setRenderHint(QPainter::Antialiasing);
 
     painter.setWorldMatrixEnabled(false);
 
+    const QColor fgColor{m_waveformRenderer->getWaveformSignalColors()->getPlayPosColor()};
+    const QColor bgColor{m_waveformRenderer->getWaveformSignalColors()->getBgColor()};
+
     // draw dim outlines to increase playpos/waveform contrast
+    painter.setPen(bgColor);
     painter.setOpacity(0.5);
-    painter.setPen(m_waveformRenderer->getWaveformSignalColors()->getBgColor());
-    QBrush bgFill = m_waveformRenderer->getWaveformSignalColors()->getBgColor();
     // lines next to playpos
     // Note: don't draw lines where they would overlap the triangles,
     // otherwise both translucent strokes add up to a darker tone.
@@ -278,23 +280,22 @@ void allshader::WaveformRenderMark::generatePlayPosMarkTexture(float breadth) {
     // Increase line/waveform contrast
     painter.setOpacity(0.8);
     {
-        QPointF t0 = QPointF(lineX - 5.f, 0.f);
-        QPointF t1 = QPointF(lineX + 5.f, 0.f);
-        QPointF t2 = QPointF(lineX, 6.f);
-        drawTriangle(&painter, bgFill, t0, t1, t2);
+        QPointF baseL = QPointF(lineX - 5.f, 0.f);
+        QPointF baseR = QPointF(lineX + 5.f, 0.f);
+        QPointF tip = QPointF(lineX, 5.f);
+        drawTriangle(&painter, bgColor, baseL, baseR, tip);
     }
     // draw colored play position indicators
+    painter.setPen(fgColor);
     painter.setOpacity(1.0);
-    painter.setPen(m_waveformRenderer->getWaveformSignalColors()->getPlayPosColor());
-    QBrush fgFill = m_waveformRenderer->getWaveformSignalColors()->getPlayPosColor();
     // play position line
     painter.drawLine(QLineF(lineX, 0.f, lineX, height));
     // triangle at top edge
     {
-        QPointF t0 = QPointF(lineX - 4.f, 0.f);
-        QPointF t1 = QPointF(lineX + 4.f, 0.f);
-        QPointF t2 = QPointF(lineX, 5.f);
-        drawTriangle(&painter, fgFill, t0, t1, t2);
+        QPointF baseL = QPointF(lineX - 4.f, 0.f);
+        QPointF baseR = QPointF(lineX + 4.f, 0.f);
+        QPointF tip = QPointF(lineX, 4.f);
+        drawTriangle(&painter, fgColor, baseL, baseR, tip);
     }
     painter.end();
 
@@ -303,30 +304,23 @@ void allshader::WaveformRenderMark::generatePlayPosMarkTexture(float breadth) {
 
 void allshader::WaveformRenderMark::drawTriangle(QPainter* painter,
         const QBrush& fillColor,
-        QPointF p0,
-        QPointF p1,
-        QPointF p2) {
+        QPointF baseL,
+        QPointF baseR,
+        QPointF tip) {
     QPainterPath triangle;
     painter->setPen(Qt::NoPen);
-    triangle.moveTo(p0); // ° base 1
-    triangle.lineTo(p1); // > base 2
-    triangle.lineTo(p2); // > peak
-    triangle.lineTo(p0); // > base 1
+    triangle.moveTo(baseL);
+    triangle.lineTo(tip);
+    triangle.lineTo(baseR);
+    triangle.closeSubpath();
     painter->fillPath(triangle, fillColor);
 }
 
-void allshader::WaveformRenderMark::resizeGL(int w, int h) {
-    const float devicePixelRatio = m_waveformRenderer->getDevicePixelRatio();
-    const float breadth =
-            static_cast<float>(
-                    m_waveformRenderer->getOrientation() == Qt::Vertical ? w
-                                                                         : h) /
-            devicePixelRatio;
-
+void allshader::WaveformRenderMark::resizeGL(int, int) {
     for (const auto& pMark : m_marks) {
-        generateMarkImage(pMark, breadth);
+        generateMarkImage(pMark);
     }
-    generatePlayPosMarkTexture(breadth);
+    generatePlayPosMarkTexture();
 }
 
 void allshader::WaveformRenderMark::onSetTrack() {
@@ -379,173 +373,13 @@ void allshader::WaveformRenderMark::checkCuesUpdated() {
             pMark->m_text = newLabel;
             const int dimBrightThreshold = m_waveformRenderer->getDimBrightThreshold();
             pMark->setBaseColor(newColor, dimBrightThreshold);
-            generateMarkImage(pMark, m_waveformRenderer->getBreadth());
+            generateMarkImage(pMark);
         }
     }
 }
 
-void allshader::WaveformRenderMark::generateMarkImage(WaveformMarkPointer pMark, float breadth) {
-    // Load the pixmap from file.
-    // If that succeeds loading the text and stroke is skipped.
-    const float devicePixelRatio = m_waveformRenderer->getDevicePixelRatio();
-    if (!pMark->m_pixmapPath.isEmpty()) {
-        QString path = pMark->m_pixmapPath;
-        // Use devicePixelRatio to properly scale the image
-        QImage image = *WImageStore::getImage(path, devicePixelRatio);
-        // QImage image = QImage(path);
-        //  If loading the image didn't fail, then we're done. Otherwise fall
-        //  through and render a label.
-        if (!image.isNull()) {
-            pMark->m_image =
-                    image.convertToFormat(QImage::Format_ARGB32_Premultiplied);
-            // WImageStore::correctImageColors(&pMark->m_image);
-            //  Set the pixel/device ratio AFTER loading the image in order to get
-            //  a truly scaled source image.
-            //  See https://doc.qt.io/qt-5/qimage.html#setDevicePixelRatio
-            //  Also, without this some Qt-internal issue results in an offset
-            //  image when calculating the center line of pixmaps in draw().
-            pMark->m_image.setDevicePixelRatio(devicePixelRatio);
-            pMark->m_pTexture = createTexture(pMark->m_image);
-            return;
-        }
-    }
-
-    {
-        // See comment on use of QPainter at top of file
-        QPainter painter;
-
-        // Determine mark text.
-        QString label = pMark->m_text;
-        if (pMark->getHotCue() >= 0) {
-            if (!label.isEmpty()) {
-                label.prepend(": ");
-            }
-            label.prepend(QString::number(pMark->getHotCue() + 1));
-            if (label.size() > kMaxCueLabelLength) {
-                label = label.left(kMaxCueLabelLength - 3) + "...";
-            }
-        }
-
-        // This alone would pick the OS default font, or that set by Qt5 Settings (qt5ct)
-        // respectively. This would mostly not be notable since contemporary OS and distros
-        // use a proven sans-serif anyway. Though, some user fonts may be lacking glyphs
-        // we use for the intro/outro markers for example.
-        QFont font;
-        // So, let's just use Open Sans which is used by all official skins to achieve
-        // a consistent skin design.
-        font.setFamily("Open Sans");
-        // Use a pixel size like everywhere else in Mixxx, which can be scaled well
-        // in general.
-        // Point sizes would work if only explicit Qt scaling QT_SCALE_FACTORS is used,
-        // though as soon as other OS-based font and app scaling mechanics join the
-        // party the resulting font size is hard to predict (affects all supported OS).
-        font.setPixelSize(13);
-        font.setWeight(75); // bold
-        font.setItalic(false);
-
-        QFontMetrics metrics(font);
-
-        // fixed margin ...
-        QRect wordRect = metrics.tightBoundingRect(label);
-        wordRect.setHeight(wordRect.height() + (wordRect.height() % 2));
-        wordRect.setWidth(wordRect.width() + (wordRect.width()) % 2);
-        constexpr float marginX = 1.f;
-        constexpr float marginY = 1.f;
-        QRectF wordRectF(marginX + 1.f,
-                marginY + 1.f,
-                static_cast<float>(wordRect.width()),
-                static_cast<float>(wordRect.height()));
-        // even wordrect to have an even Image >> draw the line in the middle !
-
-        float labelRectWidth = static_cast<float>(wordRectF.width()) + 2.f * marginX + 4.f;
-        float labelRectHeight = static_cast<float>(wordRectF.height()) + 2.f * marginY + 4.f;
-
-        QRectF labelRect(0.f, 0.f, labelRectWidth, labelRectHeight);
-
-        float width;
-        float height;
-
-        width = 2.f * labelRectWidth + 1.f;
-        height = breadth;
-
-        pMark->m_image = QImage(
-                static_cast<int>(width * devicePixelRatio),
-                static_cast<int>(height * devicePixelRatio),
-                QImage::Format_ARGB32_Premultiplied);
-        pMark->m_image.setDevicePixelRatio(devicePixelRatio);
-
-        Qt::Alignment markAlignH = pMark->m_align & Qt::AlignHorizontal_Mask;
-        Qt::Alignment markAlignV = pMark->m_align & Qt::AlignVertical_Mask;
-
-        if (markAlignH == Qt::AlignHCenter) {
-            labelRect.moveLeft((width - labelRectWidth) / 2.f);
-        } else if (markAlignH == Qt::AlignRight) {
-            labelRect.moveRight(width - 1.f);
-        }
-
-        if (markAlignV == Qt::AlignVCenter) {
-            labelRect.moveTop((height - labelRectHeight) / 2.f);
-        } else if (markAlignV == Qt::AlignBottom) {
-            labelRect.moveBottom(height - 1.f);
-        }
-
-        pMark->m_label.setAreaRect(labelRect);
-
-        // Fill with transparent pixels
-        pMark->m_image.fill(QColor(0, 0, 0, 0).rgba());
-
-        painter.begin(&pMark->m_image);
-        painter.setRenderHint(QPainter::TextAntialiasing);
-
-        painter.setWorldMatrixEnabled(false);
-
-        // Draw marker lines
-        float middle = width / 2.f;
-        pMark->m_linePosition = middle;
-        if (markAlignH == Qt::AlignHCenter) {
-            if (labelRect.top() > 0) {
-                painter.setPen(pMark->fillColor());
-                painter.drawLine(QLineF(middle, 0, middle, labelRect.top()));
-
-                painter.setPen(pMark->borderColor());
-                painter.drawLine(QLineF(middle - 1.f, 0.f, middle - 1.f, labelRect.top()));
-                painter.drawLine(QLineF(middle + 1.f, 0.f, middle + 1.f, labelRect.top()));
-            }
-
-            if (labelRect.bottom() < height) {
-                painter.setPen(pMark->fillColor());
-                painter.drawLine(QLineF(middle, labelRect.bottom(), middle, height));
-
-                painter.setPen(pMark->borderColor());
-                painter.drawLine(QLineF(middle - 1.f,
-                        labelRect.bottom(),
-                        middle - 1.f,
-                        height));
-                painter.drawLine(QLineF(middle + 1.f,
-                        labelRect.bottom(),
-                        middle + 1.f,
-                        height));
-            }
-        } else { // AlignLeft || AlignRight
-            painter.setPen(pMark->fillColor());
-            painter.drawLine(QLineF(middle, 0.f, middle, height));
-
-            painter.setPen(pMark->borderColor());
-            painter.drawLine(QLineF(middle - 1.f, 0, middle - 1.f, height));
-            painter.drawLine(QLineF(middle + 1.f, 0, middle + 1.f, height));
-        }
-
-        // Draw the label rect
-        painter.setPen(pMark->borderColor());
-        painter.setBrush(QBrush(pMark->fillColor()));
-        painter.drawRoundedRect(labelRect, 2.0, 2.0);
-
-        // Draw text
-        painter.setBrush(QBrush(QColor(0, 0, 0, 0)));
-        painter.setFont(font);
-        painter.setPen(pMark->labelColor());
-        painter.drawText(labelRect, Qt::AlignCenter, label);
-    }
-
-    pMark->m_pTexture = createTexture(pMark->m_image);
+void allshader::WaveformRenderMark::generateMarkImage(WaveformMarkPointer pMark) {
+    pMark->m_pTexture = createTexture(pMark->generateImage(m_waveformRenderer->getBreadth(),
+            m_waveformRenderer->getDevicePixelRatio()));
+    pMark->m_needsUpdate = false;
 }
diff --git a/src/waveform/renderers/allshader/waveformrendermark.h b/src/waveform/renderers/allshader/waveformrendermark.h
index b17a9dc494c..0cdbfe70225 100644
--- a/src/waveform/renderers/allshader/waveformrendermark.h
+++ b/src/waveform/renderers/allshader/waveformrendermark.h
@@ -42,8 +42,8 @@ class allshader::WaveformRenderMark final : public QObject, public allshader::Wa
   private:
     void checkCuesUpdated();
 
-    void generateMarkImage(WaveformMarkPointer pMark, float breadth);
-    void generatePlayPosMarkTexture(float breadth);
+    void generateMarkImage(WaveformMarkPointer pMark);
+    void generatePlayPosMarkTexture();
 
     void drawTriangle(QPainter* painter,
             const QBrush& fillColor,
diff --git a/src/waveform/renderers/waveformmark.cpp b/src/waveform/renderers/waveformmark.cpp
index 13e682eed0e..5d135c727df 100644
--- a/src/waveform/renderers/waveformmark.cpp
+++ b/src/waveform/renderers/waveformmark.cpp
@@ -5,6 +5,7 @@
 
 #include "skin/legacy/skincontext.h"
 #include "waveform/renderers/waveformsignalcolors.h"
+#include "widget/wimagestore.h"
 #include "widget/wskincolor.h"
 
 namespace {
@@ -52,10 +53,10 @@ Qt::Alignment decodeAlignmentFlags(const QString& alignString, Qt::Alignment def
 } // anonymous namespace
 
 WaveformMark::WaveformMark(const QString& group,
-                           const QDomNode& node,
-                           const SkinContext& context,
-                           const WaveformSignalColors& signalColors,
-                           int hotCue)
+        const QDomNode& node,
+        const SkinContext& context,
+        const WaveformSignalColors& signalColors,
+        int hotCue)
         : m_iHotCue(hotCue) {
     QString positionControl;
     QString endPositionControl;
@@ -114,7 +115,7 @@ WaveformMark::WaveformMark(const QString& group,
 WaveformMark::~WaveformMark() = default;
 
 void WaveformMark::setBaseColor(QColor baseColor, int dimBrightThreshold) {
-    m_image = QImage();
+    m_needsUpdate = true;
     m_fillColor = baseColor;
     m_borderColor = Color::chooseContrastColor(baseColor, dimBrightThreshold);
     m_labelColor = Color::chooseColorByBrightness(baseColor,
@@ -124,6 +125,8 @@ void WaveformMark::setBaseColor(QColor baseColor, int dimBrightThreshold) {
 };
 
 bool WaveformMark::contains(QPoint point, Qt::Orientation orientation) const {
+    qDebug() << "contains" << point << m_label.area();
+
     // Without some padding, the user would only have a single pixel width that
     // would count as hovering over the WaveformMark.
     float lineHoverPadding = 5.0;
@@ -136,5 +139,219 @@ bool WaveformMark::contains(QPoint point, Qt::Orientation orientation) const {
     bool lineHovered = m_linePosition >= position - lineHoverPadding &&
             m_linePosition <= position + lineHoverPadding;
 
+    qDebug() << "---contains " << point << m_label.area() << m_linePosition;
+
     return m_label.area().contains(point) || lineHovered;
 }
+
+// Helper class to calculate the geometry and fontsize needed by generateImage
+// to draw the label and text
+struct MarkerGeometry {
+    bool m_isSymbol; // it the label normal text or a single symbol (e.g. open circle arrow)
+    QFont m_font;
+    QRectF m_textRect;
+    QRectF m_labelRect;
+    QSizeF m_imageSize;
+
+    MarkerGeometry(const QString& label, Qt::Alignment align, float breadth) {
+        // If the label is 1 character long, and this character isn't a letter or a number,
+        // we can assume it's a special symbol
+        m_isSymbol = label.length() == 1 && !label[0].isLetterOrNumber();
+
+        // This alone would pick the OS default font, or that set by Qt5 Settings (qt5ct)
+        // respectively. This would mostly not be notable since contemporary OS and distros
+        // use a proven sans-serif anyway. Though, some user fonts may be lacking glyphs
+        // we use for the intro/outro markers for example.
+        // So, let's just use Open Sans which is used by all official skins to achieve
+        // a consistent skin design.
+        m_font.setFamily("Open Sans");
+        // For text, use a pixel size like everywhere else in Mixxx, which can be scaled
+        // well in general.
+        // Point sizes would work if only explicit Qt scaling QT_SCALE_FACTORS is used,
+        // though as soon as other OS-based font and app scaling mechanics join the
+        // party the resulting font size is hard to predict (affects all supported OS).
+
+        m_font.setPixelSize(13);
+        m_font.setWeight(75); // bold
+        m_font.setItalic(false);
+
+        qreal capHeight;
+        {
+            QFontMetricsF metrics{m_font};
+            capHeight = metrics.capHeight();
+
+            if (m_isSymbol) {
+                // Symbols can be aligned and sized in an way that is not ideal.
+                // We auto-scale the font size so the symbol fits in capHeight
+                // (the height of a flat capital letter such as H) but without
+                // exceeded a width of capHeight * 1.1
+                const auto targetHeight = std::ceil(capHeight);
+                const auto targetWidth = std::ceil(capHeight * 1.1f);
+
+                // As a starting point we look at the tight bounding rect at a
+                // large font size
+                m_font.setPointSize(50.0);
+                metrics = QFontMetricsF(m_font);
+                m_textRect = metrics.tightBoundingRect(label);
+
+                // Now we calculate how much bigger this is than our target
+                // size.
+                const auto ratioH = targetHeight / m_textRect.height();
+                const auto ratioW = targetWidth / m_textRect.width();
+                const auto ratio = std::min(ratioH, ratioW);
+
+                // And we scale the font size accordingly.
+                m_font.setPointSizeF(50.0 * ratio);
+                metrics = QFontMetricsF(m_font);
+                m_textRect = metrics.tightBoundingRect(label);
+            } else {
+                m_textRect = QRectF{0.f,
+                        -metrics.capHeight(),
+                        metrics.boundingRect(label).width(),
+                        metrics.capHeight()};
+            }
+        }
+
+        const qreal margin{3.f};
+        const Qt::Alignment alignH = align & Qt::AlignHorizontal_Mask;
+        const Qt::Alignment alignV = align & Qt::AlignVertical_Mask;
+        const bool alignHCenter{alignH == Qt::AlignHCenter};
+        const qreal widthRounding{alignHCenter ? 2.f : 1.f};
+
+        m_labelRect = QRectF{0.f,
+                0.f,
+                std::ceil((m_textRect.width() + 2.f * margin) / widthRounding) *
+                        widthRounding,
+                std::ceil(capHeight + 2.f * margin)};
+
+        m_imageSize = QSizeF{alignHCenter ? m_labelRect.width() + 1.f
+                                          : 2.f * m_labelRect.width() + 1.f,
+                breadth};
+
+        if (alignH == Qt::AlignHCenter) {
+            m_labelRect.moveLeft((m_imageSize.width() - m_labelRect.width()) / 2.f);
+        } else if (alignH == Qt::AlignRight) {
+            m_labelRect.moveRight(m_imageSize.width() - 0.5f);
+        } else {
+            m_labelRect.moveLeft(0.5f);
+        }
+
+        if (alignV == Qt::AlignVCenter) {
+            m_labelRect.moveTop((m_imageSize.height() - m_labelRect.height()) / 2.f);
+        } else if (alignV == Qt::AlignBottom) {
+            m_labelRect.moveBottom(m_imageSize.height() - 0.5f);
+        } else {
+            m_labelRect.moveTop(0.5f);
+        }
+    }
+    QSize getImageSize(float devicePixelRatio) const {
+        return QSize{static_cast<int>(m_imageSize.width() * devicePixelRatio),
+                static_cast<int>(m_imageSize.height() * devicePixelRatio)};
+    }
+};
+
+QImage WaveformMark::generateImage(float breadth, float devicePixelRatio) {
+    // Load the pixmap from file.
+    // If that succeeds loading the text and stroke is skipped.
+
+    if (!m_pixmapPath.isEmpty()) {
+        QString path = m_pixmapPath;
+        // Use devicePixelRatio to properly scale the image
+        QImage image = *WImageStore::getImage(path, devicePixelRatio);
+        // QImage image = QImage(path);
+        //  If loading the image didn't fail, then we're done. Otherwise fall
+        //  through and render a label.
+        if (!image.isNull()) {
+            image =
+                    image.convertToFormat(QImage::Format_ARGB32_Premultiplied);
+            // WImageStore::correctImageColors(&m_image);
+            //  Set the pixel/device ratio AFTER loading the image in order to get
+            //  a truly scaled source image.
+            //  See https://doc.qt.io/qt-5/qimage.html#setDevicePixelRatio
+            //  Also, without this some Qt-internal issue results in an offset
+            //  image when calculating the center line of pixmaps in draw().
+            image.setDevicePixelRatio(devicePixelRatio);
+            return image;
+        }
+    }
+
+    QString label = m_text;
+
+    // Determine mark text.
+    if (getHotCue() >= 0) {
+        constexpr int kMaxCueLabelLength = 23;
+        if (!label.isEmpty()) {
+            label.prepend(": ");
+        }
+        label.prepend(QString::number(getHotCue() + 1));
+        if (label.size() > kMaxCueLabelLength) {
+            label = label.left(kMaxCueLabelLength - 3) + "...";
+        }
+    }
+
+    // Determine drawing geometries
+    const MarkerGeometry markerGeometry(label, m_align, breadth);
+
+    m_label.setAreaRect(markerGeometry.m_labelRect);
+
+    // Create the image
+    QImage image{markerGeometry.getImageSize(devicePixelRatio),
+            QImage::Format_ARGB32_Premultiplied};
+    image.setDevicePixelRatio(devicePixelRatio);
+
+    // Fill with transparent pixels
+    image.fill(Qt::transparent);
+
+    QPainter painter;
+
+    painter.begin(&image);
+    painter.setRenderHint(QPainter::TextAntialiasing);
+    painter.setRenderHint(QPainter::Antialiasing);
+
+    painter.setWorldMatrixEnabled(false);
+
+    // Draw marker lines
+    const float hcenter = markerGeometry.m_imageSize.width() / 2.f;
+    m_linePosition = hcenter;
+
+    // Draw the center line
+    painter.setPen(fillColor());
+    painter.drawLine(QLineF(hcenter, 0.f, hcenter, markerGeometry.m_imageSize.height()));
+
+    painter.setPen(borderColor());
+    painter.drawLine(QLineF(hcenter - 1.f, 0, hcenter - 1.f, markerGeometry.m_imageSize.height()));
+    painter.drawLine(QLineF(hcenter + 1.f, 0, hcenter + 1.f, markerGeometry.m_imageSize.height()));
+
+    if (label.length() != 0) {
+        painter.setPen(borderColor());
+
+        // Draw the label rounded rect with border
+        QPainterPath path;
+        path.addRoundedRect(markerGeometry.m_labelRect, 2.f, 2.f);
+        painter.fillPath(path, fillColor());
+        painter.drawPath(path);
+
+        // Draw the text
+        painter.setBrush(Qt::transparent);
+        painter.setPen(labelColor());
+        painter.setFont(markerGeometry.m_font);
+
+        // Center m_textRect.width() and m_textRect.height() inside m_labelRect
+        // and apply the offset x,y so the text ends up in the centered width,height.
+        QPointF pos(markerGeometry.m_labelRect.x() +
+                        (markerGeometry.m_labelRect.width() -
+                                markerGeometry.m_textRect.width()) /
+                                2.f -
+                        markerGeometry.m_textRect.x(),
+                markerGeometry.m_labelRect.y() +
+                        (markerGeometry.m_labelRect.height() -
+                                markerGeometry.m_textRect.height()) /
+                                2.f -
+                        markerGeometry.m_textRect.y());
+        painter.drawText(pos, label);
+    }
+
+    painter.end();
+
+    return image;
+}
diff --git a/src/waveform/renderers/waveformmark.h b/src/waveform/renderers/waveformmark.h
index f0a4f4ffccf..8e38ef5e096 100644
--- a/src/waveform/renderers/waveformmark.h
+++ b/src/waveform/renderers/waveformmark.h
@@ -33,14 +33,16 @@ class WaveformMark {
     WaveformMark(const WaveformMark&) = delete;
     WaveformMark& operator=(const WaveformMark&) = delete;
 
-    int getHotCue() const { return m_iHotCue; };
+    int getHotCue() const {
+        return m_iHotCue;
+    };
 
-    //The m_pPositionCO related function
+    // The m_pPositionCO related function
     bool isValid() const {
         return m_pPositionCO && m_pPositionCO->valid();
     }
 
-    template <typename Receiver, typename Slot>
+    template<typename Receiver, typename Slot>
     void connectSamplePositionChanged(Receiver receiver, Slot slot) const {
         m_pPositionCO->connectValueChanged(receiver, slot, Qt::AutoConnection);
     };
@@ -74,7 +76,7 @@ class WaveformMark {
         return m_pVisibleCO->toBool();
     }
 
-    template <typename Receiver, typename Slot>
+    template<typename Receiver, typename Slot>
     void connectVisibleChanged(Receiver receiver, Slot slot) const {
         m_pVisibleCO->connectValueChanged(receiver, slot, Qt::AutoConnection);
     }
@@ -94,6 +96,8 @@ class WaveformMark {
     // Check if a point (in image coordinates) lies on drawn image.
     bool contains(QPoint point, Qt::Orientation orientation) const;
 
+    QImage generateImage(float breath, float devicePixelRatio);
+
     QColor m_textColor;
     QString m_text;
     Qt::Alignment m_align;
@@ -107,10 +111,15 @@ class WaveformMark {
     std::unique_ptr<ControlProxy> m_pPositionCO;
     std::unique_ptr<ControlProxy> m_pEndPositionCO;
     std::unique_ptr<ControlProxy> m_pVisibleCO;
-    std::unique_ptr<QOpenGLTexture> m_pTexture; // used by allshader::WaveformRenderMark
+
     friend class allshader::WaveformRenderMark;
+
+    std::unique_ptr<QOpenGLTexture> m_pTexture; // Used by allshader::WaveformRenderMark
+    QImage m_image;                             // Used by WaveformRenderMark
+    bool m_needsUpdate{true};                   // To indicate either the texture or the image has
+                                                // to be updated
+
     int m_iHotCue;
-    QImage m_image;
 
     QColor m_fillColor;
     QColor m_borderColor;
diff --git a/src/waveform/renderers/waveformrendermark.cpp b/src/waveform/renderers/waveformrendermark.cpp
index a279a0d0b78..bffd7ac2973 100644
--- a/src/waveform/renderers/waveformrendermark.cpp
+++ b/src/waveform/renderers/waveformrendermark.cpp
@@ -12,14 +12,9 @@
 #include "util/painterscope.h"
 #include "waveform/renderers/waveformwidgetrenderer.h"
 #include "waveform/waveform.h"
-#include "widget/wimagestore.h"
 #include "widget/wskincolor.h"
 #include "widget/wwidget.h"
 
-namespace {
-constexpr int kMaxCueLabelLength = 23;
-} // namespace
-
 WaveformRenderMark::WaveformRenderMark(
         WaveformWidgetRenderer* waveformWidgetRenderer) :
     WaveformRendererAbstract(waveformWidgetRenderer) {
@@ -55,7 +50,7 @@ void WaveformRenderMark::draw(QPainter* painter, QPaintEvent* /*event*/) {
 
         // Generate image on first paint can't be done in setup since we need to
         // wait for the render widget to be resized yet.
-        if (pMark->m_image.isNull()) {
+        if (pMark->m_needsUpdate || pMark->m_image.isNull()) {
             generateMarkImage(pMark);
         }
 
@@ -158,9 +153,9 @@ void WaveformRenderMark::draw(QPainter* painter, QPaintEvent* /*event*/) {
 }
 
 void WaveformRenderMark::onResize() {
-    // Delete all marks' images. New images will be created on next paint.
+    // Flag that the mark image has to be updated. New images will be created on next paint.
     for (const auto& pMark : m_marks) {
-        pMark->m_image = QImage();
+        pMark->m_needsUpdate = true;
     }
 }
 
@@ -211,189 +206,7 @@ void WaveformRenderMark::slotCuesUpdated() {
 }
 
 void WaveformRenderMark::generateMarkImage(WaveformMarkPointer pMark) {
-    // Load the pixmap from file.
-    // If that succeeds loading the text and stroke is skipped.
-    float devicePixelRatio = m_waveformRenderer->getDevicePixelRatio();
-    if (!pMark->m_pixmapPath.isEmpty()) {
-        QString path = pMark->m_pixmapPath;
-        // Use devicePixelRatio to properly scale the image
-        QImage image = *WImageStore::getImage(path, devicePixelRatio);
-        //QImage image = QImage(path);
-        // If loading the image didn't fail, then we're done. Otherwise fall
-        // through and render a label.
-        if (!image.isNull()) {
-            pMark->m_image =
-                    image.convertToFormat(QImage::Format_ARGB32_Premultiplied);
-            //WImageStore::correctImageColors(&pMark->m_image);
-            // Set the pixel/device ratio AFTER loading the image in order to get
-            // a truly scaled source image.
-            // See https://doc.qt.io/qt-5/qimage.html#setDevicePixelRatio
-            // Also, without this some Qt-internal issue results in an offset
-            // image when calculating the center line of pixmaps in draw().
-            pMark->m_image.setDevicePixelRatio(devicePixelRatio);
-            return;
-        }
-    }
-
-    QPainter painter;
-
-    // Determine mark text.
-    QString label = pMark->m_text;
-    if (pMark->getHotCue() >= 0) {
-        if (!label.isEmpty()) {
-            label.prepend(": ");
-        }
-        label.prepend(QString::number(pMark->getHotCue() + 1));
-        if (label.size() > kMaxCueLabelLength) {
-            label = label.left(kMaxCueLabelLength - 3) + "...";
-        }
-    }
-
-    // This alone would pick the OS default font, or that set by Qt5 Settings (qt5ct)
-    // respectively. This would mostly not be notable since contemporary OS and distros
-    // use a proven sans-serif anyway. Though, some user fonts may be lacking glyphs
-    // we use for the intro/outro markers for example.
-    QFont font;
-    // So, let's just use Open Sans which is used by all official skins to achieve
-    // a consistent skin design.
-    font.setFamily("Open Sans");
-    // Use a pixel size like everywhere else in Mixxx, which can be scaled well
-    // in general.
-    // Point sizes would work if only explicit Qt scaling QT_SCALE_FACTORS is used,
-    // though as soon as other OS-based font and app scaling mechanics join the
-    // party the resulting font size is hard to predict (affects all supported OS).
-    font.setPixelSize(13);
-    font.setWeight(75); // bold
-    font.setItalic(false);
-
-    QFontMetrics metrics(font);
-
-    //fixed margin ...
-    QRect wordRect = metrics.tightBoundingRect(label);
-    constexpr int marginX = 1;
-    constexpr int marginY = 1;
-    wordRect.moveTop(marginX + 1);
-    wordRect.moveLeft(marginY + 1);
-    wordRect.setHeight(wordRect.height() + (wordRect.height() % 2));
-    wordRect.setWidth(wordRect.width() + (wordRect.width()) % 2);
-    //even wordrect to have an even Image >> draw the line in the middle !
-
-    int labelRectWidth = wordRect.width() + 2 * marginX + 4;
-    int labelRectHeight = wordRect.height() + 2 * marginY + 4;
-
-    QRectF labelRect(0, 0, (float)labelRectWidth, (float)labelRectHeight);
-
-    int width;
-    int height;
-
-    if (m_waveformRenderer->getOrientation() == Qt::Horizontal) {
-        width = 2 * labelRectWidth + 1;
-        height = m_waveformRenderer->getHeight();
-    } else {
-        width = m_waveformRenderer->getWidth();
-        height = 2 * labelRectHeight + 1;
-    }
-
-    pMark->m_image = QImage(
-            static_cast<int>(width * devicePixelRatio),
-            static_cast<int>(height * devicePixelRatio),
-            QImage::Format_ARGB32_Premultiplied);
-    pMark->m_image.setDevicePixelRatio(devicePixelRatio);
-
-    Qt::Alignment markAlignH = pMark->m_align & Qt::AlignHorizontal_Mask;
-    Qt::Alignment markAlignV = pMark->m_align & Qt::AlignVertical_Mask;
-
-    if (markAlignH == Qt::AlignHCenter) {
-        labelRect.moveLeft((width - labelRectWidth) / 2);
-    } else if (markAlignH == Qt::AlignRight) {
-        labelRect.moveRight(width - 1);
-    }
-
-    if (markAlignV == Qt::AlignVCenter) {
-        labelRect.moveTop((height - labelRectHeight) / 2);
-    } else if (markAlignV == Qt::AlignBottom) {
-        labelRect.moveBottom(height - 1);
-    }
-
-    pMark->m_label.setAreaRect(labelRect);
-
-    // Fill with transparent pixels
-    pMark->m_image.fill(QColor(0, 0, 0, 0).rgba());
-
-    painter.begin(&pMark->m_image);
-    painter.setRenderHint(QPainter::TextAntialiasing);
-
-    painter.setWorldMatrixEnabled(false);
-
-    // Draw marker lines
-    if (m_waveformRenderer->getOrientation() == Qt::Horizontal) {
-        int middle = width / 2;
-        pMark->m_linePosition = middle;
-        if (markAlignH == Qt::AlignHCenter) {
-            if (labelRect.top() > 0) {
-                painter.setPen(pMark->fillColor());
-                painter.drawLine(QLineF(middle, 0, middle, labelRect.top()));
-
-                painter.setPen(pMark->borderColor());
-                painter.drawLine(QLineF(middle - 1, 0, middle - 1, labelRect.top()));
-                painter.drawLine(QLineF(middle + 1, 0, middle + 1, labelRect.top()));
-            }
-
-            if (labelRect.bottom() < height) {
-                painter.setPen(pMark->fillColor());
-                painter.drawLine(QLineF(middle, labelRect.bottom(), middle, height));
-
-                painter.setPen(pMark->borderColor());
-                painter.drawLine(QLineF(middle - 1, labelRect.bottom(), middle - 1, height));
-                painter.drawLine(QLineF(middle + 1, labelRect.bottom(), middle + 1, height));
-            }
-        } else { // AlignLeft || AlignRight
-            painter.setPen(pMark->fillColor());
-            painter.drawLine(middle, 0, middle, height);
-
-            painter.setPen(pMark->borderColor());
-            painter.drawLine(middle - 1, 0, middle - 1, height);
-            painter.drawLine(middle + 1, 0, middle + 1, height);
-        }
-    } else { // Vertical
-        int middle = height / 2;
-        pMark->m_linePosition = middle;
-        if (markAlignV == Qt::AlignVCenter) {
-            if (labelRect.left() > 0) {
-                painter.setPen(pMark->fillColor());
-                painter.drawLine(QLineF(0, middle, labelRect.left(), middle));
-
-                painter.setPen(pMark->borderColor());
-                painter.drawLine(QLineF(0, middle - 1, labelRect.left(), middle - 1));
-                painter.drawLine(QLineF(0, middle + 1, labelRect.left(), middle + 1));
-            }
-
-            if (labelRect.right() < width) {
-                painter.setPen(pMark->fillColor());
-                painter.drawLine(QLineF(labelRect.right(), middle, width, middle));
-
-                painter.setPen(pMark->borderColor());
-                painter.drawLine(QLineF(labelRect.right(), middle - 1, width, middle - 1));
-                painter.drawLine(QLineF(labelRect.right(), middle + 1, width, middle + 1));
-            }
-        } else { // AlignTop || AlignBottom
-            painter.setPen(pMark->fillColor());
-            painter.drawLine(0, middle, width, middle);
-
-            painter.setPen(pMark->borderColor());
-            painter.drawLine(0, middle - 1, width, middle - 1);
-            painter.drawLine(0, middle + 1, width, middle + 1);
-        }
-    }
-
-    // Draw the label rect
-    painter.setPen(pMark->borderColor());
-    painter.setBrush(QBrush(pMark->fillColor()));
-    painter.drawRoundedRect(labelRect, 2.0, 2.0);
-
-    // Draw text
-    painter.setBrush(QBrush(QColor(0, 0, 0, 0)));
-    painter.setFont(font);
-    painter.setPen(pMark->labelColor());
-    painter.drawText(labelRect, Qt::AlignCenter, label);
+    pMark->m_image = pMark->generateImage(m_waveformRenderer->getBreadth(),
+            m_waveformRenderer->getDevicePixelRatio());
+    pMark->m_needsUpdate = false;
 }
diff --git a/src/waveform/widgets/allshader/waveformwidget.cpp b/src/waveform/widgets/allshader/waveformwidget.cpp
index 73c426623de..a2d3ca92511 100644
--- a/src/waveform/widgets/allshader/waveformwidget.cpp
+++ b/src/waveform/widgets/allshader/waveformwidget.cpp
@@ -60,4 +60,9 @@ void WaveformWidget::wheelEvent(QWheelEvent* pEvent) {
     pEvent->accept();
 }
 
+void WaveformWidget::leaveEvent(QEvent* pEvent) {
+    QApplication::sendEvent(parentWidget(), pEvent);
+    pEvent->accept();
+}
+
 } // namespace allshader
diff --git a/src/waveform/widgets/allshader/waveformwidget.h b/src/waveform/widgets/allshader/waveformwidget.h
index 1924f448d6a..3ed27df9b1c 100644
--- a/src/waveform/widgets/allshader/waveformwidget.h
+++ b/src/waveform/widgets/allshader/waveformwidget.h
@@ -27,4 +27,5 @@ class allshader::WaveformWidget : public ::WGLWidget,
 
   private:
     void wheelEvent(QWheelEvent* event) override;
+    void leaveEvent(QEvent* event) override;
 };

From 714975995305a7d2ed0a728ce85c5ddd1a36cd22 Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Sat, 21 Oct 2023 11:57:07 +0200
Subject: [PATCH 131/388] fix vertical orientation

---
 src/waveform/renderers/waveformmark.cpp       | 17 ++++++-----------
 src/waveform/renderers/waveformmark.h         |  3 ++-
 src/waveform/renderers/waveformrendermark.cpp | 16 ++++++++++++----
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/waveform/renderers/waveformmark.cpp b/src/waveform/renderers/waveformmark.cpp
index 5d135c727df..33606fae079 100644
--- a/src/waveform/renderers/waveformmark.cpp
+++ b/src/waveform/renderers/waveformmark.cpp
@@ -125,21 +125,14 @@ void WaveformMark::setBaseColor(QColor baseColor, int dimBrightThreshold) {
 };
 
 bool WaveformMark::contains(QPoint point, Qt::Orientation orientation) const {
-    qDebug() << "contains" << point << m_label.area();
-
     // Without some padding, the user would only have a single pixel width that
     // would count as hovering over the WaveformMark.
     float lineHoverPadding = 5.0;
-    int position;
-    if (orientation == Qt::Horizontal) {
-        position = point.x();
-    } else {
-        position = point.y();
+    if (orientation == Qt::Vertical) {
+        point = QPoint(point.y(), m_breadth - point.x());
     }
-    bool lineHovered = m_linePosition >= position - lineHoverPadding &&
-            m_linePosition <= position + lineHoverPadding;
-
-    qDebug() << "---contains " << point << m_label.area() << m_linePosition;
+    bool lineHovered = m_linePosition >= point.x() - lineHoverPadding &&
+            m_linePosition <= point.x() + lineHoverPadding;
 
     return m_label.area().contains(point) || lineHovered;
 }
@@ -254,6 +247,8 @@ QImage WaveformMark::generateImage(float breadth, float devicePixelRatio) {
     // Load the pixmap from file.
     // If that succeeds loading the text and stroke is skipped.
 
+    m_breadth = static_cast<int>(breadth);
+
     if (!m_pixmapPath.isEmpty()) {
         QString path = m_pixmapPath;
         // Use devicePixelRatio to properly scale the image
diff --git a/src/waveform/renderers/waveformmark.h b/src/waveform/renderers/waveformmark.h
index 8e38ef5e096..b7e24bb847f 100644
--- a/src/waveform/renderers/waveformmark.h
+++ b/src/waveform/renderers/waveformmark.h
@@ -103,7 +103,8 @@ class WaveformMark {
     Qt::Alignment m_align;
     QString m_pixmapPath;
 
-    float m_linePosition;
+    float m_linePosition{};
+    int m_breadth{};
 
     WaveformMarkLabel m_label;
 
diff --git a/src/waveform/renderers/waveformrendermark.cpp b/src/waveform/renderers/waveformrendermark.cpp
index bffd7ac2973..a02ed14e59d 100644
--- a/src/waveform/renderers/waveformrendermark.cpp
+++ b/src/waveform/renderers/waveformrendermark.cpp
@@ -105,7 +105,9 @@ void WaveformRenderMark::draw(QPainter* painter, QPaintEvent* /*event*/) {
                     marksOnScreen[pMark] = drawOffset;
                 }
             } else {
-                const int markHalfHeight = static_cast<int>(pMark->m_image.height() / 2.0);
+                const int markHalfHeight =
+                        static_cast<int>(pMark->m_image.height() / 2.0 /
+                                m_waveformRenderer->getDevicePixelRatio());
                 const int drawOffset = static_cast<int>(currentMarkPoint) - markHalfHeight;
 
                 bool visible = false;
@@ -113,7 +115,7 @@ void WaveformRenderMark::draw(QPainter* painter, QPaintEvent* /*event*/) {
                 if (currentMarkPoint > -markHalfHeight &&
                         currentMarkPoint < m_waveformRenderer->getHeight() +
                                         markHalfHeight) {
-                    painter->drawImage(drawOffset, 0, pMark->m_image);
+                    painter->drawImage(0, drawOffset, pMark->m_image);
                     visible = true;
                 }
 
@@ -206,7 +208,13 @@ void WaveformRenderMark::slotCuesUpdated() {
 }
 
 void WaveformRenderMark::generateMarkImage(WaveformMarkPointer pMark) {
-    pMark->m_image = pMark->generateImage(m_waveformRenderer->getBreadth(),
-            m_waveformRenderer->getDevicePixelRatio());
+    if (m_waveformRenderer->getOrientation() == Qt::Horizontal) {
+        pMark->m_image = pMark->generateImage(m_waveformRenderer->getBreadth(),
+                m_waveformRenderer->getDevicePixelRatio());
+    } else {
+        pMark->m_image = pMark->generateImage(m_waveformRenderer->getBreadth(),
+                                      m_waveformRenderer->getDevicePixelRatio())
+                                 .transformed(QTransform().rotate(90));
+    }
     pMark->m_needsUpdate = false;
 }

From 32203af5002191b9a68c3ee3ff3632cb9275f776 Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Sat, 21 Oct 2023 20:18:03 +0200
Subject: [PATCH 132/388] missing headers, missing type cast

---
 src/waveform/renderers/waveformmark.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/waveform/renderers/waveformmark.cpp b/src/waveform/renderers/waveformmark.cpp
index 33606fae079..4806805e7e7 100644
--- a/src/waveform/renderers/waveformmark.cpp
+++ b/src/waveform/renderers/waveformmark.cpp
@@ -1,6 +1,7 @@
 #include "waveformmark.h"
 
 #include <QOpenGLTexture>
+#include <QPainterPath>
 #include <QtDebug>
 
 #include "skin/legacy/skincontext.h"
@@ -306,16 +307,22 @@ QImage WaveformMark::generateImage(float breadth, float devicePixelRatio) {
     painter.setWorldMatrixEnabled(false);
 
     // Draw marker lines
-    const float hcenter = markerGeometry.m_imageSize.width() / 2.f;
-    m_linePosition = hcenter;
+    const auto hcenter = markerGeometry.m_imageSize.width() / 2.f;
+    m_linePosition = static_cast<float>(hcenter);
 
     // Draw the center line
     painter.setPen(fillColor());
     painter.drawLine(QLineF(hcenter, 0.f, hcenter, markerGeometry.m_imageSize.height()));
 
     painter.setPen(borderColor());
-    painter.drawLine(QLineF(hcenter - 1.f, 0, hcenter - 1.f, markerGeometry.m_imageSize.height()));
-    painter.drawLine(QLineF(hcenter + 1.f, 0, hcenter + 1.f, markerGeometry.m_imageSize.height()));
+    painter.drawLine(QLineF(hcenter - 1.f,
+            0.f,
+            hcenter - 1.f,
+            markerGeometry.m_imageSize.height()));
+    painter.drawLine(QLineF(hcenter + 1.f,
+            0.f,
+            hcenter + 1.f,
+            markerGeometry.m_imageSize.height()));
 
     if (label.length() != 0) {
         painter.setPen(borderColor());

From d26931f40afb75c7122ccd6a74f144c647baa8fe Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Sat, 21 Oct 2023 23:34:58 +0200
Subject: [PATCH 133/388] scale amplitude drawn with ratio between the
 low+mid+high magnitude with and without gains

---
 .../allshader/waveformrendererlrrgb.cpp       | 74 ++++++++++-------
 .../allshader/waveformrendererrgb.cpp         | 83 ++++++++++++-------
 2 files changed, 95 insertions(+), 62 deletions(-)

diff --git a/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp b/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp
index 887c1059ec7..5c6f7c60f08 100644
--- a/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp
@@ -74,7 +74,7 @@ void WaveformRendererLRRGB::paintGL() {
     const float breadth = static_cast<float>(m_waveformRenderer->getBreadth()) * devicePixelRatio;
     const float halfBreadth = breadth / 2.0f;
 
-    const float heightFactorAbs = allGain * halfBreadth / std::sqrt(3.f * 256.f * 256.f);
+    const float heightFactorAbs = allGain * halfBreadth / 255.f;
     const float heightFactor[2] = {-heightFactorAbs, heightFactorAbs};
 
     const float low_r = static_cast<float>(m_rgbLowColor_r);
@@ -92,13 +92,12 @@ void WaveformRendererLRRGB::paintGL() {
 
     const int numVerticesPerLine = 6; // 2 triangles
 
-    const int linesReserved = numVerticesPerLine * (length * 2 + 1);
-    const int colorsReserved = numVerticesPerLine * (length * 2 + 1);
+    const int reserved = numVerticesPerLine * (length * 2 + 1);
 
     m_vertices.clear();
-    m_vertices.reserve(linesReserved);
+    m_vertices.reserve(reserved);
     m_colors.clear();
-    m_colors.reserve(colorsReserved);
+    m_colors.reserve(reserved);
 
     m_vertices.addRectangle(0.f,
             halfBreadth - 0.5f * devicePixelRatio,
@@ -140,48 +139,61 @@ void WaveformRendererLRRGB::paintGL() {
         const float fpos = static_cast<float>(pos);
 
         for (int chn = 0; chn < 2; chn++) {
-            float maxLow{};
-            float maxMid{};
-            float maxHigh{};
-            float maxAll{};
-
+            // Find the max values for low, mid, high and all in the waveform data
+            uchar u8maxLow{};
+            uchar u8maxMid{};
+            uchar u8maxHigh{};
+            uchar u8maxAll{};
             // data is interleaved left / right
             for (int i = visualIndexStart + chn; i < visualIndexStop + chn; i += 2) {
                 const WaveformData& waveformData = data[i];
 
-                const float filteredLow = static_cast<float>(waveformData.filtered.low);
-                const float filteredMid = static_cast<float>(waveformData.filtered.mid);
-                const float filteredHigh = static_cast<float>(waveformData.filtered.high);
+                u8maxLow = math_max(u8maxLow, waveformData.filtered.low);
+                u8maxMid = math_max(u8maxMid, waveformData.filtered.mid);
+                u8maxHigh = math_max(u8maxHigh, waveformData.filtered.high);
+                u8maxAll = math_max(u8maxAll, waveformData.filtered.all);
+            }
 
-                maxLow = math_max(maxLow, filteredLow);
-                maxMid = math_max(maxMid, filteredMid);
-                maxHigh = math_max(maxHigh, filteredHigh);
+            // Cast to float
+            float maxLow = static_cast<float>(u8maxLow);
+            float maxMid = static_cast<float>(u8maxMid);
+            float maxHigh = static_cast<float>(u8maxHigh);
+            float maxAll = static_cast<float>(u8maxAll);
 
-                const float all = math_pow2(filteredLow) * lowGain +
-                        math_pow2(filteredMid) * midGain +
-                        math_pow2(filteredHigh) * highGain;
-                maxAll = math_max(maxAll, all);
-            }
+            // Calculate the magnitude of the maxLow, maxMid and maxHigh values
+            const float magnitude = std::sqrt(
+                    math_pow2(maxLow) + math_pow2(maxMid) + math_pow2(maxHigh));
 
+            // Apply the gains
             maxLow *= lowGain;
             maxMid *= midGain;
             maxHigh *= highGain;
 
+            // Calculate the magnitude of the gained maxLow, maxMid and maxHigh values
+            const float magnitudeGained = std::sqrt(
+                    math_pow2(maxLow) + math_pow2(maxMid) + math_pow2(maxHigh));
+
+            // The maxAll value will be used to draw the amplitude. We scale them according to
+            // magnitude of the gained maxLow, maxMid and maxHigh values
+            if (magnitude != 0.f) {
+                const float factor = magnitudeGained / magnitude;
+                maxAll *= factor;
+            }
+
+            // Use the gained maxLow, maxMid and maxHigh values to calculate the color components
             float red = maxLow * low_r + maxMid * mid_r + maxHigh * high_r;
             float green = maxLow * low_g + maxMid * mid_g + maxHigh * high_g;
             float blue = maxLow * low_b + maxMid * mid_b + maxHigh * high_b;
 
-            const float max = math_max3(red, green, blue);
-
-            // Normalize red, green, blue, using the maximum of the three
-
-            if (max == 0.f) {
-                // avoid division by 0
+            // Normalize the color components using the maximum of the three
+            const float maxComponent = math_max3(red, green, blue);
+            if (maxComponent == 0.f) {
+                // Avoid division by 0
                 red = 0.f;
                 green = 0.f;
                 blue = 0.f;
             } else {
-                const float normFactor = 1.f / max;
+                const float normFactor = 1.f / maxComponent;
                 red *= normFactor;
                 green *= normFactor;
                 blue *= normFactor;
@@ -193,15 +205,15 @@ void WaveformRendererLRRGB::paintGL() {
             m_vertices.addRectangle(fpos - 0.5f,
                     halfBreadth,
                     fpos + 0.5f,
-                    halfBreadth + heightFactor[chn] * std::sqrt(maxAll));
+                    halfBreadth + heightFactor[chn] * maxAll);
             m_colors.addForRectangle(red, green, blue);
         }
 
         xVisualSampleIndex += visualIncrementPerPixel;
     }
 
-    DEBUG_ASSERT(linesReserved == m_vertices.size());
-    DEBUG_ASSERT(colorsReserved == m_colors.size());
+    DEBUG_ASSERT(reserved == m_vertices.size());
+    DEBUG_ASSERT(reserved == m_colors.size());
 
     const QMatrix4x4 matrix = matrixForWidgetGeometry(m_waveformRenderer, true);
 
diff --git a/src/waveform/renderers/allshader/waveformrendererrgb.cpp b/src/waveform/renderers/allshader/waveformrendererrgb.cpp
index 76d087d697e..5ef009f4d64 100644
--- a/src/waveform/renderers/allshader/waveformrendererrgb.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererrgb.cpp
@@ -74,7 +74,7 @@ void WaveformRendererRGB::paintGL() {
     const float breadth = static_cast<float>(m_waveformRenderer->getBreadth()) * devicePixelRatio;
     const float halfBreadth = breadth / 2.0f;
 
-    const float heightFactor = allGain * halfBreadth / std::sqrt(3.f * 256.f * 256.f);
+    const float heightFactor = allGain * halfBreadth / 255.f;
 
     const float low_r = static_cast<float>(m_rgbLowColor_r);
     const float mid_r = static_cast<float>(m_rgbMidColor_r);
@@ -137,63 +137,84 @@ void WaveformRendererRGB::paintGL() {
 
         const float fpos = static_cast<float>(pos);
 
-        // combined left+right
-        float maxLow{};
-        float maxMid{};
-        float maxHigh{};
-        // per channel
-        float maxAll[2]{};
-
+        // Find the max values for low, mid, high and all in the waveform data.
+        // - Max of left and right
+        uchar u8maxLow{};
+        uchar u8maxMid{};
+        uchar u8maxHigh{};
+        // - Per channel
+        uchar u8maxAllChn[2]{};
         for (int chn = 0; chn < 2; chn++) {
             // data is interleaved left / right
             for (int i = visualIndexStart + chn; i < visualIndexStop + chn; i += 2) {
                 const WaveformData& waveformData = data[i];
 
-                const float filteredLow = static_cast<float>(waveformData.filtered.low);
-                const float filteredMid = static_cast<float>(waveformData.filtered.mid);
-                const float filteredHigh = static_cast<float>(waveformData.filtered.high);
-
-                maxLow = math_max(maxLow, filteredLow);
-                maxMid = math_max(maxMid, filteredMid);
-                maxHigh = math_max(maxHigh, filteredHigh);
-
-                const float all = math_pow2(filteredLow) * lowGain +
-                        math_pow2(filteredMid) * midGain +
-                        math_pow2(filteredHigh) * highGain;
-                maxAll[chn] = math_max(maxAll[chn], all);
+                u8maxLow = math_max(u8maxLow, waveformData.filtered.low);
+                u8maxMid = math_max(u8maxMid, waveformData.filtered.mid);
+                u8maxHigh = math_max(u8maxHigh, waveformData.filtered.high);
+                u8maxAllChn[chn] = math_max(u8maxAllChn[chn], waveformData.filtered.all);
             }
         }
 
+        float maxLow;
+        float maxMid;
+        float maxHigh;
+        float maxAllChn[2];
+
+        // Cast to float
+        maxLow = static_cast<float>(u8maxLow);
+        maxMid = static_cast<float>(u8maxMid);
+        maxHigh = static_cast<float>(u8maxHigh);
+        maxAllChn[0] = static_cast<float>(u8maxAllChn[0]);
+        maxAllChn[1] = static_cast<float>(u8maxAllChn[1]);
+
+        float maxAll = math_max(maxAllChn[0], maxAllChn[1]);
+
+        // Calculate the magnitude of the maxLow, maxMid and maxHigh values
+        const float magnitude = std::sqrt(
+                math_pow2(maxLow) + math_pow2(maxMid) + math_pow2(maxHigh));
+
+        // Apply the gains
         maxLow *= lowGain;
         maxMid *= midGain;
         maxHigh *= highGain;
 
+        // Calculate the magnitude of the gained maxLow, maxMid and maxHigh values
+        const float magnitudeGained = std::sqrt(
+                math_pow2(maxLow) + math_pow2(maxMid) + math_pow2(maxHigh));
+
+        // The maxAll values will be used to draw the amplitude. We scale them according to
+        // magnitude of the gained maxLow, maxMid and maxHigh values
+        if (magnitude != 0.f) {
+            const float factor = magnitudeGained / magnitude;
+            maxAllChn[0] *= factor;
+            maxAllChn[1] *= factor;
+        }
+
+        // Use the gained maxLow, maxMid and maxHigh values to calculate the color components
         float red = maxLow * low_r + maxMid * mid_r + maxHigh * high_r;
         float green = maxLow * low_g + maxMid * mid_g + maxHigh * high_g;
         float blue = maxLow * low_b + maxMid * mid_b + maxHigh * high_b;
 
-        const float max = math_max3(red, green, blue);
-
-        // Normalize red, green, blue, using the maximum of the three
-
-        if (max == 0.f) {
-            // avoid division by 0
+        // Normalize the color components using the maximum of the three
+        const float maxComponent = math_max3(red, green, blue);
+        if (maxComponent == 0.f) {
+            // Avoid division by 0
             red = 0.f;
             green = 0.f;
             blue = 0.f;
         } else {
-            const float normFactor = 1.f / max;
+            const float normFactor = 1.f / maxComponent;
             red *= normFactor;
             green *= normFactor;
             blue *= normFactor;
         }
 
-        // lines are thin rectangles
-        // maxAll[0] is for left channel, maxAll[1] is for right channel
+        // Lines are thin rectangles
         m_vertices.addRectangle(fpos - 0.5f,
-                halfBreadth - heightFactor * std::sqrt(maxAll[0]),
+                halfBreadth - heightFactor * maxAllChn[0],
                 fpos + 0.5f,
-                halfBreadth + heightFactor * std::sqrt(maxAll[1]));
+                halfBreadth + heightFactor * maxAllChn[1]);
         m_colors.addForRectangle(red, green, blue);
 
         xVisualSampleIndex += visualIncrementPerPixel;

From f036b0acedcaca069bd433cb2af317532732f01d Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Sun, 22 Oct 2023 02:27:19 +0200
Subject: [PATCH 134/388] removed unused variable

---
 .../renderers/allshader/waveformrendererrgb.cpp  | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/waveform/renderers/allshader/waveformrendererrgb.cpp b/src/waveform/renderers/allshader/waveformrendererrgb.cpp
index 5ef009f4d64..deadc9d2a18 100644
--- a/src/waveform/renderers/allshader/waveformrendererrgb.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererrgb.cpp
@@ -156,19 +156,11 @@ void WaveformRendererRGB::paintGL() {
             }
         }
 
-        float maxLow;
-        float maxMid;
-        float maxHigh;
-        float maxAllChn[2];
-
         // Cast to float
-        maxLow = static_cast<float>(u8maxLow);
-        maxMid = static_cast<float>(u8maxMid);
-        maxHigh = static_cast<float>(u8maxHigh);
-        maxAllChn[0] = static_cast<float>(u8maxAllChn[0]);
-        maxAllChn[1] = static_cast<float>(u8maxAllChn[1]);
-
-        float maxAll = math_max(maxAllChn[0], maxAllChn[1]);
+        float maxLow = static_cast<float>(u8maxLow);
+        float maxMid = static_cast<float>(u8maxMid);
+        float maxHigh = static_cast<float>(u8maxHigh);
+        float maxAllChn[2]{static_cast<float>(u8maxAllChn[0]), static_cast<float>(u8maxAllChn[1])};
 
         // Calculate the magnitude of the maxLow, maxMid and maxHigh values
         const float magnitude = std::sqrt(

From f6caf678304f469cb0f5e8b1e77ff4dbd0c76977 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Mon, 23 Oct 2023 18:02:50 +0200
Subject: [PATCH 135/388] WTrackMenu: create only on demand for deck widgets

---
 src/widget/wtrackproperty.cpp    | 12 ++++++++++--
 src/widget/wtrackproperty.h      |  5 ++++-
 src/widget/wtracktext.cpp        | 13 ++++++++++---
 src/widget/wtracktext.h          |  5 ++++-
 src/widget/wtrackwidgetgroup.cpp | 13 ++++++++++---
 src/widget/wtrackwidgetgroup.h   |  5 ++++-
 6 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/src/widget/wtrackproperty.cpp b/src/widget/wtrackproperty.cpp
index c6658702c40..85ee08486d9 100644
--- a/src/widget/wtrackproperty.cpp
+++ b/src/widget/wtrackproperty.cpp
@@ -35,8 +35,7 @@ WTrackProperty::WTrackProperty(
         : WLabel(pParent),
           m_group(group),
           m_pConfig(pConfig),
-          m_pTrackMenu(make_parented<WTrackMenu>(
-                  this, pConfig, pLibrary, kTrackMenuFeatures)) {
+          m_pLibrary(pLibrary) {
     setAcceptDrops(true);
 }
 
@@ -102,6 +101,7 @@ void WTrackProperty::mouseMoveEvent(QMouseEvent* event) {
 void WTrackProperty::mouseDoubleClickEvent(QMouseEvent* event) {
     Q_UNUSED(event);
     if (m_pCurrentTrack) {
+        ensureTrackMenuIsCreated();
         m_pTrackMenu->loadTrack(m_pCurrentTrack, m_group);
         m_pTrackMenu->showDlgTrackInfo(m_property);
     }
@@ -118,8 +118,16 @@ void WTrackProperty::dropEvent(QDropEvent* event) {
 void WTrackProperty::contextMenuEvent(QContextMenuEvent* event) {
     event->accept();
     if (m_pCurrentTrack) {
+        ensureTrackMenuIsCreated();
         m_pTrackMenu->loadTrack(m_pCurrentTrack, m_group);
         // Create the right-click menu
         m_pTrackMenu->popup(event->globalPos());
     }
 }
+
+void WTrackProperty::ensureTrackMenuIsCreated() {
+    if (m_pTrackMenu.get() == nullptr) {
+        m_pTrackMenu = make_parented<WTrackMenu>(
+                this, m_pConfig, m_pLibrary, kTrackMenuFeatures);
+    }
+}
diff --git a/src/widget/wtrackproperty.h b/src/widget/wtrackproperty.h
index d2cd7f4e9fa..7ee8a751c2d 100644
--- a/src/widget/wtrackproperty.h
+++ b/src/widget/wtrackproperty.h
@@ -49,10 +49,13 @@ private slots:
 
   void updateLabel();
 
+  void ensureTrackMenuIsCreated();
+
   const QString m_group;
   const UserSettingsPointer m_pConfig;
+  Library* m_pLibrary;
   TrackPointer m_pCurrentTrack;
   QString m_property;
 
-  const parented_ptr<WTrackMenu> m_pTrackMenu;
+  parented_ptr<WTrackMenu> m_pTrackMenu;
 };
diff --git a/src/widget/wtracktext.cpp b/src/widget/wtracktext.cpp
index a5b8f31f40d..cab74256760 100644
--- a/src/widget/wtracktext.cpp
+++ b/src/widget/wtracktext.cpp
@@ -33,8 +33,7 @@ WTrackText::WTrackText(QWidget* pParent,
         : WLabel(pParent),
           m_group(group),
           m_pConfig(pConfig),
-          m_pTrackMenu(make_parented<WTrackMenu>(
-                  this, pConfig, pLibrary, kTrackMenuFeatures)) {
+          m_pLibrary(pLibrary) {
     setAcceptDrops(true);
 }
 
@@ -86,6 +85,7 @@ void WTrackText::mouseMoveEvent(QMouseEvent *event) {
 void WTrackText::mouseDoubleClickEvent(QMouseEvent* event) {
     Q_UNUSED(event);
     if (m_pCurrentTrack) {
+        ensureTrackMenuIsCreated();
         m_pTrackMenu->loadTrack(m_pCurrentTrack, m_group);
         m_pTrackMenu->slotShowDlgTrackInfo();
     }
@@ -102,8 +102,15 @@ void WTrackText::dropEvent(QDropEvent *event) {
 void WTrackText::contextMenuEvent(QContextMenuEvent* event) {
     event->accept();
     if (m_pCurrentTrack) {
+        ensureTrackMenuIsCreated();
         m_pTrackMenu->loadTrack(m_pCurrentTrack, m_group);
-        // Create the right-click menu
         m_pTrackMenu->popup(event->globalPos());
     }
 }
+
+void WTrackText::ensureTrackMenuIsCreated() {
+    if (m_pTrackMenu.get() == nullptr) {
+        m_pTrackMenu = make_parented<WTrackMenu>(
+                this, m_pConfig, m_pLibrary, kTrackMenuFeatures);
+    }
+}
diff --git a/src/widget/wtracktext.h b/src/widget/wtracktext.h
index 257d0fefea6..415978cd4c5 100644
--- a/src/widget/wtracktext.h
+++ b/src/widget/wtracktext.h
@@ -46,8 +46,11 @@ class WTrackText : public WLabel, public TrackDropTarget {
 
     void updateLabel();
 
+    void ensureTrackMenuIsCreated();
+
     const QString m_group;
     UserSettingsPointer m_pConfig;
+    Library* m_pLibrary;
     TrackPointer m_pCurrentTrack;
-    const parented_ptr<WTrackMenu> m_pTrackMenu;
+    parented_ptr<WTrackMenu> m_pTrackMenu;
 };
diff --git a/src/widget/wtrackwidgetgroup.cpp b/src/widget/wtrackwidgetgroup.cpp
index 2e64807e48c..91c2355f8db 100644
--- a/src/widget/wtrackwidgetgroup.cpp
+++ b/src/widget/wtrackwidgetgroup.cpp
@@ -38,9 +38,8 @@ WTrackWidgetGroup::WTrackWidgetGroup(QWidget* pParent,
         : WWidgetGroup(pParent),
           m_group(group),
           m_pConfig(pConfig),
-          m_trackColorAlpha(kDefaultTrackColorAlpha),
-          m_pTrackMenu(make_parented<WTrackMenu>(
-                  this, pConfig, pLibrary, kTrackMenuFeatures)) {
+          m_pLibrary(pLibrary),
+          m_trackColorAlpha(kDefaultTrackColorAlpha) {
     setAcceptDrops(true);
 }
 
@@ -125,8 +124,16 @@ void WTrackWidgetGroup::dropEvent(QDropEvent* event) {
 void WTrackWidgetGroup::contextMenuEvent(QContextMenuEvent* event) {
     event->accept();
     if (m_pCurrentTrack) {
+        ensureTrackMenuIsCreated();
         m_pTrackMenu->loadTrack(m_pCurrentTrack, m_group);
         // Create the right-click menu
         m_pTrackMenu->popup(event->globalPos());
     }
 }
+
+void WTrackWidgetGroup::ensureTrackMenuIsCreated() {
+    if (m_pTrackMenu.get() == nullptr) {
+        m_pTrackMenu = make_parented<WTrackMenu>(
+                this, m_pConfig, m_pLibrary, kTrackMenuFeatures);
+    }
+}
diff --git a/src/widget/wtrackwidgetgroup.h b/src/widget/wtrackwidgetgroup.h
index 12968e1c269..880ecb77eb7 100644
--- a/src/widget/wtrackwidgetgroup.h
+++ b/src/widget/wtrackwidgetgroup.h
@@ -42,11 +42,14 @@ class WTrackWidgetGroup : public WWidgetGroup, public TrackDropTarget {
 
     void updateColor();
 
+    void ensureTrackMenuIsCreated();
+
     const QString m_group;
     const UserSettingsPointer m_pConfig;
+    Library* m_pLibrary;
     TrackPointer m_pCurrentTrack;
     QColor m_trackColor;
     int m_trackColorAlpha;
 
-    const parented_ptr<WTrackMenu> m_pTrackMenu;
+    parented_ptr<WTrackMenu> m_pTrackMenu;
 };

From d3915e6515b6145be56171ac1e01f1ea15288c08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Tue, 24 Oct 2023 12:19:50 +0200
Subject: [PATCH 136/388] Add missing include

---
 src/waveform/renderers/allshader/waveformrendererpreroll.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/waveform/renderers/allshader/waveformrendererpreroll.h b/src/waveform/renderers/allshader/waveformrendererpreroll.h
index 617ca2a0579..c8163c2dc87 100644
--- a/src/waveform/renderers/allshader/waveformrendererpreroll.h
+++ b/src/waveform/renderers/allshader/waveformrendererpreroll.h
@@ -2,6 +2,7 @@
 
 #include <QColor>
 #include <QImage>
+#include <memory>
 
 #include "shaders/patternshader.h"
 #include "util/class.h"

From 38af58d29cc76f8052ac21b019f500621285780e Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Fri, 27 Oct 2023 00:05:46 +0200
Subject: [PATCH 137/388] (fix) Looping: reset loop_end_pos on eject

---
 src/engine/controls/loopingcontrol.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/engine/controls/loopingcontrol.cpp b/src/engine/controls/loopingcontrol.cpp
index 0589d176815..7318f37b4fe 100644
--- a/src/engine/controls/loopingcontrol.cpp
+++ b/src/engine/controls/loopingcontrol.cpp
@@ -1107,8 +1107,8 @@ void LoopingControl::slotLoopEndPos(double positionSamples) {
 
     // Reject if the loop-in is not set, or if the new position is before the
     // start point (but not -1).
-    if (!loopInfo.startPosition.isValid() ||
-            (position.isValid() && position <= loopInfo.startPosition)) {
+    if (position.isValid() &&
+            (!loopInfo.startPosition.isValid() || position <= loopInfo.startPosition)) {
         m_pCOLoopEndPosition->set(loopInfo.endPosition.toEngineSamplePosMaybeInvalid());
         return;
     }

From 7c9254b6bb4a2f3eb1d6089a92b105ef51eaff6a Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Fri, 27 Oct 2023 01:48:30 +0200
Subject: [PATCH 138/388] Test: eject should reset loop_start/end_pos

---
 src/test/looping_control_test.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/test/looping_control_test.cpp b/src/test/looping_control_test.cpp
index 58557d5a1de..ff3eeafd0fc 100644
--- a/src/test/looping_control_test.cpp
+++ b/src/test/looping_control_test.cpp
@@ -678,6 +678,14 @@ TEST_F(LoopingControlTest, LoopResizeSeek) {
     EXPECT_FRAMEPOS_EQ(mixxx::audio::FramePos{250}, currentFramePos());
 }
 
+TEST_F(LoopingControlTest, EjectResetsLoopInOutPositions) {
+    m_pLoopStartPoint->set(mixxx::audio::kStartFramePos.toEngineSamplePos());
+    m_pLoopEndPoint->set(mixxx::audio::FramePos{300}.toEngineSamplePos());
+    m_pChannel1->getEngineBuffer()->ejectTrack();
+    EXPECT_FRAMEPOS_EQ_CONTROL(mixxx::audio::kInvalidFramePos, m_pLoopStartPoint);
+    EXPECT_FRAMEPOS_EQ_CONTROL(mixxx::audio::kInvalidFramePos, m_pLoopEndPoint);
+}
+
 TEST_F(LoopingControlTest, BeatLoopSize_SetAndToggle) {
     m_pTrack1->trySetBpm(120.0);
     // Setting beatloop_size should not activate a loop

From 345eea7c9128098dd980478aeb8c4ace7879fff6 Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Fri, 13 Oct 2023 12:57:42 +0100
Subject: [PATCH 139/388] ConfigObject: Perform cd in a single step while
 finding resource path

This avoids accidentally leaving the `mixxxDir` in a half-traversed
state if the `cdUp` succeeds, but the `cd` fails
---
 src/preferences/configobject.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/preferences/configobject.cpp b/src/preferences/configobject.cpp
index 5f5f8e1f2ca..47d9877cdb5 100644
--- a/src/preferences/configobject.cpp
+++ b/src/preferences/configobject.cpp
@@ -42,7 +42,7 @@ QString computeResourcePathImpl() {
             DEBUG_ASSERT(QDir(qResourcePath).exists());
         }
 #if defined(__UNIX__)
-        else if (mixxxDir.cdUp() && mixxxDir.cd(QStringLiteral("share/mixxx"))) {
+        else if (mixxxDir.cd(QStringLiteral("../share/mixxx"))) {
             qResourcePath = mixxxDir.absolutePath();
         }
 #elif defined(__WINDOWS__)
@@ -52,7 +52,7 @@ QString computeResourcePathImpl() {
             qResourcePath = QCoreApplication::applicationDirPath();
         }
 #elif defined(__APPLE__)
-        else if (mixxxDir.cdUp() && mixxxDir.cd("Resources")) {
+        else if (mixxxDir.cd("../Resources")) {
             // Release configuration
             qResourcePath = mixxxDir.absolutePath();
         } else {

From ff4804f057b3a2b893715f06de0bfcd6999963d5 Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Fri, 13 Oct 2023 13:11:00 +0100
Subject: [PATCH 140/388] ConfigObject: Find build directory when running from
 macOS bundle

---
 src/preferences/configobject.cpp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/preferences/configobject.cpp b/src/preferences/configobject.cpp
index 47d9877cdb5..cb5a77930a5 100644
--- a/src/preferences/configobject.cpp
+++ b/src/preferences/configobject.cpp
@@ -23,12 +23,24 @@ QString computeResourcePathImpl() {
 
     if (qResourcePath.isEmpty()) {
         QDir mixxxDir = QCoreApplication::applicationDirPath();
+
         // We used to support using the mixxx.cfg's [Config],Path setting but
         // this causes issues if you try and use two different versions of Mixxx
         // on the same computer.
-        auto cmakecache = QFile(mixxxDir.filePath(kCMakeCacheFile));
+
+        QDir potentialBuildDir = mixxxDir;
+#ifdef __APPLE__
+        if (potentialBuildDir.absolutePath().endsWith(".app/Contents/MacOS")) {
+            // We are in an app bundle (built with `-DMACOS_BUNDLE=ON`).
+            // If we are in a development build directory, we need to search three directories up.
+            potentialBuildDir.cd("../../..");
+        }
+#endif
+
+        // Check if there's a `CMakeCache.txt`, if so we are in a development build directory.
+        auto cmakecache = QFile(potentialBuildDir.filePath(kCMakeCacheFile));
         if (cmakecache.open(QFile::ReadOnly | QFile::Text)) {
-            // We are running form a build dir (CMAKE_CURRENT_BINARY_DIR),
+            // We are running from a build dir (CMAKE_CURRENT_BINARY_DIR),
             // Look up the source path from CMakeCache.txt (mixxx_SOURCE_DIR)
             QTextStream in(&cmakecache);
             QString line = in.readLine();

From 50990dbbe407c4a3561016bae6891d22125e7712 Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Sat, 28 Oct 2023 12:21:42 +0200
Subject: [PATCH 141/388] optionally use an svg for the mark icon instead of
 text

---
 .../LateNight/classic/style/mark_loop.svg     | 54 ++++++++++++++++
 res/skins/LateNight/waveform.xml              |  2 +-
 src/waveform/renderers/waveformmark.cpp       | 64 ++++++++++++-------
 src/waveform/renderers/waveformmark.h         |  1 +
 4 files changed, 96 insertions(+), 25 deletions(-)
 create mode 100644 res/skins/LateNight/classic/style/mark_loop.svg

diff --git a/res/skins/LateNight/classic/style/mark_loop.svg b/res/skins/LateNight/classic/style/mark_loop.svg
new file mode 100644
index 00000000000..7e7adfd53fa
--- /dev/null
+++ b/res/skins/LateNight/classic/style/mark_loop.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="64"
+   height="64"
+   viewBox="0 0 16.933333 16.933334"
+   version="1.1"
+   id="svg7299"
+   sodipodi:docname="mark_loop.svg"
+   inkscape:version="1.1.1 (c3084ef, 2021-09-22)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview829"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="8.734375"
+     inkscape:cx="32.457961"
+     inkscape:cy="35.663685"
+     inkscape:window-width="1312"
+     inkscape:window-height="781"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7299" />
+  <defs
+     id="defs7296" />
+  <g
+     id="g940"
+     transform="matrix(0.97898566,0,0,0.97883358,0.1884315,0.18864367)"
+     style="stroke-width:3.175;stroke-miterlimit:4;stroke-dasharray:none">
+    <g
+       id="layer1"
+       transform="matrix(1.0692589,0,0,1.0692589,-0.58545593,-0.58545597)"
+       style="stroke-width:2.96935;stroke-miterlimit:4;stroke-dasharray:none">
+      <path
+         style="fill:none;stroke:#000000;stroke-width:2.96935;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 1.852085,1.852085 H 7.1437516 V 7.1437516"
+         id="path8821" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:2.96935;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         id="path9136"
+         d="M 13.580891,4.6619169 A 6.3307567,6.3307567 0 0 1 14.070556,12.132762 6.3307567,6.3307567 0 0 1 7.0927295,14.84629 6.3307567,6.3307567 0 0 1 2.4065186,9.0073927 6.3307567,6.3307567 0 0 1 6.5660033,2.7822836" />
+    </g>
+  </g>
+</svg>
diff --git a/res/skins/LateNight/waveform.xml b/res/skins/LateNight/waveform.xml
index 2b84f4f7514..649541c1df4 100644
--- a/res/skins/LateNight/waveform.xml
+++ b/res/skins/LateNight/waveform.xml
@@ -62,7 +62,7 @@
             </MarkRange>
             <Mark>
               <Control>loop_start_position</Control>
-              <Text>&#8635;</Text>
+              <Icon>skin:../LateNight/classic/style/mark_loop.svg</Icon>
               <Align>top|left</Align>
               <Color><Variable name="LoopColor"/></Color>
               <TextColor>#FFFFFF</TextColor>
diff --git a/src/waveform/renderers/waveformmark.cpp b/src/waveform/renderers/waveformmark.cpp
index 4806805e7e7..9012b7b7f84 100644
--- a/src/waveform/renderers/waveformmark.cpp
+++ b/src/waveform/renderers/waveformmark.cpp
@@ -111,6 +111,11 @@ WaveformMark::WaveformMark(const QString& group,
     if (!m_pixmapPath.isEmpty()) {
         m_pixmapPath = context.makeSkinPath(m_pixmapPath);
     }
+
+    m_iconPath = context.selectString(node, "Icon");
+    if (!m_iconPath.isEmpty()) {
+        m_iconPath = context.makeSkinPath(m_iconPath);
+    }
 }
 
 WaveformMark::~WaveformMark() = default;
@@ -143,11 +148,11 @@ bool WaveformMark::contains(QPoint point, Qt::Orientation orientation) const {
 struct MarkerGeometry {
     bool m_isSymbol; // it the label normal text or a single symbol (e.g. open circle arrow)
     QFont m_font;
-    QRectF m_textRect;
+    QRectF m_contentRect;
     QRectF m_labelRect;
     QSizeF m_imageSize;
 
-    MarkerGeometry(const QString& label, Qt::Alignment align, float breadth) {
+    MarkerGeometry(const QString& label, bool useIcon, Qt::Alignment align, float breadth) {
         // If the label is 1 character long, and this character isn't a letter or a number,
         // we can assume it's a special symbol
         m_isSymbol = label.length() == 1 && !label[0].isLetterOrNumber();
@@ -169,6 +174,8 @@ struct MarkerGeometry {
         m_font.setWeight(75); // bold
         m_font.setItalic(false);
 
+        const qreal margin{3.f};
+
         qreal capHeight;
         {
             QFontMetricsF metrics{m_font};
@@ -186,27 +193,28 @@ struct MarkerGeometry {
                 // large font size
                 m_font.setPointSize(50.0);
                 metrics = QFontMetricsF(m_font);
-                m_textRect = metrics.tightBoundingRect(label);
+                m_contentRect = metrics.tightBoundingRect(label);
 
                 // Now we calculate how much bigger this is than our target
                 // size.
-                const auto ratioH = targetHeight / m_textRect.height();
-                const auto ratioW = targetWidth / m_textRect.width();
+                const auto ratioH = targetHeight / m_contentRect.height();
+                const auto ratioW = targetWidth / m_contentRect.width();
                 const auto ratio = std::min(ratioH, ratioW);
 
                 // And we scale the font size accordingly.
                 m_font.setPointSizeF(50.0 * ratio);
                 metrics = QFontMetricsF(m_font);
-                m_textRect = metrics.tightBoundingRect(label);
+                m_contentRect = metrics.tightBoundingRect(label);
+            } else if (useIcon) {
+                m_contentRect = QRectF(0.f, 0.f, std::ceil(capHeight), std::ceil(capHeight));
             } else {
-                m_textRect = QRectF{0.f,
-                        -metrics.capHeight(),
+                m_contentRect = QRectF{0.f,
+                        -capHeight,
                         metrics.boundingRect(label).width(),
-                        metrics.capHeight()};
+                        capHeight};
             }
         }
 
-        const qreal margin{3.f};
         const Qt::Alignment alignH = align & Qt::AlignHorizontal_Mask;
         const Qt::Alignment alignV = align & Qt::AlignVertical_Mask;
         const bool alignHCenter{alignH == Qt::AlignHCenter};
@@ -214,7 +222,7 @@ struct MarkerGeometry {
 
         m_labelRect = QRectF{0.f,
                 0.f,
-                std::ceil((m_textRect.width() + 2.f * margin) / widthRounding) *
+                std::ceil((m_contentRect.width() + 2.f * margin) / widthRounding) *
                         widthRounding,
                 std::ceil(capHeight + 2.f * margin)};
 
@@ -285,8 +293,10 @@ QImage WaveformMark::generateImage(float breadth, float devicePixelRatio) {
         }
     }
 
+    const bool useIcon = m_iconPath != "";
+
     // Determine drawing geometries
-    const MarkerGeometry markerGeometry(label, m_align, breadth);
+    const MarkerGeometry markerGeometry(label, useIcon, m_align, breadth);
 
     m_label.setAreaRect(markerGeometry.m_labelRect);
 
@@ -324,7 +334,7 @@ QImage WaveformMark::generateImage(float breadth, float devicePixelRatio) {
             hcenter + 1.f,
             markerGeometry.m_imageSize.height()));
 
-    if (label.length() != 0) {
+    if (useIcon || label.length() != 0) {
         painter.setPen(borderColor());
 
         // Draw the label rounded rect with border
@@ -333,24 +343,30 @@ QImage WaveformMark::generateImage(float breadth, float devicePixelRatio) {
         painter.fillPath(path, fillColor());
         painter.drawPath(path);
 
-        // Draw the text
-        painter.setBrush(Qt::transparent);
-        painter.setPen(labelColor());
-        painter.setFont(markerGeometry.m_font);
-
-        // Center m_textRect.width() and m_textRect.height() inside m_labelRect
+        // Center m_contentRect.width() and m_contentRect.height() inside m_labelRect
         // and apply the offset x,y so the text ends up in the centered width,height.
         QPointF pos(markerGeometry.m_labelRect.x() +
                         (markerGeometry.m_labelRect.width() -
-                                markerGeometry.m_textRect.width()) /
+                                markerGeometry.m_contentRect.width()) /
                                 2.f -
-                        markerGeometry.m_textRect.x(),
+                        markerGeometry.m_contentRect.x(),
                 markerGeometry.m_labelRect.y() +
                         (markerGeometry.m_labelRect.height() -
-                                markerGeometry.m_textRect.height()) /
+                                markerGeometry.m_contentRect.height()) /
                                 2.f -
-                        markerGeometry.m_textRect.y());
-        painter.drawText(pos, label);
+                        markerGeometry.m_contentRect.y());
+
+        if (useIcon) {
+            QSvgRenderer svgRenderer(m_iconPath);
+            svgRenderer.render(&painter, QRectF(pos, markerGeometry.m_contentRect.size()));
+        } else {
+            // Draw the text
+            painter.setBrush(Qt::transparent);
+            painter.setPen(labelColor());
+            painter.setFont(markerGeometry.m_font);
+
+            painter.drawText(pos, label);
+        }
     }
 
     painter.end();
diff --git a/src/waveform/renderers/waveformmark.h b/src/waveform/renderers/waveformmark.h
index b7e24bb847f..0dc6ec632d6 100644
--- a/src/waveform/renderers/waveformmark.h
+++ b/src/waveform/renderers/waveformmark.h
@@ -102,6 +102,7 @@ class WaveformMark {
     QString m_text;
     Qt::Alignment m_align;
     QString m_pixmapPath;
+    QString m_iconPath;
 
     float m_linePosition{};
     int m_breadth{};

From 17f0f19c53d746aaedc24287afe721d80cdff8d1 Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Sat, 28 Oct 2023 17:34:04 +0200
Subject: [PATCH 142/388] WaveformMark::Graphics can either be ImageGraphics or
 TextureGraphics, depending on the context

---
 .../allshader/waveformrendermark.cpp          | 34 +++++++++------
 .../renderers/allshader/waveformrendermark.h  |  1 -
 src/waveform/renderers/waveformmark.cpp       |  4 +-
 src/waveform/renderers/waveformmark.h         | 13 ++++--
 src/waveform/renderers/waveformrendermark.cpp | 42 +++++++++++++------
 5 files changed, 64 insertions(+), 30 deletions(-)

diff --git a/src/waveform/renderers/allshader/waveformrendermark.cpp b/src/waveform/renderers/allshader/waveformrendermark.cpp
index 2f2f1523638..0b7fd5c799c 100644
--- a/src/waveform/renderers/allshader/waveformrendermark.cpp
+++ b/src/waveform/renderers/allshader/waveformrendermark.cpp
@@ -29,17 +29,23 @@
 // only to draw on a QImage. This is only done once when needed and the images are
 // then used as textures to be drawn with a GLSL shader.
 
+class TextureGraphics : public WaveformMark::Graphics {
+    std::unique_ptr<QOpenGLTexture> m_pTexture;
+
+  public:
+    TextureGraphics(std::unique_ptr<QOpenGLTexture>&& pTexture)
+            : m_pTexture{std::move(pTexture)} {
+    }
+    QOpenGLTexture* texture() const {
+        return m_pTexture.get();
+    }
+};
+
 allshader::WaveformRenderMark::WaveformRenderMark(WaveformWidgetRenderer* waveformWidget)
         : WaveformRenderer(waveformWidget),
           m_bCuesUpdates(false) {
 }
 
-allshader::WaveformRenderMark::~WaveformRenderMark() {
-    for (const auto& pMark : m_marks) {
-        pMark->m_pTexture.reset();
-    }
-}
-
 void allshader::WaveformRenderMark::setup(const QDomNode& node, const SkinContext& context) {
     WaveformSignalColors signalColors = *m_waveformRenderer->getWaveformSignalColors();
     m_marks.setup(m_waveformRenderer->getGroup(), node, context, signalColors);
@@ -169,10 +175,14 @@ void allshader::WaveformRenderMark::paintGL() {
             continue;
         }
 
-        if (pMark->m_needsUpdate) {
+        if (!pMark->m_pGraphics || pMark->m_pGraphics->m_obsolete) {
             generateMarkImage(pMark);
         }
 
+        QOpenGLTexture* pTexture =
+                static_cast<TextureGraphics*>(pMark->m_pGraphics.get())
+                        ->texture();
+
         const double samplePosition = pMark->getSamplePosition();
         if (samplePosition != Cue::kNoPosition) {
             const float currentMarkPoint = std::floor(static_cast<float>(
@@ -183,7 +193,7 @@ void allshader::WaveformRenderMark::paintGL() {
             // Pixmaps are expected to have the mark stroke at the center,
             // and preferably have an odd width in order to have the stroke
             // exactly at the sample position.
-            const float markHalfWidth = pMark->m_pTexture->width() / devicePixelRatio / 2.f;
+            const float markHalfWidth = pTexture->width() / devicePixelRatio / 2.f;
             const float drawOffset = currentMarkPoint - markHalfWidth;
 
             bool visible = false;
@@ -191,7 +201,7 @@ void allshader::WaveformRenderMark::paintGL() {
             if (currentMarkPoint > -markHalfWidth &&
                     currentMarkPoint < m_waveformRenderer->getLength() +
                                     markHalfWidth) {
-                drawTexture(drawOffset, 0, pMark->m_pTexture.get());
+                drawTexture(drawOffset, 0, pTexture);
                 visible = true;
             }
 
@@ -379,7 +389,7 @@ void allshader::WaveformRenderMark::checkCuesUpdated() {
 }
 
 void allshader::WaveformRenderMark::generateMarkImage(WaveformMarkPointer pMark) {
-    pMark->m_pTexture = createTexture(pMark->generateImage(m_waveformRenderer->getBreadth(),
-            m_waveformRenderer->getDevicePixelRatio()));
-    pMark->m_needsUpdate = false;
+    pMark->m_pGraphics = std::make_unique<TextureGraphics>(
+            createTexture(pMark->generateImage(m_waveformRenderer->getBreadth(),
+                    m_waveformRenderer->getDevicePixelRatio())));
 }
diff --git a/src/waveform/renderers/allshader/waveformrendermark.h b/src/waveform/renderers/allshader/waveformrendermark.h
index 0cdbfe70225..101a96a0126 100644
--- a/src/waveform/renderers/allshader/waveformrendermark.h
+++ b/src/waveform/renderers/allshader/waveformrendermark.h
@@ -21,7 +21,6 @@ class allshader::WaveformRenderMark final : public QObject, public allshader::Wa
     Q_OBJECT
   public:
     explicit WaveformRenderMark(WaveformWidgetRenderer* waveformWidget);
-    ~WaveformRenderMark() override;
 
     void setup(const QDomNode& node, const SkinContext& context) override;
 
diff --git a/src/waveform/renderers/waveformmark.cpp b/src/waveform/renderers/waveformmark.cpp
index 9012b7b7f84..2d7076772a7 100644
--- a/src/waveform/renderers/waveformmark.cpp
+++ b/src/waveform/renderers/waveformmark.cpp
@@ -121,7 +121,9 @@ WaveformMark::WaveformMark(const QString& group,
 WaveformMark::~WaveformMark() = default;
 
 void WaveformMark::setBaseColor(QColor baseColor, int dimBrightThreshold) {
-    m_needsUpdate = true;
+    if (m_pGraphics) {
+        m_pGraphics->m_obsolete = true;
+    }
     m_fillColor = baseColor;
     m_borderColor = Color::chooseContrastColor(baseColor, dimBrightThreshold);
     m_labelColor = Color::chooseColorByBrightness(baseColor,
diff --git a/src/waveform/renderers/waveformmark.h b/src/waveform/renderers/waveformmark.h
index 0dc6ec632d6..7b6b5bb2a8e 100644
--- a/src/waveform/renderers/waveformmark.h
+++ b/src/waveform/renderers/waveformmark.h
@@ -21,6 +21,14 @@ class WaveformRenderMark;
 
 class WaveformMark {
   public:
+    class Graphics {
+      public:
+        Graphics()
+                : m_obsolete{false} {
+        }
+        bool m_obsolete;
+    };
+
     WaveformMark(
             const QString& group,
             const QDomNode& node,
@@ -116,10 +124,7 @@ class WaveformMark {
 
     friend class allshader::WaveformRenderMark;
 
-    std::unique_ptr<QOpenGLTexture> m_pTexture; // Used by allshader::WaveformRenderMark
-    QImage m_image;                             // Used by WaveformRenderMark
-    bool m_needsUpdate{true};                   // To indicate either the texture or the image has
-                                                // to be updated
+    std::unique_ptr<Graphics> m_pGraphics;
 
     int m_iHotCue;
 
diff --git a/src/waveform/renderers/waveformrendermark.cpp b/src/waveform/renderers/waveformrendermark.cpp
index a02ed14e59d..113e7f608bf 100644
--- a/src/waveform/renderers/waveformrendermark.cpp
+++ b/src/waveform/renderers/waveformrendermark.cpp
@@ -15,6 +15,19 @@
 #include "widget/wskincolor.h"
 #include "widget/wwidget.h"
 
+class ImageGraphics : public WaveformMark::Graphics {
+    QImage m_image;
+
+  public:
+    ImageGraphics(QImage&& image)
+            : m_image{std::move(image)} {
+    }
+
+    const QImage& image() const {
+        return m_image;
+    }
+};
+
 WaveformRenderMark::WaveformRenderMark(
         WaveformWidgetRenderer* waveformWidgetRenderer) :
     WaveformRendererAbstract(waveformWidgetRenderer) {
@@ -50,10 +63,12 @@ void WaveformRenderMark::draw(QPainter* painter, QPaintEvent* /*event*/) {
 
         // Generate image on first paint can't be done in setup since we need to
         // wait for the render widget to be resized yet.
-        if (pMark->m_needsUpdate || pMark->m_image.isNull()) {
+        if (!pMark->m_pGraphics || pMark->m_pGraphics->m_obsolete) {
             generateMarkImage(pMark);
         }
 
+        const QImage& image = static_cast<ImageGraphics*>(pMark->m_pGraphics.get())->image();
+
         const double samplePosition = pMark->getSamplePosition();
         if (samplePosition != Cue::kNoPosition) {
             const double currentMarkPoint =
@@ -64,14 +79,14 @@ void WaveformRenderMark::draw(QPainter* painter, QPaintEvent* /*event*/) {
                 // and preferably have an odd width in order to have the stroke
                 // exactly at the sample position.
                 const int markHalfWidth =
-                        static_cast<int>(pMark->m_image.width() / 2.0 /
+                        static_cast<int>(image.width() / 2.0 /
                                 m_waveformRenderer->getDevicePixelRatio());
                 const int drawOffset = static_cast<int>(currentMarkPoint) - markHalfWidth;
 
                 bool visible = false;
                 // Check if the current point needs to be displayed.
                 if (currentMarkPoint > -markHalfWidth && currentMarkPoint < m_waveformRenderer->getWidth() + markHalfWidth) {
-                    painter->drawImage(drawOffset, 0, pMark->m_image);
+                    painter->drawImage(drawOffset, 0, image);
                     visible = true;
                 }
 
@@ -106,7 +121,7 @@ void WaveformRenderMark::draw(QPainter* painter, QPaintEvent* /*event*/) {
                 }
             } else {
                 const int markHalfHeight =
-                        static_cast<int>(pMark->m_image.height() / 2.0 /
+                        static_cast<int>(image.height() / 2.0 /
                                 m_waveformRenderer->getDevicePixelRatio());
                 const int drawOffset = static_cast<int>(currentMarkPoint) - markHalfHeight;
 
@@ -115,7 +130,7 @@ void WaveformRenderMark::draw(QPainter* painter, QPaintEvent* /*event*/) {
                 if (currentMarkPoint > -markHalfHeight &&
                         currentMarkPoint < m_waveformRenderer->getHeight() +
                                         markHalfHeight) {
-                    painter->drawImage(0, drawOffset, pMark->m_image);
+                    painter->drawImage(0, drawOffset, image);
                     visible = true;
                 }
 
@@ -157,7 +172,9 @@ void WaveformRenderMark::draw(QPainter* painter, QPaintEvent* /*event*/) {
 void WaveformRenderMark::onResize() {
     // Flag that the mark image has to be updated. New images will be created on next paint.
     for (const auto& pMark : m_marks) {
-        pMark->m_needsUpdate = true;
+        if (pMark->m_pGraphics) {
+            pMark->m_pGraphics->m_obsolete = true;
+        }
     }
 }
 
@@ -209,12 +226,13 @@ void WaveformRenderMark::slotCuesUpdated() {
 
 void WaveformRenderMark::generateMarkImage(WaveformMarkPointer pMark) {
     if (m_waveformRenderer->getOrientation() == Qt::Horizontal) {
-        pMark->m_image = pMark->generateImage(m_waveformRenderer->getBreadth(),
-                m_waveformRenderer->getDevicePixelRatio());
+        pMark->m_pGraphics = std::make_unique<ImageGraphics>(
+                pMark->generateImage(m_waveformRenderer->getBreadth(),
+                        m_waveformRenderer->getDevicePixelRatio()));
     } else {
-        pMark->m_image = pMark->generateImage(m_waveformRenderer->getBreadth(),
-                                      m_waveformRenderer->getDevicePixelRatio())
-                                 .transformed(QTransform().rotate(90));
+        pMark->m_pGraphics = std::make_unique<ImageGraphics>(
+                pMark->generateImage(m_waveformRenderer->getBreadth(),
+                             m_waveformRenderer->getDevicePixelRatio())
+                        .transformed(QTransform().rotate(90)));
     }
-    pMark->m_needsUpdate = false;
 }

From 5ef75301fcfcd991bd682fe0fd3410d6e0e05ed0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Fri, 27 Oct 2023 09:01:27 +0200
Subject: [PATCH 143/388] Remove redundant by-copy capture default

---
 src/controllers/dlgprefcontrollers.cpp | 2 +-
 src/engine/controls/loopingcontrol.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/controllers/dlgprefcontrollers.cpp b/src/controllers/dlgprefcontrollers.cpp
index 841424b50fa..f9ee21171de 100644
--- a/src/controllers/dlgprefcontrollers.cpp
+++ b/src/controllers/dlgprefcontrollers.cpp
@@ -23,7 +23,7 @@ DlgPrefControllers::DlgPrefControllers(DlgPreferences* pPreferences,
     createLinkColor();
     setupControllerWidgets();
 
-    connect(btnOpenUserMappings, &QPushButton::clicked, this, [=, this]() {
+    connect(btnOpenUserMappings, &QPushButton::clicked, this, [this]() {
         QString mappingsPath = userMappingsPath(m_pConfig);
         openLocalFile(mappingsPath);
     });
diff --git a/src/engine/controls/loopingcontrol.cpp b/src/engine/controls/loopingcontrol.cpp
index 0589d176815..87cdbdc2ab4 100644
--- a/src/engine/controls/loopingcontrol.cpp
+++ b/src/engine/controls/loopingcontrol.cpp
@@ -133,7 +133,7 @@ LoopingControl::LoopingControl(const QString& group,
             m_pCOBeatLoop,
             &ControlObject::valueChanged,
             this,
-            [=, this](double value) { slotBeatLoop(value); },
+            [this](double value) { slotBeatLoop(value); },
             Qt::DirectConnection);
 
     m_pCOBeatLoopSize = new ControlObject(ConfigKey(group, "beatloop_size"),

From bddca84dde63c0290d92b497f3f3b34ef1c48359 Mon Sep 17 00:00:00 2001
From: Antoine C <mixxx@acolombier.dev>
Date: Sat, 28 Oct 2023 13:29:31 +0100
Subject: [PATCH 144/388] ci: workaround runner-image issue

This workaround has been suggested on the issue https://github.com/actions/runner-images/issues/8659
---
 .github/workflows/build-checks.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/build-checks.yml b/.github/workflows/build-checks.yml
index 67b2557c165..9a0ae7641bc 100644
--- a/.github/workflows/build-checks.yml
+++ b/.github/workflows/build-checks.yml
@@ -112,6 +112,13 @@ jobs:
         working-directory: build
       - name: Set up problem matcher
         uses: ammaraskar/gcc-problem-matcher@0.2.0
+      # Work around https://github.com/actions/runner-images/issues/8659
+      - name: "Remove GCC 13 from runner image (workaround)"
+        shell: bash
+        run: |
+          sudo rm -f /etc/apt/sources.list.d/ubuntu-toolchain-r-ubuntu-test-jammy.list
+          sudo apt-get update
+          sudo apt-get install -y --allow-downgrades libc6=2.35-0ubuntu3.4 libc6-dev=2.35-0ubuntu3.4 libstdc++6=12.3.0-1ubuntu1~22.04 libgcc-s1=12.3.0-1ubuntu1~22.04
       - name: Build
         # Do not abort on errors and build/check the whole project
         run: cmake --build . -j $(nproc) -- --keep-going

From 0c1d4ee0068f147dd8b4dc26bf9cca4678926965 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Thu, 26 Oct 2023 13:11:14 +0200
Subject: [PATCH 145/388] Improve Reverb.cc includes

---
 lib/reverb/Reverb.cc | 5 ++++-
 lib/reverb/basics.h  | 5 ++---
 src/util/types.h     | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/reverb/Reverb.cc b/lib/reverb/Reverb.cc
index 38daba6d24f..7e0bf2e56f6 100644
--- a/lib/reverb/Reverb.cc
+++ b/lib/reverb/Reverb.cc
@@ -43,9 +43,12 @@
 	02111-1307, USA or point your web browser to http://www.gnu.org.
 */
 
+#include "Reverb.h"
+
+#include <cmath>
 #include "basics.h"
+#include "dsp/FPTruncateMode.h"
 
-#include "Reverb.h"
 //#include "Descriptor.h"
 
 #if 0
diff --git a/lib/reverb/basics.h b/lib/reverb/basics.h
index bae7aa1daba..1b10d43183d 100644
--- a/lib/reverb/basics.h
+++ b/lib/reverb/basics.h
@@ -43,8 +43,7 @@
 #include <assert.h>
 #include <stdio.h>
 
-#include "util/types.h"
-typedef CSAMPLE sample_t;
+typedef float sample_t;
 
 // NOTE(rryan): 3/2014 Added these for the MSVC build.
 #include <QtGlobal>
@@ -67,7 +66,7 @@ typedef unsigned int uint;
 typedef unsigned long ulong;
 
 /* prototype that takes a sample and yields a sample */
-typedef CSAMPLE (*clip_func_t) (CSAMPLE);
+typedef sample_t (*clip_func_t) (sample_t);
 
 #ifndef max
 template <class X, class Y> X min (X x, Y y) { return x < (X)y ? x : (X)y; }
diff --git a/src/util/types.h b/src/util/types.h
index 2cf3249cd87..c026e38fdb1 100644
--- a/src/util/types.h
+++ b/src/util/types.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <cstddef>
 #include <climits>
+#include <cstddef>
 
 #include "util/math.h"
 

From d833c88bed51b8165a34927aedcc0ff0800929e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Fri, 27 Oct 2023 10:27:25 +0200
Subject: [PATCH 146/388] Remove unused definitions from reverb/basics.h

---
 lib/reverb/basics.h | 75 +++------------------------------------------
 1 file changed, 5 insertions(+), 70 deletions(-)

diff --git a/lib/reverb/basics.h b/lib/reverb/basics.h
index 1b10d43183d..685b6bfbdb3 100644
--- a/lib/reverb/basics.h
+++ b/lib/reverb/basics.h
@@ -1,3 +1,5 @@
+#pragma once
+
 /*
 	basics.h
 
@@ -29,77 +31,16 @@
 	02111-1307, USA or point your web browser to http://www.gnu.org.
 */
 
-#ifndef BASICS_H
-#define BASICS_H
-
 #include <cmath>
-
-#include <stdlib.h>
-#include <string.h>
-
-#include <math.h>
-#include <float.h>
-
+#include <cstring>
 #include <assert.h>
-#include <stdio.h>
+#include <cstdint>
 
 typedef float sample_t;
-
-// NOTE(rryan): 3/2014 Added these for the MSVC build.
-#include <QtGlobal>
-typedef qint8 int8;
-typedef quint8 uint8;
-typedef qint16 int16;
-typedef quint16 uint16;
-typedef qint32 int32;
-typedef quint32 uint32;
-typedef qint64 int64;
-typedef quint64 uint64;
-
-#define MIN_GAIN 1e-6 /* -120 dB */
-/* smallest non-denormal 32 bit IEEE float is 1.18e-38 */
-#define NOISE_FLOOR 1e-20 /* -400 dB */
-
-/* //////////////////////////////////////////////////////////////////////// */
-
+typedef uint32_t uint32;
 typedef unsigned int uint;
 typedef unsigned long ulong;
 
-/* prototype that takes a sample and yields a sample */
-typedef sample_t (*clip_func_t) (sample_t);
-
-#ifndef max
-template <class X, class Y> X min (X x, Y y) { return x < (X)y ? x : (X)y; }
-template <class X, class Y> X max (X x, Y y) { return x > (X)y ? x : (X)y; }
-#endif /* ! max */
-
-template <class T>
-T clamp (T value, T lower, T upper)
-{
-	if (value < lower) return lower;
-	if (value > upper) return upper;
-	return value;
-}
-
-// (timrae) change random() to rand() for MSVC support
-static inline float frandom() { return (float) rand() / (float) RAND_MAX; }
-
-/* NB: also true if 0  */
-inline bool
-is_denormal (float & f)
-{
-	int32 i = *((int32 *) &f);
-	return ((i & 0x7f800000) == 0);
-}
-
-/* not used, check validity before using */
-inline bool
-is_denormal (double & f)
-{
-	int64 i = *((int64 *) &f);
-	return ((i & 0x7fe0000000000000ll) == 0);
-}
-
 /* lovely algorithm from
   http://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2Float
 */
@@ -118,9 +59,3 @@ next_power_of_2 (uint n)
 	return ++n;
 }
 
-inline double db2lin (double db) { return pow(10, .05*db); }
-inline double lin2db (double lin) { return 20*log10(lin); }
-
-/* //////////////////////////////////////////////////////////////////////// */
-
-#endif /* BASICS_H */

From 1235df3ddedee6b299cbdcc9600a7773873592e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sat, 28 Oct 2023 22:49:06 +0200
Subject: [PATCH 147/388] Added comments to the include directives

---
 lib/reverb/basics.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/reverb/basics.h b/lib/reverb/basics.h
index 685b6bfbdb3..f9541518a13 100644
--- a/lib/reverb/basics.h
+++ b/lib/reverb/basics.h
@@ -31,10 +31,10 @@
 	02111-1307, USA or point your web browser to http://www.gnu.org.
 */
 
-#include <cmath>
-#include <cstring>
-#include <assert.h>
-#include <cstdint>
+#include <cmath> // for M_PI
+#include <cstring> // for memset 
+#include <cassert> // for assert
+#include <cstdint> // for uint32_t
 
 typedef float sample_t;
 typedef uint32_t uint32;

From 494c360fe030b9481f59f7ff6ba31aa8647bd4ca Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Sun, 29 Oct 2023 01:08:28 +0200
Subject: [PATCH 148/388] add icons for intro and outro

---
 .../LateNight/classic/style/mark_intro.svg     | 18 ++++++++++++++++++
 .../LateNight/classic/style/mark_outro.svg     | 18 ++++++++++++++++++
 res/skins/LateNight/waveform.xml               | 13 +++++++++----
 3 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 res/skins/LateNight/classic/style/mark_intro.svg
 create mode 100644 res/skins/LateNight/classic/style/mark_outro.svg

diff --git a/res/skins/LateNight/classic/style/mark_intro.svg b/res/skins/LateNight/classic/style/mark_intro.svg
new file mode 100644
index 00000000000..96dd7bcd702
--- /dev/null
+++ b/res/skins/LateNight/classic/style/mark_intro.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="64"
+   height="64"
+   viewBox="0 0 16.933333 16.933334"
+   version="1.1"
+   id="svg7299"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs7296" />
+  <path
+     style="fill:#ffffff;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 16.933334,0 V 16.933334 H 0 Z"
+     id="path1109" />
+</svg>
diff --git a/res/skins/LateNight/classic/style/mark_outro.svg b/res/skins/LateNight/classic/style/mark_outro.svg
new file mode 100644
index 00000000000..ad9c98f174b
--- /dev/null
+++ b/res/skins/LateNight/classic/style/mark_outro.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="64"
+   height="64"
+   viewBox="0 0 16.933333 16.933334"
+   version="1.1"
+   id="svg7299"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs7296" />
+  <path
+     style="fill:#ffffff;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 0,0 V 16.933334 H 16.933334 Z"
+     id="path1109" />
+</svg>
diff --git a/res/skins/LateNight/waveform.xml b/res/skins/LateNight/waveform.xml
index 649541c1df4..101719929ef 100644
--- a/res/skins/LateNight/waveform.xml
+++ b/res/skins/LateNight/waveform.xml
@@ -62,6 +62,7 @@
             </MarkRange>
             <Mark>
               <Control>loop_start_position</Control>
+              <!--Text>&#8635;</Text-->
               <Icon>skin:../LateNight/classic/style/mark_loop.svg</Icon>
               <Align>top|left</Align>
               <Color><Variable name="LoopColor"/></Color>
@@ -86,7 +87,8 @@
             </MarkRange>
             <Mark>
               <Control>intro_start_position</Control>
-              <Text>&#9698;</Text>
+              <!--Text>&#9698;</Text-->
+              <Icon>skin:../LateNight/classic/style/mark_intro.svg</Icon>
               <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
               <Align>top|right</Align>
               <Color><Variable name="IntroOutroColor"/></Color>
@@ -95,7 +97,8 @@
             <Mark>
               <Control>intro_end_position</Control>
               <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
-              <Text>&#9698;</Text>
+              <!--Text>&#9698;</Text-->
+              <Icon>skin:../LateNight/classic/style/mark_intro.svg</Icon>
               <Align>top|left</Align>
               <Color><Variable name="IntroOutroColor"/></Color>
               <TextColor>#FFFFFF</TextColor>
@@ -113,14 +116,16 @@
             <Mark>
               <Control>outro_start_position</Control>
               <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
-              <Text>&#9699;</Text>
+              <!--Text>&#9699;</Text-->
+              <Icon>skin:../LateNight/classic/style/mark_outro.svg</Icon>
               <Align>top|right</Align>
               <Color><Variable name="IntroOutroColor"/></Color>
               <TextColor>#FFFFFF</TextColor>
             </Mark>
             <Mark>
               <Control>outro_end_position</Control>
-              <Text>&#9699;</Text>
+              <!--Text>&#9699;</Text-->
+              <Icon>skin:../LateNight/classic/style/mark_outro.svg</Icon>
               <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
               <Align>top|left</Align>
               <Color><Variable name="IntroOutroColor"/></Color>

From c9b7a75cb7578e8ada364482fc54ff1eb283da62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Mon, 30 Oct 2023 09:08:16 +0100
Subject: [PATCH 149/388] moved includes <cmath> and <cstring> closer to usage

---
 lib/reverb/Reverb.h    | 1 +
 lib/reverb/basics.h    | 2 --
 lib/reverb/dsp/Delay.h | 2 ++
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/reverb/Reverb.h b/lib/reverb/Reverb.h
index ac8821124ac..8900d0bfd6e 100644
--- a/lib/reverb/Reverb.h
+++ b/lib/reverb/Reverb.h
@@ -48,6 +48,7 @@
 #define REVERB_H
 
 #include <stdio.h>
+#include <cmath> // for M_PI
 
 #include "basics.h"
 #include "dsp/Delay.h"
diff --git a/lib/reverb/basics.h b/lib/reverb/basics.h
index f9541518a13..d825c48220a 100644
--- a/lib/reverb/basics.h
+++ b/lib/reverb/basics.h
@@ -31,8 +31,6 @@
 	02111-1307, USA or point your web browser to http://www.gnu.org.
 */
 
-#include <cmath> // for M_PI
-#include <cstring> // for memset 
 #include <cassert> // for assert
 #include <cstdint> // for uint32_t
 
diff --git a/lib/reverb/dsp/Delay.h b/lib/reverb/dsp/Delay.h
index 791e8bfd030..c7e77ce79f3 100644
--- a/lib/reverb/dsp/Delay.h
+++ b/lib/reverb/dsp/Delay.h
@@ -32,6 +32,8 @@
 #ifndef _DSP_DELAY_H_
 #define _DSP_DELAY_H_
 
+#include <cstring> // for memset
+
 #include "util.h"
 #include "FPTruncateMode.h"
 

From b4309cd5a510545fc0ff683d1e29bbb31e60f1ae Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jholthuis@mixxx.org>
Date: Mon, 30 Oct 2023 18:19:57 +0100
Subject: [PATCH 150/388] fix: Replace deprecated `qAsConst` with
 `std::as_const`

The `qAsConst` macro was deprecated in Qt 6.6.
---
 src/control/controlobjectscript.cpp           |  2 +-
 .../controllerinputmappingtablemodel.cpp      |  2 +-
 src/controllers/controllermanager.cpp         |  2 +-
 .../controllermappinginfoenumerator.cpp       |  2 +-
 .../controlleroutputmappingtablemodel.cpp     |  2 +-
 .../delegates/midiopcodedelegate.cpp          |  2 +-
 src/controllers/dlgprefcontrollers.cpp        |  6 ++--
 src/dialog/dlgreplacecuecolor.cpp             |  2 +-
 src/encoder/encoderfdkaac.cpp                 |  6 ++--
 src/encoder/encoderflacsettings.cpp           |  2 +-
 src/encoder/encodermp3settings.cpp            |  2 +-
 src/encoder/encoderopussettings.cpp           |  4 +--
 src/encoder/encoderwavesettings.cpp           |  2 +-
 src/engine/cachingreader/cachingreader.cpp    |  2 +-
 src/engine/controls/cuecontrol.cpp            |  8 ++---
 src/engine/controls/loopingcontrol.cpp        |  2 +-
 src/engine/effects/engineeffectchain.cpp      |  2 +-
 src/engine/enginebuffer.cpp                   | 12 +++----
 src/engine/sidechain/enginenetworkstream.cpp  |  4 +--
 src/engine/sync/enginesync.cpp                | 10 +++---
 src/library/basesqltablemodel.cpp             |  2 +-
 src/library/basetrackcache.cpp                |  4 +--
 src/library/dao/playlistdao.cpp               |  2 +-
 src/library/dao/trackdao.cpp                  |  2 +-
 src/library/dlgtagfetcher.cpp                 |  2 +-
 src/library/export/engineprimeexportjob.cpp   |  6 ++--
 src/library/library.cpp                       |  4 +--
 src/library/rekordbox/rekordboxfeature.cpp    |  2 +-
 src/library/scanner/libraryscanner.cpp        |  2 +-
 src/library/serato/seratofeature.cpp          |  2 +-
 src/library/trackcollection.cpp               |  2 +-
 src/library/trackset/playlistfeature.cpp      |  2 +-
 src/library/trackset/setlogfeature.cpp        |  2 +-
 src/library/treeitem.cpp                      |  2 +-
 src/preferences/broadcastsettings.cpp         |  2 +-
 src/preferences/dialog/dlgprefbeats.cpp       |  2 +-
 src/preferences/dialog/dlgprefcolors.cpp      |  4 +--
 src/preferences/dialog/dlgprefdeck.cpp        | 18 +++++-----
 src/preferences/dialog/dlgpreferences.cpp     |  2 +-
 src/preferences/dialog/dlgprefinterface.cpp   |  2 +-
 src/preferences/dialog/dlgprefkey.cpp         |  2 +-
 src/preferences/dialog/dlgprefrecord.cpp      | 12 +++----
 src/preferences/dialog/dlgprefsounditem.cpp   |  6 ++--
 src/preferences/dialog/dlgprefvinyl.cpp       | 14 ++++----
 src/skin/skinloader.cpp                       |  2 +-
 src/soundio/soundmanager.cpp                  |  8 ++---
 src/soundio/soundmanagerconfig.cpp            |  4 +--
 src/sources/libfaadloader.cpp                 |  2 +-
 src/test/soundproxy_test.cpp                  |  2 +-
 src/test/trackdao_test.cpp                    |  2 +-
 src/track/cueinfoimporter.cpp                 |  2 +-
 src/track/serato/markers.cpp                  |  2 +-
 src/track/serato/markers2.cpp                 | 12 +++----
 src/track/serato/tags.cpp                     |  2 +-
 src/track/track.cpp                           | 10 +++---
 src/widget/wbasewidget.cpp                    | 34 ++++++++++---------
 src/widget/weffectpushbutton.cpp              |  2 +-
 src/widget/wlibrarytableview.cpp              |  2 +-
 src/widget/wmainmenubar.cpp                   |  4 +--
 src/widget/wtrackmenu.cpp                     |  4 +--
 src/widget/wtracktableviewheader.cpp          |  2 +-
 61 files changed, 137 insertions(+), 135 deletions(-)

diff --git a/src/control/controlobjectscript.cpp b/src/control/controlobjectscript.cpp
index 0b63635c0bf..50030941b2d 100644
--- a/src/control/controlobjectscript.cpp
+++ b/src/control/controlobjectscript.cpp
@@ -64,7 +64,7 @@ bool ControlObjectScript::addScriptConnection(const ScriptConnection& conn) {
         }
     }
 
-    for (const auto& priorConnection : qAsConst(m_scriptConnections)) {
+    for (const auto& priorConnection : std::as_const(m_scriptConnections)) {
         if (conn == priorConnection) {
             qCWarning(m_logger) << "Connection " + conn.id.toString() +
                             " already connected to (" +
diff --git a/src/controllers/controllerinputmappingtablemodel.cpp b/src/controllers/controllerinputmappingtablemodel.cpp
index 5e486e695f5..0fd0749cfff 100644
--- a/src/controllers/controllerinputmappingtablemodel.cpp
+++ b/src/controllers/controllerinputmappingtablemodel.cpp
@@ -23,7 +23,7 @@ void ControllerInputMappingTableModel::apply() {
         // Clear existing input mappings and insert all the input mappings in
         // the table into the mapping.
         QMultiHash<uint16_t, MidiInputMapping> mappings;
-        for (const MidiInputMapping& mapping : qAsConst(m_midiInputMappings)) {
+        for (const MidiInputMapping& mapping : std::as_const(m_midiInputMappings)) {
             // There can be multiple input mappings for the same input
             // MidiKey, so we need to use a QMultiHash here.
             mappings.insert(mapping.key.key, mapping);
diff --git a/src/controllers/controllermanager.cpp b/src/controllers/controllermanager.cpp
index 9c1938d8ade..89f2c00c0be 100644
--- a/src/controllers/controllermanager.cpp
+++ b/src/controllers/controllermanager.cpp
@@ -357,7 +357,7 @@ void ControllerManager::pollDevices() {
     }
 
     mixxx::Duration start = mixxx::Time::elapsed();
-    for (Controller* pDevice : qAsConst(m_controllers)) {
+    for (Controller* pDevice : std::as_const(m_controllers)) {
         if (pDevice->isOpen() && pDevice->isPolling()) {
             pDevice->poll();
         }
diff --git a/src/controllers/controllermappinginfoenumerator.cpp b/src/controllers/controllermappinginfoenumerator.cpp
index f47dd093122..7a1207c4f67 100644
--- a/src/controllers/controllermappinginfoenumerator.cpp
+++ b/src/controllers/controllermappinginfoenumerator.cpp
@@ -50,7 +50,7 @@ void MappingInfoEnumerator::loadSupportedMappings() {
     m_hidMappings.clear();
     m_bulkMappings.clear();
 
-    for (const QString& dirPath : qAsConst(m_controllerDirPaths)) {
+    for (const QString& dirPath : std::as_const(m_controllerDirPaths)) {
         QDirIterator it(dirPath);
         while (it.hasNext()) {
             it.next();
diff --git a/src/controllers/controlleroutputmappingtablemodel.cpp b/src/controllers/controlleroutputmappingtablemodel.cpp
index a188819f33a..1aee340fa5a 100644
--- a/src/controllers/controlleroutputmappingtablemodel.cpp
+++ b/src/controllers/controlleroutputmappingtablemodel.cpp
@@ -22,7 +22,7 @@ void ControllerOutputMappingTableModel::apply() {
         // Clear existing output mappings and insert all the output mappings in
         // the table into the mapping.
         QMultiHash<ConfigKey, MidiOutputMapping> mappings;
-        for (const MidiOutputMapping& mapping : qAsConst(m_midiOutputMappings)) {
+        for (const MidiOutputMapping& mapping : std::as_const(m_midiOutputMappings)) {
             // There can be multiple output mappings for the same output
             // control, so we need to use a QMultiHash here.
             mappings.insert(mapping.controlKey, mapping);
diff --git a/src/controllers/delegates/midiopcodedelegate.cpp b/src/controllers/delegates/midiopcodedelegate.cpp
index 14dfb93d3d7..bb9de3815fe 100644
--- a/src/controllers/delegates/midiopcodedelegate.cpp
+++ b/src/controllers/delegates/midiopcodedelegate.cpp
@@ -26,7 +26,7 @@ QWidget* MidiOpCodeDelegate::createEditor(QWidget* parent,
     choices.append(MidiOpCode::ControlChange);
     choices.append(MidiOpCode::PitchBendChange);
 
-    for (const MidiOpCode choice : qAsConst(choices)) {
+    for (const MidiOpCode choice : std::as_const(choices)) {
         pComboBox->addItem(MidiUtils::opCodeToTranslatedString(choice),
                 static_cast<uint8_t>(choice));
     }
diff --git a/src/controllers/dlgprefcontrollers.cpp b/src/controllers/dlgprefcontrollers.cpp
index f9ee21171de..a689e4f9cf5 100644
--- a/src/controllers/dlgprefcontrollers.cpp
+++ b/src/controllers/dlgprefcontrollers.cpp
@@ -83,19 +83,19 @@ void DlgPrefControllers::slotUpdate() {
 }
 
 void DlgPrefControllers::slotCancel() {
-    for (DlgPrefController* pControllerDlg : qAsConst(m_controllerPages)) {
+    for (DlgPrefController* pControllerDlg : std::as_const(m_controllerPages)) {
         pControllerDlg->slotCancel();
     }
 }
 
 void DlgPrefControllers::slotApply() {
-    for (DlgPrefController* pControllerDlg : qAsConst(m_controllerPages)) {
+    for (DlgPrefController* pControllerDlg : std::as_const(m_controllerPages)) {
         pControllerDlg->slotApply();
     }
 }
 
 void DlgPrefControllers::slotResetToDefaults() {
-    for (DlgPrefController* pControllerDlg : qAsConst(m_controllerPages)) {
+    for (DlgPrefController* pControllerDlg : std::as_const(m_controllerPages)) {
         pControllerDlg->slotResetToDefaults();
     }
 }
diff --git a/src/dialog/dlgreplacecuecolor.cpp b/src/dialog/dlgreplacecuecolor.cpp
index 7d0e600450a..bae68ec50fc 100644
--- a/src/dialog/dlgreplacecuecolor.cpp
+++ b/src/dialog/dlgreplacecuecolor.cpp
@@ -386,7 +386,7 @@ void DlgReplaceCueColor::slotApply() {
     bool canceled = false;
 
     QMultiMap<TrackPointer, DbId> cues;
-    for (const auto& row : qAsConst(rows)) {
+    for (const auto& row : std::as_const(rows)) {
         QCoreApplication::processEvents();
         if (progress.wasCanceled()) {
             canceled = true;
diff --git a/src/encoder/encoderfdkaac.cpp b/src/encoder/encoderfdkaac.cpp
index 754075fe097..984af6df64d 100644
--- a/src/encoder/encoderfdkaac.cpp
+++ b/src/encoder/encoderfdkaac.cpp
@@ -85,7 +85,7 @@ EncoderFdkAac::EncoderFdkAac(EncoderCallback* pCallback)
              << QStringLiteral("libfdk-aac.so.2");
 
     QStringList errorMessages;
-    for (const auto& libname : qAsConst(libnames)) {
+    for (const auto& libname : std::as_const(libnames)) {
         m_pLibrary = std::make_unique<QLibrary>(libname, 2);
         if (m_pLibrary->load()) {
             kLogger.debug() << "Successfully loaded encoder library" << m_pLibrary->fileName();
@@ -104,7 +104,7 @@ EncoderFdkAac::EncoderFdkAac(EncoderCallback* pCallback)
     }
 
     if (!m_pLibrary || !m_pLibrary->isLoaded()) {
-        for (const auto& errorMessage : qAsConst(errorMessages)) {
+        for (const auto& errorMessage : std::as_const(errorMessages)) {
             kLogger.warning() << "Failed to load AAC encoder library:" << errorMessage;
         }
         return;
@@ -179,7 +179,7 @@ QString EncoderFdkAac::buttWindowsFdkAac() {
 
     // Try to find a butt installation in one of the
     // potential paths above
-    for (const auto& topPath : qAsConst(searchPaths)) {
+    for (const auto& topPath : std::as_const(searchPaths)) {
         QDir folder(topPath);
         if (!folder.exists()) {
             continue;
diff --git a/src/encoder/encoderflacsettings.cpp b/src/encoder/encoderflacsettings.cpp
index e21f562cf32..936c5629e55 100644
--- a/src/encoder/encoderflacsettings.cpp
+++ b/src/encoder/encoderflacsettings.cpp
@@ -72,7 +72,7 @@ QList<EncoderSettings::OptionsGroup> EncoderFlacSettings::getOptionGroups() cons
 // index 0 means disabled and 1 enabled.
 void EncoderFlacSettings::setGroupOption(const QString& groupCode, int optionIndex) {
     bool found=false;
-    for (const auto& group : qAsConst(m_radioList)) {
+    for (const auto& group : std::as_const(m_radioList)) {
         if (groupCode == group.groupCode) {
             found=true;
             if (optionIndex < group.controlNames.size() || optionIndex == 1) {
diff --git a/src/encoder/encodermp3settings.cpp b/src/encoder/encodermp3settings.cpp
index 3fca377eca4..e057a28e347 100644
--- a/src/encoder/encodermp3settings.cpp
+++ b/src/encoder/encodermp3settings.cpp
@@ -91,7 +91,7 @@ QList<EncoderSettings::OptionsGroup> EncoderMp3Settings::getOptionGroups() const
 // index 0 means disabled and 1 enabled.
 void EncoderMp3Settings::setGroupOption(const QString& groupCode, int optionIndex) {
     bool found=false;
-    for (const auto& group : qAsConst(m_radioList)) {
+    for (const auto& group : std::as_const(m_radioList)) {
         if (groupCode == group.groupCode) {
             found=true;
             if (optionIndex < group.controlNames.size() || optionIndex == 1) {
diff --git a/src/encoder/encoderopussettings.cpp b/src/encoder/encoderopussettings.cpp
index 43a7fe494d1..2c18e1db3fa 100644
--- a/src/encoder/encoderopussettings.cpp
+++ b/src/encoder/encoderopussettings.cpp
@@ -88,7 +88,7 @@ QList<EncoderSettings::OptionsGroup> EncoderOpusSettings::getOptionGroups() cons
 
 void EncoderOpusSettings::setGroupOption(const QString& groupCode, int optionIndex) {
     bool found = false;
-    for (const OptionsGroup& group : qAsConst(m_radioList)) {
+    for (const OptionsGroup& group : std::as_const(m_radioList)) {
         if (groupCode == group.groupCode) {
             found = true;
             if (optionIndex < group.controlNames.size() || optionIndex == 1) {
@@ -114,7 +114,7 @@ int EncoderOpusSettings::getSelectedOption(const QString& groupCode) const {
             ConfigKey(RECORDING_PREF_KEY, BITRATE_MODE_GROUP), 0);
 
     bool found = false;
-    for (const OptionsGroup& group : qAsConst(m_radioList)) {
+    for (const OptionsGroup& group : std::as_const(m_radioList)) {
         if (groupCode == group.groupCode) {
             found = true;
             if (value >= group.controlNames.size() && value > 1) {
diff --git a/src/encoder/encoderwavesettings.cpp b/src/encoder/encoderwavesettings.cpp
index 531f83142fd..2b4df125af5 100644
--- a/src/encoder/encoderwavesettings.cpp
+++ b/src/encoder/encoderwavesettings.cpp
@@ -30,7 +30,7 @@ QList<EncoderSettings::OptionsGroup> EncoderWaveSettings::getOptionGroups() cons
 // index 0 means disabled and 1 enabled.
 void EncoderWaveSettings::setGroupOption(const QString& groupCode, int optionIndex) {
     bool found=false;
-    for (const auto& group : qAsConst(m_radioList)) {
+    for (const auto& group : std::as_const(m_radioList)) {
         if (groupCode == group.groupCode) {
             found=true;
             if (optionIndex < group.controlNames.size() || optionIndex == 1) {
diff --git a/src/engine/cachingreader/cachingreader.cpp b/src/engine/cachingreader/cachingreader.cpp
index 7beed72e3a6..7b23c19941e 100644
--- a/src/engine/cachingreader/cachingreader.cpp
+++ b/src/engine/cachingreader/cachingreader.cpp
@@ -119,7 +119,7 @@ void CachingReader::freeChunk(CachingReaderChunkForOwner* pChunk) {
 }
 
 void CachingReader::freeAllChunks() {
-    for (const auto& pChunk: qAsConst(m_chunks)) {
+    for (const auto& pChunk : std::as_const(m_chunks)) {
         // We will receive CHUNK_READ_INVALID for all pending chunk reads
         // which should free the chunks individually.
         if (pChunk->getState() == CachingReaderChunkForOwner::READ_PENDING) {
diff --git a/src/engine/controls/cuecontrol.cpp b/src/engine/controls/cuecontrol.cpp
index 8ebe81c412c..176dbb981a9 100644
--- a/src/engine/controls/cuecontrol.cpp
+++ b/src/engine/controls/cuecontrol.cpp
@@ -342,7 +342,7 @@ void CueControl::connectControls() {
             Qt::DirectConnection);
 
     // Hotcue controls
-    for (const auto& pControl : qAsConst(m_hotcueControls)) {
+    for (const auto& pControl : std::as_const(m_hotcueControls)) {
         connect(pControl, &HotcueControl::hotcuePositionChanged,
                 this, &CueControl::hotcuePositionChanged,
                 Qt::DirectConnection);
@@ -428,7 +428,7 @@ void CueControl::disconnectControls() {
     disconnect(m_pHotcueFocusColorPrev.get(), nullptr, this, nullptr);
     disconnect(m_pHotcueFocusColorNext.get(), nullptr, this, nullptr);
 
-    for (const auto& pControl : qAsConst(m_hotcueControls)) {
+    for (const auto& pControl : std::as_const(m_hotcueControls)) {
         disconnect(pControl, nullptr, this, nullptr);
     }
 }
@@ -484,7 +484,7 @@ void CueControl::trackLoaded(TrackPointer pNewTrack) {
 
         updateCurrentlyPreviewingIndex(Cue::kNoHotCue);
 
-        for (const auto& pControl : qAsConst(m_hotcueControls)) {
+        for (const auto& pControl : std::as_const(m_hotcueControls)) {
             detachCue(pControl);
         }
 
@@ -1254,7 +1254,7 @@ void CueControl::hintReader(gsl::not_null<HintVector*> pHintList) {
     // this is called from the engine thread
     // it is no locking required, because m_hotcueControl is filled during the
     // constructor and getPosition()->get() is a ControlObject
-    for (const auto& pControl : qAsConst(m_hotcueControls)) {
+    for (const auto& pControl : std::as_const(m_hotcueControls)) {
         appendCueHint(pHintList, pControl->getPosition(), Hint::Type::HotCue);
     }
 
diff --git a/src/engine/controls/loopingcontrol.cpp b/src/engine/controls/loopingcontrol.cpp
index edc10d47b58..aaa7f2c26af 100644
--- a/src/engine/controls/loopingcontrol.cpp
+++ b/src/engine/controls/loopingcontrol.cpp
@@ -1314,7 +1314,7 @@ void LoopingControl::updateBeatLoopingControls() {
     // O(n) search, but there are only ~10-ish beatloop controls so this is
     // fine.
     double dBeatloopSize = m_pCOBeatLoopSize->get();
-    for (BeatLoopingControl* pBeatLoopControl: qAsConst(m_beatLoops)) {
+    for (BeatLoopingControl* pBeatLoopControl : std::as_const(m_beatLoops)) {
         if (pBeatLoopControl->getSize() == dBeatloopSize) {
             if (m_bLoopingEnabled) {
                 pBeatLoopControl->activate();
diff --git a/src/engine/effects/engineeffectchain.cpp b/src/engine/effects/engineeffectchain.cpp
index bf133f05891..614eee081d1 100644
--- a/src/engine/effects/engineeffectchain.cpp
+++ b/src/engine/effects/engineeffectchain.cpp
@@ -220,7 +220,7 @@ bool EngineEffectChain::process(const ChannelHandle& inputHandle,
         SINT effectChainGroupDelayFrames = 0;
         bool firstAddDryToWetEffectProcessed = false;
 
-        for (EngineEffect* pEffect : qAsConst(m_effects)) {
+        for (EngineEffect* pEffect : std::as_const(m_effects)) {
             if (pEffect != nullptr) {
                 // Select an unused intermediate buffer for the next output
                 if (pIntermediateInput == m_buffer1.data()) {
diff --git a/src/engine/enginebuffer.cpp b/src/engine/enginebuffer.cpp
index 23f3cd3d7f6..b60a519926f 100644
--- a/src/engine/enginebuffer.cpp
+++ b/src/engine/enginebuffer.cpp
@@ -385,7 +385,7 @@ void EngineBuffer::setLoop(mixxx::audio::FramePos startPosition,
 }
 
 void EngineBuffer::setEngineMixer(EngineMixer* pEngineMixer) {
-    for (const auto& pControl: qAsConst(m_engineControls)) {
+    for (const auto& pControl : std::as_const(m_engineControls)) {
         pControl->setEngineMixer(pEngineMixer);
     }
 }
@@ -489,7 +489,7 @@ void EngineBuffer::setNewPlaypos(mixxx::audio::FramePos position) {
     m_iSamplesSinceLastIndicatorUpdate = 1000000;
 
     // Must hold the engineLock while using m_engineControls
-    for (const auto& pControl: qAsConst(m_engineControls)) {
+    for (const auto& pControl : std::as_const(m_engineControls)) {
         pControl->notifySeek(m_playPos);
     }
 
@@ -638,7 +638,7 @@ void EngineBuffer::notifyTrackLoaded(
     // Note: we are still in a worker thread.
     const auto trackEndPosition = getTrackEndPosition();
     const auto sampleRate = mixxx::audio::SampleRate::fromDouble(m_pTrackSampleRate->get());
-    for (const auto& pControl : qAsConst(m_engineControls)) {
+    for (const auto& pControl : std::as_const(m_engineControls)) {
         pControl->trackLoaded(pNewTrack);
         pControl->setFrameInfo(m_playPos, trackEndPosition, sampleRate);
     }
@@ -1097,7 +1097,7 @@ void EngineBuffer::processTrackLocked(
         }
     }
 
-    for (const auto& pControl: qAsConst(m_engineControls)) {
+    for (const auto& pControl : std::as_const(m_engineControls)) {
         pControl->setFrameInfo(m_playPos, trackEndPosition, m_trackSampleRateOld);
         pControl->process(rate, m_playPos, iBufferSize);
     }
@@ -1480,7 +1480,7 @@ void EngineBuffer::hintReader(const double dRate) {
         m_hintList.append(hint);
     }
 
-    for (const auto& pControl: qAsConst(m_engineControls)) {
+    for (const auto& pControl : std::as_const(m_engineControls)) {
         pControl->hintReader(&m_hintList);
     }
     m_pReader->hintAndMaybeWake(m_hintList);
@@ -1555,7 +1555,7 @@ void EngineBuffer::collectFeatures(GroupFeatureState* pGroupFeatures) const {
 void EngineBuffer::slotUpdatedTrackBeats() {
     TrackPointer pTrack = m_pCurrentTrack;
     if (pTrack) {
-        for (const auto& pControl : qAsConst(m_engineControls)) {
+        for (const auto& pControl : std::as_const(m_engineControls)) {
             pControl->trackBeatsUpdated(pTrack->getBeats());
         }
     }
diff --git a/src/engine/sidechain/enginenetworkstream.cpp b/src/engine/sidechain/enginenetworkstream.cpp
index 83d17951048..d449314f8ed 100644
--- a/src/engine/sidechain/enginenetworkstream.cpp
+++ b/src/engine/sidechain/enginenetworkstream.cpp
@@ -78,7 +78,7 @@ void EngineNetworkStream::startStream(double sampleRate) {
     m_inputStreamStartTimeUs = getNetworkTimeUs();
     m_inputStreamFramesWritten = 0;
 
-    for (NetworkOutputStreamWorkerPtr worker : qAsConst(m_outputWorkers)) {
+    for (NetworkOutputStreamWorkerPtr worker : std::as_const(m_outputWorkers)) {
         if (worker.isNull()) {
             continue;
         }
@@ -90,7 +90,7 @@ void EngineNetworkStream::startStream(double sampleRate) {
 void EngineNetworkStream::stopStream() {
     m_inputStreamStartTimeUs = -1;
 
-    for (NetworkOutputStreamWorkerPtr worker : qAsConst(m_outputWorkers)) {
+    for (NetworkOutputStreamWorkerPtr worker : std::as_const(m_outputWorkers)) {
         if (worker.isNull()) {
             continue;
         }
diff --git a/src/engine/sync/enginesync.cpp b/src/engine/sync/enginesync.cpp
index 42fdd32d0da..daa085ee7a9 100644
--- a/src/engine/sync/enginesync.cpp
+++ b/src/engine/sync/enginesync.cpp
@@ -245,7 +245,7 @@ Syncable* EngineSync::pickNewLeader(Syncable* pEnablingSyncable) {
     int stopped_deck_count = 0;
     int playing_deck_count = 0;
 
-    for (const auto& pSyncable : qAsConst(m_syncables)) {
+    for (const auto& pSyncable : std::as_const(m_syncables)) {
         if (!pSyncable->getBaseBpm().isValid()) {
             continue;
         }
@@ -321,7 +321,7 @@ Syncable* EngineSync::findBpmMatchTarget(Syncable* requester) {
     Syncable* pPlayingNonSyncTarget = nullptr;
     Syncable* pStoppedNonSyncTarget = nullptr;
 
-    for (const auto& pOtherSyncable : qAsConst(m_syncables)) {
+    for (const auto& pOtherSyncable : std::as_const(m_syncables)) {
         if (pOtherSyncable == requester) {
             continue;
         }
@@ -556,7 +556,7 @@ Syncable* EngineSync::pickNonSyncSyncTarget(EngineChannel* pDontPick) const {
 
 bool EngineSync::otherSyncedPlaying(const QString& group) {
     bool othersInSync = false;
-    for (Syncable* theSyncable : qAsConst(m_syncables)) {
+    for (Syncable* theSyncable : std::as_const(m_syncables)) {
         bool isSynchonized = theSyncable->isSynchronized();
         if (theSyncable->getGroup() == group) {
             if (!isSynchonized) {
@@ -603,7 +603,7 @@ Syncable* EngineSync::getSyncableForGroup(const QString& group) {
 }
 
 bool EngineSync::syncDeckExists() const {
-    for (const auto& pSyncable : qAsConst(m_syncables)) {
+    for (const auto& pSyncable : std::as_const(m_syncables)) {
         if (pSyncable->isSynchronized() && pSyncable->getBaseBpm().isValid()) {
             return true;
         }
@@ -690,7 +690,7 @@ void EngineSync::reinitLeaderParams(Syncable* pSource) {
         // explicit Leader and we should not initialize the beat distance.  Take it from the
         // internal clock instead, because that will be up to date with the playing deck(s).
         bool playingSyncables = false;
-        for (Syncable* pSyncable : qAsConst(m_syncables)) {
+        for (Syncable* pSyncable : std::as_const(m_syncables)) {
             if (pSyncable == pSource) {
                 continue;
             }
diff --git a/src/library/basesqltablemodel.cpp b/src/library/basesqltablemodel.cpp
index 77fb23e2f1b..fd9d0b99c62 100644
--- a/src/library/basesqltablemodel.cpp
+++ b/src/library/basesqltablemodel.cpp
@@ -528,7 +528,7 @@ void BaseSqlTableModel::setSort(int column, Qt::SortOrder order) {
         m_sortColumns.prepend(SortColumn(column, order));
     } else if (m_trackSource) {
         bool first = true;
-        for (const SortColumn& sc : qAsConst(m_sortColumns)) {
+        for (const SortColumn& sc : std::as_const(m_sortColumns)) {
             QString sort_field;
             if (sc.m_column < m_tableColumns.size()) {
                 if (sc.m_column == kIdColumn) {
diff --git a/src/library/basetrackcache.cpp b/src/library/basetrackcache.cpp
index 0d11796a493..68b10b9b1fa 100644
--- a/src/library/basetrackcache.cpp
+++ b/src/library/basetrackcache.cpp
@@ -76,7 +76,7 @@ void BaseTrackCache::slotTracksRemoved(const QSet<TrackId>& trackIds) {
     if (sDebug) {
         qDebug() << this << "slotTracksRemoved" << trackIds.size();
     }
-    for (const auto& trackId : qAsConst(trackIds)) {
+    for (const auto& trackId : std::as_const(trackIds)) {
         m_trackInfo.remove(trackId);
         m_dirtyTracks.remove(trackId);
     }
@@ -532,7 +532,7 @@ void BaseTrackCache::filterAndSort(const QSet<TrackId>& trackIds,
         return;
     }
 
-    for (TrackId trackId: qAsConst(dirtyTracks)) {
+    for (TrackId trackId : std::as_const(dirtyTracks)) {
         // Only get the track if it is in the cache. Tracks that
         // are not cached in memory cannot be dirty.
         TrackPointer pTrack = getRecentTrack(trackId);
diff --git a/src/library/dao/playlistdao.cpp b/src/library/dao/playlistdao.cpp
index b24074b7a47..7758d148730 100644
--- a/src/library/dao/playlistdao.cpp
+++ b/src/library/dao/playlistdao.cpp
@@ -626,7 +626,7 @@ void PlaylistDAO::removeTracksFromPlaylist(int playlistId, const QList<int>& pos
     //qDebug() << "PlaylistDAO::removeTrackFromPlaylist"
     //         << QThread::currentThread() << m_database.connectionName();
     ScopedTransaction transaction(m_database);
-    for (const auto position : qAsConst(sortedPositons)) {
+    for (const auto position : std::as_const(sortedPositons)) {
         removeTracksFromPlaylistInner(playlistId, position);
     }
     transaction.commit();
diff --git a/src/library/dao/trackdao.cpp b/src/library/dao/trackdao.cpp
index a27e6fa344d..d2c06ce613c 100644
--- a/src/library/dao/trackdao.cpp
+++ b/src/library/dao/trackdao.cpp
@@ -341,7 +341,7 @@ void TrackDAO::slotDatabaseTracksChanged(const QSet<TrackId>& changedTrackIds) {
 void TrackDAO::slotDatabaseTracksRelocated(const QList<RelocatedTrack>& relocatedTracks) {
     QSet<TrackId> removedTrackIds;
     QSet<TrackId> changedTrackIds;
-    for (const auto& relocatedTrack : qAsConst(relocatedTracks)) {
+    for (const auto& relocatedTrack : std::as_const(relocatedTracks)) {
         const auto changedTrackId = relocatedTrack.updatedTrackRef().getId();
         DEBUG_ASSERT(changedTrackId.isValid());
         DEBUG_ASSERT(!removedTrackIds.contains(changedTrackId));
diff --git a/src/library/dlgtagfetcher.cpp b/src/library/dlgtagfetcher.cpp
index c8a2a370285..a6fc8f936ad 100644
--- a/src/library/dlgtagfetcher.cpp
+++ b/src/library/dlgtagfetcher.cpp
@@ -455,7 +455,7 @@ void DlgTagFetcher::fetchTagFinished(
         {
             int trackIndex = 0;
             QSet<QStringList> allColumnValues; // deduplication
-            for (const auto& trackRelease : qAsConst(m_data.m_tags)) {
+            for (const auto& trackRelease : std::as_const(m_data.m_tags)) {
                 const auto columnValues = trackReleaseColumnValues(trackRelease);
                 // Add fetched tag into TreeItemWidget, if it is not added before
                 if (!allColumnValues.contains(columnValues)) {
diff --git a/src/library/export/engineprimeexportjob.cpp b/src/library/export/engineprimeexportjob.cpp
index 03aa3e6f54c..300e6ed7972 100644
--- a/src/library/export/engineprimeexportjob.cpp
+++ b/src/library/export/engineprimeexportjob.cpp
@@ -532,7 +532,7 @@ void EnginePrimeExportJob::run() {
     // We will build up a map from Mixxx track id to EL track id during export.
     QHash<TrackId, int64_t> mixxxToEnginePrimeTrackIdMap;
 
-    for (const auto& trackRef : qAsConst(m_trackRefs)) {
+    for (const auto& trackRef : std::as_const(m_trackRefs)) {
         // Load each track.
         // Note that loading must happen on the same thread as the track collection
         // manager, which is not the same as this method's worker thread.
@@ -590,7 +590,7 @@ void EnginePrimeExportJob::run() {
     }
 
     // Add each track to the root crate, even if it also belongs to others.
-    for (const TrackRef& trackRef : qAsConst(m_trackRefs)) {
+    for (const TrackRef& trackRef : std::as_const(m_trackRefs)) {
         if (!mixxxToEnginePrimeTrackIdMap.contains(trackRef.getId())) {
             qInfo() << "Not adding track" << trackRef.getId()
                     << "to any crates, as it was not exported";
@@ -614,7 +614,7 @@ void EnginePrimeExportJob::run() {
     emit jobProgress(currProgress);
 
     // Export all Mixxx crates
-    for (const CrateId& crateId : qAsConst(m_crateIds)) {
+    for (const CrateId& crateId : std::as_const(m_crateIds)) {
         // Load the current crate.
         // Note that loading must happen on the same thread as the track collection
         // manager, which is not the same as this method's worker thread.
diff --git a/src/library/library.cpp b/src/library/library.cpp
index 5ed953ec48a..1f2e4b53cac 100644
--- a/src/library/library.cpp
+++ b/src/library/library.cpp
@@ -376,7 +376,7 @@ void Library::bindSidebarWidget(WLibrarySidebar* pSidebarWidget) {
             pSidebarWidget,
             &WLibrarySidebar::slotSetFont);
 
-    for (const auto& feature : qAsConst(m_features)) {
+    for (const auto& feature : std::as_const(m_features)) {
         feature->bindSidebarWidget(pSidebarWidget);
     }
 }
@@ -449,7 +449,7 @@ void Library::bindLibraryWidget(
             m_pLibraryControl,
             &LibraryControl::slotUpdateTrackMenuControl);
 
-    for (const auto& feature : qAsConst(m_features)) {
+    for (const auto& feature : std::as_const(m_features)) {
         feature->bindLibraryWidget(m_pLibraryWidget, pKeyboard);
     }
 
diff --git a/src/library/rekordbox/rekordboxfeature.cpp b/src/library/rekordbox/rekordboxfeature.cpp
index f04b3d5ac2e..d8d45020a50 100644
--- a/src/library/rekordbox/rekordboxfeature.cpp
+++ b/src/library/rekordbox/rekordboxfeature.cpp
@@ -1486,7 +1486,7 @@ QString RekordboxFeature::formatRootViewHtml() const {
     html.append(QString("<h2>%1</h2>").arg(title));
     html.append(QString("<p>%1</p>").arg(summary));
     html.append(QString("<ul>"));
-    for (const auto& item : qAsConst(items)) {
+    for (const auto& item : std::as_const(items)) {
         html.append(QString("<li>%1</li>").arg(item));
     }
     html.append(QString("</ul>"));
diff --git a/src/library/scanner/libraryscanner.cpp b/src/library/scanner/libraryscanner.cpp
index 693a35eff8b..375efe1945e 100644
--- a/src/library/scanner/libraryscanner.cpp
+++ b/src/library/scanner/libraryscanner.cpp
@@ -245,7 +245,7 @@ void LibraryScanner::slotStartScan() {
             this,
             &LibraryScanner::slotFinishHashedScan);
 
-    for (const mixxx::FileInfo& rootDir : qAsConst(m_libraryRootDirs)) {
+    for (const mixxx::FileInfo& rootDir : std::as_const(m_libraryRootDirs)) {
         // Acquire a security bookmark for this directory if we are in a
         // sandbox. For speed we avoid opening security bookmarks when recursive
         // scanning so that relies on having an open bookmark for the containing
diff --git a/src/library/serato/seratofeature.cpp b/src/library/serato/seratofeature.cpp
index e935f84c82d..e2166aa33ba 100644
--- a/src/library/serato/seratofeature.cpp
+++ b/src/library/serato/seratofeature.cpp
@@ -977,7 +977,7 @@ QString SeratoFeature::formatRootViewHtml() const {
     html.append(QString("<h2>%1</h2>").arg(title));
     html.append(QString("<p>%1</p>").arg(summary));
     html.append(QString("<ul>"));
-    for (const auto& item : qAsConst(items)) {
+    for (const auto& item : std::as_const(items)) {
         html.append(QString("<li>%1</li>").arg(item));
     }
     html.append(QString("</ul>"));
diff --git a/src/library/trackcollection.cpp b/src/library/trackcollection.cpp
index 179705bacd1..b6ad00cde3e 100644
--- a/src/library/trackcollection.cpp
+++ b/src/library/trackcollection.cpp
@@ -258,7 +258,7 @@ bool TrackCollection::hideTracks(const QList<TrackId>& trackIds) {
     for (const auto& trackId: trackIds) {
         QSet<int> playlistIds;
         m_playlistDao.getPlaylistsTrackIsIn(trackId, &playlistIds);
-        for (const auto& playlistId : qAsConst(playlistIds)) {
+        for (const auto& playlistId : std::as_const(playlistIds)) {
             if (m_playlistDao.getHiddenType(playlistId) != PlaylistDAO::PLHT_SET_LOG) {
                 allPlaylistIds.insert(playlistId);
             }
diff --git a/src/library/trackset/playlistfeature.cpp b/src/library/trackset/playlistfeature.cpp
index c25bf224ea8..1498bf256ea 100644
--- a/src/library/trackset/playlistfeature.cpp
+++ b/src/library/trackset/playlistfeature.cpp
@@ -309,7 +309,7 @@ void PlaylistFeature::slotPlaylistTableChanged(int playlistId) {
 void PlaylistFeature::slotPlaylistContentOrLockChanged(const QSet<int>& playlistIds) {
     // qDebug() << "slotPlaylistContentOrLockChanged() playlistId:" << playlistId;
     QSet<int> idsToBeUpdated;
-    for (const auto playlistId : qAsConst(playlistIds)) {
+    for (const auto playlistId : std::as_const(playlistIds)) {
         if (m_playlistDao.getHiddenType(playlistId) == PlaylistDAO::PLHT_NOT_HIDDEN) {
             idsToBeUpdated.insert(playlistId);
         }
diff --git a/src/library/trackset/setlogfeature.cpp b/src/library/trackset/setlogfeature.cpp
index 5e345206926..d329a3be90d 100644
--- a/src/library/trackset/setlogfeature.cpp
+++ b/src/library/trackset/setlogfeature.cpp
@@ -692,7 +692,7 @@ void SetlogFeature::slotPlaylistContentOrLockChanged(const QSet<int>& playlistId
     // qDebug() << "slotPlaylistContentOrLockChanged() for"
     //          << playlistIds.count() << "playlist(s)";
     QSet<int> idsToBeUpdated;
-    for (const auto playlistId : qAsConst(playlistIds)) {
+    for (const auto playlistId : std::as_const(playlistIds)) {
         if (m_playlistDao.getHiddenType(playlistId) == PlaylistDAO::PLHT_SET_LOG) {
             idsToBeUpdated.insert(playlistId);
         }
diff --git a/src/library/treeitem.cpp b/src/library/treeitem.cpp
index 3b574b2c827..bbb3f6409d7 100644
--- a/src/library/treeitem.cpp
+++ b/src/library/treeitem.cpp
@@ -76,7 +76,7 @@ void TreeItem::initFeatureRecursively(LibraryFeature* pFeature) {
     }
     DEBUG_ASSERT(!m_pFeature);
     m_pFeature = pFeature;
-    for (auto* pChild : qAsConst(m_children)) {
+    for (auto* pChild : std::as_const(m_children)) {
         pChild->initFeatureRecursively(pFeature);
     }
 }
diff --git a/src/preferences/broadcastsettings.cpp b/src/preferences/broadcastsettings.cpp
index 940d3fbc81c..c7ba7c205a0 100644
--- a/src/preferences/broadcastsettings.cpp
+++ b/src/preferences/broadcastsettings.cpp
@@ -160,7 +160,7 @@ QString BroadcastSettings::getProfilesFolder() {
 }
 
 void BroadcastSettings::saveAll() {
-    for (const auto& pProfile : qAsConst(m_profiles)) {
+    for (const auto& pProfile : std::as_const(m_profiles)) {
         DEBUG_ASSERT(pProfile);
         saveProfile(&*pProfile);
     }
diff --git a/src/preferences/dialog/dlgprefbeats.cpp b/src/preferences/dialog/dlgprefbeats.cpp
index e0ad96904f7..e4684e4d8cb 100644
--- a/src/preferences/dialog/dlgprefbeats.cpp
+++ b/src/preferences/dialog/dlgprefbeats.cpp
@@ -16,7 +16,7 @@ DlgPrefBeats::DlgPrefBeats(QWidget* parent, UserSettingsPointer pConfig)
     setupUi(this);
 
     m_availablePlugins = AnalyzerBeats::availablePlugins();
-    for (const auto& info : qAsConst(m_availablePlugins)) {
+    for (const auto& info : std::as_const(m_availablePlugins)) {
         comboBoxBeatPlugin->addItem(info.name(), info.id());
     }
 
diff --git a/src/preferences/dialog/dlgprefcolors.cpp b/src/preferences/dialog/dlgprefcolors.cpp
index 565f0b0a1b0..7be1ae13a96 100644
--- a/src/preferences/dialog/dlgprefcolors.cpp
+++ b/src/preferences/dialog/dlgprefcolors.cpp
@@ -79,7 +79,7 @@ DlgPrefColors::~DlgPrefColors() {
 void DlgPrefColors::slotUpdate() {
     comboBoxHotcueColors->clear();
     comboBoxTrackColors->clear();
-    for (const auto& palette : qAsConst(mixxx::PredefinedColorPalettes::kPalettes)) {
+    for (const auto& palette : std::as_const(mixxx::PredefinedColorPalettes::kPalettes)) {
         QString paletteName = palette.getName();
         QIcon paletteIcon = drawPalettePreview(paletteName);
         comboBoxHotcueColors->addItem(paletteName);
@@ -174,7 +174,7 @@ void DlgPrefColors::slotApply() {
     bool bTrackColorPaletteFound = false;
 
     for (const auto& palette :
-            qAsConst(mixxx::PredefinedColorPalettes::kPalettes)) {
+            std::as_const(mixxx::PredefinedColorPalettes::kPalettes)) {
         if (!bHotcueColorPaletteFound &&
                 hotcueColorPaletteName == palette.getName()) {
             m_colorPaletteSettings.setHotcueColorPalette(palette);
diff --git a/src/preferences/dialog/dlgprefdeck.cpp b/src/preferences/dialog/dlgprefdeck.cpp
index a9d4afff477..b41bcc4e50c 100644
--- a/src/preferences/dialog/dlgprefdeck.cpp
+++ b/src/preferences/dialog/dlgprefdeck.cpp
@@ -73,7 +73,7 @@ DlgPrefDeck::DlgPrefDeck(QWidget* parent, UserSettingsPointer pConfig)
     const int cueModeIndex = cueDefaultIndexByData(cueDefaultValue);
     ComboBoxCueMode->setCurrentIndex(cueModeIndex);
     slotCueModeCombobox(cueModeIndex);
-    for (ControlProxy* pControl : qAsConst(m_cueControls)) {
+    for (ControlProxy* pControl : std::as_const(m_cueControls)) {
         pControl->set(static_cast<int>(m_cueMode));
     }
     connect(ComboBoxCueMode,
@@ -278,7 +278,7 @@ DlgPrefDeck::DlgPrefDeck(QWidget* parent, UserSettingsPointer pConfig)
     m_keylockMode = static_cast<KeylockMode>(
         m_pConfig->getValue(ConfigKey("[Controls]", "keylockMode"),
                             static_cast<int>(KeylockMode::LockOriginalKey)));
-    for (ControlProxy* pControl : qAsConst(m_keylockModeControls)) {
+    for (ControlProxy* pControl : std::as_const(m_keylockModeControls)) {
         pControl->set(static_cast<double>(m_keylockMode));
     }
 
@@ -293,7 +293,7 @@ DlgPrefDeck::DlgPrefDeck(QWidget* parent, UserSettingsPointer pConfig)
     m_keyunlockMode = static_cast<KeyunlockMode>(
         m_pConfig->getValue(ConfigKey("[Controls]", "keyunlockMode"),
         static_cast<int>(KeyunlockMode::ResetLockedKey)));
-    for (ControlProxy* pControl : qAsConst(m_keyunlockModeControls)) {
+    for (ControlProxy* pControl : std::as_const(m_keyunlockModeControls)) {
         pControl->set(static_cast<int>(m_keyunlockMode));
     }
 
@@ -563,7 +563,7 @@ void DlgPrefDeck::slotRateRangeComboBox(int index) {
 }
 
 void DlgPrefDeck::setRateRangeForAllDecks(int rangePercent) {
-    for (ControlProxy* pControl : qAsConst(m_rateRangeControls)) {
+    for (ControlProxy* pControl : std::as_const(m_rateRangeControls)) {
         pControl->set(rangePercent / 100.0);
     }
 }
@@ -578,14 +578,14 @@ void DlgPrefDeck::setRateDirectionForAllDecks(bool inverted) {
     if (inverted) {
         rateDirectionMultiplier = kRateDirectionInverted;
     }
-    for (ControlProxy* pControl : qAsConst(m_rateDirectionControls)) {
+    for (ControlProxy* pControl : std::as_const(m_rateDirectionControls)) {
         pControl->set(rateDirectionMultiplier);
     }
 
     // If the rate slider direction setting has changed,
     // multiply the rate by -1 so the current sound does not change.
     if (rateDirectionMultiplier != oldRateDirectionMultiplier) {
-        for (ControlProxy* pControl : qAsConst(m_rateControls)) {
+        for (ControlProxy* pControl : std::as_const(m_rateControls)) {
             pControl->set(-1 * pControl->get());
         }
     }
@@ -696,7 +696,7 @@ void DlgPrefDeck::slotApply() {
     m_pConfig->setValue(ConfigKey("[Controls]", "TimeFormat"), timeFormat);
 
     // Set cue mode for every deck
-    for (ControlProxy* pControl : qAsConst(m_cueControls)) {
+    for (ControlProxy* pControl : std::as_const(m_cueControls)) {
         pControl->set(static_cast<int>(m_cueMode));
     }
     m_pConfig->setValue(ConfigKey("[Controls]", "CueDefault"), static_cast<int>(m_cueMode));
@@ -732,14 +732,14 @@ void DlgPrefDeck::slotApply() {
     m_pConfig->setValue(ConfigKey("[Controls]", "keylockMode"),
                         static_cast<int>(m_keylockMode));
     // Set key lock behavior for every group
-    for (ControlProxy* pControl : qAsConst(m_keylockModeControls)) {
+    for (ControlProxy* pControl : std::as_const(m_keylockModeControls)) {
         pControl->set(static_cast<double>(m_keylockMode));
     }
 
     m_pConfig->setValue(ConfigKey("[Controls]", "keyunlockMode"),
                         static_cast<int>(m_keyunlockMode));
     // Set key un-lock behavior for every group
-    for (ControlProxy* pControl : qAsConst(m_keyunlockModeControls)) {
+    for (ControlProxy* pControl : std::as_const(m_keyunlockModeControls)) {
         pControl->set(static_cast<double>(m_keyunlockMode));
     }
 
diff --git a/src/preferences/dialog/dlgpreferences.cpp b/src/preferences/dialog/dlgpreferences.cpp
index b95f8cbb747..2ac93ac45aa 100644
--- a/src/preferences/dialog/dlgpreferences.cpp
+++ b/src/preferences/dialog/dlgpreferences.cpp
@@ -301,7 +301,7 @@ void DlgPreferences::changePage(QTreeWidgetItem* pCurrent, QTreeWidgetItem* pPre
         return;
     }
 
-    for (PreferencesPage page : qAsConst(m_allPages)) {
+    for (PreferencesPage page : std::as_const(m_allPages)) {
         if (pCurrent == page.pTreeItem) {
             switchToPage(pCurrent->text(0), page.pDlg);
             break;
diff --git a/src/preferences/dialog/dlgprefinterface.cpp b/src/preferences/dialog/dlgprefinterface.cpp
index de896fe1f2b..e33c8885b36 100644
--- a/src/preferences/dialog/dlgprefinterface.cpp
+++ b/src/preferences/dialog/dlgprefinterface.cpp
@@ -80,7 +80,7 @@ DlgPrefInterface::DlgPrefInterface(
     DEBUG_ASSERT(!fileNames.contains(QStringLiteral("mixxx_en_US.qm")));
     fileNames.push_back(QStringLiteral("mixxx_en_US.qm"));
 
-    for (const auto& fileName : qAsConst(fileNames)) {
+    for (const auto& fileName : std::as_const(fileNames)) {
         // Extract locale name from file name
         QString localeName = fileName;
         // Strip prefix
diff --git a/src/preferences/dialog/dlgprefkey.cpp b/src/preferences/dialog/dlgprefkey.cpp
index c6265832f0b..901a9544bc0 100644
--- a/src/preferences/dialog/dlgprefkey.cpp
+++ b/src/preferences/dialog/dlgprefkey.cpp
@@ -44,7 +44,7 @@ DlgPrefKey::DlgPrefKey(QWidget* parent, UserSettingsPointer pConfig)
     m_keyLineEdits.insert(mixxx::track::io::key::B_MINOR, b_minor_edit);
 
     m_availablePlugins = AnalyzerKey::availablePlugins();
-    for (const auto& info : qAsConst(m_availablePlugins)) {
+    for (const auto& info : std::as_const(m_availablePlugins)) {
         plugincombo->addItem(info.name(), info.id());
     }
 
diff --git a/src/preferences/dialog/dlgprefrecord.cpp b/src/preferences/dialog/dlgprefrecord.cpp
index 20c5835a451..3432c2cb4c3 100644
--- a/src/preferences/dialog/dlgprefrecord.cpp
+++ b/src/preferences/dialog/dlgprefrecord.cpp
@@ -126,7 +126,7 @@ DlgPrefRecord::~DlgPrefRecord()
 {
     // Note: I don't disconnect signals, since that's supposedly done automatically
     // when the object is deleted
-    for (QRadioButton* button : qAsConst(m_formatButtons)) {
+    for (QRadioButton* button : std::as_const(m_formatButtons)) {
         if (LosslessEncLayout->indexOf(button) != -1) {
             LosslessEncLayout->removeWidget(button);
         } else {
@@ -134,7 +134,7 @@ DlgPrefRecord::~DlgPrefRecord()
         }
         button->deleteLater();
     }
-    for (QAbstractButton* widget : qAsConst(m_optionWidgets)) {
+    for (QAbstractButton* widget : std::as_const(m_optionWidgets)) {
         OptionGroupsLayout->removeWidget(widget);
         widget->deleteLater();
     }
@@ -267,7 +267,7 @@ void DlgPrefRecord::setupEncoderUI() {
         TextCompression->setVisible(false);
     }
 
-    for (QAbstractButton* widget : qAsConst(m_optionWidgets)) {
+    for (QAbstractButton* widget : std::as_const(m_optionWidgets)) {
         optionsgroup.removeButton(widget);
         OptionGroupsLayout->removeWidget(widget);
         disconnect(widget, &QAbstractButton::clicked, this, &DlgPrefRecord::slotGroupChanged);
@@ -286,7 +286,7 @@ void DlgPrefRecord::setupEncoderUI() {
         EncoderSettings::OptionsGroup group = settings->getOptionGroups().first();
         labelOptionGroup->setText(group.groupName);
         int controlIdx = settings->getSelectedOption(group.groupCode);
-        for (const QString& name : qAsConst(group.controlNames)) {
+        for (const QString& name : std::as_const(group.controlNames)) {
             QAbstractButton* widget;
             if (group.controlNames.size() == 1) {
                 QCheckBox* button = new QCheckBox(name, this);
@@ -330,7 +330,7 @@ void DlgPrefRecord::updateTextQuality() {
     bool isVbr = false;
     if (m_selFormat.internalName == ENCODING_MP3) {
         EncoderSettings::OptionsGroup group = settings->getOptionGroups().first();
-        for (const QAbstractButton* widget : qAsConst(m_optionWidgets)) {
+        for (const QAbstractButton* widget : std::as_const(m_optionWidgets)) {
             if (widget->objectName() == group.groupCode) {
                 if (widget->isChecked() != Qt::Unchecked && widget->text() == "VBR") {
                     isVbr = true;
@@ -437,7 +437,7 @@ void DlgPrefRecord::saveEncoding() {
         // The concept is already there for multiple groups
         EncoderSettings::OptionsGroup group = settings->getOptionGroups().first();
         int i=0;
-        for (const QAbstractButton* widget : qAsConst(m_optionWidgets)) {
+        for (const QAbstractButton* widget : std::as_const(m_optionWidgets)) {
             if (widget->objectName() == group.groupCode) {
                 if (widget->isChecked() != Qt::Unchecked) {
                     settings->setGroupOption(group.groupCode, i);
diff --git a/src/preferences/dialog/dlgprefsounditem.cpp b/src/preferences/dialog/dlgprefsounditem.cpp
index 940d1ecf97c..af372f1c583 100644
--- a/src/preferences/dialog/dlgprefsounditem.cpp
+++ b/src/preferences/dialog/dlgprefsounditem.cpp
@@ -60,7 +60,7 @@ void DlgPrefSoundItem::refreshDevices(const QList<SoundDevicePointer>& devices)
     while (deviceComboBox->count() > 1) {
         deviceComboBox->removeItem(deviceComboBox->count() - 1);
     }
-    for (const auto& pDevice: qAsConst(m_devices)) {
+    for (const auto& pDevice : std::as_const(m_devices)) {
         if (!hasSufficientChannels(*pDevice)) {
             continue;
         }
@@ -83,7 +83,7 @@ void DlgPrefSoundItem::deviceChanged(int index) {
     if (selection == SoundDeviceId()) {
         goto emitAndReturn;
     } else {
-        for (const auto& pDevice: qAsConst(m_devices)) {
+        for (const auto& pDevice : std::as_const(m_devices)) {
             if (pDevice->getDeviceId() == selection) {
                 if (m_isInput) {
                     numChannels = pDevice->getNumInputChannels();
@@ -230,7 +230,7 @@ SoundDevicePointer DlgPrefSoundItem::getDevice() const {
     if (selection == SoundDeviceId()) {
         return SoundDevicePointer();
     }
-    for (const auto& pDevice: qAsConst(m_devices)) {
+    for (const auto& pDevice : std::as_const(m_devices)) {
         if (selection == pDevice->getDeviceId()) {
             //qDebug() << "DlgPrefSoundItem::getDevice" << pDevice->getDeviceId();
             return pDevice;
diff --git a/src/preferences/dialog/dlgprefvinyl.cpp b/src/preferences/dialog/dlgprefvinyl.cpp
index 06fbc60ae60..096b62ccf27 100644
--- a/src/preferences/dialog/dlgprefvinyl.cpp
+++ b/src/preferences/dialog/dlgprefvinyl.cpp
@@ -36,7 +36,7 @@ DlgPrefVinyl::DlgPrefVinyl(
             ComboBoxVinylType2,
             ComboBoxVinylType3,
             ComboBoxVinylType4};
-    for (auto* box : qAsConst(m_vcTypeBoxes)) {
+    for (auto* box : std::as_const(m_vcTypeBoxes)) {
         box->addItem(MIXXX_VINYL_SERATOCV02VINYLSIDEA);
         box->addItem(MIXXX_VINYL_SERATOCV02VINYLSIDEB);
         box->addItem(MIXXX_VINYL_SERATOCD);
@@ -56,13 +56,13 @@ DlgPrefVinyl::DlgPrefVinyl(
             ComboBoxVinylSpeed2,
             ComboBoxVinylSpeed3,
             ComboBoxVinylSpeed4};
-    for (auto* box : qAsConst(m_vcSpeedBoxes)) {
+    for (auto* box : std::as_const(m_vcSpeedBoxes)) {
         box->addItem(MIXXX_VINYL_SPEED_33);
         box->addItem(MIXXX_VINYL_SPEED_45);
     }
 
     m_vcLeadInBoxes = {LeadinTime1, LeadinTime2, LeadinTime3, LeadinTime4};
-    for (auto* box : qAsConst(m_vcLeadInBoxes)) {
+    for (auto* box : std::as_const(m_vcLeadInBoxes)) {
         box->setSuffix(" s");
     }
 
@@ -150,16 +150,16 @@ void DlgPrefVinyl::slotHide() {
 
 void DlgPrefVinyl::slotResetToDefaults() {
     // Default to Serato Side A.
-    for (auto* box : qAsConst(m_vcTypeBoxes)) {
+    for (auto* box : std::as_const(m_vcTypeBoxes)) {
         box->setCurrentIndex(0);
     }
 
     // Default to 33 RPM.
-    for (auto* box : qAsConst(m_vcTypeBoxes)) {
+    for (auto* box : std::as_const(m_vcTypeBoxes)) {
         box->setCurrentIndex(0);
     }
 
-    for (auto* box : qAsConst(m_vcLeadInBoxes)) {
+    for (auto* box : std::as_const(m_vcLeadInBoxes)) {
         box->setValue(MIXXX_VINYL_SERATOCV02VINYLSIDEA_LEADIN);
     }
 
@@ -260,7 +260,7 @@ void DlgPrefVinyl::slotApply() {
 
     // Save the vinylcontrol_speed_type in ControlObjects as well so it can be
     // retrieved quickly on the fly. (eg. WSpinny needs to know how fast to spin)
-    for (auto* co : qAsConst(m_COSpeeds)) {
+    for (auto* co : std::as_const(m_COSpeeds)) {
         int i = m_COSpeeds.indexOf(co);
         double speed = m_vcSpeedBoxes[i]->currentText() == MIXXX_VINYL_SPEED_33
                 ? MIXXX_VINYL_SPEED_33_NUM
diff --git a/src/skin/skinloader.cpp b/src/skin/skinloader.cpp
index d193e5d3547..80b115dc059 100644
--- a/src/skin/skinloader.cpp
+++ b/src/skin/skinloader.cpp
@@ -325,7 +325,7 @@ void SkinLoader::updateDuckingControl() {
         return;
     }
     double atLeastOneMicConfigured = 0.0;
-    for (auto* pMicCon : qAsConst(m_pMicConfiguredControls)) {
+    for (auto* pMicCon : std::as_const(m_pMicConfiguredControls)) {
         if (pMicCon->toBool()) {
             atLeastOneMicConfigured = 1.0;
             break;
diff --git a/src/soundio/soundmanager.cpp b/src/soundio/soundmanager.cpp
index 4f885fd07a6..6188806be9f 100644
--- a/src/soundio/soundmanager.cpp
+++ b/src/soundio/soundmanager.cpp
@@ -148,7 +148,7 @@ void SoundManager::closeDevices(bool sleepAfterClosing) {
     //qDebug() << "SoundManager::closeDevices()";
 
     bool closed = false;
-    for (const auto& pDevice: qAsConst(m_devices)) {
+    for (const auto& pDevice : std::as_const(m_devices)) {
         if (pDevice->isOpen()) {
             // NOTE(rryan): As of 2009 (?) it has been safe to close() a SoundDevice
             // while callbacks are active.
@@ -168,7 +168,7 @@ void SoundManager::closeDevices(bool sleepAfterClosing) {
     // TODO(rryan): Should we do this before SoundDevice::close()? No! Because
     // then the callback may be running when we call
     // onInputDisconnected/onOutputDisconnected.
-    for (const auto& pDevice: qAsConst(m_devices)) {
+    for (const auto& pDevice : std::as_const(m_devices)) {
         for (const auto& in: pDevice->inputs()) {
             // Need to tell all registered AudioDestinations for this AudioInput
             // that the input was disconnected.
@@ -361,7 +361,7 @@ SoundDeviceStatus SoundManager::setupDevices() {
     QVector<DeviceMode> toOpen;
     bool haveOutput = false;
     // loop over all available devices
-    for (const auto& pDevice: qAsConst(m_devices)) {
+    for (const auto& pDevice : std::as_const(m_devices)) {
         DeviceMode mode = {pDevice, false, false};
         pDevice->clearInputs();
         pDevice->clearOutputs();
@@ -401,7 +401,7 @@ SoundDeviceStatus SoundManager::setupDevices() {
             }
         }
 
-        for (const auto& out: qAsConst(outputs)) {
+        for (const auto& out : std::as_const(outputs)) {
             mode.isOutput = true;
             if (pDevice->getDeviceId().name != kNetworkDeviceInternalName) {
                 haveOutput = true;
diff --git a/src/soundio/soundmanagerconfig.cpp b/src/soundio/soundmanagerconfig.cpp
index 26ca5f440d2..9d922bec0c6 100644
--- a/src/soundio/soundmanagerconfig.cpp
+++ b/src/soundio/soundmanagerconfig.cpp
@@ -180,7 +180,7 @@ bool SoundManagerConfig::readFromDisk() {
                 continue;
             }
             bool dupe(false);
-            for (const AudioOutput& otherOut : qAsConst(m_outputs)) {
+            for (const AudioOutput& otherOut : std::as_const(m_outputs)) {
                 if (out == otherOut
                         && out.getChannelGroup() == otherOut.getChannelGroup()) {
                     dupe = true;
@@ -203,7 +203,7 @@ bool SoundManagerConfig::readFromDisk() {
                 continue;
             }
             bool dupe(false);
-            for (const AudioInput& otherIn : qAsConst(m_inputs)) {
+            for (const AudioInput& otherIn : std::as_const(m_inputs)) {
                 if (in == otherIn
                         && in.getChannelGroup() == otherIn.getChannelGroup()) {
                     dupe = true;
diff --git a/src/sources/libfaadloader.cpp b/src/sources/libfaadloader.cpp
index 4207cdb40f8..bf7e7a03c63 100644
--- a/src/sources/libfaadloader.cpp
+++ b/src/sources/libfaadloader.cpp
@@ -44,7 +44,7 @@ LibLoader::LibLoader()
              << "libfaad.so";
 #endif
 
-    for (const auto& libname : qAsConst(libnames)) {
+    for (const auto& libname : std::as_const(libnames)) {
         m_pLibrary.reset();
         m_pLibrary = std::make_unique<QLibrary>(libname, 0);
         if (m_pLibrary->load()) {
diff --git a/src/test/soundproxy_test.cpp b/src/test/soundproxy_test.cpp
index e94e08c867e..bdb07e20902 100644
--- a/src/test/soundproxy_test.cpp
+++ b/src/test/soundproxy_test.cpp
@@ -63,7 +63,7 @@ class SoundSourceProxyTest : public MixxxTest, SoundSourceProviderRegistration {
                 << ".wv";
 
         QStringList supportedFileNameSuffixes;
-        for (const auto& fileNameSuffix : qAsConst(availableFileNameSuffixes)) {
+        for (const auto& fileNameSuffix : std::as_const(availableFileNameSuffixes)) {
             // We need to check for the whole file name here!
             if (SoundSourceProxy::isFileNameSupported(fileNameSuffix)) {
                 supportedFileNameSuffixes << fileNameSuffix;
diff --git a/src/test/trackdao_test.cpp b/src/test/trackdao_test.cpp
index 7e5a63c4b4a..fb4093788a6 100644
--- a/src/test/trackdao_test.cpp
+++ b/src/test/trackdao_test.cpp
@@ -45,7 +45,7 @@ TEST_F(TrackDAOTest, detectMovedTracks) {
 
     QSet<TrackId> updatedTrackIds;
     QSet<TrackId> removedTrackIds;
-    for (const auto& relocatedTrack : qAsConst(relocatedTracks)) {
+    for (const auto& relocatedTrack : std::as_const(relocatedTracks)) {
         updatedTrackIds.insert(relocatedTrack.updatedTrackRef().getId());
         removedTrackIds.insert(relocatedTrack.deletedTrackId());
     }
diff --git a/src/track/cueinfoimporter.cpp b/src/track/cueinfoimporter.cpp
index cfae43c5d39..5ebaa530858 100644
--- a/src/track/cueinfoimporter.cpp
+++ b/src/track/cueinfoimporter.cpp
@@ -7,7 +7,7 @@ CueInfoImporter::CueInfoImporter(QList<CueInfo> cueInfos)
 }
 
 bool CueInfoImporter::hasCueOfType(CueType cueType) const {
-    for (const CueInfo& cueInfo : qAsConst(m_cueInfos)) {
+    for (const CueInfo& cueInfo : std::as_const(m_cueInfos)) {
         if (cueInfo.getType() == cueType) {
             return true;
         }
diff --git a/src/track/serato/markers.cpp b/src/track/serato/markers.cpp
index eea05027071..fd79bfb6967 100644
--- a/src/track/serato/markers.cpp
+++ b/src/track/serato/markers.cpp
@@ -640,7 +640,7 @@ QList<CueInfo> SeratoMarkers::getCues() const {
     QList<CueInfo> cueInfos;
     int cueIndex = 0;
     int loopIndex = 0;
-    for (const auto& pEntry : qAsConst(m_entries)) {
+    for (const auto& pEntry : std::as_const(m_entries)) {
         VERIFY_OR_DEBUG_ASSERT(pEntry) {
             continue;
         }
diff --git a/src/track/serato/markers2.cpp b/src/track/serato/markers2.cpp
index 6855a906dbd..89b7c003836 100644
--- a/src/track/serato/markers2.cpp
+++ b/src/track/serato/markers2.cpp
@@ -565,7 +565,7 @@ QByteArray SeratoMarkers2::dumpID3() const {
 QList<SeratoMarkers2EntryPointer> SeratoMarkers2::findEntriesByType(
         SeratoMarkers2Entry::TypeId typeId) const {
     QList<SeratoMarkers2EntryPointer> entriesFound;
-    for (const auto& pEntry : qAsConst(m_entries)) {
+    for (const auto& pEntry : std::as_const(m_entries)) {
         VERIFY_OR_DEBUG_ASSERT(pEntry) {
             continue;
         }
@@ -579,7 +579,7 @@ QList<SeratoMarkers2EntryPointer> SeratoMarkers2::findEntriesByType(
 
 SeratoMarkers2EntryPointer SeratoMarkers2::findEntryByType(
         SeratoMarkers2Entry::TypeId typeId) const {
-    for (const auto& pEntry : qAsConst(m_entries)) {
+    for (const auto& pEntry : std::as_const(m_entries)) {
         VERIFY_OR_DEBUG_ASSERT(pEntry) {
             continue;
         }
@@ -653,7 +653,7 @@ void SeratoMarkers2::setCues(const QList<CueInfo>& cueInfos) {
     QMap<int, CueInfo> cueMap;
     QMap<int, CueInfo> loopMap;
 
-    for (const CueInfo& cueInfo : qAsConst(cueInfos)) {
+    for (const CueInfo& cueInfo : std::as_const(cueInfos)) {
         // All of these check can be debug assertions, as the list should be
         // pre-filtered by the seratoTags class.
         VERIFY_OR_DEBUG_ASSERT(cueInfo.getHotCueIndex()) {
@@ -798,7 +798,7 @@ QByteArray SeratoMarkers2::dumpFLAC() const {
 std::optional<SeratoStoredTrackColor> SeratoMarkers2::getTrackColor() const {
     kLogger.debug() << "Reading track color from 'Serato Markers2' tag data...";
 
-    for (const auto& pEntry : qAsConst(m_entries)) {
+    for (const auto& pEntry : std::as_const(m_entries)) {
         VERIFY_OR_DEBUG_ASSERT(pEntry) {
             continue;
         }
@@ -848,7 +848,7 @@ void SeratoMarkers2::setTrackColor(SeratoStoredTrackColor color) {
 bool SeratoMarkers2::isBpmLocked() const {
     kLogger.debug() << "Reading bpmlock state from 'Serato Markers2' tag data...";
 
-    for (const auto& pEntry : qAsConst(m_entries)) {
+    for (const auto& pEntry : std::as_const(m_entries)) {
         VERIFY_OR_DEBUG_ASSERT(pEntry) {
             continue;
         }
@@ -897,7 +897,7 @@ void SeratoMarkers2::setBpmLocked(bool bpmLocked) {
 
 int SeratoMarkers2::countEntriesByType(SeratoMarkers2Entry::TypeId typeId) const {
     int numEntries = 0;
-    for (const auto& pEntry : qAsConst(m_entries)) {
+    for (const auto& pEntry : std::as_const(m_entries)) {
         VERIFY_OR_DEBUG_ASSERT(pEntry) {
             continue;
         }
diff --git a/src/track/serato/tags.cpp b/src/track/serato/tags.cpp
index 948d1f64308..288dfe5c0ca 100644
--- a/src/track/serato/tags.cpp
+++ b/src/track/serato/tags.cpp
@@ -292,7 +292,7 @@ void SeratoTags::setCueInfos(const QList<CueInfo>& cueInfos, double timingOffset
     // ensure that each hotcue number is unique (by using a map), apply the
     // timing offset and split up cues and loops.
     QList<CueInfo> cueList;
-    for (const CueInfo& cueInfo : qAsConst(cueInfos)) {
+    for (const CueInfo& cueInfo : std::as_const(cueInfos)) {
         if (!cueInfo.getHotCueIndex()) {
             continue;
         }
diff --git a/src/track/track.cpp b/src/track/track.cpp
index 7b2829f1940..ee73f655739 100644
--- a/src/track/track.cpp
+++ b/src/track/track.cpp
@@ -955,7 +955,7 @@ void Track::shiftCuePositionsMillis(double milliseconds) {
         return;
     }
     double frames = m_record.getStreamInfoFromSource()->getSignalInfo().millis2frames(milliseconds);
-    for (const CuePointer& pCue : qAsConst(m_cuePoints)) {
+    for (const CuePointer& pCue : std::as_const(m_cuePoints)) {
         pCue->shiftPositionFrames(frames);
     }
 
@@ -1215,13 +1215,13 @@ bool Track::setCuePointsWhileLocked(const QList<CuePointer>& cuePoints) {
         return false;
     }
     // disconnect existing cue points
-    for (const auto& pCue : qAsConst(m_cuePoints)) {
+    for (const auto& pCue : std::as_const(m_cuePoints)) {
         disconnect(pCue.get(), nullptr, this, nullptr);
     }
 
     m_cuePoints = cuePoints;
     // connect new cue points
-    for (const auto& pCue : qAsConst(m_cuePoints)) {
+    for (const auto& pCue : std::as_const(m_cuePoints)) {
         DEBUG_ASSERT(pCue->thread() == thread());
         // Start listening to cue point updates AFTER setting
         // the track id. Otherwise we would receive unwanted
@@ -1278,7 +1278,7 @@ bool Track::importPendingCueInfosWhileLocked() {
     // user data that cannot be expressed in Serato. https://github.com/mixxxdj/mixxx/issues/11530
     // For now the save route is to skip the imports if Mixxx cues already exist.
     // TODO() Consider a merge strategy.
-    for (const CuePointer& pCue : qAsConst(m_cuePoints)) {
+    for (const CuePointer& pCue : std::as_const(m_cuePoints)) {
         if (!m_pCueInfoImporterPending->hasCueOfType(pCue->getType())) {
             cuePoints.append(pCue);
         } else {
@@ -1491,7 +1491,7 @@ bool Track::exportSeratoMetadata() {
             streamInfo->getSignalInfo().getSampleRate();
     QList<mixxx::CueInfo> cueInfos;
     cueInfos.reserve(m_cuePoints.size());
-    for (const CuePointer& pCue : qAsConst(m_cuePoints)) {
+    for (const CuePointer& pCue : std::as_const(m_cuePoints)) {
         cueInfos.append(pCue->getCueInfo(sampleRate));
     }
 
diff --git a/src/widget/wbasewidget.cpp b/src/widget/wbasewidget.cpp
index 09728672108..40a4b7b43c1 100644
--- a/src/widget/wbasewidget.cpp
+++ b/src/widget/wbasewidget.cpp
@@ -86,36 +86,37 @@ double WBaseWidget::getControlParameterDisplay() const {
 }
 
 void WBaseWidget::resetControlParameter() {
-    for (ControlParameterWidgetConnection* pControlConnection : qAsConst(m_connections)) {
+    for (ControlParameterWidgetConnection* pControlConnection : std::as_const(m_connections)) {
         pControlConnection->resetControl();
     }
 }
 
 void WBaseWidget::setControlParameter(double v) {
-    for (ControlParameterWidgetConnection* pControlConnection : qAsConst(m_connections)) {
+    for (ControlParameterWidgetConnection* pControlConnection : std::as_const(m_connections)) {
         pControlConnection->setControlParameter(v);
     }
 }
 
 void WBaseWidget::setControlParameterUp(double v) {
-    for (ControlParameterWidgetConnection* pControlConnection : qAsConst(m_connections)) {
+    for (ControlParameterWidgetConnection* pControlConnection : std::as_const(m_connections)) {
         pControlConnection->setControlParameterUp(v);
     }
 }
 
 void WBaseWidget::setControlParameterDown(double v) {
-    for (ControlParameterWidgetConnection* pControlConnection : qAsConst(m_connections)) {
+    for (ControlParameterWidgetConnection* pControlConnection : std::as_const(m_connections)) {
         pControlConnection->setControlParameterDown(v);
     }
 }
 
 void WBaseWidget::setControlParameterLeftDown(double v) {
     if (!m_leftConnections.isEmpty()) {
-        for (ControlParameterWidgetConnection* pControlConnection : qAsConst(m_leftConnections)) {
+        for (ControlParameterWidgetConnection* pControlConnection :
+                std::as_const(m_leftConnections)) {
             pControlConnection->setControlParameterDown(v);
         }
     } else {
-        for (ControlParameterWidgetConnection* pControlConnection : qAsConst(m_connections)) {
+        for (ControlParameterWidgetConnection* pControlConnection : std::as_const(m_connections)) {
             pControlConnection->setControlParameterDown(v);
         }
     }
@@ -123,24 +124,25 @@ void WBaseWidget::setControlParameterLeftDown(double v) {
 
 void WBaseWidget::setControlParameterLeftUp(double v) {
     if (!m_leftConnections.isEmpty()) {
-        for (ControlParameterWidgetConnection* pControlConnection : qAsConst(m_leftConnections)) {
+        for (ControlParameterWidgetConnection* pControlConnection :
+                std::as_const(m_leftConnections)) {
             pControlConnection->setControlParameterUp(v);
         }
     } else {
-        for (ControlParameterWidgetConnection* pControlConnection : qAsConst(m_connections)) {
+        for (ControlParameterWidgetConnection* pControlConnection : std::as_const(m_connections)) {
             pControlConnection->setControlParameterUp(v);
         }
     }
 }
 
 void WBaseWidget::setControlParameterRightDown(double v) {
-    for (ControlParameterWidgetConnection* pControlConnection : qAsConst(m_rightConnections)) {
+    for (ControlParameterWidgetConnection* pControlConnection : std::as_const(m_rightConnections)) {
         pControlConnection->setControlParameterDown(v);
     }
 }
 
 void WBaseWidget::setControlParameterRightUp(double v) {
-    for (ControlParameterWidgetConnection* pControlConnection : qAsConst(m_rightConnections)) {
+    for (ControlParameterWidgetConnection* pControlConnection : std::as_const(m_rightConnections)) {
         pControlConnection->setControlParameterUp(v);
     }
 }
@@ -193,14 +195,14 @@ void WBaseWidget::fillDebugTooltip(QStringList* debug) {
            << QString("SizeHint: %1").arg(toDebugString(m_pWidget->sizeHint()))
            << QString("MinimumSizeHint: %1").arg(toDebugString(m_pWidget->minimumSizeHint()));
 
-    for (ControlParameterWidgetConnection* pControlConnection : qAsConst(m_leftConnections)) {
-        *debug << QString("LeftConnection: %1").arg(pControlConnection->toDebugString());
+    for (ControlParameterWidgetConnection* pControlConnection : std::as_const(m_leftConnections)) {
+            *debug << QString("LeftConnection: %1").arg(pControlConnection->toDebugString());
     }
-    for (ControlParameterWidgetConnection* pControlConnection : qAsConst(m_rightConnections)) {
-        *debug << QString("RightConnection: %1").arg(pControlConnection->toDebugString());
+    for (ControlParameterWidgetConnection* pControlConnection : std::as_const(m_rightConnections)) {
+            *debug << QString("RightConnection: %1").arg(pControlConnection->toDebugString());
     }
-    for (ControlParameterWidgetConnection* pControlConnection : qAsConst(m_connections)) {
-        *debug << QString("Connection: %1").arg(pControlConnection->toDebugString());
+    for (ControlParameterWidgetConnection* pControlConnection : std::as_const(m_connections)) {
+            *debug << QString("Connection: %1").arg(pControlConnection->toDebugString());
     }
     if (m_pDisplayConnection) {
         *debug << QString("DisplayConnection: %1").arg(m_pDisplayConnection->toDebugString());
diff --git a/src/widget/weffectpushbutton.cpp b/src/widget/weffectpushbutton.cpp
index 39fc74f050d..d9a02796468 100644
--- a/src/widget/weffectpushbutton.cpp
+++ b/src/widget/weffectpushbutton.cpp
@@ -127,7 +127,7 @@ void WEffectPushButton::parameterUpdated() {
 
     auto* actionGroup = new QActionGroup(m_pButtonMenu);
     actionGroup->setExclusive(true);
-    for (const auto& option : qAsConst(options)) {
+    for (const auto& option : std::as_const(options)) {
         // action is added automatically to actionGroup
         auto* action = new QAction(actionGroup);
         // qDebug() << options[i].first;
diff --git a/src/widget/wlibrarytableview.cpp b/src/widget/wlibrarytableview.cpp
index 93a3ddea314..b0547bcb72f 100644
--- a/src/widget/wlibrarytableview.cpp
+++ b/src/widget/wlibrarytableview.cpp
@@ -159,7 +159,7 @@ bool WLibraryTableView::restoreTrackModelState(
     pSelection->clearSelection();
     QModelIndexList selectedRows = state->selectedRows;
     if (!selectedRows.isEmpty()) {
-        for (auto index : qAsConst(selectedRows)) {
+        for (auto index : std::as_const(selectedRows)) {
             pSelection->select(index,
                     QItemSelectionModel::Select | QItemSelectionModel::Rows);
         }
diff --git a/src/widget/wmainmenubar.cpp b/src/widget/wmainmenubar.cpp
index f249fe8fc83..6419b73416e 100644
--- a/src/widget/wmainmenubar.cpp
+++ b/src/widget/wmainmenubar.cpp
@@ -760,11 +760,11 @@ void WMainMenuBar::createVisibilityControl(QAction* pAction,
 
 void WMainMenuBar::onNumberOfDecksChanged(int decks) {
     int deck = 0;
-    for (QAction* pVinylControlEnabled : qAsConst(m_vinylControlEnabledActions)) {
+    for (QAction* pVinylControlEnabled : std::as_const(m_vinylControlEnabledActions)) {
         pVinylControlEnabled->setVisible(deck++ < decks);
     }
     deck = 0;
-    for (QAction* pLoadToDeck : qAsConst(m_loadToDeckActions)) {
+    for (QAction* pLoadToDeck : std::as_const(m_loadToDeckActions)) {
         pLoadToDeck->setVisible(deck++ < decks);
     }
 }
diff --git a/src/widget/wtrackmenu.cpp b/src/widget/wtrackmenu.cpp
index a4aa90a63ee..c704b529703 100644
--- a/src/widget/wtrackmenu.cpp
+++ b/src/widget/wtrackmenu.cpp
@@ -569,7 +569,7 @@ void WTrackMenu::setupActions() {
         m_pMetadataMenu->addAction(m_pExportMetadataAct);
 
         for (const auto& updateInExternalTrackCollection :
-                qAsConst(m_updateInExternalTrackCollections)) {
+                std::as_const(m_updateInExternalTrackCollections)) {
             m_pMetadataUpdateExternalCollectionsMenu->addAction(
                     updateInExternalTrackCollection.action);
         }
@@ -582,7 +582,7 @@ void WTrackMenu::setupActions() {
                     this,
                     [this] {
                         for (const auto& updateInExternalTrackCollection :
-                                qAsConst(m_updateInExternalTrackCollections)) {
+                                std::as_const(m_updateInExternalTrackCollections)) {
                             updateInExternalTrackCollection.action->setEnabled(
                                     updateInExternalTrackCollection
                                             .externalTrackCollection
diff --git a/src/widget/wtracktableviewheader.cpp b/src/widget/wtracktableviewheader.cpp
index d911d5557e0..81b06f3b31f 100644
--- a/src/widget/wtracktableviewheader.cpp
+++ b/src/widget/wtracktableviewheader.cpp
@@ -280,7 +280,7 @@ void WTrackTableViewHeader::showOrHideColumn(int column) {
 
 int WTrackTableViewHeader::hiddenCount() {
     int count = 0;
-    for (const auto& pAction : qAsConst(m_columnActions)) {
+    for (const auto& pAction : std::as_const(m_columnActions)) {
         if (!pAction->isChecked()) {
             count += 1;
         }

From 8825992a57c67e31d4416a082c4bfe99ab10ca01 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jholthuis@mixxx.org>
Date: Mon, 30 Oct 2023 18:36:04 +0100
Subject: [PATCH 151/388] fix: Replace deprecated `QColor::setNamedColor` with
 `QColor` ctor

The deprecation warning advises to use `QColor::fromString`, but that
method is only available in Qt 6.6+. To avoid excessive ifdef'ing, we
just use the regular ctor instead.
---
 src/skin/legacy/legacyskinparser.cpp | 12 ++++++------
 src/widget/wcoverart.cpp             |  4 ++--
 src/widget/wlabel.cpp                |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/skin/legacy/legacyskinparser.cpp b/src/skin/legacy/legacyskinparser.cpp
index 9a4bc46baf0..7f41d448bbd 100644
--- a/src/skin/legacy/legacyskinparser.cpp
+++ b/src/skin/legacy/legacyskinparser.cpp
@@ -900,7 +900,7 @@ QWidget* LegacySkinParser::parseBackground(const QDomElement& node,
     QColor c(0,0,0);
     QString cStr;
     if (m_pContext->hasNodeSelectString(node, "BgColor", &cStr)) {
-        c.setNamedColor(cStr);
+        c = QColor(cStr);
     }
 
     QPalette palette;
@@ -1204,7 +1204,7 @@ QWidget* LegacySkinParser::parseNumberRate(const QDomElement& node) {
     QColor c(255,255,255);
     QString cStr;
     if (m_pContext->hasNodeSelectString(node, "BgColor", &cStr)) {
-        c.setNamedColor(cStr);
+        c = QColor(cStr);
     }
 
     QPalette palette;
@@ -1633,7 +1633,7 @@ QString LegacySkinParser::getLibraryStyle(const QDomNode& node) {
     QString styleHack = "";
     QString fgColor;
     if (m_pContext->hasNodeSelectString(node, "FgColor", &fgColor)) {
-        color.setNamedColor(fgColor);
+        color = QColor(fgColor);
         color = WSkinColor::getCorrectColor(color);
 
         styleHack.append(QString("WLibraryTableView { color: %1; }\n ").arg(color.name()));
@@ -1647,7 +1647,7 @@ QString LegacySkinParser::getLibraryStyle(const QDomNode& node) {
 
     QString bgColor;
     if (m_pContext->hasNodeSelectString(node, "BgColor", &bgColor)) {
-        color.setNamedColor(bgColor);
+        color = QColor(bgColor);
         color = WSkinColor::getCorrectColor(color);
         styleHack.append(QString("WLibraryTableView {  background-color: %1; }\n ").arg(color.name()));
         styleHack.append(QString("WLibrarySidebar {  background-color: %1; }\n ").arg(color.name()));
@@ -1659,7 +1659,7 @@ QString LegacySkinParser::getLibraryStyle(const QDomNode& node) {
 
     QString bgColorRowEven;
     if (m_pContext->hasNodeSelectString(node, "BgColorRowEven", &bgColorRowEven)) {
-        color.setNamedColor(bgColorRowEven);
+        color = QColor(bgColorRowEven);
         color = WSkinColor::getCorrectColor(color);
 
         styleHack.append(QString("WLibraryTableView { background: %1; }\n ").arg(color.name()));
@@ -1667,7 +1667,7 @@ QString LegacySkinParser::getLibraryStyle(const QDomNode& node) {
 
     QString bgColorRowUneven;
     if (m_pContext->hasNodeSelectString(node, "BgColorRowUneven", &bgColorRowUneven)) {
-        color.setNamedColor(bgColorRowUneven);
+        color = QColor(bgColorRowUneven);
         color = WSkinColor::getCorrectColor(color);
 
         styleHack.append(QString("WLibraryTableView { alternate-background-color: %1; }\n ").arg(color.name()));
diff --git a/src/widget/wcoverart.cpp b/src/widget/wcoverart.cpp
index cc5d1964ce6..ee04a7b3ab5 100644
--- a/src/widget/wcoverart.cpp
+++ b/src/widget/wcoverart.cpp
@@ -65,7 +65,7 @@ void WCoverArt::setup(const QDomNode& node, const SkinContext& context) {
     QColor bgc(255,255,255);
     QString bgColorStr;
     if (context.hasNodeSelectString(node, "BgColor", &bgColorStr)) {
-        bgc.setNamedColor(bgColorStr);
+        bgc = QColor(bgColorStr);
         setAutoFillBackground(true);
     }
     QPalette pal = palette();
@@ -75,7 +75,7 @@ void WCoverArt::setup(const QDomNode& node, const SkinContext& context) {
     QColor m_fgc(0,0,0);
     QString fgColorStr;
     if (context.hasNodeSelectString(node, "FgColor", &fgColorStr)) {
-        m_fgc.setNamedColor(fgColorStr);
+        m_fgc = QColor(fgColorStr);
     }
     bgc = WSkinColor::getCorrectColor(bgc);
     m_fgc = QColor(255 - bgc.red(), 255 - bgc.green(), 255 - bgc.blue());
diff --git a/src/widget/wlabel.cpp b/src/widget/wlabel.cpp
index e16b68aa86c..8bd56847edf 100644
--- a/src/widget/wlabel.cpp
+++ b/src/widget/wlabel.cpp
@@ -24,12 +24,12 @@ void WLabel::setup(const QDomNode& node, const SkinContext& context) {
 
     QDomElement bgColor = context.selectElement(node, "BgColor");
     if (!bgColor.isNull()) {
-        m_qBgColor.setNamedColor(context.nodeToString(bgColor));
+        m_qBgColor = QColor(context.nodeToString(bgColor));
         pal.setColor(this->backgroundRole(), WSkinColor::getCorrectColor(m_qBgColor));
         setAutoFillBackground(true);
     }
 
-    m_qFgColor.setNamedColor(context.selectString(node, "FgColor"));
+    m_qFgColor = QColor(context.selectString(node, "FgColor"));
     pal.setColor(this->foregroundRole(), WSkinColor::getCorrectColor(m_qFgColor));
     setPalette(pal);
 

From 21649ac8f6a5c3677331bb68b8bc12599704d939 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jholthuis@mixxx.org>
Date: Mon, 30 Oct 2023 18:39:15 +0100
Subject: [PATCH 152/388] fix(dlgprefinterface): Replace deprecated `country`
 term with `territory`

---
 src/preferences/dialog/dlgprefinterface.cpp | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/preferences/dialog/dlgprefinterface.cpp b/src/preferences/dialog/dlgprefinterface.cpp
index e33c8885b36..4b17c387241 100644
--- a/src/preferences/dialog/dlgprefinterface.cpp
+++ b/src/preferences/dialog/dlgprefinterface.cpp
@@ -89,7 +89,7 @@ DlgPrefInterface::DlgPrefInterface(
         // Strip file extension
         localeName.truncate(localeName.lastIndexOf('.'));
         // Convert to QLocale name format. Unfortunately the translation files
-        // use inconsistent language/country separators, i.e. both '-' and '_'.
+        // use inconsistent language/territory separators, i.e. both '-' and '_'.
         auto localeNameFixed = localeName;
         localeNameFixed.replace('-', '_');
         const auto locale = QLocale(localeNameFixed);
@@ -100,18 +100,22 @@ DlgPrefInterface::DlgPrefInterface(
             qWarning() << "Preferences: skipping unsupported locale" << localeNameFixed;
             continue;
         }
-        QString countryName;
-        // Ugly hack to detect locales with an explicitly specified country.
+        QString territoryName;
+        // Ugly hack to detect locales with an explicitly specified country/territory.
         // https://doc.qt.io/qt-5/qlocale.html#QLocale-1
         // "If country is not present, or is not a valid ISO 3166 code, the most
         // appropriate country is chosen for the specified language."
         if (localeNameFixed.contains('_')) {
-            countryName = QLocale::countryToString(locale.country());
-            DEBUG_ASSERT(!countryName.isEmpty());
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+            territoryName = QLocale::countryToString(locale.country());
+#else
+            territoryName = QLocale::territoryToString(locale.territory());
+#endif
+            DEBUG_ASSERT(!territoryName.isEmpty());
         }
         QString displayName = languageName;
-        if (!countryName.isEmpty()) {
-            displayName += QStringLiteral(" (") + countryName + ')';
+        if (!territoryName.isEmpty()) {
+            displayName += QStringLiteral(" (") + territoryName + ')';
         }
         // The locale name is stored in the config
         ComboBoxLocale->addItem(displayName, localeName);

From 373eb83be95be1211760c4759b31a902db4365c9 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Mon, 30 Oct 2023 16:20:42 +0100
Subject: [PATCH 153/388] Deere: add 'Sync Leader' button

---
 res/skins/Deere/deck_tempo_column.xml         | 40 ++++++++++++-------
 res/skins/Deere/icon/ic_sync_leader_off.svg   | 23 +++++++++++
 .../Deere/icon/ic_sync_leader_off_plain.svg   | 26 ++++++++++++
 res/skins/Deere/icon/ic_sync_leader_on.svg    | 23 +++++++++++
 res/skins/Deere/style.qss                     | 11 +++++
 5 files changed, 108 insertions(+), 15 deletions(-)
 create mode 100644 res/skins/Deere/icon/ic_sync_leader_off.svg
 create mode 100644 res/skins/Deere/icon/ic_sync_leader_off_plain.svg
 create mode 100644 res/skins/Deere/icon/ic_sync_leader_on.svg

diff --git a/res/skins/Deere/deck_tempo_column.xml b/res/skins/Deere/deck_tempo_column.xml
index 1792733f9ee..886fa154425 100644
--- a/res/skins/Deere/deck_tempo_column.xml
+++ b/res/skins/Deere/deck_tempo_column.xml
@@ -15,21 +15,31 @@
         <ObjectName>TempoControlButtons</ObjectName>
         <Layout>vertical</Layout>
         <Children>
-          <Template src="skin:left_right_2state_button.xml">
-            <SetVariable name="TooltipId">sync_enabled</SetVariable>
-            <SetVariable name="ObjectName">DeckSync</SetVariable>
-            <SetVariable name="MinimumSize">-1,18</SetVariable>
-            <SetVariable name="MaximumSize">-1,18</SetVariable>
-            <SetVariable name="SizePolicy"><Variable name="HorizontalStretchButtonSizePolicy"/></SetVariable>
-            <SetVariable name="state_0_text">Sync</SetVariable>
-            <SetVariable name="state_0_pressed"></SetVariable>
-            <SetVariable name="state_0_unpressed"></SetVariable>
-            <SetVariable name="state_1_text">Sync</SetVariable>
-            <SetVariable name="state_1_pressed"></SetVariable>
-            <SetVariable name="state_1_unpressed"></SetVariable>
-            <SetVariable name="left_connection_control"><Variable name="group"/>,sync_enabled</SetVariable>
-            <SetVariable name="right_connection_control"><Variable name="group"/>,beatsync_tempo</SetVariable>
-          </Template>
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <ObjectName>RateTempButtons</ObjectName>
+            <Children>
+              <Template src="skin:left_right_2state_button.xml">
+                <SetVariable name="TooltipId">sync_enabled</SetVariable>
+                <SetVariable name="ObjectName">DeckSync</SetVariable>
+                <SetVariable name="MinimumSize">35,18</SetVariable>
+                <SetVariable name="MaximumSize">35,18</SetVariable>
+                <!-- <SetVariable name="SizePolicy"><Variable name="HorizontalStretchButtonSizePolicy"/></SetVariable> -->
+                <SetVariable name="state_0_text">Sync</SetVariable>
+                <SetVariable name="state_1_text">Sync</SetVariable>
+                <SetVariable name="left_connection_control"><Variable name="group"/>,sync_enabled</SetVariable>
+                <SetVariable name="right_connection_control"><Variable name="group"/>,beatsync_tempo</SetVariable>
+              </Template>
+              <Template src="skin:left_3state_button.xml">
+                <SetVariable name="TooltipId">sync_leader</SetVariable>
+                <SetVariable name="ObjectName">SyncLeader</SetVariable>
+                <SetVariable name="MinimumSize">15,18</SetVariable>
+                <SetVariable name="MaximumSize">15,18</SetVariable>
+                <SetVariable name="SizePolicy">f,f</SetVariable>
+                <SetVariable name="left_connection_control"><Variable name="group"/>,sync_leader</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
 
           <WidgetGroup>
             <ObjectName>RateTempButtons</ObjectName>
diff --git a/res/skins/Deere/icon/ic_sync_leader_off.svg b/res/skins/Deere/icon/ic_sync_leader_off.svg
new file mode 100644
index 00000000000..9cc351d83c1
--- /dev/null
+++ b/res/skins/Deere/icon/ic_sync_leader_off.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="13"
+   height="16"
+   viewBox="0 0 13 16"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="layer1">
+    <path
+       style="fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:0;stroke-dasharray:none;paint-order:stroke markers fill;stroke-opacity:0"
+       d="M 6.5000001,2.5 3.9466648,6.7871094 1,3.1295547 V 9.9974611 H 12 V 3.1297527 L 9.0533354,6.7871094 Z"
+       id="path1" />
+    <path
+       d="m 1,10.997461 h 11 v 2.00001 H 1 Z"
+       style="fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:0;stroke-dasharray:none;paint-order:stroke markers fill;stroke-opacity:0"
+       id="path2" />
+  </g>
+</svg>
diff --git a/res/skins/Deere/icon/ic_sync_leader_off_plain.svg b/res/skins/Deere/icon/ic_sync_leader_off_plain.svg
new file mode 100644
index 00000000000..c64923c2ac0
--- /dev/null
+++ b/res/skins/Deere/icon/ic_sync_leader_off_plain.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="13"
+   height="16"
+   viewBox="0 0 13 16"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="layer1"
+     style="stroke:none;stroke-opacity:0;fill:#d2d2d2;fill-opacity:1">
+    <path
+       style="fill:#d2d2d2;fill-opacity:1;stroke:none;stroke-width:0;stroke-dasharray:none;paint-order:stroke markers fill;stroke-opacity:0"
+       d="M 6.5000001,2.5 3.9466648,6.7871094 1,3.1295547 V 9.9974611 H 12 V 3.1297527 L 9.0533354,6.7871094 Z"
+       id="path1" />
+    <path
+       d="m 1,10.997461 h 11 v 2.00001 H 1 Z"
+       style="fill:#d2d2d2;fill-opacity:1;stroke:none;stroke-width:0;stroke-dasharray:none;paint-order:stroke markers fill;stroke-opacity:0"
+       id="path2" />
+  </g>
+</svg>
diff --git a/res/skins/Deere/icon/ic_sync_leader_on.svg b/res/skins/Deere/icon/ic_sync_leader_on.svg
new file mode 100644
index 00000000000..375321e7761
--- /dev/null
+++ b/res/skins/Deere/icon/ic_sync_leader_on.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="13"
+   height="16"
+   viewBox="0 0 13 16"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="layer1">
+    <path
+       style="fill:#fdfdfd;fill-opacity:1;stroke:none;stroke-width:0;stroke-dasharray:none;paint-order:stroke markers fill;stroke-opacity:0"
+       d="M 6.5000001,2.5 3.9466648,6.7871094 1,3.1295547 V 9.9974611 H 12 V 3.1297527 L 9.0533354,6.7871094 Z"
+       id="path1" />
+    <path
+       d="m 1,10.997461 h 11 v 2.00001 H 1 Z"
+       style="fill:#fdfdfd;fill-opacity:1;stroke:none;stroke-width:0;stroke-dasharray:none;paint-order:stroke markers fill;stroke-opacity:0"
+       id="path2" />
+  </g>
+</svg>
diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index 77b2c1d4cdd..c345236d546 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -1625,6 +1625,17 @@ WPushButton[value="2"],
     background-color: #006596;
     border: 1px solid #006596;
 }
+WPushButton#SyncLeader[value="1"] {
+    background-color: #4B4B4B;
+    border: 1px solid #0092d9;
+}
+WPushButton#SyncLeader[value="0"] {
+  image: url(skin:/../Deere/icon/ic_sync_leader_off.svg) no-repeat center center;
+}
+WPushButton#SyncLeader[value="1"],
+WPushButton#SyncLeader[value="2"] {
+  image: url(skin:/../Deere/icon/ic_sync_leader_on.svg) no-repeat center center;
+}
 
 WPushButton[value="1"]:hover,
 WPushButton[value="2"]:hover,

From 5593640e4758ab82f9816c3ca05a25912fcaf94d Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Wed, 1 Nov 2023 23:37:20 +0100
Subject: [PATCH 154/388] simplify playlist import function, add whitespace
 before the # suffix

---
 src/library/trackset/baseplaylistfeature.cpp | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/library/trackset/baseplaylistfeature.cpp b/src/library/trackset/baseplaylistfeature.cpp
index 30ca7cc4a98..ca7be6403ff 100644
--- a/src/library/trackset/baseplaylistfeature.cpp
+++ b/src/library/trackset/baseplaylistfeature.cpp
@@ -506,20 +506,12 @@ void BasePlaylistFeature::slotCreateImportPlaylist() {
         const QFileInfo fileInfo(playlistFile);
         // Get a valid name
         const QString baseName = fileInfo.baseName();
-        QString name;
-
-        bool validNameGiven = false;
-        int i = 0;
-        while (!validNameGiven) {
-            name = baseName;
-            if (i != 0) {
-                name += QString::number(i);
-            }
-
-            // Check name
-            int existingId = m_playlistDao.getPlaylistIdFromName(name);
-
-            validNameGiven = (existingId == kInvalidPlaylistId);
+        QString name = baseName;
+        // Check if there already is a playlist by that name. If yes, add
+        // increasing suffix (1++) until we find an unused name.
+        int i = 1;
+        while (m_playlistDao.getPlaylistIdFromName(name) != kInvalidPlaylistId) {
+            name = baseName + QChar(' ') + QString::number(i);
             ++i;
         }
 

From febc7350e48f96bfa3eab1f3e65ac5521e4dc089 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Thu, 2 Nov 2023 00:02:15 +0100
Subject: [PATCH 155/388] Control picker menu: add 'waveform_zoom_set_default'

---
 src/controllers/controlpickermenu.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/controllers/controlpickermenu.cpp b/src/controllers/controlpickermenu.cpp
index f2762a65510..1a63f9f2849 100644
--- a/src/controllers/controlpickermenu.cpp
+++ b/src/controllers/controlpickermenu.cpp
@@ -1314,6 +1314,11 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent)
     addDeckControl("waveform_zoom", tr("Waveform Zoom"), tr("Waveform zoom"), guiMenu);
     addDeckControl("waveform_zoom_down", tr("Waveform Zoom In"), tr("Zoom waveform in"), guiMenu);
     addDeckControl("waveform_zoom_up", tr("Waveform Zoom Out"), tr("Zoom waveform out"), guiMenu);
+    addDeckControl("waveform_zoom_set_default",
+            tr("Waveform Zoom Reset To Default"),
+            tr("Reset the waveform zoom level to the default value selected in "
+               "Preferences -> Waveforms"),
+            guiMenu);
 
     guiMenu->addSeparator();
 

From 7db60b6e5de58ec4026aa1024eeb9490a8c58a62 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Sat, 4 Nov 2023 00:22:33 +0100
Subject: [PATCH 156/388] make WHotcueButton learnable with the MIDI Wizard

---
 src/skin/legacy/legacyskinparser.cpp | 19 +++++++++++++++++--
 src/widget/whotcuebutton.cpp         |  2 +-
 src/widget/whotcuebutton.h           |  7 +++++++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/skin/legacy/legacyskinparser.cpp b/src/skin/legacy/legacyskinparser.cpp
index 7f41d448bbd..17ba2f5d334 100644
--- a/src/skin/legacy/legacyskinparser.cpp
+++ b/src/skin/legacy/legacyskinparser.cpp
@@ -1788,8 +1788,23 @@ QWidget* LegacySkinParser::parseHotcueButton(const QDomElement& element) {
     commonWidgetSetup(element, pWidget);
     pWidget->setup(element, *m_pContext);
     pWidget->installEventFilter(m_pKeyboard);
-    pWidget->installEventFilter(
-            m_pControllerManager->getControllerLearningEventFilter());
+    auto* pCLEFilter = m_pControllerManager->getControllerLearningEventFilter();
+    pWidget->installEventFilter(pCLEFilter);
+    // For HotcueButton, widget connections are created in its own setup(), not
+    // via <Connection> nodes. In order to make Hotcue controls learnable for
+    // ControllerLearningEventFilter we need to add the clickInfo manually.
+    pCLEFilter->addWidgetClickInfo(pWidget->toQWidget(),
+            Qt::LeftButton,
+            controlFromConfigKey(pWidget->getLeftClickConfigKey(), false),
+            ControlParameterWidgetConnection::EmitOption::EMIT_ON_PRESS_AND_RELEASE);
+    // Shift + right click = clear hotcue
+    // ControllerLearningEventFilter doesn't (yet) care about keyboard events or
+    // modifiers, so let's use just right-click to make this learnable as well.
+    pCLEFilter->addWidgetClickInfo(pWidget->toQWidget(),
+            Qt::RightButton,
+            controlFromConfigKey(pWidget->getClearConfigKey(), false),
+            ControlParameterWidgetConnection::EmitOption::EMIT_ON_PRESS_AND_RELEASE);
+
     pWidget->Init();
     return pWidget;
 }
diff --git a/src/widget/whotcuebutton.cpp b/src/widget/whotcuebutton.cpp
index 98bad972db1..2a78f5885e3 100644
--- a/src/widget/whotcuebutton.cpp
+++ b/src/widget/whotcuebutton.cpp
@@ -67,7 +67,7 @@ void WHotcueButton::setup(const QDomNode& node, const SkinContext& context) {
 
     auto* pLeftConnection = new ControlParameterWidgetConnection(
             this,
-            createConfigKey(QStringLiteral("activate")),
+            getLeftClickConfigKey(), // "activate"
             nullptr,
             ControlParameterWidgetConnection::DIR_FROM_WIDGET,
             ControlParameterWidgetConnection::EMIT_ON_PRESS_AND_RELEASE);
diff --git a/src/widget/whotcuebutton.h b/src/widget/whotcuebutton.h
index 15ebbe08f70..70bbe0e944b 100644
--- a/src/widget/whotcuebutton.h
+++ b/src/widget/whotcuebutton.h
@@ -17,6 +17,13 @@ class WHotcueButton : public WPushButton {
 
     void setup(const QDomNode& node, const SkinContext& context) override;
 
+    ConfigKey getLeftClickConfigKey() {
+        return createConfigKey(QStringLiteral("activate"));
+    }
+    ConfigKey getClearConfigKey() {
+        return createConfigKey(QStringLiteral("clear"));
+    }
+
     Q_PROPERTY(bool light MEMBER m_bCueColorIsLight);
     Q_PROPERTY(bool dark MEMBER m_bCueColorIsDark);
     Q_PROPERTY(QString type MEMBER m_type);

From 392085b7657d576422c1b88e9d38d0d7e52069ca Mon Sep 17 00:00:00 2001
From: Uwe Klotz <uwe.klotz@gmail.com>
Date: Sat, 4 Nov 2023 17:44:47 +0100
Subject: [PATCH 157/388] Fix update of play count after removing tracks from
 history playlist

---
 src/library/dao/trackdao.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/library/dao/trackdao.cpp b/src/library/dao/trackdao.cpp
index d2c06ce613c..e343ecfdd59 100644
--- a/src/library/dao/trackdao.cpp
+++ b/src/library/dao/trackdao.cpp
@@ -2252,7 +2252,7 @@ bool TrackDAO::updatePlayCounterFromPlayedHistory(
     VERIFY_OR_DEBUG_ASSERT(!trackIds.isEmpty()) {
         return false;
     }
-    // Update both timesplay and last_played_at according to the
+    // Update both timesplayed and last_played_at according to the
     // corresponding aggregated properties from the played history,
     // i.e. COUNT for the number of times a track has been played
     // and MAX for the last time it has been played.
@@ -2302,13 +2302,13 @@ bool TrackDAO::updatePlayCounterFromPlayedHistory(
                         "UPDATE library SET "
                         "timesplayed=0,"
                         "last_played_at=NULL "
-                        "WHERE library.id NOT IN("
+                        "WHERE id NOT IN("
                         "SELECT PlaylistTracks.track_id "
                         "FROM PlaylistTracks "
                         "JOIN Playlists ON "
                         "PlaylistTracks.playlist_id=Playlists.id "
-                        "WHERE Playlists.hidden=:playlistHidden "
-                        "AND PlaylistTracks.track_id IN (%1))")
+                        "WHERE Playlists.hidden=:playlistHidden) "
+                        "AND id IN (%1)")
                         .arg(trackIdList));
         updateNotPlayed.bindValue(
                 QStringLiteral(":playlistHidden"),

From 07b6389dfaefb89b577fb013d829599df28ed863 Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Sat, 4 Nov 2023 19:35:58 +0100
Subject: [PATCH 158/388] plain svg

---
 .../LateNight/classic/style/mark_loop.svg     | 22 -------------------
 1 file changed, 22 deletions(-)

diff --git a/res/skins/LateNight/classic/style/mark_loop.svg b/res/skins/LateNight/classic/style/mark_loop.svg
index 7e7adfd53fa..3bcb6feff1c 100644
--- a/res/skins/LateNight/classic/style/mark_loop.svg
+++ b/res/skins/LateNight/classic/style/mark_loop.svg
@@ -7,30 +7,8 @@
    viewBox="0 0 16.933333 16.933334"
    version="1.1"
    id="svg7299"
-   sodipodi:docname="mark_loop.svg"
-   inkscape:version="1.1.1 (c3084ef, 2021-09-22)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview829"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="8.734375"
-     inkscape:cx="32.457961"
-     inkscape:cy="35.663685"
-     inkscape:window-width="1312"
-     inkscape:window-height="781"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg7299" />
   <defs
      id="defs7296" />
   <g

From dd36ac0998a3ca194211ea63ada85fe7501cbbbe Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Sat, 4 Nov 2023 19:40:01 +0100
Subject: [PATCH 159/388] Text as fallback

---
 res/skins/LateNight/waveform.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/res/skins/LateNight/waveform.xml b/res/skins/LateNight/waveform.xml
index 101719929ef..2fb5db34968 100644
--- a/res/skins/LateNight/waveform.xml
+++ b/res/skins/LateNight/waveform.xml
@@ -62,7 +62,7 @@
             </MarkRange>
             <Mark>
               <Control>loop_start_position</Control>
-              <!--Text>&#8635;</Text-->
+              <Text>&#8635;</Text>
               <Icon>skin:../LateNight/classic/style/mark_loop.svg</Icon>
               <Align>top|left</Align>
               <Color><Variable name="LoopColor"/></Color>
@@ -87,7 +87,7 @@
             </MarkRange>
             <Mark>
               <Control>intro_start_position</Control>
-              <!--Text>&#9698;</Text-->
+              <Text>&#9698;</Text>
               <Icon>skin:../LateNight/classic/style/mark_intro.svg</Icon>
               <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
               <Align>top|right</Align>
@@ -97,7 +97,7 @@
             <Mark>
               <Control>intro_end_position</Control>
               <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
-              <!--Text>&#9698;</Text-->
+              <Text>&#9698;</Text>
               <Icon>skin:../LateNight/classic/style/mark_intro.svg</Icon>
               <Align>top|left</Align>
               <Color><Variable name="IntroOutroColor"/></Color>
@@ -116,7 +116,7 @@
             <Mark>
               <Control>outro_start_position</Control>
               <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
-              <!--Text>&#9699;</Text-->
+              <Text>&#9699;</Text>
               <Icon>skin:../LateNight/classic/style/mark_outro.svg</Icon>
               <Align>top|right</Align>
               <Color><Variable name="IntroOutroColor"/></Color>
@@ -124,7 +124,7 @@
             </Mark>
             <Mark>
               <Control>outro_end_position</Control>
-              <!--Text>&#9699;</Text-->
+              <Text>&#9699;</Text>
               <Icon>skin:../LateNight/classic/style/mark_outro.svg</Icon>
               <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
               <Align>top|left</Align>

From 2a03c50b1e7ffe4705e69c4244e1399ec5014921 Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Sat, 4 Nov 2023 19:40:31 +0100
Subject: [PATCH 160/388] corrected a comment

---
 src/waveform/renderers/waveformmark.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/waveform/renderers/waveformmark.cpp b/src/waveform/renderers/waveformmark.cpp
index 2d7076772a7..a21f3608b18 100644
--- a/src/waveform/renderers/waveformmark.cpp
+++ b/src/waveform/renderers/waveformmark.cpp
@@ -145,7 +145,7 @@ bool WaveformMark::contains(QPoint point, Qt::Orientation orientation) const {
     return m_label.area().contains(point) || lineHovered;
 }
 
-// Helper class to calculate the geometry and fontsize needed by generateImage
+// Helper struct to calculate the geometry and fontsize needed by generateImage
 // to draw the label and text
 struct MarkerGeometry {
     bool m_isSymbol; // it the label normal text or a single symbol (e.g. open circle arrow)

From 7d32e40eae8c11f281cd9bcb8325e059b9d147ea Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Sat, 4 Nov 2023 19:44:52 +0100
Subject: [PATCH 161/388] removed unnecessary scoping

---
 src/waveform/renderers/waveformmark.cpp | 71 ++++++++++++-------------
 1 file changed, 34 insertions(+), 37 deletions(-)

diff --git a/src/waveform/renderers/waveformmark.cpp b/src/waveform/renderers/waveformmark.cpp
index a21f3608b18..2845a8c306f 100644
--- a/src/waveform/renderers/waveformmark.cpp
+++ b/src/waveform/renderers/waveformmark.cpp
@@ -178,43 +178,40 @@ struct MarkerGeometry {
 
         const qreal margin{3.f};
 
-        qreal capHeight;
-        {
-            QFontMetricsF metrics{m_font};
-            capHeight = metrics.capHeight();
-
-            if (m_isSymbol) {
-                // Symbols can be aligned and sized in an way that is not ideal.
-                // We auto-scale the font size so the symbol fits in capHeight
-                // (the height of a flat capital letter such as H) but without
-                // exceeded a width of capHeight * 1.1
-                const auto targetHeight = std::ceil(capHeight);
-                const auto targetWidth = std::ceil(capHeight * 1.1f);
-
-                // As a starting point we look at the tight bounding rect at a
-                // large font size
-                m_font.setPointSize(50.0);
-                metrics = QFontMetricsF(m_font);
-                m_contentRect = metrics.tightBoundingRect(label);
-
-                // Now we calculate how much bigger this is than our target
-                // size.
-                const auto ratioH = targetHeight / m_contentRect.height();
-                const auto ratioW = targetWidth / m_contentRect.width();
-                const auto ratio = std::min(ratioH, ratioW);
-
-                // And we scale the font size accordingly.
-                m_font.setPointSizeF(50.0 * ratio);
-                metrics = QFontMetricsF(m_font);
-                m_contentRect = metrics.tightBoundingRect(label);
-            } else if (useIcon) {
-                m_contentRect = QRectF(0.f, 0.f, std::ceil(capHeight), std::ceil(capHeight));
-            } else {
-                m_contentRect = QRectF{0.f,
-                        -capHeight,
-                        metrics.boundingRect(label).width(),
-                        capHeight};
-            }
+        QFontMetricsF metrics{m_font};
+        const qreal capHeight = metrics.capHeight();
+
+        if (m_isSymbol) {
+            // Symbols can be aligned and sized in an way that is not ideal.
+            // We auto-scale the font size so the symbol fits in capHeight
+            // (the height of a flat capital letter such as H) but without
+            // exceeded a width of capHeight * 1.1
+            const auto targetHeight = std::ceil(capHeight);
+            const auto targetWidth = std::ceil(capHeight * 1.1f);
+
+            // As a starting point we look at the tight bounding rect at a
+            // large font size
+            m_font.setPointSize(50.0);
+            metrics = QFontMetricsF(m_font);
+            m_contentRect = metrics.tightBoundingRect(label);
+
+            // Now we calculate how much bigger this is than our target
+            // size.
+            const auto ratioH = targetHeight / m_contentRect.height();
+            const auto ratioW = targetWidth / m_contentRect.width();
+            const auto ratio = std::min(ratioH, ratioW);
+
+            // And we scale the font size accordingly.
+            m_font.setPointSizeF(50.0 * ratio);
+            metrics = QFontMetricsF(m_font);
+            m_contentRect = metrics.tightBoundingRect(label);
+        } else if (useIcon) {
+            m_contentRect = QRectF(0.f, 0.f, std::ceil(capHeight), std::ceil(capHeight));
+        } else {
+            m_contentRect = QRectF{0.f,
+                    -capHeight,
+                    metrics.boundingRect(label).width(),
+                    capHeight};
         }
 
         const Qt::Alignment alignH = align & Qt::AlignHorizontal_Mask;

From e7aeb02ad490b0e7266f64ab2a2826f5097db926 Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Sat, 4 Nov 2023 19:48:16 +0100
Subject: [PATCH 162/388] removed commented code

---
 src/waveform/renderers/waveformmark.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/waveform/renderers/waveformmark.cpp b/src/waveform/renderers/waveformmark.cpp
index 2845a8c306f..37523b662c1 100644
--- a/src/waveform/renderers/waveformmark.cpp
+++ b/src/waveform/renderers/waveformmark.cpp
@@ -261,13 +261,10 @@ QImage WaveformMark::generateImage(float breadth, float devicePixelRatio) {
         QString path = m_pixmapPath;
         // Use devicePixelRatio to properly scale the image
         QImage image = *WImageStore::getImage(path, devicePixelRatio);
-        // QImage image = QImage(path);
         //  If loading the image didn't fail, then we're done. Otherwise fall
         //  through and render a label.
         if (!image.isNull()) {
-            image =
-                    image.convertToFormat(QImage::Format_ARGB32_Premultiplied);
-            // WImageStore::correctImageColors(&m_image);
+            image = image.convertToFormat(QImage::Format_ARGB32_Premultiplied);
             //  Set the pixel/device ratio AFTER loading the image in order to get
             //  a truly scaled source image.
             //  See https://doc.qt.io/qt-5/qimage.html#setDevicePixelRatio

From efaf97d6e71ed6219bec69d1ae2e0eedf9cf7a42 Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Sat, 4 Nov 2023 19:55:33 +0100
Subject: [PATCH 163/388] prefer useIcon over symbol

---
 src/waveform/renderers/waveformmark.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/waveform/renderers/waveformmark.cpp b/src/waveform/renderers/waveformmark.cpp
index 37523b662c1..7a82022b748 100644
--- a/src/waveform/renderers/waveformmark.cpp
+++ b/src/waveform/renderers/waveformmark.cpp
@@ -157,7 +157,7 @@ struct MarkerGeometry {
     MarkerGeometry(const QString& label, bool useIcon, Qt::Alignment align, float breadth) {
         // If the label is 1 character long, and this character isn't a letter or a number,
         // we can assume it's a special symbol
-        m_isSymbol = label.length() == 1 && !label[0].isLetterOrNumber();
+        m_isSymbol = !useIcon && label.length() == 1 && !label[0].isLetterOrNumber();
 
         // This alone would pick the OS default font, or that set by Qt5 Settings (qt5ct)
         // respectively. This would mostly not be notable since contemporary OS and distros

From 1ac78625831ba0a58c2caca9949b597b5737fa42 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Sun, 5 Nov 2023 01:56:00 +0100
Subject: [PATCH 164/388] SettingsManager: remove unused initializeDefaults()

---
 src/preferences/settingsmanager.cpp | 10 ----------
 src/preferences/settingsmanager.h   |  2 --
 2 files changed, 12 deletions(-)

diff --git a/src/preferences/settingsmanager.cpp b/src/preferences/settingsmanager.cpp
index 784c666b798..48c377c192a 100644
--- a/src/preferences/settingsmanager.cpp
+++ b/src/preferences/settingsmanager.cpp
@@ -23,8 +23,6 @@ SettingsManager::SettingsManager(const QString& settingsPath)
     }
     m_bShouldRescanLibrary = upgrader.rescanLibrary();
 
-    initializeDefaults();
-
     ControlDoublePrivate::setUserConfig(m_pSettings);
 
 #ifdef __BROADCAST__
@@ -36,11 +34,3 @@ SettingsManager::SettingsManager(const QString& settingsPath)
 SettingsManager::~SettingsManager() {
     ControlDoublePrivate::setUserConfig(UserSettingsPointer());
 }
-
-void SettingsManager::initializeDefaults() {
-    QString resourcePath = m_pSettings->getResourcePath();
-
-    // Store the last resource path in the config database.
-    // TODO(rryan): this looks unused.
-    m_pSettings->set(ConfigKey("[Config]", "Path"), ConfigValue(resourcePath));
-}
diff --git a/src/preferences/settingsmanager.h b/src/preferences/settingsmanager.h
index 760898f2352..a97e0095b17 100644
--- a/src/preferences/settingsmanager.h
+++ b/src/preferences/settingsmanager.h
@@ -29,8 +29,6 @@ class SettingsManager {
     }
 
   private:
-    void initializeDefaults();
-
     UserSettingsPointer m_pSettings;
     bool m_bShouldRescanLibrary;
 #ifdef __BROADCAST__

From bd49856331dd4d55107ee3017f37b9719b5de92e Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Sun, 15 Oct 2023 16:08:25 +0100
Subject: [PATCH 165/388] Notarization: Fix error messages

These didn't print the environment variable that was unset, but
substituted in the (unset) variable instead.
---
 packaging/macos/sign_notarize_staple.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packaging/macos/sign_notarize_staple.sh b/packaging/macos/sign_notarize_staple.sh
index 2cb698230cd..76236ac3a4b 100755
--- a/packaging/macos/sign_notarize_staple.sh
+++ b/packaging/macos/sign_notarize_staple.sh
@@ -2,11 +2,11 @@
 
 DMG_FILE="${1}"
 [ -z "${DMG_FILE}" ] && echo "Pass DMG file name as first argument." >&2 && exit 1
-[ -z "${APPLE_CODESIGN_IDENTITY}" ] && echo "Please set the $APPLE_CODESIGN_IDENTITY env var." >&2 && exit 1
-[ -z "${APPLE_BUNDLE_ID}" ] && echo "Please set the $APPLE_BUNDLE_ID env var." >&2 && exit 1
-[ -z "${APPLE_ID_USERNAME}" ] && echo "Please set the $APPLE_ID_USERNAME env var." >&2 && exit 1
-[ -z "${APPLE_APP_SPECIFIC_PASSWORD}" ] && echo "Please set the $APPLE_APP_SPECIFIC_PASSWORD env var." >&2 && exit 1
-[ -z "${ASC_PROVIDER}" ] && echo "Please set the $ASC_PROVIDER env var." >&2 && exit 1
+[ -z "${APPLE_CODESIGN_IDENTITY}" ] && echo 'Please set the APPLE_CODESIGN_IDENTITY env var.' >&2 && exit 1
+[ -z "${APPLE_BUNDLE_ID}" ] && echo 'Please set the APPLE_BUNDLE_ID env var.' >&2 && exit 1
+[ -z "${APPLE_ID_USERNAME}" ] && echo 'Please set the APPLE_ID_USERNAME env var.' >&2 && exit 1
+[ -z "${APPLE_APP_SPECIFIC_PASSWORD}" ] && echo 'Please set the APPLE_APP_SPECIFIC_PASSWORD env var.' >&2 && exit 1
+[ -z "${ASC_PROVIDER}" ] && echo 'Please set the ASC_PROVIDER env var.' >&2 && exit 1
 
 echo "Signing $DMG_FILE"
 codesign --verbose=4 --options runtime \

From 0546565231aabdcbb80c444567bb6a9fd07b89f7 Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Sun, 15 Oct 2023 16:14:38 +0100
Subject: [PATCH 166/388] Notarization: Migrate script to `notarytool`

---
 .github/workflows/build.yml             |  2 +-
 packaging/macos/sign_notarize_staple.sh | 20 +++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fdc162aeb1b..45a605ca0f6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -387,7 +387,7 @@ jobs:
           APPLE_ID_USERNAME: rryan@mixxx.org
           APPLE_BUNDLE_ID: org.mixxx.mixxx
           APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.MACOS_NOTARIZATION_APP_SPECIFIC_PASSWORD }}
-          ASC_PROVIDER: FLYL4D545V
+          APPLE_TEAM_ID: FLYL4D545V
 
       - name: "[Windows] Sign Package"
         if: runner.os == 'Windows' && env.WINDOWS_CODESIGN_CERTIFICATE_PATH != null && env.WINDOWS_CODESIGN_CERTIFICATE_PASSWORD != null
diff --git a/packaging/macos/sign_notarize_staple.sh b/packaging/macos/sign_notarize_staple.sh
index 76236ac3a4b..5178cfc4c80 100755
--- a/packaging/macos/sign_notarize_staple.sh
+++ b/packaging/macos/sign_notarize_staple.sh
@@ -6,16 +6,20 @@ DMG_FILE="${1}"
 [ -z "${APPLE_BUNDLE_ID}" ] && echo 'Please set the APPLE_BUNDLE_ID env var.' >&2 && exit 1
 [ -z "${APPLE_ID_USERNAME}" ] && echo 'Please set the APPLE_ID_USERNAME env var.' >&2 && exit 1
 [ -z "${APPLE_APP_SPECIFIC_PASSWORD}" ] && echo 'Please set the APPLE_APP_SPECIFIC_PASSWORD env var.' >&2 && exit 1
-[ -z "${ASC_PROVIDER}" ] && echo 'Please set the ASC_PROVIDER env var.' >&2 && exit 1
+[ -z "${APPLE_TEAM_ID}" ] && echo 'Please set the APPLE_TEAM_ID env var.' >&2 && exit 1
 
 echo "Signing $DMG_FILE"
 codesign --verbose=4 --options runtime \
     --sign "${APPLE_CODESIGN_IDENTITY}" "$(dirname "$0")/Mixxx.entitlements" "${DMG_FILE}"
 
 echo "Notarizing $DMG_FILE"
-xcrun altool --notarize-app --primary-bundle-id "${APPLE_BUNDLE_ID}" --username "${APPLE_ID_USERNAME}" \
-    --password "${APPLE_APP_SPECIFIC_PASSWORD}" --asc-provider "${ASC_PROVIDER}" --file "${DMG_FILE}" \
-    --output-format xml > notarize_result.plist
+xcrun notarytool \
+    --primary-bundle-id "${APPLE_BUNDLE_ID}" \
+    --apple-id "${APPLE_ID_USERNAME}" \
+    --password "${APPLE_APP_SPECIFIC_PASSWORD}" \
+    --team-id "${APPLE_TEAM_ID}" \
+    --file "${DMG_FILE}" \
+    --output-format plist > notarize_result.plist
 UUID="$(/usr/libexec/PlistBuddy -c 'Print notarization-upload:RequestUUID' notarize_result.plist)"
 echo "Notarization UUID: $UUID"
 rm notarize_result.plist
@@ -25,9 +29,11 @@ sleep 5
 
 # wait for confirmation that notarization finished
 while true; do
-    xcrun altool --notarization-info "$UUID" \
-    --username "${APPLE_ID_USERNAME}" --password "${APPLE_APP_SPECIFIC_PASSWORD}" \
-    --output-format xml > notarize_status.plist
+    xcrun notarytool \
+        --notarization-info "$UUID" \
+        --apple-id "${APPLE_ID_USERNAME}" \
+        --password "${APPLE_APP_SPECIFIC_PASSWORD}" \
+        --output-format plist > notarize_status.plist
 
     # shellcheck disable=SC2181
     if [ "$?" != "0" ]; then

From ebe19c5cff0bdf84a3cb9e488ff19f300807f650 Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Sun, 15 Oct 2023 16:25:50 +0100
Subject: [PATCH 167/388] Notarization: Fix some more flags

---
 packaging/macos/sign_notarize_staple.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/packaging/macos/sign_notarize_staple.sh b/packaging/macos/sign_notarize_staple.sh
index 5178cfc4c80..0e4704b0b53 100755
--- a/packaging/macos/sign_notarize_staple.sh
+++ b/packaging/macos/sign_notarize_staple.sh
@@ -13,13 +13,12 @@ codesign --verbose=4 --options runtime \
     --sign "${APPLE_CODESIGN_IDENTITY}" "$(dirname "$0")/Mixxx.entitlements" "${DMG_FILE}"
 
 echo "Notarizing $DMG_FILE"
-xcrun notarytool \
-    --primary-bundle-id "${APPLE_BUNDLE_ID}" \
+xcrun notarytool submit \
     --apple-id "${APPLE_ID_USERNAME}" \
     --password "${APPLE_APP_SPECIFIC_PASSWORD}" \
     --team-id "${APPLE_TEAM_ID}" \
-    --file "${DMG_FILE}" \
-    --output-format plist > notarize_result.plist
+    --output-format plist \
+    "${DMG_FILE}" > notarize_result.plist
 UUID="$(/usr/libexec/PlistBuddy -c 'Print notarization-upload:RequestUUID' notarize_result.plist)"
 echo "Notarization UUID: $UUID"
 rm notarize_result.plist
@@ -29,11 +28,11 @@ sleep 5
 
 # wait for confirmation that notarization finished
 while true; do
-    xcrun notarytool \
-        --notarization-info "$UUID" \
+    xcrun notarytool info \
         --apple-id "${APPLE_ID_USERNAME}" \
         --password "${APPLE_APP_SPECIFIC_PASSWORD}" \
-        --output-format plist > notarize_status.plist
+        --output-format plist > notarize_status.plist \
+        "$UUID"
 
     # shellcheck disable=SC2181
     if [ "$?" != "0" ]; then

From e91dc715ea09642789f48236e30c7638de8c2152 Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Sun, 15 Oct 2023 16:29:54 +0100
Subject: [PATCH 168/388] Notarization: Use `--wait` flag instead of polling

This is recommended over polling:
https://developer.apple.com/documentation/technotes/tn3147-migrating-to-the-latest-notarization-tool#Submit-a-file
---
 packaging/macos/sign_notarize_staple.sh | 59 ++++++++++---------------
 1 file changed, 23 insertions(+), 36 deletions(-)

diff --git a/packaging/macos/sign_notarize_staple.sh b/packaging/macos/sign_notarize_staple.sh
index 0e4704b0b53..dac0420d421 100755
--- a/packaging/macos/sign_notarize_staple.sh
+++ b/packaging/macos/sign_notarize_staple.sh
@@ -18,46 +18,33 @@ xcrun notarytool submit \
     --password "${APPLE_APP_SPECIFIC_PASSWORD}" \
     --team-id "${APPLE_TEAM_ID}" \
     --output-format plist \
-    "${DMG_FILE}" > notarize_result.plist
-UUID="$(/usr/libexec/PlistBuddy -c 'Print notarization-upload:RequestUUID' notarize_result.plist)"
-echo "Notarization UUID: $UUID"
-rm notarize_result.plist
-
-# Wait a few seconds to avoid "Could not find the RequestUUID." error
-sleep 5
-
-# wait for confirmation that notarization finished
-while true; do
-    xcrun notarytool info \
-        --apple-id "${APPLE_ID_USERNAME}" \
-        --password "${APPLE_APP_SPECIFIC_PASSWORD}" \
-        --output-format plist > notarize_status.plist \
-        "$UUID"
-
-    # shellcheck disable=SC2181
-    if [ "$?" != "0" ]; then
-        echo "Notarization failed:"
-        cat notarize_status.plist
-        curl "$(/usr/libexec/PlistBuddy -c 'Print notarization-info:LogFileURL' notarize_status.plist)"
-        exit 1
-    fi
+    --wait \
+    "${DMG_FILE}" > notarize_status.plist
+
+# shellcheck disable=SC2181
+if [ "$?" != "0" ]; then
+    echo "Notarization failed:"
+    cat notarize_status.plist
+    curl "$(/usr/libexec/PlistBuddy -c 'Print notarization-info:LogFileURL' notarize_status.plist)"
+    exit 1
+fi
+
+NOTARIZATION_STATUS="$(/usr/libexec/PlistBuddy -c 'Print notarization-info:Status' notarize_status.plist)"
+rm notarize_status.plist
 
-    NOTARIZATION_STATUS="$(/usr/libexec/PlistBuddy -c 'Print notarization-info:Status' notarize_status.plist)"
-    if [ "${NOTARIZATION_STATUS}" == "in progress" ]; then
-        echo "Waiting another 10 seconds for notarization to complete"
-        sleep 10
-    elif [ "${NOTARIZATION_STATUS}" == "success" ]; then
+case "${NOTARIZATION_STATUS}" in
+    success)
         echo "Notarization succeeded"
-        break
-    elif [ "${NOTARIZATION_STATUS}" == "invalid" ]; then
+        ;;
+    invalid)
         echo "Notarization failed with status: ${NOTARIZATION_STATUS}"
         exit 1
-    else
-        echo "Notarization status: ${NOTARIZATION_STATUS}"
-    fi
-done
-
-rm notarize_status.plist
+        ;;
+    *)
+        echo "Unknown notarization status: ${NOTARIZATION_STATUS}"
+        exit 1
+        ;;
+esac
 
 echo "Stapling $DMG_FILE"
 xcrun stapler staple -q "${DMG_FILE}"

From 65f1006e66449b5d3676b11adaf0f4dc53017f82 Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Sun, 15 Oct 2023 16:44:49 +0100
Subject: [PATCH 169/388] Notarization: Remove redundant `APPLE_BUNDLE_ID`

---
 .github/workflows/build.yml             | 1 -
 packaging/macos/sign_notarize_staple.sh | 1 -
 2 files changed, 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 45a605ca0f6..253f30200e4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -385,7 +385,6 @@ jobs:
         timeout-minutes: 5
         env:
           APPLE_ID_USERNAME: rryan@mixxx.org
-          APPLE_BUNDLE_ID: org.mixxx.mixxx
           APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.MACOS_NOTARIZATION_APP_SPECIFIC_PASSWORD }}
           APPLE_TEAM_ID: FLYL4D545V
 
diff --git a/packaging/macos/sign_notarize_staple.sh b/packaging/macos/sign_notarize_staple.sh
index dac0420d421..66d48046ca4 100755
--- a/packaging/macos/sign_notarize_staple.sh
+++ b/packaging/macos/sign_notarize_staple.sh
@@ -3,7 +3,6 @@
 DMG_FILE="${1}"
 [ -z "${DMG_FILE}" ] && echo "Pass DMG file name as first argument." >&2 && exit 1
 [ -z "${APPLE_CODESIGN_IDENTITY}" ] && echo 'Please set the APPLE_CODESIGN_IDENTITY env var.' >&2 && exit 1
-[ -z "${APPLE_BUNDLE_ID}" ] && echo 'Please set the APPLE_BUNDLE_ID env var.' >&2 && exit 1
 [ -z "${APPLE_ID_USERNAME}" ] && echo 'Please set the APPLE_ID_USERNAME env var.' >&2 && exit 1
 [ -z "${APPLE_APP_SPECIFIC_PASSWORD}" ] && echo 'Please set the APPLE_APP_SPECIFIC_PASSWORD env var.' >&2 && exit 1
 [ -z "${APPLE_TEAM_ID}" ] && echo 'Please set the APPLE_TEAM_ID env var.' >&2 && exit 1

From 268b550c4d9c6f869ec54e5a105b9c062fd1df47 Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Sun, 15 Oct 2023 16:56:08 +0100
Subject: [PATCH 170/388] Notarization: Always print status

---
 packaging/macos/sign_notarize_staple.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packaging/macos/sign_notarize_staple.sh b/packaging/macos/sign_notarize_staple.sh
index 66d48046ca4..8e1dd8fca59 100755
--- a/packaging/macos/sign_notarize_staple.sh
+++ b/packaging/macos/sign_notarize_staple.sh
@@ -20,16 +20,17 @@ xcrun notarytool submit \
     --wait \
     "${DMG_FILE}" > notarize_status.plist
 
+trap 'rm notarize_status.plist' EXIT
+cat notarize_status.plist
+
 # shellcheck disable=SC2181
 if [ "$?" != "0" ]; then
     echo "Notarization failed:"
-    cat notarize_status.plist
     curl "$(/usr/libexec/PlistBuddy -c 'Print notarization-info:LogFileURL' notarize_status.plist)"
     exit 1
 fi
 
 NOTARIZATION_STATUS="$(/usr/libexec/PlistBuddy -c 'Print notarization-info:Status' notarize_status.plist)"
-rm notarize_status.plist
 
 case "${NOTARIZATION_STATUS}" in
     success)

From f2d078f86653eacdb2a014c7dd8c6e2859b9172a Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Sun, 15 Oct 2023 16:57:04 +0100
Subject: [PATCH 171/388] Notarization: Gitignore status plist

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index b6c32a00ab7..5a8fc761211 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,9 @@
 *.log
 *.log.*
 
+# Notarization
+notarize_status.plist
+
 # TOOLS
 
 # Might be created when running a Python script from the tools folder

From 393c78dd7573e0a26a3b36061c14dfb5d7af3d53 Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Mon, 16 Oct 2023 09:36:07 +0100
Subject: [PATCH 172/388] Notarization: Remove legacy error handling

---
 packaging/macos/sign_notarize_staple.sh | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/packaging/macos/sign_notarize_staple.sh b/packaging/macos/sign_notarize_staple.sh
index 8e1dd8fca59..83337b743e3 100755
--- a/packaging/macos/sign_notarize_staple.sh
+++ b/packaging/macos/sign_notarize_staple.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 DMG_FILE="${1}"
 [ -z "${DMG_FILE}" ] && echo "Pass DMG file name as first argument." >&2 && exit 1
 [ -z "${APPLE_CODESIGN_IDENTITY}" ] && echo 'Please set the APPLE_CODESIGN_IDENTITY env var.' >&2 && exit 1
@@ -23,13 +25,6 @@ xcrun notarytool submit \
 trap 'rm notarize_status.plist' EXIT
 cat notarize_status.plist
 
-# shellcheck disable=SC2181
-if [ "$?" != "0" ]; then
-    echo "Notarization failed:"
-    curl "$(/usr/libexec/PlistBuddy -c 'Print notarization-info:LogFileURL' notarize_status.plist)"
-    exit 1
-fi
-
 NOTARIZATION_STATUS="$(/usr/libexec/PlistBuddy -c 'Print notarization-info:Status' notarize_status.plist)"
 
 case "${NOTARIZATION_STATUS}" in

From 559ddc529eaaec86d7f7ab9a803d952be70d90c0 Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Mon, 16 Oct 2023 09:40:01 +0100
Subject: [PATCH 173/388] Notarization: Fix status parsing

---
 packaging/macos/sign_notarize_staple.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/packaging/macos/sign_notarize_staple.sh b/packaging/macos/sign_notarize_staple.sh
index 83337b743e3..5eef30fa880 100755
--- a/packaging/macos/sign_notarize_staple.sh
+++ b/packaging/macos/sign_notarize_staple.sh
@@ -25,14 +25,18 @@ xcrun notarytool submit \
 trap 'rm notarize_status.plist' EXIT
 cat notarize_status.plist
 
-NOTARIZATION_STATUS="$(/usr/libexec/PlistBuddy -c 'Print notarization-info:Status' notarize_status.plist)"
+NOTARIZATION_STATUS="$(/usr/libexec/PlistBuddy -c 'Print status' notarize_status.plist)"
 
 case "${NOTARIZATION_STATUS}" in
-    success)
+    Accepted)
         echo "Notarization succeeded"
         ;;
-    invalid)
-        echo "Notarization failed with status: ${NOTARIZATION_STATUS}"
+    Invalid)
+        echo "Notarization invalid"
+        exit 1
+        ;;
+    Rejected)
+        echo "Notarization rejected"
         exit 1
         ;;
     *)

From cfff7644d8507e81e98610a5f326169afe33ea26 Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Mon, 16 Oct 2023 09:51:23 +0100
Subject: [PATCH 174/388] Notarization: Output log if failed

---
 packaging/macos/sign_notarize_staple.sh | 36 ++++++++++++++-----------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/packaging/macos/sign_notarize_staple.sh b/packaging/macos/sign_notarize_staple.sh
index 5eef30fa880..fd25df92f2b 100755
--- a/packaging/macos/sign_notarize_staple.sh
+++ b/packaging/macos/sign_notarize_staple.sh
@@ -13,34 +13,38 @@ echo "Signing $DMG_FILE"
 codesign --verbose=4 --options runtime \
     --sign "${APPLE_CODESIGN_IDENTITY}" "$(dirname "$0")/Mixxx.entitlements" "${DMG_FILE}"
 
+CREDENTIALS=(
+    --apple-id "${APPLE_ID_USERNAME}"
+    --password "${APPLE_APP_SPECIFIC_PASSWORD}"
+    --team-id "${APPLE_TEAM_ID}"
+)
+
 echo "Notarizing $DMG_FILE"
-xcrun notarytool submit \
-    --apple-id "${APPLE_ID_USERNAME}" \
-    --password "${APPLE_APP_SPECIFIC_PASSWORD}" \
-    --team-id "${APPLE_TEAM_ID}" \
-    --output-format plist \
-    --wait \
-    "${DMG_FILE}" > notarize_status.plist
+xcrun notarytool submit "${CREDENTIALS[@]}" --output-format plist --wait "${DMG_FILE}" \
+    > notarize_status.plist
 
 trap 'rm notarize_status.plist' EXIT
 cat notarize_status.plist
 
-NOTARIZATION_STATUS="$(/usr/libexec/PlistBuddy -c 'Print status' notarize_status.plist)"
+ID="$(/usr/libexec/PlistBuddy -c 'Print id' notarize_status.plist)"
+STATUS="$(/usr/libexec/PlistBuddy -c 'Print status' notarize_status.plist)"
+
+print_notary_log() {
+    xcrun notarytool log "${CREDENTIALS[@]}" "$ID"
+}
 
-case "${NOTARIZATION_STATUS}" in
+case "${STATUS}" in
     Accepted)
         echo "Notarization succeeded"
         ;;
-    Invalid)
-        echo "Notarization invalid"
-        exit 1
-        ;;
-    Rejected)
-        echo "Notarization rejected"
+    Invalid|Rejected)
+        echo "Notarization failed: ${STATUS}"
+        print_notary_log
         exit 1
         ;;
     *)
-        echo "Unknown notarization status: ${NOTARIZATION_STATUS}"
+        echo "Unknown notarization status: ${STATUS}"
+        print_notary_log
         exit 1
         ;;
 esac

From d68a3706f4cd18e858687efcdb5a18262a27c839 Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Mon, 16 Oct 2023 10:37:10 +0100
Subject: [PATCH 175/388] Notarization: Don't set entitlements/runtime on DMG

This is unnecessary as per https://developer.apple.com/forums/thread/701469
---
 packaging/macos/sign_notarize_staple.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packaging/macos/sign_notarize_staple.sh b/packaging/macos/sign_notarize_staple.sh
index fd25df92f2b..5a8e1fc6de3 100755
--- a/packaging/macos/sign_notarize_staple.sh
+++ b/packaging/macos/sign_notarize_staple.sh
@@ -10,8 +10,7 @@ DMG_FILE="${1}"
 [ -z "${APPLE_TEAM_ID}" ] && echo 'Please set the APPLE_TEAM_ID env var.' >&2 && exit 1
 
 echo "Signing $DMG_FILE"
-codesign --verbose=4 --options runtime \
-    --sign "${APPLE_CODESIGN_IDENTITY}" "$(dirname "$0")/Mixxx.entitlements" "${DMG_FILE}"
+codesign --verbose=4 --sign "${APPLE_CODESIGN_IDENTITY}" "${DMG_FILE}"
 
 CREDENTIALS=(
     --apple-id "${APPLE_ID_USERNAME}"

From 8613e974cb898125540fd862564c1f6fe48126da Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Mon, 16 Oct 2023 10:45:44 +0100
Subject: [PATCH 176/388] Notarization: Lowercase non-constants/env-vars

As per Bash conventions
---
 packaging/macos/sign_notarize_staple.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packaging/macos/sign_notarize_staple.sh b/packaging/macos/sign_notarize_staple.sh
index 5a8e1fc6de3..50d95c7510d 100755
--- a/packaging/macos/sign_notarize_staple.sh
+++ b/packaging/macos/sign_notarize_staple.sh
@@ -12,37 +12,37 @@ DMG_FILE="${1}"
 echo "Signing $DMG_FILE"
 codesign --verbose=4 --sign "${APPLE_CODESIGN_IDENTITY}" "${DMG_FILE}"
 
-CREDENTIALS=(
+credentials=(
     --apple-id "${APPLE_ID_USERNAME}"
     --password "${APPLE_APP_SPECIFIC_PASSWORD}"
     --team-id "${APPLE_TEAM_ID}"
 )
 
 echo "Notarizing $DMG_FILE"
-xcrun notarytool submit "${CREDENTIALS[@]}" --output-format plist --wait "${DMG_FILE}" \
+xcrun notarytool submit "${credentials[@]}" --output-format plist --wait "${DMG_FILE}" \
     > notarize_status.plist
 
 trap 'rm notarize_status.plist' EXIT
 cat notarize_status.plist
 
-ID="$(/usr/libexec/PlistBuddy -c 'Print id' notarize_status.plist)"
-STATUS="$(/usr/libexec/PlistBuddy -c 'Print status' notarize_status.plist)"
+id="$(/usr/libexec/PlistBuddy -c 'Print id' notarize_status.plist)"
+status="$(/usr/libexec/PlistBuddy -c 'Print status' notarize_status.plist)"
 
 print_notary_log() {
-    xcrun notarytool log "${CREDENTIALS[@]}" "$ID"
+    xcrun notarytool log "${credentials[@]}" "$id"
 }
 
-case "${STATUS}" in
+case "${status}" in
     Accepted)
         echo "Notarization succeeded"
         ;;
     Invalid|Rejected)
-        echo "Notarization failed: ${STATUS}"
+        echo "Notarization failed: ${status}"
         print_notary_log
         exit 1
         ;;
     *)
-        echo "Unknown notarization status: ${STATUS}"
+        echo "Unknown notarization status: ${status}"
         print_notary_log
         exit 1
         ;;

From 5fd192318854f4765952b112906e6276522dff66 Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Mon, 16 Oct 2023 10:49:26 +0100
Subject: [PATCH 177/388] Notarization: Use temporary directory for status

---
 .gitignore                              |  3 ---
 packaging/macos/sign_notarize_staple.sh | 16 +++++++++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5a8fc761211..b6c32a00ab7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,9 +7,6 @@
 *.log
 *.log.*
 
-# Notarization
-notarize_status.plist
-
 # TOOLS
 
 # Might be created when running a Python script from the tools folder
diff --git a/packaging/macos/sign_notarize_staple.sh b/packaging/macos/sign_notarize_staple.sh
index 50d95c7510d..9419f09dbf9 100755
--- a/packaging/macos/sign_notarize_staple.sh
+++ b/packaging/macos/sign_notarize_staple.sh
@@ -9,6 +9,11 @@ DMG_FILE="${1}"
 [ -z "${APPLE_APP_SPECIFIC_PASSWORD}" ] && echo 'Please set the APPLE_APP_SPECIFIC_PASSWORD env var.' >&2 && exit 1
 [ -z "${APPLE_TEAM_ID}" ] && echo 'Please set the APPLE_TEAM_ID env var.' >&2 && exit 1
 
+tmp_dir="$(mktemp -dt mixxx_notarize)"
+# We want $tmp_dir to expand now, therefore we disable the check
+# shellcheck disable=SC2064
+trap "rm -rf '$tmp_dir'" EXIT
+
 echo "Signing $DMG_FILE"
 codesign --verbose=4 --sign "${APPLE_CODESIGN_IDENTITY}" "${DMG_FILE}"
 
@@ -18,15 +23,16 @@ credentials=(
     --team-id "${APPLE_TEAM_ID}"
 )
 
+status_plist="$tmp_dir/status.plist"
+
 echo "Notarizing $DMG_FILE"
 xcrun notarytool submit "${credentials[@]}" --output-format plist --wait "${DMG_FILE}" \
-    > notarize_status.plist
+    > "$status_plist"
 
-trap 'rm notarize_status.plist' EXIT
-cat notarize_status.plist
+cat "$status_plist"
 
-id="$(/usr/libexec/PlistBuddy -c 'Print id' notarize_status.plist)"
-status="$(/usr/libexec/PlistBuddy -c 'Print status' notarize_status.plist)"
+id="$(/usr/libexec/PlistBuddy -c 'Print id' "$status_plist")"
+status="$(/usr/libexec/PlistBuddy -c 'Print status' "$status_plist")"
 
 print_notary_log() {
     xcrun notarytool log "${credentials[@]}" "$id"

From 2f4896ac714323015315059fbba1d372c9d7f39f Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Mon, 16 Oct 2023 10:51:23 +0100
Subject: [PATCH 178/388] Notarization: Make output slightly prettier

---
 packaging/macos/sign_notarize_staple.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packaging/macos/sign_notarize_staple.sh b/packaging/macos/sign_notarize_staple.sh
index 9419f09dbf9..659303ab28c 100755
--- a/packaging/macos/sign_notarize_staple.sh
+++ b/packaging/macos/sign_notarize_staple.sh
@@ -14,7 +14,7 @@ tmp_dir="$(mktemp -dt mixxx_notarize)"
 # shellcheck disable=SC2064
 trap "rm -rf '$tmp_dir'" EXIT
 
-echo "Signing $DMG_FILE"
+echo "==> Signing $DMG_FILE"
 codesign --verbose=4 --sign "${APPLE_CODESIGN_IDENTITY}" "${DMG_FILE}"
 
 credentials=(
@@ -25,7 +25,7 @@ credentials=(
 
 status_plist="$tmp_dir/status.plist"
 
-echo "Notarizing $DMG_FILE"
+echo "==> Notarizing $DMG_FILE"
 xcrun notarytool submit "${credentials[@]}" --output-format plist --wait "${DMG_FILE}" \
     > "$status_plist"
 
@@ -54,5 +54,5 @@ case "${status}" in
         ;;
 esac
 
-echo "Stapling $DMG_FILE"
+echo "==> Stapling $DMG_FILE"
 xcrun stapler staple -q "${DMG_FILE}"

From 7813c385d1218780b50acad9110709ebdbcacefe Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Mon, 16 Oct 2023 11:57:01 +0100
Subject: [PATCH 179/388] BundleInstall: Log signing identity

---
 cmake/modules/BundleInstall.cmake.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmake/modules/BundleInstall.cmake.in b/cmake/modules/BundleInstall.cmake.in
index 6e3217255f7..10185062f3d 100644
--- a/cmake/modules/BundleInstall.cmake.in
+++ b/cmake/modules/BundleInstall.cmake.in
@@ -27,6 +27,7 @@ if(DEFINED APPLE_CODESIGN_IDENTITY AND DEFINED APPLE_CODESIGN_ENTITLEMENTS)
           "${PATH_TO_SIGN}"
       )
     else()
+      message(STATUS "Signing bundle with hardened runtime and identity ${APPLE_CODESIGN_IDENTITY}")
       execute_process(COMMAND
           codesign --verbose=4 --deep --force --options runtime
           --entitlements "${APPLE_CODESIGN_ENTITLEMENTS}"

From 450a1c17593d5d8407c295a6b71eecab79fda3b8 Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Mon, 16 Oct 2023 11:58:43 +0100
Subject: [PATCH 180/388] BundleInstall: Emit fatal error if signing fails

---
 cmake/modules/BundleInstall.cmake.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cmake/modules/BundleInstall.cmake.in b/cmake/modules/BundleInstall.cmake.in
index 10185062f3d..0d08fddb1be 100644
--- a/cmake/modules/BundleInstall.cmake.in
+++ b/cmake/modules/BundleInstall.cmake.in
@@ -35,6 +35,9 @@ if(DEFINED APPLE_CODESIGN_IDENTITY AND DEFINED APPLE_CODESIGN_ENTITLEMENTS)
           "${PATH_TO_SIGN}"
       )
     endif()
+    if(NOT _EXIT_CODE EQUAL 0)
+      message(FATAL_ERROR "Signing ${PATH_TO_SIGN} failed")
+    endif()
   endforeach()
 else()
   message(STATUS "Not signing bundle. Specify -DAPPLE_CODESIGN_IDENTITY and -DAPPLE_CODESIGN_ENTITLEMENTS to cmake before running cpack to sign")

From ec32a1c06504c05b89a803c6fe0728fd2405dc05 Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Mon, 16 Oct 2023 12:19:34 +0100
Subject: [PATCH 181/388] CI: Use `github.workspace` instead of hardcoding path

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 253f30200e4..4ff239032e9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -226,7 +226,7 @@ jobs:
           # Decrypt the certificate
           openssl enc -aes-256-cbc -d -md sha512 \
             -k "${MACOS_CODESIGN_OPENSSL_PASSWORD}" \
-            -in /Users/runner/work/mixxx/mixxx/packaging/certificates/macos_developer_id_codesign_certificate.p12.enc \
+            -in "${{ github.workspace }}/packaging/certificates/macos_developer_id_codesign_certificate.p12.enc" \
             -out ~/certificate.p12
 
           # Create a temporary keychain for the certificate and import it.

From 627da334bdd17d9329a48a59866e81c5a40f8058 Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Mon, 16 Oct 2023 12:54:36 +0100
Subject: [PATCH 182/388] CI: Print code signing identities

---
 .github/workflows/build.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4ff239032e9..1e08be00b3f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -241,6 +241,9 @@ jobs:
           security set-keychain-settings Mixxx.keychain
           echo "CMAKE_ARGS_EXTRA=${CMAKE_ARGS_EXTRA} -DAPPLE_CODESIGN_IDENTITY=${APPLE_CODESIGN_IDENTITY}" >> "${GITHUB_ENV}"
 
+          # Print code signing identities
+          security find-identity -v -p codesigning
+
       - name: "[Windows] Set up Windows code signing"
         env:
           WINDOWS_CODESIGN_CERTIFICATE_PATH: ${{ github.workspace }}\packaging\certificates\windows_sectigo_codesign_certificate.pfx

From dd392a2b7728daa45ebdee9cad4c38438773d389 Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Mon, 16 Oct 2023 13:37:27 +0100
Subject: [PATCH 183/388] CI: Use the correct keychain when printing identities

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1e08be00b3f..234f402a6a0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -242,7 +242,7 @@ jobs:
           echo "CMAKE_ARGS_EXTRA=${CMAKE_ARGS_EXTRA} -DAPPLE_CODESIGN_IDENTITY=${APPLE_CODESIGN_IDENTITY}" >> "${GITHUB_ENV}"
 
           # Print code signing identities
-          security find-identity -v -p codesigning
+          security find-identity -v -p codesigning Mixxx.keychain
 
       - name: "[Windows] Set up Windows code signing"
         env:

From 41fba7519a9b8148d268e5fb647df23ec30593f1 Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Mon, 16 Oct 2023 14:04:10 +0100
Subject: [PATCH 184/388] CI: Print certificates and expiry dates

---
 .github/workflows/build.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 234f402a6a0..1eab7102d03 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -241,7 +241,13 @@ jobs:
           security set-keychain-settings Mixxx.keychain
           echo "CMAKE_ARGS_EXTRA=${CMAKE_ARGS_EXTRA} -DAPPLE_CODESIGN_IDENTITY=${APPLE_CODESIGN_IDENTITY}" >> "${GITHUB_ENV}"
 
-          # Print code signing identities
+          # https://unix.stackexchange.com/questions/696224/using-openssl-to-display-all-certificates-of-a-pem-file
+          # https://stackoverflow.com/questions/16576537/how-can-i-find-exactly-what-my-codesign-identity-is
+
+          echo "==> Available certificates"
+          security find-certificate -a -p Mixxx.keychain | while openssl x509 -noout -text; do :; done | grep "Certificate\|Validity\|Subject\|Not"
+
+          echo "==> Available code signing identities"
           security find-identity -v -p codesigning Mixxx.keychain
 
       - name: "[Windows] Set up Windows code signing"

From d28c5aa03338570389e3a032ed4ea67e4855c446 Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Mon, 16 Oct 2023 19:05:33 +0100
Subject: [PATCH 185/388] BundleInstall: Fix error handling after signing

---
 cmake/modules/BundleInstall.cmake.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cmake/modules/BundleInstall.cmake.in b/cmake/modules/BundleInstall.cmake.in
index 0d08fddb1be..334f28f89d1 100644
--- a/cmake/modules/BundleInstall.cmake.in
+++ b/cmake/modules/BundleInstall.cmake.in
@@ -25,6 +25,7 @@ if(DEFINED APPLE_CODESIGN_IDENTITY AND DEFINED APPLE_CODESIGN_ENTITLEMENTS)
           codesign --verbose=4 --deep --force
           --sign "${APPLE_CODESIGN_IDENTITY}"
           "${PATH_TO_SIGN}"
+          RESULT_VARIABLE CODESIGN_EXIT_CODE
       )
     else()
       message(STATUS "Signing bundle with hardened runtime and identity ${APPLE_CODESIGN_IDENTITY}")
@@ -33,9 +34,10 @@ if(DEFINED APPLE_CODESIGN_IDENTITY AND DEFINED APPLE_CODESIGN_ENTITLEMENTS)
           --entitlements "${APPLE_CODESIGN_ENTITLEMENTS}"
           --sign "${APPLE_CODESIGN_IDENTITY}"
           "${PATH_TO_SIGN}"
+          RESULT_VARIABLE CODESIGN_EXIT_CODE
       )
     endif()
-    if(NOT _EXIT_CODE EQUAL 0)
+    if(NOT CODESIGN_EXIT_CODE EQUAL 0)
       message(FATAL_ERROR "Signing ${PATH_TO_SIGN} failed")
     endif()
   endforeach()

From 31320170dbc6f6b296154837f7d7a5ad0f04a76a Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Sun, 5 Nov 2023 11:37:48 +0100
Subject: [PATCH 186/388] removed in-class initialization

---
 src/waveform/renderers/waveformmark.cpp | 2 +-
 src/waveform/renderers/waveformmark.h   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/waveform/renderers/waveformmark.cpp b/src/waveform/renderers/waveformmark.cpp
index 7a82022b748..98672acabb5 100644
--- a/src/waveform/renderers/waveformmark.cpp
+++ b/src/waveform/renderers/waveformmark.cpp
@@ -58,7 +58,7 @@ WaveformMark::WaveformMark(const QString& group,
         const SkinContext& context,
         const WaveformSignalColors& signalColors,
         int hotCue)
-        : m_iHotCue(hotCue) {
+        : m_linePosition{}, m_breadth{}, m_iHotCue{hotCue} {
     QString positionControl;
     QString endPositionControl;
     if (hotCue != Cue::kNoHotCue) {
diff --git a/src/waveform/renderers/waveformmark.h b/src/waveform/renderers/waveformmark.h
index 7b6b5bb2a8e..11a53131dcb 100644
--- a/src/waveform/renderers/waveformmark.h
+++ b/src/waveform/renderers/waveformmark.h
@@ -112,8 +112,8 @@ class WaveformMark {
     QString m_pixmapPath;
     QString m_iconPath;
 
-    float m_linePosition{};
-    int m_breadth{};
+    float m_linePosition;
+    int m_breadth;
 
     WaveformMarkLabel m_label;
 

From c08bf330beb6282fff6591ba5457b014e086f76f Mon Sep 17 00:00:00 2001
From: Uwe Klotz <uwe.klotz@gmail.com>
Date: Sat, 4 Nov 2023 19:02:21 +0100
Subject: [PATCH 187/388] Add SQL statement for restoring play counts to
 mixxxdb_cleanup.sql

---
 tools/mixxxdb_cleanup.sql | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/tools/mixxxdb_cleanup.sql b/tools/mixxxdb_cleanup.sql
index a99a2676c78..f69d87d013d 100644
--- a/tools/mixxxdb_cleanup.sql
+++ b/tools/mixxxdb_cleanup.sql
@@ -47,6 +47,27 @@ DELETE FROM PlaylistTracks WHERE track_id NOT IN (SELECT id FROM library);
 -- Analysis
 DELETE FROM track_analysis WHERE track_id NOT IN (SELECT id FROM track_locations);
 
+-----------------------------------------------------------------------
+-- Restore the play count columns in the library table from the      --
+-- history playlists (requires SQLite v3.33.0 or newer)              --
+-----------------------------------------------------------------------
+
+UPDATE library
+SET timesplayed=q.timesplayed,last_played_at=q.last_played_at
+FROM (
+    SELECT
+    PlaylistTracks.track_id as id,
+    COUNT(PlaylistTracks.track_id) as timesplayed,
+    MAX(PlaylistTracks.pl_datetime_added) as last_played_at
+    FROM PlaylistTracks
+    JOIN Playlists
+    ON PlaylistTracks.playlist_id=Playlists.id
+    -- PlaylistDAO::PLHT_SET_LOG=2
+    WHERE Playlists.hidden=2
+    GROUP BY PlaylistTracks.track_id
+) q
+WHERE library.id=q.id;
+
 -----------------------------------------------------------------------
 -- Fix referential integrity issues in external libraries (optional) --
 -- Enable conditionally depending on the contents of mixxxdb.sqlite  --

From b2786a10d8d742dcd9a062244008ce8476d3f64e Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jholthuis@mixxx.org>
Date: Sun, 5 Nov 2023 14:38:08 +0100
Subject: [PATCH 188/388] feat(control): Do not show CO aliases in developer
 tools window

This hides aliases in the control model. Aliases are only for backwards
compatibility, so this reduces the risk that mapping developers use
these COs for new mappings.

This also removes a bunch of CO deprecation warnings when opening the
developer tools window or starting the QML interface.
---
 src/control/controlmodel.cpp | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/control/controlmodel.cpp b/src/control/controlmodel.cpp
index 23dd7c8d584..23f29e1c541 100644
--- a/src/control/controlmodel.cpp
+++ b/src/control/controlmodel.cpp
@@ -15,8 +15,6 @@ ControlModel::ControlModel(QObject* pParent)
     // Add all controls to Model
     const QList<QSharedPointer<ControlDoublePrivate>> controlsList =
             ControlDoublePrivate::getAllInstances();
-    const QHash<ConfigKey, ConfigKey> controlAliases =
-            ControlDoublePrivate::getControlAliases();
 
     for (const QSharedPointer<ControlDoublePrivate>& pControl : controlsList) {
         if (!pControl) {
@@ -26,14 +24,6 @@ ControlModel::ControlModel(QObject* pParent)
         addControl(pControl->getKey(),
                 pControl->name(),
                 pControl->description());
-
-        ConfigKey aliasKey = controlAliases[pControl->getKey()];
-        if (aliasKey.isValid()) {
-            addControl(aliasKey,
-                    pControl->name(),
-                    QStringLiteral("Alias for ") + pControl->getKey().group +
-                            pControl->getKey().item);
-        }
     }
 }
 

From 7d2538b20cb0d5ce89bb562f0b60a14694207777 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Tue, 10 Oct 2023 08:24:54 +0200
Subject: [PATCH 189/388] Improve headers in vinyl control classes

---
 src/engine/controls/vinylcontrolcontrol.cpp   |  4 +++-
 src/engine/controls/vinylcontrolcontrol.h     |  7 ++++---
 src/preferences/dialog/dlgprefvinyl.cpp       |  3 ++-
 src/preferences/dialog/dlgprefvinyl.h         |  6 +++---
 src/vinylcontrol/steadypitch.cpp              |  3 ---
 src/vinylcontrol/steadypitch.h                |  4 ----
 src/vinylcontrol/vinylcontrol.cpp             |  2 +-
 src/vinylcontrol/vinylcontrol.h               |  2 +-
 src/vinylcontrol/vinylcontrolmanager.cpp      |  4 +---
 src/vinylcontrol/vinylcontrolmanager.h        | 10 ++--------
 src/vinylcontrol/vinylcontrolprocessor.cpp    |  1 -
 src/vinylcontrol/vinylcontrolprocessor.h      |  3 +--
 src/vinylcontrol/vinylcontrolsignalwidget.cpp |  1 +
 src/vinylcontrol/vinylcontrolsignalwidget.h   | 12 ++----------
 src/vinylcontrol/vinylcontrolxwax.cpp         |  5 +++--
 src/vinylcontrol/vinylcontrolxwax.h           |  8 +++++---
 16 files changed, 29 insertions(+), 46 deletions(-)

diff --git a/src/engine/controls/vinylcontrolcontrol.cpp b/src/engine/controls/vinylcontrolcontrol.cpp
index b7f5987a83f..df4bc1bf740 100644
--- a/src/engine/controls/vinylcontrolcontrol.cpp
+++ b/src/engine/controls/vinylcontrolcontrol.cpp
@@ -1,8 +1,10 @@
 #include "engine/controls/vinylcontrolcontrol.h"
 
+#include "control/controlobject.h"
+#include "control/controlpushbutton.h"
 #include "moc_vinylcontrolcontrol.cpp"
 #include "track/track.h"
-#include "vinylcontrol/vinylcontrol.h"
+#include "vinylcontrol/defs_vinylcontrol.h"
 
 VinylControlControl::VinylControlControl(const QString& group, UserSettingsPointer pConfig)
         : EngineControl(group, pConfig),
diff --git a/src/engine/controls/vinylcontrolcontrol.h b/src/engine/controls/vinylcontrolcontrol.h
index 4b9065b924e..cfd5f1d66cf 100644
--- a/src/engine/controls/vinylcontrolcontrol.h
+++ b/src/engine/controls/vinylcontrolcontrol.h
@@ -1,12 +1,13 @@
 #pragma once
 
-#include "control/controlobject.h"
-#include "control/controlproxy.h"
-#include "control/controlpushbutton.h"
 #include "engine/controls/enginecontrol.h"
 #include "preferences/usersettings.h"
 #include "track/track_decl.h"
 
+class ControlObject;
+class ControlPushButton;
+class ControlProxy;
+
 class VinylControlControl : public EngineControl {
     Q_OBJECT
   public:
diff --git a/src/preferences/dialog/dlgprefvinyl.cpp b/src/preferences/dialog/dlgprefvinyl.cpp
index 096b62ccf27..18d4aff5b61 100644
--- a/src/preferences/dialog/dlgprefvinyl.cpp
+++ b/src/preferences/dialog/dlgprefvinyl.cpp
@@ -8,9 +8,10 @@
 #include "defs_urls.h"
 #include "mixer/playermanager.h"
 #include "moc_dlgprefvinyl.cpp"
-#include "util/platform.h"
+#include "util/defs.h"
 #include "vinylcontrol/defs_vinylcontrol.h"
 #include "vinylcontrol/vinylcontrolmanager.h"
+#include "vinylcontrol/vinylcontrolsignalwidget.h"
 
 DlgPrefVinyl::DlgPrefVinyl(
         QWidget* parent,
diff --git a/src/preferences/dialog/dlgprefvinyl.h b/src/preferences/dialog/dlgprefvinyl.h
index eb9e022d10e..ee7c1d3ca3e 100644
--- a/src/preferences/dialog/dlgprefvinyl.h
+++ b/src/preferences/dialog/dlgprefvinyl.h
@@ -1,17 +1,17 @@
 #pragma once
 
-#include <QSpinBox>
-#include <QWidget>
 #include <memory>
 
 #include "preferences/dialog/dlgpreferencepage.h"
 #include "preferences/dialog/ui_dlgprefvinyldlg.h"
 #include "preferences/usersettings.h"
-#include "vinylcontrol/vinylcontrolsignalwidget.h"
 
 class ControlProxy;
 class PollingControlProxy;
 class VinylControlManager;
+class QSpinBox;
+class QWidget;
+class VinylControlSignalWidget;
 
 class DlgPrefVinyl : public DlgPreferencePage, Ui::DlgPrefVinylDlg  {
     Q_OBJECT
diff --git a/src/vinylcontrol/steadypitch.cpp b/src/vinylcontrol/steadypitch.cpp
index ec431903bf7..2411bfb90e8 100644
--- a/src/vinylcontrol/steadypitch.cpp
+++ b/src/vinylcontrol/steadypitch.cpp
@@ -1,6 +1,3 @@
-#include <QtDebug>
-
-#include "vinylcontrolxwax.h"
 #include "steadypitch.h"
 #include "util/math.h"
 
diff --git a/src/vinylcontrol/steadypitch.h b/src/vinylcontrol/steadypitch.h
index 6b37d7efaa7..9116b779349 100644
--- a/src/vinylcontrol/steadypitch.h
+++ b/src/vinylcontrol/steadypitch.h
@@ -1,9 +1,5 @@
 #pragma once
 
-#include <QTime>
-
-#include "vinylcontrol.h"
-
 class SteadyPitch {
     public:
         SteadyPitch(double threshold, bool assumeSteady);
diff --git a/src/vinylcontrol/vinylcontrol.cpp b/src/vinylcontrol/vinylcontrol.cpp
index 8ce44c36e61..e4819f494a9 100644
--- a/src/vinylcontrol/vinylcontrol.cpp
+++ b/src/vinylcontrol/vinylcontrol.cpp
@@ -1,8 +1,8 @@
 #include "vinylcontrol/vinylcontrol.h"
 
-#include "control/controlobject.h"
 #include "control/controlproxy.h"
 #include "moc_vinylcontrol.cpp"
+#include "vinylcontrol/defs_vinylcontrol.h"
 
 VinylControl::VinylControl(UserSettingsPointer pConfig, const QString& group)
         : m_pConfig(pConfig),
diff --git a/src/vinylcontrol/vinylcontrol.h b/src/vinylcontrol/vinylcontrol.h
index ced857a2f60..e5f510497c3 100644
--- a/src/vinylcontrol/vinylcontrol.h
+++ b/src/vinylcontrol/vinylcontrol.h
@@ -4,9 +4,9 @@
 
 #include "util/types.h"
 #include "preferences/usersettings.h"
-#include "vinylcontrol/vinylsignalquality.h"
 
 class ControlProxy;
+struct VinylSignalQualityReport;
 
 class VinylControl : public QObject {
     Q_OBJECT
diff --git a/src/vinylcontrol/vinylcontrolmanager.cpp b/src/vinylcontrol/vinylcontrolmanager.cpp
index cea9edc958d..afd17bac71e 100644
--- a/src/vinylcontrol/vinylcontrolmanager.cpp
+++ b/src/vinylcontrol/vinylcontrolmanager.cpp
@@ -7,11 +7,9 @@
 #include "mixer/playermanager.h"
 #include "moc_vinylcontrolmanager.cpp"
 #include "soundio/soundmanager.h"
-#include "util/timer.h"
+#include "util/defs.h"
 #include "vinylcontrol/defs_vinylcontrol.h"
-#include "vinylcontrol/vinylcontrol.h"
 #include "vinylcontrol/vinylcontrolprocessor.h"
-#include "vinylcontrol/vinylcontrolxwax.h"
 
 namespace {
 const QRegularExpression kChannelRegex(QStringLiteral("\\[Channel([1-9]\\d*)\\]"));
diff --git a/src/vinylcontrol/vinylcontrolmanager.h b/src/vinylcontrol/vinylcontrolmanager.h
index 5a346d80a20..83f3c8a762f 100644
--- a/src/vinylcontrol/vinylcontrolmanager.h
+++ b/src/vinylcontrol/vinylcontrolmanager.h
@@ -1,20 +1,14 @@
 #pragma once
 
 #include <QObject>
-#include <QString>
-#include <QTimerEvent>
 
 #include "preferences/usersettings.h"
-#include "soundio/soundmanagerutil.h"
-#include "util/defs.h"
-#include "vinylcontrol/vinylsignalquality.h"
 
 class ControlProxy;
-class ControlPushButton;
 class SoundManager;
-class VinylControl;
 class VinylControlProcessor;
-
+class QTimerEvent;
+class VinylSignalQualityListener;
 
 // VinylControlManager is the main-thread interface that other parts of Mixxx
 // use to interact with the vinyl control subsystem (other than controls exposed
diff --git a/src/vinylcontrol/vinylcontrolprocessor.cpp b/src/vinylcontrol/vinylcontrolprocessor.cpp
index ae77d500b46..649d6800144 100644
--- a/src/vinylcontrol/vinylcontrolprocessor.cpp
+++ b/src/vinylcontrol/vinylcontrolprocessor.cpp
@@ -3,7 +3,6 @@
 #include "control/controlpushbutton.h"
 #include "moc_vinylcontrolprocessor.cpp"
 #include "util/defs.h"
-#include "util/event.h"
 #include "util/sample.h"
 #include "util/timer.h"
 #include "vinylcontrol/defs_vinylcontrol.h"
diff --git a/src/vinylcontrol/vinylcontrolprocessor.h b/src/vinylcontrol/vinylcontrolprocessor.h
index defe9cdbe27..d6a6994d458 100644
--- a/src/vinylcontrol/vinylcontrolprocessor.h
+++ b/src/vinylcontrol/vinylcontrolprocessor.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <QMutex>
-#include <QObject>
 #include <QThread>
 #include <QVector>
 #include <QWaitCondition>
@@ -14,6 +12,7 @@
 
 class VinylControl;
 class ControlPushButton;
+class QObject;
 
 // VinylControlProcessor is a thread that is in charge of receiving samples from
 // the engine callback and feeding those samples to the VinylControl
diff --git a/src/vinylcontrol/vinylcontrolsignalwidget.cpp b/src/vinylcontrol/vinylcontrolsignalwidget.cpp
index a2b8d1f324a..564de2b00c5 100644
--- a/src/vinylcontrol/vinylcontrolsignalwidget.cpp
+++ b/src/vinylcontrol/vinylcontrolsignalwidget.cpp
@@ -1,5 +1,6 @@
 #include "vinylcontrol/vinylcontrolsignalwidget.h"
 
+#include <QPainter>
 #include <algorithm>
 
 #include "moc_vinylcontrolsignalwidget.cpp"
diff --git a/src/vinylcontrol/vinylcontrolsignalwidget.h b/src/vinylcontrol/vinylcontrolsignalwidget.h
index b38932ed5be..91da0cf309c 100644
--- a/src/vinylcontrol/vinylcontrolsignalwidget.h
+++ b/src/vinylcontrol/vinylcontrolsignalwidget.h
@@ -1,21 +1,13 @@
-/*
- * vinylcontrolsignalwidget.h
- *
- *  Created on: 5-Jul-2008
- *      Author: asantoni
- */
-
 #pragma once
 
 #include <QImage>
-#include <QPaintEvent>
-#include <QPainter>
-#include <QTimerEvent>
 #include <QWidget>
 #include <vector>
 
 #include "vinylcontrol/vinylsignalquality.h"
 
+class QPaintEvent;
+
 class VinylControlSignalWidget : public QWidget, public VinylSignalQualityListener {
     Q_OBJECT
   public:
diff --git a/src/vinylcontrol/vinylcontrolxwax.cpp b/src/vinylcontrol/vinylcontrolxwax.cpp
index ffa281ead4a..9de8c5d4c33 100644
--- a/src/vinylcontrol/vinylcontrolxwax.cpp
+++ b/src/vinylcontrol/vinylcontrolxwax.cpp
@@ -1,7 +1,5 @@
 #include "vinylcontrol/vinylcontrolxwax.h"
 
-#include <limits.h>
-
 #include <QtDebug>
 
 #include "control/controlobject.h"
@@ -10,6 +8,9 @@
 #include "util/defs.h"
 #include "util/math.h"
 #include "util/timer.h"
+#include "vinylcontrol/defs_vinylcontrol.h"
+#include "vinylcontrol/steadypitch.h"
+#include "vinylcontrol/vinylsignalquality.h"
 
 /****** TODO *******
    Stuff to maybe implement here
diff --git a/src/vinylcontrol/vinylcontrolxwax.h b/src/vinylcontrol/vinylcontrolxwax.h
index c223108938f..09144315ddb 100644
--- a/src/vinylcontrol/vinylcontrolxwax.h
+++ b/src/vinylcontrol/vinylcontrolxwax.h
@@ -1,11 +1,9 @@
 #pragma once
 
-#include <QTime>
+#include <QMutex>
 #include <vector>
 
-#include "soundio/soundmanagerutil.h"
 #include "util/types.h"
-#include "vinylcontrol/steadypitch.h"
 #include "vinylcontrol/vinylcontrol.h"
 
 #ifdef _MSC_VER
@@ -20,6 +18,10 @@ extern "C" {
 #define XWAX_SMOOTHING (128 / XWAX_DEVICE_FRAME) /* result value is in frames */
 #define QUALITY_RING_SIZE 32
 
+class ControlProxy;
+class SteadyPitch;
+struct VinylSignalQualityReport;
+
 class VinylControlXwax : public VinylControl {
     Q_OBJECT
   public:

From 4a4f1e917ca5c44329bc674f46a23716d378682a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Tue, 10 Oct 2023 08:25:52 +0200
Subject: [PATCH 190/388] Improve headers in hid classes

---
 src/controllers/hid/hidcontroller.cpp           |  6 ++----
 src/controllers/hid/hidcontroller.h             |  3 ---
 src/controllers/hid/hiddevice.cpp               |  2 ++
 src/controllers/hid/hiddevice.h                 |  4 ++--
 .../hid/hidioglobaloutputreportfifo.cpp         |  6 ++----
 .../hid/hidioglobaloutputreportfifo.h           | 17 ++++++++++++++---
 src/controllers/hid/hidiooutputreport.cpp       |  4 +---
 src/controllers/hid/hidiooutputreport.h         |  9 +++++----
 src/controllers/hid/hidiothread.cpp             |  5 +----
 src/controllers/hid/hidiothread.h               |  3 +--
 .../hid/legacyhidcontrollermapping.cpp          |  1 -
 .../hid/legacyhidcontrollermapping.h            |  1 -
 12 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/src/controllers/hid/hidcontroller.cpp b/src/controllers/hid/hidcontroller.cpp
index 283dfe5fbc0..e97a94045d3 100644
--- a/src/controllers/hid/hidcontroller.cpp
+++ b/src/controllers/hid/hidcontroller.cpp
@@ -3,11 +3,9 @@
 #include <hidapi.h>
 
 #include "controllers/defs_controllers.h"
-#include "controllers/hid/legacyhidcontrollermappingfilehandler.h"
 #include "moc_hidcontroller.cpp"
-#include "util/string.h"
-#include "util/time.h"
-#include "util/trace.h"
+
+class LegacyControllerMapping;
 
 HidController::HidController(
         mixxx::hid::DeviceInfo&& deviceInfo)
diff --git a/src/controllers/hid/hidcontroller.h b/src/controllers/hid/hidcontroller.h
index 6f7f81108f3..4da9df976e6 100644
--- a/src/controllers/hid/hidcontroller.h
+++ b/src/controllers/hid/hidcontroller.h
@@ -1,12 +1,9 @@
 #pragma once
 
-#include <QThread>
-
 #include "controllers/controller.h"
 #include "controllers/hid/hiddevice.h"
 #include "controllers/hid/hidiothread.h"
 #include "controllers/hid/legacyhidcontrollermapping.h"
-#include "util/duration.h"
 
 /// HID controller backend
 class HidController final : public Controller {
diff --git a/src/controllers/hid/hiddevice.cpp b/src/controllers/hid/hiddevice.cpp
index 0d35450853d..32cc37b271b 100644
--- a/src/controllers/hid/hiddevice.cpp
+++ b/src/controllers/hid/hiddevice.cpp
@@ -1,5 +1,7 @@
 #include "controllers/hid/hiddevice.h"
 
+#include <hidapi.h>
+
 #include <QDebugStateSaver>
 
 #include "controllers/controllermappinginfo.h"
diff --git a/src/controllers/hid/hiddevice.h b/src/controllers/hid/hiddevice.h
index 7fd820601be..a15d97670c7 100644
--- a/src/controllers/hid/hiddevice.h
+++ b/src/controllers/hid/hiddevice.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <hidapi.h>
-
 #include <QObject>
+#include <QString>
 #include <string>
 
 struct ProductInfo;
+struct hid_device_info;
 
 namespace mixxx {
 
diff --git a/src/controllers/hid/hidioglobaloutputreportfifo.cpp b/src/controllers/hid/hidioglobaloutputreportfifo.cpp
index c8cb0c958f3..d7105acbcae 100644
--- a/src/controllers/hid/hidioglobaloutputreportfifo.cpp
+++ b/src/controllers/hid/hidioglobaloutputreportfifo.cpp
@@ -2,13 +2,11 @@
 
 #include <hidapi.h>
 
-#include "controllers/defs_controllers.h"
-#include "controllers/hid/legacyhidcontrollermappingfilehandler.h"
-#include "util/compatibility/qbytearray.h"
+#include "controllers/hid/hiddevice.h"
 #include "util/compatibility/qmutex.h"
+#include "util/runtimeloggingcategory.h"
 #include "util/string.h"
 #include "util/time.h"
-#include "util/trace.h"
 
 namespace {
 constexpr size_t kMaxHidErrorMessageSize = 512;
diff --git a/src/controllers/hid/hidioglobaloutputreportfifo.h b/src/controllers/hid/hidioglobaloutputreportfifo.h
index d9735b818e1..2feb5aa80ba 100644
--- a/src/controllers/hid/hidioglobaloutputreportfifo.h
+++ b/src/controllers/hid/hidioglobaloutputreportfifo.h
@@ -1,9 +1,20 @@
 #pragma once
 
-#include "controllers/controller.h"
-#include "controllers/hid/hiddevice.h"
+#include <QtGlobal>
+
 #include "rigtorp/SPSCQueue.h"
-#include "util/duration.h"
+
+struct RuntimeLoggingCategory;
+class QMutex;
+class QByteArray;
+
+typedef struct hid_device_ hid_device;
+
+namespace mixxx {
+namespace hid {
+class DeviceInfo;
+} // namespace hid
+} // namespace mixxx
 
 /// Stores and sends OutputReports (independent of the ReportID) in First In /
 /// First Out (FIFO) order
diff --git a/src/controllers/hid/hidiooutputreport.cpp b/src/controllers/hid/hidiooutputreport.cpp
index c5fdca46386..d573eb79b44 100644
--- a/src/controllers/hid/hidiooutputreport.cpp
+++ b/src/controllers/hid/hidiooutputreport.cpp
@@ -2,12 +2,10 @@
 
 #include <hidapi.h>
 
-#include "controllers/defs_controllers.h"
-#include "controllers/hid/legacyhidcontrollermappingfilehandler.h"
 #include "util/compatibility/qbytearray.h"
+#include "util/runtimeloggingcategory.h"
 #include "util/string.h"
 #include "util/time.h"
-#include "util/trace.h"
 
 namespace {
 constexpr int kReportIdSize = 1;
diff --git a/src/controllers/hid/hidiooutputreport.h b/src/controllers/hid/hidiooutputreport.h
index af70b5d045c..098a1e2e423 100644
--- a/src/controllers/hid/hidiooutputreport.h
+++ b/src/controllers/hid/hidiooutputreport.h
@@ -1,10 +1,11 @@
 #pragma once
 
-#include "controllers/controller.h"
-#include "controllers/hid/hiddevice.h"
-#include "controllers/hid/hidioglobaloutputreportfifo.h"
+#include <QByteArray>
+
 #include "util/compatibility/qmutex.h"
-#include "util/duration.h"
+
+struct RuntimeLoggingCategory;
+typedef struct hid_device_ hid_device;
 
 class HidIoOutputReport {
   public:
diff --git a/src/controllers/hid/hidiothread.cpp b/src/controllers/hid/hidiothread.cpp
index 6d1475ddc0e..f9791d8a659 100644
--- a/src/controllers/hid/hidiothread.cpp
+++ b/src/controllers/hid/hidiothread.cpp
@@ -2,11 +2,8 @@
 
 #include <hidapi.h>
 
-#include <QTimer>
-
-#include "controllers/defs_controllers.h"
-#include "controllers/hid/legacyhidcontrollermappingfilehandler.h"
 #include "moc_hidiothread.cpp"
+#include "util/runtimeloggingcategory.h"
 #include "util/string.h"
 #include "util/time.h"
 #include "util/trace.h"
diff --git a/src/controllers/hid/hidiothread.h b/src/controllers/hid/hidiothread.h
index 96faf5b98cb..a52d7e99815 100644
--- a/src/controllers/hid/hidiothread.h
+++ b/src/controllers/hid/hidiothread.h
@@ -1,16 +1,15 @@
 #pragma once
 
-#include <QAtomicInteger>
 #include <QSemaphore>
 #include <QThread>
 #include <map>
 
-#include "controllers/controller.h"
 #include "controllers/hid/hiddevice.h"
 #include "controllers/hid/hidioglobaloutputreportfifo.h"
 #include "controllers/hid/hidiooutputreport.h"
 #include "util/compatibility/qmutex.h"
 #include "util/duration.h"
+#include "util/runtimeloggingcategory.h"
 
 enum class HidIoThreadState {
     Initialized,
diff --git a/src/controllers/hid/legacyhidcontrollermapping.cpp b/src/controllers/hid/legacyhidcontrollermapping.cpp
index bdaee3ca0a0..ad3731b94e8 100644
--- a/src/controllers/hid/legacyhidcontrollermapping.cpp
+++ b/src/controllers/hid/legacyhidcontrollermapping.cpp
@@ -5,7 +5,6 @@
 
 #include "controllers/hid/legacyhidcontrollermapping.h"
 
-#include "controllers/defs_controllers.h"
 #include "controllers/hid/legacyhidcontrollermappingfilehandler.h"
 
 bool LegacyHidControllerMapping::saveMapping(const QString& fileName) const {
diff --git a/src/controllers/hid/legacyhidcontrollermapping.h b/src/controllers/hid/legacyhidcontrollermapping.h
index c7bc040eeee..97574aed1c0 100644
--- a/src/controllers/hid/legacyhidcontrollermapping.h
+++ b/src/controllers/hid/legacyhidcontrollermapping.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "controllers/hid/legacyhidcontrollermappingfilehandler.h"
 #include "controllers/legacycontrollermapping.h"
 
 /// This class represents a HID or Bulk controller mapping, containing the data

From c2835fe58fdabb377f2da5291c988a7bcd15a981 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Tue, 10 Oct 2023 08:26:17 +0200
Subject: [PATCH 191/388] improve headers in bulk classes

---
 src/controllers/bulk/bulkcontroller.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/controllers/bulk/bulkcontroller.h b/src/controllers/bulk/bulkcontroller.h
index 4bf6f0ea740..9d1e71ad986 100644
--- a/src/controllers/bulk/bulkcontroller.h
+++ b/src/controllers/bulk/bulkcontroller.h
@@ -5,12 +5,9 @@
 
 #include "controllers/controller.h"
 #include "controllers/hid/legacyhidcontrollermapping.h"
-#include "controllers/hid/legacyhidcontrollermappingfilehandler.h"
-#include "util/duration.h"
 
 struct libusb_device_handle;
 struct libusb_context;
-struct libusb_device_descriptor;
 
 /// USB Bulk controller backend
 class BulkReader : public QThread {

From d3811675470aa4e8c81e83690b24f6482f1460f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Tue, 10 Oct 2023 22:59:36 +0200
Subject: [PATCH 192/388] Initalize uninitalised variable.

---
 src/control/controlcompressingproxy.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/control/controlcompressingproxy.cpp b/src/control/controlcompressingproxy.cpp
index dbae37173aa..53fad03d0c8 100644
--- a/src/control/controlcompressingproxy.cpp
+++ b/src/control/controlcompressingproxy.cpp
@@ -10,7 +10,11 @@ constexpr int kMaxNumOfRecursions = 128;
 CompressingProxy::CompressingProxy(const ConfigKey& key,
         const RuntimeLoggingCategory& logger,
         QObject* pParent)
-        : QObject(pParent), m_key(key), m_logger(logger), m_recursionDepth(0) {
+        : QObject(pParent),
+          m_key(key),
+          m_logger(logger),
+          m_recursiveSearchForLastEventOngoing(false),
+          m_recursionDepth(0) {
 }
 
 // This function is called recursive by QCoreApplication::sendPostedEvents, until no more events are in the queue.

From ba83052bca5b00450a664936b84a248895da0e67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Wed, 11 Oct 2023 00:23:54 +0200
Subject: [PATCH 193/388] Improve headers of sound source classes.

---
 src/encoder/encoderopus.cpp               | 2 --
 src/encoder/encoderopussettings.h         | 2 +-
 src/preferences/dialog/dlgprefmodplug.cpp | 3 ---
 src/preferences/dialog/dlgprefmodplug.h   | 4 +---
 src/preferences/usersettings.h            | 1 +
 src/sources/soundsourcemodplug.cpp        | 2 --
 6 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/encoder/encoderopus.cpp b/src/encoder/encoderopus.cpp
index 34238ed2986..f8e98fc38bb 100644
--- a/src/encoder/encoderopus.cpp
+++ b/src/encoder/encoderopus.cpp
@@ -1,7 +1,5 @@
 #include "encoder/encoderopus.h"
 
-#include <stdlib.h>
-
 #include <QByteArray>
 #include <QMapIterator>
 
diff --git a/src/encoder/encoderopussettings.h b/src/encoder/encoderopussettings.h
index 197b60a6c7b..adfdb18722f 100644
--- a/src/encoder/encoderopussettings.h
+++ b/src/encoder/encoderopussettings.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "encoder/encoderrecordingsettings.h"
-#include "encoder/encoder.h"
+#include "preferences/usersettings.h"
 #include "recording/defs_recording.h"
 
 #define OPUS_BITRATE_MODES_COUNT 3
diff --git a/src/preferences/dialog/dlgprefmodplug.cpp b/src/preferences/dialog/dlgprefmodplug.cpp
index a4bcd3447e3..1936906ea1f 100644
--- a/src/preferences/dialog/dlgprefmodplug.cpp
+++ b/src/preferences/dialog/dlgprefmodplug.cpp
@@ -1,8 +1,5 @@
 #include "preferences/dialog/dlgprefmodplug.h"
 
-#include <QtDebug>
-
-#include "defs_urls.h"
 #include "moc_dlgprefmodplug.cpp"
 #include "preferences/dialog/ui_dlgprefmodplugdlg.h"
 #include "preferences/usersettings.h"
diff --git a/src/preferences/dialog/dlgprefmodplug.h b/src/preferences/dialog/dlgprefmodplug.h
index 34855047d71..d484face220 100644
--- a/src/preferences/dialog/dlgprefmodplug.h
+++ b/src/preferences/dialog/dlgprefmodplug.h
@@ -2,14 +2,12 @@
 
 #pragma once
 
-#include <QDialog>
-
 #include "preferences/dialog/dlgpreferencepage.h"
 #include "preferences/usersettings.h"
 
 namespace Ui {
 class DlgPrefModplug;
-}
+} // namespace Ui
 
 class DlgPrefModplug : public DlgPreferencePage {
     Q_OBJECT
diff --git a/src/preferences/usersettings.h b/src/preferences/usersettings.h
index 7e58dfe01ea..316ba958412 100644
--- a/src/preferences/usersettings.h
+++ b/src/preferences/usersettings.h
@@ -4,6 +4,7 @@
 #include <QWeakPointer>
 
 #include "preferences/configobject.h"
+#include "preferences/usersettings.h"
 
 typedef ConfigObject<ConfigValue> UserSettings;
 typedef QSharedPointer<UserSettings> UserSettingsPointer;
diff --git a/src/sources/soundsourcemodplug.cpp b/src/sources/soundsourcemodplug.cpp
index 7226a775042..2f1acd14e47 100644
--- a/src/sources/soundsourcemodplug.cpp
+++ b/src/sources/soundsourcemodplug.cpp
@@ -8,8 +8,6 @@
 
 #include <QFile>
 
-#include <stdlib.h>
-
 namespace mixxx {
 
 namespace {

From 77c6f0d1f5456d1644bebaa4b851dfc63b5db1a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Thu, 12 Oct 2023 08:06:33 +0200
Subject: [PATCH 194/388] improve headers in broadcast classes

---
 src/broadcast/broadcastmanager.cpp          |  4 ++--
 src/broadcast/broadcastmanager.h            |  7 ++++---
 src/encoder/encoderbroadcastsettings.cpp    |  3 ++-
 src/encoder/encoderbroadcastsettings.h      |  3 +--
 src/encoder/encoderopus.cpp                 |  2 +-
 src/encoder/encoderopus.h                   |  9 ++++++---
 src/engine/sidechain/shoutconnection.cpp    |  7 +++++--
 src/engine/sidechain/shoutconnection.h      | 12 ++++--------
 src/preferences/broadcastprofile.cpp        |  2 +-
 src/preferences/broadcastprofile.h          |  2 --
 src/preferences/broadcastsettings.cpp       |  4 +---
 src/preferences/broadcastsettings.h         |  3 ++-
 src/preferences/broadcastsettingsmodel.h    |  2 +-
 src/preferences/dialog/dlgprefbroadcast.cpp | 11 +++++------
 src/preferences/dialog/dlgprefbroadcast.h   |  9 ++-------
 src/sources/soundsourceopus.cpp             |  1 -
 src/test/broadcastsettings_test.cpp         |  6 +++---
 17 files changed, 40 insertions(+), 47 deletions(-)

diff --git a/src/broadcast/broadcastmanager.cpp b/src/broadcast/broadcastmanager.cpp
index f55c7825c3d..ea334d9ebce 100644
--- a/src/broadcast/broadcastmanager.cpp
+++ b/src/broadcast/broadcastmanager.cpp
@@ -9,10 +9,10 @@
 
 #include "broadcast/broadcastmanager.h"
 #include "broadcast/defs_broadcast.h"
-#include "engine/enginemixer.h"
+#include "control/controlpushbutton.h"
 #include "engine/sidechain/enginenetworkstream.h"
-#include "engine/sidechain/enginesidechain.h"
 #include "moc_broadcastmanager.cpp"
+#include "preferences/settingsmanager.h"
 #include "soundio/soundmanager.h"
 #include "util/logger.h"
 
diff --git a/src/broadcast/broadcastmanager.h b/src/broadcast/broadcastmanager.h
index 8a68d16efae..5a6c0831d58 100644
--- a/src/broadcast/broadcastmanager.h
+++ b/src/broadcast/broadcastmanager.h
@@ -2,13 +2,14 @@
 
 #include <QObject>
 
-#include "preferences/settingsmanager.h"
-#include "preferences/usersettings.h"
-#include "engine/sidechain/enginenetworkstream.h"
 #include "engine/sidechain/shoutconnection.h"
+#include "preferences/broadcastsettings.h"
+#include "preferences/usersettings.h"
 
 class SoundManager;
 class ControlPushButton;
+class EngineNetworkStream;
+class SettingsManager;
 
 class BroadcastManager : public QObject {
     Q_OBJECT
diff --git a/src/encoder/encoderbroadcastsettings.cpp b/src/encoder/encoderbroadcastsettings.cpp
index 652878c4323..3a023bddf77 100644
--- a/src/encoder/encoderbroadcastsettings.cpp
+++ b/src/encoder/encoderbroadcastsettings.cpp
@@ -1,5 +1,6 @@
 #include "encoder/encoderbroadcastsettings.h"
-#include "broadcast/defs_broadcast.h"
+
+#include <QDebug>
 
 #define DEFAULT_BITRATE 128
 
diff --git a/src/encoder/encoderbroadcastsettings.h b/src/encoder/encoderbroadcastsettings.h
index a6c259ab6ad..ab4b63f5554 100644
--- a/src/encoder/encoderbroadcastsettings.h
+++ b/src/encoder/encoderbroadcastsettings.h
@@ -1,8 +1,7 @@
 #pragma once
 
 #include "encoder/encodersettings.h"
-#include "encoder/encoder.h"
-#include "preferences/broadcastsettings.h"
+#include "preferences/broadcastprofile.h"
 
 /// Storage of broadcast settings for the encoders.
 class EncoderBroadcastSettings : public EncoderSettings {
diff --git a/src/encoder/encoderopus.cpp b/src/encoder/encoderopus.cpp
index f8e98fc38bb..ecd39e2b78d 100644
--- a/src/encoder/encoderopus.cpp
+++ b/src/encoder/encoderopus.cpp
@@ -2,13 +2,13 @@
 
 #include <QByteArray>
 #include <QMapIterator>
-
 #include <QRandomGenerator>
 #include <QtGlobal>
 
 #include "encoder/encoderopussettings.h"
 #include "engine/sidechain/enginesidechain.h"
 #include "util/logger.h"
+#include "util/samplebuffer.h"
 
 namespace {
 // From libjitsi's Opus encoder:
diff --git a/src/encoder/encoderopus.h b/src/encoder/encoderopus.h
index 032dce77305..9b431bc50b5 100644
--- a/src/encoder/encoderopus.h
+++ b/src/encoder/encoderopus.h
@@ -9,11 +9,14 @@
 
 #include "audio/types.h"
 #include "encoder/encoder.h"
-#include "encoder/encodercallback.h"
 #include "util/fifo.h"
 #include "util/memory.h"
-#include "util/sample.h"
-#include "util/samplebuffer.h"
+
+class EncoderCallback;
+class EncoderSettings;
+namespace mixxx {
+class SampleBuffer;
+} // namespace mixxx
 
 class EncoderOpus: public Encoder {
   public:
diff --git a/src/engine/sidechain/shoutconnection.cpp b/src/engine/sidechain/shoutconnection.cpp
index b4e0aebeeae..1721dfda1b0 100644
--- a/src/engine/sidechain/shoutconnection.cpp
+++ b/src/engine/sidechain/shoutconnection.cpp
@@ -1,3 +1,7 @@
+#include "engine/sidechain/shoutconnection.h"
+
+#include <QRegularExpression>
+#include <QTextCodec>
 #include <QUrl>
 
 // These includes are only required by ignoreSigpipe, which is unix-only
@@ -16,13 +20,12 @@
 #endif
 
 #include "broadcast/defs_broadcast.h"
-#include "control/controlpushbutton.h"
 #include "encoder/encoder.h"
 #include "encoder/encoderbroadcastsettings.h"
 #ifdef __OPUS__
 #include "encoder/encoderopus.h"
 #endif
-#include "engine/sidechain/shoutconnection.h"
+#include "errordialoghandler.h"
 #include "mixer/playerinfo.h"
 #include "moc_shoutconnection.cpp"
 #include "preferences/usersettings.h"
diff --git a/src/engine/sidechain/shoutconnection.h b/src/engine/sidechain/shoutconnection.h
index 93aaff6a709..6d3004bfb7d 100644
--- a/src/engine/sidechain/shoutconnection.h
+++ b/src/engine/sidechain/shoutconnection.h
@@ -2,33 +2,29 @@
 
 #include <engine/sidechain/networkoutputstreamworker.h>
 
-#include <QMessageBox>
 #include <QMutex>
-#include <QObject>
 #include <QSemaphore>
 #include <QSharedPointer>
-#include <QTextCodec>
 #include <QThread>
 #include <QVector>
 #include <QWaitCondition>
 
-#include "control/controlobject.h"
 #include "control/pollingcontrolproxy.h"
 #include "encoder/encoder.h"
 #include "encoder/encodercallback.h"
-#include "errordialoghandler.h"
 #include "preferences/broadcastprofile.h"
 #include "preferences/usersettings.h"
 #include "track/track_decl.h"
-#include "util/fifo.h"
 
 // Forward declare libshout structures to prevent leaking shout.h definitions
 // beyond where they are needed.
-struct shout;
 typedef struct shout shout_t;
-struct _util_dict;
 typedef struct _util_dict shout_metadata_t;
 
+class QTextCodec;
+template<class DataType>
+class FIFO;
+
 class ShoutConnection
         : public QThread, public EncoderCallback, public NetworkOutputStreamWorker {
     Q_OBJECT
diff --git a/src/preferences/broadcastprofile.cpp b/src/preferences/broadcastprofile.cpp
index 3aabad01439..b2d354561ad 100644
--- a/src/preferences/broadcastprofile.cpp
+++ b/src/preferences/broadcastprofile.cpp
@@ -18,11 +18,11 @@ using namespace QKeychain;
 #include "broadcast/defs_broadcast.h"
 #include "broadcastprofile.h"
 #include "defs_urls.h"
+#include "errordialoghandler.h"
 #include "moc_broadcastprofile.cpp"
 #include "recording/defs_recording.h"
 #include "util/compatibility/qatomic.h"
 #include "util/logger.h"
-#include "util/memory.h"
 #include "util/xml.h"
 
 namespace {
diff --git a/src/preferences/broadcastprofile.h b/src/preferences/broadcastprofile.h
index 17592f98c9b..ec381c8d756 100644
--- a/src/preferences/broadcastprofile.h
+++ b/src/preferences/broadcastprofile.h
@@ -4,8 +4,6 @@
 #include <QObject>
 #include <QString>
 
-#include "preferences/usersettings.h"
-
 class BroadcastProfile;
 typedef QSharedPointer<BroadcastProfile> BroadcastProfilePtr;
 Q_DECLARE_METATYPE(BroadcastProfilePtr)
diff --git a/src/preferences/broadcastsettings.cpp b/src/preferences/broadcastsettings.cpp
index c7ba7c205a0..3c0dded503e 100644
--- a/src/preferences/broadcastsettings.cpp
+++ b/src/preferences/broadcastsettings.cpp
@@ -2,14 +2,12 @@
 
 #include <QDir>
 #include <QFileInfo>
-#include <QFileInfoList>
 #include <QStringList>
 
 #include "broadcast/defs_broadcast.h"
-#include "defs_urls.h"
 #include "moc_broadcastsettings.cpp"
+#include "preferences/broadcastsettingsmodel.h"
 #include "util/logger.h"
-#include "util/memory.h"
 
 namespace {
 const char* kProfilesSubfolder = "broadcast_profiles";
diff --git a/src/preferences/broadcastsettings.h b/src/preferences/broadcastsettings.h
index a1b92642e62..4cd5ca5ca5b 100644
--- a/src/preferences/broadcastsettings.h
+++ b/src/preferences/broadcastsettings.h
@@ -5,9 +5,10 @@
 #include <QString>
 
 #include "preferences/usersettings.h"
-#include "preferences/broadcastsettingsmodel.h"
 #include "preferences/broadcastprofile.h"
 
+class BroadcastSettingsModel;
+
 class BroadcastSettings : public QObject {
   Q_OBJECT
 
diff --git a/src/preferences/broadcastsettingsmodel.h b/src/preferences/broadcastsettingsmodel.h
index 84d13622756..d8792194c80 100644
--- a/src/preferences/broadcastsettingsmodel.h
+++ b/src/preferences/broadcastsettingsmodel.h
@@ -1,12 +1,12 @@
 #pragma once
 
 #include <QAbstractTableModel>
-#include <QAbstractItemDelegate>
 #include <QMap>
 #include <QVariant>
 
 #include "preferences/broadcastprofile.h"
 
+class QAbstractItemDelegate;
 class BroadcastSettings;
 typedef QSharedPointer<BroadcastSettings> BroadcastSettingsPointer;
 
diff --git a/src/preferences/dialog/dlgprefbroadcast.cpp b/src/preferences/dialog/dlgprefbroadcast.cpp
index 56c31d2989c..61ad09eabb3 100644
--- a/src/preferences/dialog/dlgprefbroadcast.cpp
+++ b/src/preferences/dialog/dlgprefbroadcast.cpp
@@ -1,10 +1,9 @@
-#include <QtDebug>
+#include "preferences/dialog/dlgprefbroadcast.h"
+
+#include <QHeaderView>
 #include <QInputDialog>
-#include <QMetaMethod>
-#include <QMetaProperty>
-#include <QAbstractItemDelegate>
 #include <QMessageBox>
-#include <QHeaderView>
+#include <QtDebug>
 
 // shout.h checks for WIN32 to see if we are on Windows
 #ifdef WIN64
@@ -21,7 +20,7 @@
 #include "defs_urls.h"
 #include "encoder/encodersettings.h"
 #include "moc_dlgprefbroadcast.cpp"
-#include "preferences/dialog/dlgprefbroadcast.h"
+#include "preferences/broadcastsettingsmodel.h"
 #include "recording/defs_recording.h"
 #include "util/logger.h"
 
diff --git a/src/preferences/dialog/dlgprefbroadcast.h b/src/preferences/dialog/dlgprefbroadcast.h
index a8a1b301a02..fa52f4ed7e8 100644
--- a/src/preferences/dialog/dlgprefbroadcast.h
+++ b/src/preferences/dialog/dlgprefbroadcast.h
@@ -1,17 +1,12 @@
 #pragma once
 
-#include <QModelIndex>
-#include <QWidget>
-
-#include "broadcast/defs_broadcast.h"
-#include "control/controlobject.h"
 #include "preferences/broadcastsettings.h"
-#include "preferences/broadcastsettingsmodel.h"
 #include "preferences/dialog/dlgpreferencepage.h"
 #include "preferences/dialog/ui_dlgprefbroadcastdlg.h"
-#include "preferences/usersettings.h"
 
 class ControlProxy;
+class QWidget;
+class QModelIndex;
 
 class DlgPrefBroadcast : public DlgPreferencePage, public Ui::DlgPrefBroadcastDlg  {
     Q_OBJECT
diff --git a/src/sources/soundsourceopus.cpp b/src/sources/soundsourceopus.cpp
index 556ade41f59..fa3d6de4c31 100644
--- a/src/sources/soundsourceopus.cpp
+++ b/src/sources/soundsourceopus.cpp
@@ -2,7 +2,6 @@
 
 #include <QFileInfo>
 
-#include "audio/streaminfo.h"
 #include "util/logger.h"
 
 namespace mixxx {
diff --git a/src/test/broadcastsettings_test.cpp b/src/test/broadcastsettings_test.cpp
index 17ad4a1d8f7..0c56e220840 100644
--- a/src/test/broadcastsettings_test.cpp
+++ b/src/test/broadcastsettings_test.cpp
@@ -1,12 +1,12 @@
 #ifdef __BROADCAST__
 
+#include "preferences/broadcastsettings.h"
+
 #include <QFile>
 #include <QString>
 
+#include "preferences/broadcastsettingsmodel.h"
 #include "test/mixxxtest.h"
-#include "preferences/broadcastsettings.h"
-//#include "broadcast/defs_broadcast.h"
-//#include "defs_urls.h"
 
 namespace {
 

From 3b9860846491c3b4abf925be69cb361c5761948e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Thu, 12 Oct 2023 23:40:12 +0200
Subject: [PATCH 195/388] improve headers of effect classes

---
 src/effects/backends/lv2/lv2backend.h           | 1 -
 src/effects/backends/lv2/lv2effectprocessor.cpp | 2 +-
 src/effects/backends/lv2/lv2effectprocessor.h   | 1 -
 src/effects/backends/lv2/lv2manifest.h          | 1 -
 src/mixxxmainwindow.cpp                         | 1 +
 5 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/effects/backends/lv2/lv2backend.h b/src/effects/backends/lv2/lv2backend.h
index 4b008882fa5..5cfb5490c4a 100644
--- a/src/effects/backends/lv2/lv2backend.h
+++ b/src/effects/backends/lv2/lv2backend.h
@@ -5,7 +5,6 @@
 #include "effects/backends/effectsbackend.h"
 #include "effects/backends/lv2/lv2manifest.h"
 #include "effects/defs.h"
-#include "preferences/usersettings.h"
 
 /// Refer to EffectsBackend for documentation
 class LV2Backend : public EffectsBackend {
diff --git a/src/effects/backends/lv2/lv2effectprocessor.cpp b/src/effects/backends/lv2/lv2effectprocessor.cpp
index 7ae1ef61a9d..f4807e12488 100644
--- a/src/effects/backends/lv2/lv2effectprocessor.cpp
+++ b/src/effects/backends/lv2/lv2effectprocessor.cpp
@@ -1,7 +1,7 @@
 #include "effects/backends/lv2/lv2effectprocessor.h"
 
+#include "engine/effects/engineeffectparameter.h"
 #include "util/defs.h"
-#include "util/sample.h"
 
 LV2EffectProcessor::LV2EffectProcessor(LV2EffectManifestPointer pManifest)
         : m_pManifest(pManifest),
diff --git a/src/effects/backends/lv2/lv2effectprocessor.h b/src/effects/backends/lv2/lv2effectprocessor.h
index 2bfc66243f6..30d85172cfc 100644
--- a/src/effects/backends/lv2/lv2effectprocessor.h
+++ b/src/effects/backends/lv2/lv2effectprocessor.h
@@ -5,7 +5,6 @@
 #include "effects/backends/effectprocessor.h"
 #include "effects/backends/lv2/lv2manifest.h"
 #include "effects/defs.h"
-#include "engine/effects/engineeffectparameter.h"
 #include "engine/engine.h"
 
 // Refer to EffectProcessor for documentation
diff --git a/src/effects/backends/lv2/lv2manifest.h b/src/effects/backends/lv2/lv2manifest.h
index fc6aee0b4e6..f4dd981e429 100644
--- a/src/effects/backends/lv2/lv2manifest.h
+++ b/src/effects/backends/lv2/lv2manifest.h
@@ -6,7 +6,6 @@
 #include <vector>
 
 #include "effects/backends/effectmanifest.h"
-#include "effects/defs.h"
 
 /// Refer to EffectManifest for documentation
 class LV2Manifest : public EffectManifest {
diff --git a/src/mixxxmainwindow.cpp b/src/mixxxmainwindow.cpp
index 2df5f1f0f9e..e258ce5442d 100644
--- a/src/mixxxmainwindow.cpp
+++ b/src/mixxxmainwindow.cpp
@@ -35,6 +35,7 @@
 #include "controllers/controllermanager.h"
 #include "controllers/keyboard/keyboardeventfilter.h"
 #include "database/mixxxdb.h"
+#include "engine/sidechain/enginenetworkstream.h"
 #include "library/library.h"
 #include "library/library_prefs.h"
 #ifdef __ENGINEPRIME__

From b99450b6dd2be142afda51c7dac6bbe7774123c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Fri, 13 Oct 2023 08:09:54 +0200
Subject: [PATCH 196/388] Improve engineprime headers

---
 src/library/export/dlglibraryexport.cpp     |  3 ---
 src/library/export/dlglibraryexport.h       |  9 ++++-----
 src/library/export/engineprimeexportjob.cpp |  6 ++----
 src/library/export/engineprimeexportjob.h   | 11 ++++++-----
 src/library/export/libraryexporter.cpp      |  1 +
 src/library/export/libraryexporter.h        |  5 +++--
 6 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/library/export/dlglibraryexport.cpp b/src/library/export/dlglibraryexport.cpp
index 5512faced63..71e1600f7cb 100644
--- a/src/library/export/dlglibraryexport.cpp
+++ b/src/library/export/dlglibraryexport.cpp
@@ -4,12 +4,9 @@
 #include <QFormLayout>
 #include <QGridLayout>
 #include <QHBoxLayout>
-#include <QLabel>
 #include <QPushButton>
 #include <QStandardPaths>
-#include <algorithm>
 #include <djinterop/djinterop.hpp>
-#include <string>
 
 #include "library/export/engineprimeexportrequest.h"
 #include "library/trackcollection.h"
diff --git a/src/library/export/dlglibraryexport.h b/src/library/export/dlglibraryexport.h
index eb58b0937e8..da17ebfcab6 100644
--- a/src/library/export/dlglibraryexport.h
+++ b/src/library/export/dlglibraryexport.h
@@ -6,20 +6,19 @@
 #include <QLineEdit>
 #include <QListWidget>
 #include <QRadioButton>
-#include <QTreeWidget>
-#include <QWidget>
-#include <memory>
 
-#include "library/export/engineprimeexportrequest.h"
-#include "library/trackset/crate/crateid.h"
 #include "preferences/usersettings.h"
 #include "util/optional.h"
 #include "util/parented_ptr.h"
 
 class TrackCollectionManager;
+class QWidget;
+class CrateId;
 
 namespace mixxx {
 
+struct EnginePrimeExportRequest;
+
 /// The DlgLibraryExport class is a UI window that gathers information from
 /// the user about how they would like to export the Mixxx library.
 ///
diff --git a/src/library/export/engineprimeexportjob.cpp b/src/library/export/engineprimeexportjob.cpp
index 300e6ed7972..16355cf2c47 100644
--- a/src/library/export/engineprimeexportjob.cpp
+++ b/src/library/export/engineprimeexportjob.cpp
@@ -1,17 +1,15 @@
 #include "library/export/engineprimeexportjob.h"
 
 #include <QHash>
-#include <QMetaMethod>
 #include <QStringList>
-#include <QtGlobal>
 #include <array>
-#include <chrono>
 #include <cstdint>
-#include <djinterop/djinterop.hpp>
 #include <memory>
 #include <stdexcept>
 
+#include "library/export/engineprimeexportrequest.h"
 #include "library/trackcollection.h"
+#include "library/trackcollectionmanager.h"
 #include "library/trackset/crate/crate.h"
 #include "moc_engineprimeexportjob.cpp"
 #include "track/track.h"
diff --git a/src/library/export/engineprimeexportjob.h b/src/library/export/engineprimeexportjob.h
index 69bf0a35be7..71d80454c47 100644
--- a/src/library/export/engineprimeexportjob.h
+++ b/src/library/export/engineprimeexportjob.h
@@ -2,23 +2,24 @@
 
 #include <QAtomicInteger>
 #include <QList>
-#include <QQueue>
 #include <QSet>
 #include <QSharedPointer>
 #include <QThread>
-#include <QWaitCondition>
 #include <memory>
 
-#include "library/export/engineprimeexportrequest.h"
-#include "library/trackcollectionmanager.h"
 #include "library/trackset/crate/crate.h"
 #include "library/trackset/crate/crateid.h"
-#include "track/track.h"
+#include "track/track_decl.h"
 #include "track/trackid.h"
 #include "track/trackref.h"
 
+class TrackCollectionManager;
+class Waveform;
+
 namespace mixxx {
 
+struct EnginePrimeExportRequest;
+
 /// The Engine Prime export job performs the work of exporting the Mixxx
 /// library to an external Engine Prime (also known as "Engine Library")
 /// database, using the libdjinterop library, in accordance with the export
diff --git a/src/library/export/libraryexporter.cpp b/src/library/export/libraryexporter.cpp
index 9935a3597d3..fd796953338 100644
--- a/src/library/export/libraryexporter.cpp
+++ b/src/library/export/libraryexporter.cpp
@@ -4,6 +4,7 @@
 #include <QThreadPool>
 
 #include "library/export/engineprimeexportjob.h"
+#include "library/export/engineprimeexportrequest.h"
 #include "moc_libraryexporter.cpp"
 #include "util/parented_ptr.h"
 
diff --git a/src/library/export/libraryexporter.h b/src/library/export/libraryexporter.h
index fe7373280ca..e47409d3262 100644
--- a/src/library/export/libraryexporter.h
+++ b/src/library/export/libraryexporter.h
@@ -2,16 +2,17 @@
 
 #include <QSharedPointer>
 #include <QWidget>
-#include <memory>
 
 #include "library/export/dlglibraryexport.h"
-#include "library/export/engineprimeexportrequest.h"
 #include "library/trackset/crate/crateid.h"
 #include "preferences/usersettings.h"
 #include "util/optional.h"
 #include "util/parented_ptr.h"
 
 class TrackCollectionManager;
+namespace mixxx {
+struct EnginePrimeExportRequest;
+} // Namespace mixxx
 
 namespace mixxx {
 

From 5e7c2939359962a781bf14ac5cbd751e757027c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Fri, 13 Oct 2023 07:26:33 +0200
Subject: [PATCH 197/388] Improve header of library classes

---
 src/library/dlgtrackinfo.cpp           | 2 ++
 src/library/export/libraryexporter.cpp | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/library/dlgtrackinfo.cpp b/src/library/dlgtrackinfo.cpp
index fd26b4c2a48..149f62f0a91 100644
--- a/src/library/dlgtrackinfo.cpp
+++ b/src/library/dlgtrackinfo.cpp
@@ -2,6 +2,7 @@
 
 #include <QSignalBlocker>
 #include <QStringBuilder>
+#include <QStyleFactory>
 #include <QTreeWidget>
 #include <QtDebug>
 
@@ -18,6 +19,7 @@
 #include "track/keyfactory.h"
 #include "track/keyutils.h"
 #include "track/track.h"
+#include "util/color/color.h"
 #include "util/color/colorpalette.h"
 #include "util/datetime.h"
 #include "util/desktophelper.h"
diff --git a/src/library/export/libraryexporter.cpp b/src/library/export/libraryexporter.cpp
index fd796953338..5cefd97dfa4 100644
--- a/src/library/export/libraryexporter.cpp
+++ b/src/library/export/libraryexporter.cpp
@@ -1,7 +1,6 @@
 #include "library/export/libraryexporter.h"
 
 #include <QProgressDialog>
-#include <QThreadPool>
 
 #include "library/export/engineprimeexportjob.h"
 #include "library/export/engineprimeexportrequest.h"

From aa4e3d20d56b881dd2ee067f17b8fbaa2b2e3ab0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Fri, 13 Oct 2023 07:26:43 +0200
Subject: [PATCH 198/388] Improve heacedr of analyzer classes

---
 src/analyzer/plugins/analyzerkeyfinder.cpp | 1 -
 src/analyzer/plugins/analyzerkeyfinder.h   | 2 --
 2 files changed, 3 deletions(-)

diff --git a/src/analyzer/plugins/analyzerkeyfinder.cpp b/src/analyzer/plugins/analyzerkeyfinder.cpp
index bec7b9aa5d4..06df1598e36 100644
--- a/src/analyzer/plugins/analyzerkeyfinder.cpp
+++ b/src/analyzer/plugins/analyzerkeyfinder.cpp
@@ -2,7 +2,6 @@
 
 #include "analyzer/constants.h"
 #include "util/assert.h"
-#include "util/math.h"
 
 using mixxx::track::io::key::ChromaticKey;
 using mixxx::track::io::key::ChromaticKey_IsValid;
diff --git a/src/analyzer/plugins/analyzerkeyfinder.h b/src/analyzer/plugins/analyzerkeyfinder.h
index 4bfdaeb4b5e..89817b3bb72 100644
--- a/src/analyzer/plugins/analyzerkeyfinder.h
+++ b/src/analyzer/plugins/analyzerkeyfinder.h
@@ -1,8 +1,6 @@
 #pragma once
 #include <keyfinder/keyfinder.h>
 
-#include <QObject>
-
 #include "analyzer/plugins/analyzerplugin.h"
 #include "util/types.h"
 

From aa659fadc732e9100b42155f39b4d44990e79726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Fri, 13 Oct 2023 08:41:23 +0200
Subject: [PATCH 199/388] Improve headers in waveform classes

---
 src/util/rlimit.cpp                             |  1 -
 src/util/texture.cpp                            |  6 ++++++
 src/util/texture.h                              |  8 ++++----
 src/waveform/guitick.cpp                        |  3 +--
 src/waveform/guitick.h                          |  2 --
 .../renderers/allshader/waveformrenderbeat.cpp  |  4 +---
 .../renderers/allshader/waveformrenderer.cpp    |  2 +-
 .../allshader/waveformrendererendoftrack.cpp    |  5 +----
 .../allshader/waveformrendererendoftrack.h      |  1 -
 .../allshader/waveformrendererfiltered.cpp      |  5 +----
 .../renderers/allshader/waveformrendererhsv.cpp |  5 +----
 .../allshader/waveformrendererlrrgb.cpp         |  5 +----
 .../allshader/waveformrendererpreroll.cpp       |  2 --
 .../renderers/allshader/waveformrendererrgb.cpp |  4 ----
 .../allshader/waveformrenderersignalbase.cpp    |  2 --
 .../allshader/waveformrenderersimple.cpp        |  5 +----
 .../renderers/allshader/waveformrendermark.cpp  |  8 ++------
 .../allshader/waveformrendermarkrange.cpp       | 12 ++----------
 .../renderers/glslwaveformrenderersignal.cpp    |  1 -
 .../renderers/glslwaveformrenderersignal.h      |  1 -
 src/waveform/renderers/glvsynctestrenderer.cpp  |  2 --
 src/waveform/renderers/glvsynctestrenderer.h    |  4 ----
 .../glwaveformrendererfilteredsignal.cpp        |  2 --
 .../glwaveformrendererfilteredsignal.h          |  5 +----
 .../renderers/glwaveformrendererrgb.cpp         |  4 ----
 src/waveform/renderers/glwaveformrendererrgb.h  |  2 --
 .../glwaveformrenderersimplesignal.cpp          |  2 --
 .../renderers/glwaveformrenderersimplesignal.h  |  2 --
 src/waveform/renderers/waveformmark.h           |  4 ----
 src/waveform/renderers/waveformmarkrange.h      |  2 +-
 src/waveform/renderers/waveformmarkset.cpp      |  2 --
 src/waveform/renderers/waveformmarkset.h        |  2 --
 .../renderers/waveformrenderbackground.cpp      |  4 +---
 .../renderers/waveformrenderbackground.h        |  4 ++--
 src/waveform/renderers/waveformrenderbeat.cpp   | 12 +++++-------
 .../renderers/waveformrendererendoftrack.cpp    | 16 +++++-----------
 .../renderers/waveformrendererendoftrack.h      |  4 ----
 .../waveformrendererfilteredsignal.cpp          |  4 ----
 src/waveform/renderers/waveformrendererhsv.cpp  |  3 ---
 .../renderers/waveformrendererpreroll.cpp       | 10 ++++------
 src/waveform/renderers/waveformrendererrgb.cpp  |  4 ----
 .../renderers/waveformrenderersignalbase.cpp    |  5 -----
 .../renderers/waveformrenderersignalbase.h      |  3 +--
 src/waveform/renderers/waveformrendermark.cpp   | 11 +----------
 src/waveform/renderers/waveformrendermark.h     |  3 ---
 .../renderers/waveformrendermarkrange.cpp       | 17 ++++-------------
 .../renderers/waveformrendermarkrange.h         | 12 +++---------
 src/waveform/renderers/waveformsignalcolors.cpp |  5 ++---
 .../renderers/waveformwidgetrenderer.cpp        |  4 +---
 src/waveform/renderers/waveformwidgetrenderer.h |  9 ++-------
 src/waveform/sharedglcontext.cpp                |  5 ++---
 src/waveform/sharedglcontext.h                  |  4 +---
 src/waveform/visualplayposition.cpp             |  4 ----
 src/waveform/visualsmanager.cpp                 |  3 +--
 src/waveform/visualsmanager.h                   |  3 ++-
 src/waveform/vsyncthread.cpp                    |  5 -----
 src/waveform/vsyncthread.h                      |  4 ++--
 src/waveform/waveformfactory.cpp                |  2 --
 src/waveform/waveformmarklabel.cpp              |  5 +++++
 src/waveform/waveformmarklabel.h                |  4 ++--
 src/waveform/waveformwidgetfactory.cpp          |  7 +------
 src/waveform/waveformwidgetfactory.h            |  1 -
 .../widgets/allshader/waveformwidget.cpp        |  1 +
 src/waveform/widgets/emptywaveformwidget.cpp    |  1 -
 src/waveform/widgets/emptywaveformwidget.h      |  4 ++--
 src/waveform/widgets/glrgbwaveformwidget.cpp    |  2 --
 src/waveform/widgets/glsimplewaveformwidget.cpp |  3 ---
 src/waveform/widgets/glslwaveformwidget.cpp     |  3 ---
 src/waveform/widgets/glslwaveformwidget.h       |  1 -
 src/waveform/widgets/glvsynctestwidget.cpp      |  8 --------
 src/waveform/widgets/glwaveformwidget.cpp       |  5 -----
 src/waveform/widgets/glwaveformwidgetabstract.h |  2 +-
 src/waveform/widgets/hsvwaveformwidget.cpp      |  1 -
 src/waveform/widgets/hsvwaveformwidget.h        |  4 ++--
 src/waveform/widgets/rgbwaveformwidget.cpp      |  1 -
 src/waveform/widgets/rgbwaveformwidget.h        |  4 ++--
 src/waveform/widgets/softwarewaveformwidget.cpp |  1 -
 src/waveform/widgets/softwarewaveformwidget.h   |  4 ++--
 src/waveform/widgets/waveformwidgetabstract.cpp |  4 ++--
 src/waveform/widgets/waveformwidgetabstract.h   |  6 +++---
 src/widget/tooltipqopengl.cpp                   |  2 --
 src/widget/tooltipqopengl.h                     |  1 -
 src/widget/woverview.cpp                        | 17 -----------------
 src/widget/woverview.h                          | 16 ++--------------
 src/widget/wspinnybase.cpp                      |  8 --------
 src/widget/wspinnyglsl.cpp                      |  3 ++-
 src/widget/wspinnyglsl.h                        |  3 ++-
 src/widget/wvumeter.cpp                         |  1 +
 src/widget/wvumeterbase.h                       |  1 -
 src/widget/wvumeterglsl.cpp                     |  4 +++-
 src/widget/wvumeterglsl.h                       |  5 ++---
 src/widget/wwaveformviewer.cpp                  | 11 +++--------
 src/widget/wwaveformviewer.h                    | 12 ++++--------
 93 files changed, 105 insertions(+), 326 deletions(-)

diff --git a/src/util/rlimit.cpp b/src/util/rlimit.cpp
index d6465110c13..2445f2bbc3c 100644
--- a/src/util/rlimit.cpp
+++ b/src/util/rlimit.cpp
@@ -3,7 +3,6 @@
 #ifdef __LINUX__
 
 extern "C" {
-    #include <sys/time.h>
     #include <sys/resource.h>
 }
 
diff --git a/src/util/texture.cpp b/src/util/texture.cpp
index 9d7c0a9c68c..03acd8afa36 100644
--- a/src/util/texture.cpp
+++ b/src/util/texture.cpp
@@ -1,5 +1,11 @@
 #include "util/texture.h"
 
+#include <QImage>
+#include <QOpenGLTexture>
+#include <QPixmap>
+
+#include "widget/paintable.h"
+
 std::unique_ptr<QOpenGLTexture> createTexture(const QImage& image) {
     if (image.isNull()) {
         return nullptr;
diff --git a/src/util/texture.h b/src/util/texture.h
index 053843f8c37..89f4ea9e9ed 100644
--- a/src/util/texture.h
+++ b/src/util/texture.h
@@ -1,10 +1,10 @@
-#include <QImage>
-#include <QOpenGLTexture>
-#include <QPixmap>
 #include <QSharedPointer>
 #include <memory>
 
-#include "widget/paintable.h"
+class QImage;
+class QOpenGLTexture;
+class QPixmap;
+class Paintable;
 
 std::unique_ptr<QOpenGLTexture> createTexture(const QImage& image);
 std::unique_ptr<QOpenGLTexture> createTexture(const QPixmap& pixmap);
diff --git a/src/waveform/guitick.cpp b/src/waveform/guitick.cpp
index 4e624fa3adb..296d5e45cdd 100644
--- a/src/waveform/guitick.cpp
+++ b/src/waveform/guitick.cpp
@@ -1,6 +1,5 @@
-#include <QTimer>
-
 #include "waveform/guitick.h"
+
 #include "control/controlobject.h"
 
 namespace {
diff --git a/src/waveform/guitick.h b/src/waveform/guitick.h
index 4386b244056..a6830e55fec 100644
--- a/src/waveform/guitick.h
+++ b/src/waveform/guitick.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <QObject>
-
 #include "control/controlobject.h"
 #include "util/duration.h"
 #include "util/memory.h"
diff --git a/src/waveform/renderers/allshader/waveformrenderbeat.cpp b/src/waveform/renderers/allshader/waveformrenderbeat.cpp
index e5a9c1df91d..a91a28d83e7 100644
--- a/src/waveform/renderers/allshader/waveformrenderbeat.cpp
+++ b/src/waveform/renderers/allshader/waveformrenderbeat.cpp
@@ -2,13 +2,11 @@
 
 #include <QDomNode>
 
-#include "control/controlobject.h"
 #include "skin/legacy/skincontext.h"
 #include "track/track.h"
 #include "waveform/renderers/allshader/matrixforwidgetgeometry.h"
-#include "waveform/widgets/allshader/waveformwidget.h"
+#include "waveform/renderers/waveformwidgetrenderer.h"
 #include "widget/wskincolor.h"
-#include "widget/wwidget.h"
 
 namespace allshader {
 
diff --git a/src/waveform/renderers/allshader/waveformrenderer.cpp b/src/waveform/renderers/allshader/waveformrenderer.cpp
index 52f81676f73..16ee93f82ed 100644
--- a/src/waveform/renderers/allshader/waveformrenderer.cpp
+++ b/src/waveform/renderers/allshader/waveformrenderer.cpp
@@ -1,6 +1,6 @@
 #include "waveform/renderers/allshader/waveformrenderer.h"
 
-#include "waveform/widgets/allshader/waveformwidget.h"
+#include "util/assert.h"
 
 namespace allshader {
 
diff --git a/src/waveform/renderers/allshader/waveformrendererendoftrack.cpp b/src/waveform/renderers/allshader/waveformrendererendoftrack.cpp
index 4491270415f..8ad86c49b32 100644
--- a/src/waveform/renderers/allshader/waveformrendererendoftrack.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererendoftrack.cpp
@@ -3,13 +3,10 @@
 #include <QDomNode>
 #include <memory>
 
-#include "control/controlobject.h"
 #include "control/controlproxy.h"
-#include "util/timer.h"
+#include "waveform/renderers/waveformwidgetrenderer.h"
 #include "waveform/waveformwidgetfactory.h"
-#include "waveform/widgets/allshader/waveformwidget.h"
 #include "widget/wskincolor.h"
-#include "widget/wwidget.h"
 
 namespace {
 
diff --git a/src/waveform/renderers/allshader/waveformrendererendoftrack.h b/src/waveform/renderers/allshader/waveformrendererendoftrack.h
index a1d0af135f3..664a2cac16e 100644
--- a/src/waveform/renderers/allshader/waveformrendererendoftrack.h
+++ b/src/waveform/renderers/allshader/waveformrendererendoftrack.h
@@ -8,7 +8,6 @@
 #include "util/performancetimer.h"
 #include "waveform/renderers/allshader/waveformrenderer.h"
 
-class ControlObject;
 class ControlProxy;
 class QDomNode;
 class SkinContext;
diff --git a/src/waveform/renderers/allshader/waveformrendererfiltered.cpp b/src/waveform/renderers/allshader/waveformrendererfiltered.cpp
index d03a981c696..1adf16e2900 100644
--- a/src/waveform/renderers/allshader/waveformrendererfiltered.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererfiltered.cpp
@@ -3,11 +3,8 @@
 #include "track/track.h"
 #include "util/math.h"
 #include "waveform/renderers/allshader/matrixforwidgetgeometry.h"
+#include "waveform/renderers/waveformwidgetrenderer.h"
 #include "waveform/waveform.h"
-#include "waveform/waveformwidgetfactory.h"
-#include "waveform/widgets/allshader/waveformwidget.h"
-#include "widget/wskincolor.h"
-#include "widget/wwidget.h"
 
 namespace allshader {
 
diff --git a/src/waveform/renderers/allshader/waveformrendererhsv.cpp b/src/waveform/renderers/allshader/waveformrendererhsv.cpp
index 593f01eae2b..5c130a64fbd 100644
--- a/src/waveform/renderers/allshader/waveformrendererhsv.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererhsv.cpp
@@ -4,11 +4,8 @@
 #include "util/colorcomponents.h"
 #include "util/math.h"
 #include "waveform/renderers/allshader/matrixforwidgetgeometry.h"
+#include "waveform/renderers/waveformwidgetrenderer.h"
 #include "waveform/waveform.h"
-#include "waveform/waveformwidgetfactory.h"
-#include "waveform/widgets/allshader/waveformwidget.h"
-#include "widget/wskincolor.h"
-#include "widget/wwidget.h"
 
 namespace allshader {
 
diff --git a/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp b/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp
index 887c1059ec7..156109bf934 100644
--- a/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp
@@ -3,11 +3,8 @@
 #include "track/track.h"
 #include "util/math.h"
 #include "waveform/renderers/allshader/matrixforwidgetgeometry.h"
+#include "waveform/renderers/waveformwidgetrenderer.h"
 #include "waveform/waveform.h"
-#include "waveform/waveformwidgetfactory.h"
-#include "waveform/widgets/allshader/waveformwidget.h"
-#include "widget/wskincolor.h"
-#include "widget/wwidget.h"
 
 namespace allshader {
 
diff --git a/src/waveform/renderers/allshader/waveformrendererpreroll.cpp b/src/waveform/renderers/allshader/waveformrendererpreroll.cpp
index b39e73ba1b6..6bb6d5be1a2 100644
--- a/src/waveform/renderers/allshader/waveformrendererpreroll.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererpreroll.cpp
@@ -5,12 +5,10 @@
 #include <QPainterPath>
 
 #include "skin/legacy/skincontext.h"
-#include "track/track.h"
 #include "util/texture.h"
 #include "waveform/renderers/allshader/matrixforwidgetgeometry.h"
 #include "waveform/renderers/waveformwidgetrenderer.h"
 #include "widget/wskincolor.h"
-#include "widget/wwidget.h"
 
 namespace {
 std::unique_ptr<QOpenGLTexture> generateTexture(float markerLength,
diff --git a/src/waveform/renderers/allshader/waveformrendererrgb.cpp b/src/waveform/renderers/allshader/waveformrendererrgb.cpp
index 76d087d697e..238587f2d28 100644
--- a/src/waveform/renderers/allshader/waveformrendererrgb.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererrgb.cpp
@@ -4,10 +4,6 @@
 #include "util/math.h"
 #include "waveform/renderers/allshader/matrixforwidgetgeometry.h"
 #include "waveform/waveform.h"
-#include "waveform/waveformwidgetfactory.h"
-#include "waveform/widgets/allshader/waveformwidget.h"
-#include "widget/wskincolor.h"
-#include "widget/wwidget.h"
 
 namespace allshader {
 
diff --git a/src/waveform/renderers/allshader/waveformrenderersignalbase.cpp b/src/waveform/renderers/allshader/waveformrenderersignalbase.cpp
index 1e39ebdeeb0..853a3f2e47d 100644
--- a/src/waveform/renderers/allshader/waveformrenderersignalbase.cpp
+++ b/src/waveform/renderers/allshader/waveformrenderersignalbase.cpp
@@ -1,7 +1,5 @@
 #include "waveform/renderers/allshader/waveformrenderersignalbase.h"
 
-#include "waveform/widgets/allshader/waveformwidget.h"
-
 using namespace allshader;
 
 allshader::WaveformRendererSignalBase::WaveformRendererSignalBase(
diff --git a/src/waveform/renderers/allshader/waveformrenderersimple.cpp b/src/waveform/renderers/allshader/waveformrenderersimple.cpp
index dd8afd012bf..70215ebb373 100644
--- a/src/waveform/renderers/allshader/waveformrenderersimple.cpp
+++ b/src/waveform/renderers/allshader/waveformrenderersimple.cpp
@@ -3,11 +3,8 @@
 #include "track/track.h"
 #include "util/math.h"
 #include "waveform/renderers/allshader/matrixforwidgetgeometry.h"
+#include "waveform/renderers/waveformwidgetrenderer.h"
 #include "waveform/waveform.h"
-#include "waveform/waveformwidgetfactory.h"
-#include "waveform/widgets/allshader/waveformwidget.h"
-#include "widget/wskincolor.h"
-#include "widget/wwidget.h"
 
 namespace allshader {
 
diff --git a/src/waveform/renderers/allshader/waveformrendermark.cpp b/src/waveform/renderers/allshader/waveformrendermark.cpp
index 0b7fd5c799c..4eab1d32151 100644
--- a/src/waveform/renderers/allshader/waveformrendermark.cpp
+++ b/src/waveform/renderers/allshader/waveformrendermark.cpp
@@ -4,21 +4,17 @@
 #include <QOpenGLTexture>
 #include <QPainterPath>
 
-#include "control/controlobject.h"
-#include "engine/controls/cuecontrol.h"
 #include "track/track.h"
 #include "util/color/color.h"
 #include "util/colorcomponents.h"
-#include "util/painterscope.h"
 #include "util/texture.h"
 #include "waveform/renderers/allshader/matrixforwidgetgeometry.h"
 #include "waveform/renderers/allshader/moc_waveformrendermark.cpp"
 #include "waveform/renderers/allshader/rgbadata.h"
 #include "waveform/renderers/allshader/vertexdata.h"
-#include "waveform/waveform.h"
-#include "waveform/widgets/allshader/waveformwidget.h"
+#include "waveform/renderers/waveformsignalcolors.h"
+#include "waveform/renderers/waveformwidgetrenderer.h"
 #include "widget/wimagestore.h"
-#include "widget/wskincolor.h"
 
 // On the use of QPainter:
 //
diff --git a/src/waveform/renderers/allshader/waveformrendermarkrange.cpp b/src/waveform/renderers/allshader/waveformrendermarkrange.cpp
index b392fefab23..cd04d6cbdca 100644
--- a/src/waveform/renderers/allshader/waveformrendermarkrange.cpp
+++ b/src/waveform/renderers/allshader/waveformrendermarkrange.cpp
@@ -1,16 +1,8 @@
 #include "waveform/renderers/allshader/waveformrendermarkrange.h"
 
-#include <QColor>
-#include <QDomNode>
-#include <QObject>
-#include <QVector>
-
-#include "preferences/usersettings.h"
-#include "track/track.h"
+#include "skin/legacy/skincontext.h"
 #include "waveform/renderers/allshader/matrixforwidgetgeometry.h"
-#include "waveform/widgets/allshader/waveformwidget.h"
-#include "widget/wskincolor.h"
-#include "widget/wwidget.h"
+#include "waveform/renderers/waveformwidgetrenderer.h"
 
 allshader::WaveformRenderMarkRange::WaveformRenderMarkRange(WaveformWidgetRenderer* waveformWidget)
         : WaveformRenderer(waveformWidget) {
diff --git a/src/waveform/renderers/glslwaveformrenderersignal.cpp b/src/waveform/renderers/glslwaveformrenderersignal.cpp
index c47c79da889..00864ddb9db 100644
--- a/src/waveform/renderers/glslwaveformrenderersignal.cpp
+++ b/src/waveform/renderers/glslwaveformrenderersignal.cpp
@@ -13,7 +13,6 @@
 #include "track/track.h"
 #include "waveform/renderers/waveformwidgetrenderer.h"
 #include "waveform/waveform.h"
-#include "waveform/waveformwidgetfactory.h"
 
 GLSLWaveformRendererSignal::GLSLWaveformRendererSignal(WaveformWidgetRenderer* waveformWidgetRenderer,
         ColorType colorType,
diff --git a/src/waveform/renderers/glslwaveformrenderersignal.h b/src/waveform/renderers/glslwaveformrenderersignal.h
index bbe018c8583..e4f84dc7432 100644
--- a/src/waveform/renderers/glslwaveformrenderersignal.h
+++ b/src/waveform/renderers/glslwaveformrenderersignal.h
@@ -5,7 +5,6 @@
 
 #include "track/track_decl.h"
 #include "util/memory.h"
-#include "waveform/renderers/glwaveformrenderersignal.h"
 
 #ifdef MIXXX_USE_QOPENGL
 class QOpenGLFramebufferObject;
diff --git a/src/waveform/renderers/glvsynctestrenderer.cpp b/src/waveform/renderers/glvsynctestrenderer.cpp
index 55a44bb092f..a1d1cb7da27 100644
--- a/src/waveform/renderers/glvsynctestrenderer.cpp
+++ b/src/waveform/renderers/glvsynctestrenderer.cpp
@@ -1,11 +1,9 @@
 #include "waveform/renderers/glvsynctestrenderer.h"
 #if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
 
-#include "track/track.h"
 #include "util/performancetimer.h"
 #include "waveform/renderers/waveformwidgetrenderer.h"
 #include "waveform/waveform.h"
-#include "waveform/waveformwidgetfactory.h"
 
 GLVSyncTestRenderer::GLVSyncTestRenderer(
         WaveformWidgetRenderer* waveformWidgetRenderer)
diff --git a/src/waveform/renderers/glvsynctestrenderer.h b/src/waveform/renderers/glvsynctestrenderer.h
index ba218dbfa03..ca5e264db72 100644
--- a/src/waveform/renderers/glvsynctestrenderer.h
+++ b/src/waveform/renderers/glvsynctestrenderer.h
@@ -3,10 +3,6 @@
 #include "waveform/renderers/glwaveformrenderersignal.h"
 #if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
 
-#include "waveform/renderers/glwaveformrenderersignal.h"
-
-class ControlObject;
-
 class GLVSyncTestRenderer : public GLWaveformRendererSignal {
   public:
     explicit GLVSyncTestRenderer(
diff --git a/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp b/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp
index bb2d1cb8fb3..1b116205566 100644
--- a/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp
+++ b/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp
@@ -3,10 +3,8 @@
 
 #include <QDomNode>
 
-#include "track/track.h"
 #include "waveform/waveform.h"
 #include "waveformwidgetrenderer.h"
-#include "waveform/waveformwidgetfactory.h"
 #include "util/math.h"
 
 GLWaveformRendererFilteredSignal::GLWaveformRendererFilteredSignal(
diff --git a/src/waveform/renderers/glwaveformrendererfilteredsignal.h b/src/waveform/renderers/glwaveformrendererfilteredsignal.h
index 11b56a97fee..ac27667e9ea 100644
--- a/src/waveform/renderers/glwaveformrendererfilteredsignal.h
+++ b/src/waveform/renderers/glwaveformrendererfilteredsignal.h
@@ -3,10 +3,7 @@
 #include "waveform/renderers/glwaveformrenderersignal.h"
 #if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
 
-#include "waveform/renderers/glwaveformrenderersignal.h"
-
-QT_FORWARD_DECLARE_CLASS(QDomNode)
-class ControlObject;
+class QDomNode;
 
 class GLWaveformRendererFilteredSignal : public GLWaveformRendererSignal {
   public:
diff --git a/src/waveform/renderers/glwaveformrendererrgb.cpp b/src/waveform/renderers/glwaveformrendererrgb.cpp
index b68ea55d844..0df2c6344e8 100644
--- a/src/waveform/renderers/glwaveformrendererrgb.cpp
+++ b/src/waveform/renderers/glwaveformrendererrgb.cpp
@@ -1,13 +1,9 @@
 #include "waveform/renderers/glwaveformrendererrgb.h"
 #if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
 
-#include "track/track.h"
 #include "util/math.h"
 #include "waveform/waveform.h"
-#include "waveform/waveformwidgetfactory.h"
 #include "waveformwidgetrenderer.h"
-#include "widget/wskincolor.h"
-#include "widget/wwidget.h"
 
 namespace {
 const float kHeightScaleFactor = 255.0f / sqrtf(255 * 255 * 3);
diff --git a/src/waveform/renderers/glwaveformrendererrgb.h b/src/waveform/renderers/glwaveformrendererrgb.h
index 0c2f6c7e256..c96e9812482 100644
--- a/src/waveform/renderers/glwaveformrendererrgb.h
+++ b/src/waveform/renderers/glwaveformrendererrgb.h
@@ -3,8 +3,6 @@
 #include "glwaveformrenderersignal.h"
 #if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
 
-class ControlObject;
-
 class GLWaveformRendererRGB : public GLWaveformRendererSignal {
   public:
     explicit GLWaveformRendererRGB(
diff --git a/src/waveform/renderers/glwaveformrenderersimplesignal.cpp b/src/waveform/renderers/glwaveformrenderersimplesignal.cpp
index 01e6cc1344a..c2291445103 100644
--- a/src/waveform/renderers/glwaveformrenderersimplesignal.cpp
+++ b/src/waveform/renderers/glwaveformrenderersimplesignal.cpp
@@ -1,10 +1,8 @@
 #include "waveform/renderers/glwaveformrenderersimplesignal.h"
 #if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
 
-#include "track/track.h"
 #include "util/math.h"
 #include "waveform/waveform.h"
-#include "waveform/waveformwidgetfactory.h"
 #include "waveformwidgetrenderer.h"
 
 GLWaveformRendererSimpleSignal::GLWaveformRendererSimpleSignal(
diff --git a/src/waveform/renderers/glwaveformrenderersimplesignal.h b/src/waveform/renderers/glwaveformrenderersimplesignal.h
index 0735b913f92..056a861d014 100644
--- a/src/waveform/renderers/glwaveformrenderersimplesignal.h
+++ b/src/waveform/renderers/glwaveformrenderersimplesignal.h
@@ -3,8 +3,6 @@
 #include "glwaveformrenderersignal.h"
 #if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
 
-class ControlObject;
-
 class GLWaveformRendererSimpleSignal : public GLWaveformRendererSignal {
   public:
     explicit GLWaveformRendererSimpleSignal(WaveformWidgetRenderer* waveformWidgetRenderer);
diff --git a/src/waveform/renderers/waveformmark.h b/src/waveform/renderers/waveformmark.h
index 11a53131dcb..e0548384629 100644
--- a/src/waveform/renderers/waveformmark.h
+++ b/src/waveform/renderers/waveformmark.h
@@ -2,7 +2,6 @@
 #include <QDomNode>
 #include <QImage>
 
-#include "control/controlobject.h"
 #include "control/controlproxy.h"
 #include "track/cue.h"
 #include "util/memory.h"
@@ -10,9 +9,6 @@
 
 class SkinContext;
 class WaveformSignalColors;
-
-class WOverview;
-
 class QOpenGLTexture;
 
 namespace allshader {
diff --git a/src/waveform/renderers/waveformmarkrange.h b/src/waveform/renderers/waveformmarkrange.h
index 5ed7b4d3063..15100bf8f03 100644
--- a/src/waveform/renderers/waveformmarkrange.h
+++ b/src/waveform/renderers/waveformmarkrange.h
@@ -3,9 +3,9 @@
 #include <QColor>
 #include <QImage>
 #include <QString>
+#include <memory>
 
 #include "control/controlproxy.h"
-#include "util/memory.h"
 #include "waveform/waveformmarklabel.h"
 
 QT_FORWARD_DECLARE_CLASS(QDomNode);
diff --git a/src/waveform/renderers/waveformmarkset.cpp b/src/waveform/renderers/waveformmarkset.cpp
index 45ab38fda3a..6e4ad60a416 100644
--- a/src/waveform/renderers/waveformmarkset.cpp
+++ b/src/waveform/renderers/waveformmarkset.cpp
@@ -3,8 +3,6 @@
 
 #include "waveformmarkset.h"
 #include "engine/controls/cuecontrol.h"
-#include "control/controlobject.h"
-#include "util/memory.h"
 
 WaveformMarkSet::WaveformMarkSet() {
 }
diff --git a/src/waveform/renderers/waveformmarkset.h b/src/waveform/renderers/waveformmarkset.h
index 2f893ca85dd..a7f5ece1055 100644
--- a/src/waveform/renderers/waveformmarkset.h
+++ b/src/waveform/renderers/waveformmarkset.h
@@ -4,9 +4,7 @@
 
 #include "waveformmark.h"
 #include "skin/legacy/skincontext.h"
-#include "util/memory.h"
 
-class WaveformWidgetRenderer;
 
 // This class helps share code between the WaveformRenderMark and WOverview
 // constructors.
diff --git a/src/waveform/renderers/waveformrenderbackground.cpp b/src/waveform/renderers/waveformrenderbackground.cpp
index abe095f19d0..25da6fe9e08 100644
--- a/src/waveform/renderers/waveformrenderbackground.cpp
+++ b/src/waveform/renderers/waveformrenderbackground.cpp
@@ -1,8 +1,6 @@
 #include "waveformrenderbackground.h"
-#include "waveformwidgetrenderer.h"
 
-#include "widget/wskincolor.h"
-#include "widget/wwidget.h"
+#include "waveformwidgetrenderer.h"
 #include "widget/wimagestore.h"
 
 WaveformRenderBackground::WaveformRenderBackground(
diff --git a/src/waveform/renderers/waveformrenderbackground.h b/src/waveform/renderers/waveformrenderbackground.h
index c03bf596b79..d557d172db6 100644
--- a/src/waveform/renderers/waveformrenderbackground.h
+++ b/src/waveform/renderers/waveformrenderbackground.h
@@ -2,13 +2,13 @@
 
 #include <QColor>
 #include <QDomNode>
-#include <QPaintEvent>
-#include <QPainter>
 
 #include "skin/legacy/skincontext.h"
 #include "util/class.h"
 #include "waveformrendererabstract.h"
 
+class QPaintEvent;
+class QPainter;
 class WaveformWidgetRenderer;
 
 class WaveformRenderBackground : public WaveformRendererAbstract {
diff --git a/src/waveform/renderers/waveformrenderbeat.cpp b/src/waveform/renderers/waveformrenderbeat.cpp
index ef59fe74634..a1ef589e90e 100644
--- a/src/waveform/renderers/waveformrenderbeat.cpp
+++ b/src/waveform/renderers/waveformrenderbeat.cpp
@@ -1,15 +1,13 @@
-#include <QDomNode>
-#include <QPaintEvent>
-#include <QPainter>
-
 #include "waveform/renderers/waveformrenderbeat.h"
 
-#include "control/controlobject.h"
+#include <QPainter>
+
 #include "track/track.h"
+#include "util/painterscope.h"
 #include "waveform/renderers/waveformwidgetrenderer.h"
 #include "widget/wskincolor.h"
-#include "widget/wwidget.h"
-#include "util/painterscope.h"
+
+class QPaintEvent;
 
 WaveformRenderBeat::WaveformRenderBeat(WaveformWidgetRenderer* waveformWidgetRenderer)
         : WaveformRendererAbstract(waveformWidgetRenderer) {
diff --git a/src/waveform/renderers/waveformrendererendoftrack.cpp b/src/waveform/renderers/waveformrendererendoftrack.cpp
index edef583da39..c478f940755 100644
--- a/src/waveform/renderers/waveformrendererendoftrack.cpp
+++ b/src/waveform/renderers/waveformrendererendoftrack.cpp
@@ -1,18 +1,12 @@
-#include <QDomNode>
-#include <QPaintEvent>
-#include <QPainter>
-
 #include "waveformrendererendoftrack.h"
-#include "waveformwidgetrenderer.h"
-
-#include "control/controlobject.h"
-#include "control/controlproxy.h"
 
-#include "widget/wskincolor.h"
-#include "widget/wwidget.h"
+#include <QPainter>
 
+#include "control/controlproxy.h"
 #include "util/painterscope.h"
-#include "util/timer.h"
+#include "waveform/waveformwidgetfactory.h"
+#include "waveformwidgetrenderer.h"
+#include "widget/wskincolor.h"
 
 namespace {
 
diff --git a/src/waveform/renderers/waveformrendererendoftrack.h b/src/waveform/renderers/waveformrendererendoftrack.h
index c987dad3243..697ffcbe188 100644
--- a/src/waveform/renderers/waveformrendererendoftrack.h
+++ b/src/waveform/renderers/waveformrendererendoftrack.h
@@ -1,16 +1,12 @@
 #pragma once
 
 #include <QColor>
-#include <QTime>
-//#include <QLinearGradient>
 
 #include "skin/legacy/skincontext.h"
 #include "util/class.h"
 #include "waveform/renderers/waveformrendererabstract.h"
-#include "waveform/waveformwidgetfactory.h"
 #include "util/performancetimer.h"
 
-class ControlObject;
 class ControlProxy;
 
 class WaveformRendererEndOfTrack : public WaveformRendererAbstract {
diff --git a/src/waveform/renderers/waveformrendererfilteredsignal.cpp b/src/waveform/renderers/waveformrendererfilteredsignal.cpp
index b18c122575d..ee0cf9bb771 100644
--- a/src/waveform/renderers/waveformrendererfilteredsignal.cpp
+++ b/src/waveform/renderers/waveformrendererfilteredsignal.cpp
@@ -2,11 +2,7 @@
 
 #include "waveformwidgetrenderer.h"
 #include "waveform/waveform.h"
-#include "waveform/waveformwidgetfactory.h"
 #include "control/controlproxy.h"
-#include "widget/wskincolor.h"
-#include "track/track.h"
-#include "widget/wwidget.h"
 #include "util/math.h"
 #include "util/painterscope.h"
 
diff --git a/src/waveform/renderers/waveformrendererhsv.cpp b/src/waveform/renderers/waveformrendererhsv.cpp
index d2a3308a73e..693942eefdf 100644
--- a/src/waveform/renderers/waveformrendererhsv.cpp
+++ b/src/waveform/renderers/waveformrendererhsv.cpp
@@ -1,14 +1,11 @@
 #include "waveformrendererhsv.h"
 
-#include "track/track.h"
 #include "util/colorcomponents.h"
 #include "util/math.h"
 #include "util/painterscope.h"
 #include "waveform/waveform.h"
 #include "waveform/waveformwidgetfactory.h"
 #include "waveformwidgetrenderer.h"
-#include "widget/wskincolor.h"
-#include "widget/wwidget.h"
 
 WaveformRendererHSV::WaveformRendererHSV(
         WaveformWidgetRenderer* waveformWidgetRenderer)
diff --git a/src/waveform/renderers/waveformrendererpreroll.cpp b/src/waveform/renderers/waveformrendererpreroll.cpp
index 1c0a4abb839..f3219c3b8e6 100644
--- a/src/waveform/renderers/waveformrendererpreroll.cpp
+++ b/src/waveform/renderers/waveformrendererpreroll.cpp
@@ -1,15 +1,13 @@
+#include "waveform/renderers/waveformrendererpreroll.h"
+
 #include <QBrush>
-#include <QPen>
 #include <QPainter>
+#include <QPen>
 #include <QPolygonF>
 
-#include "waveform/renderers/waveformrendererpreroll.h"
-
+#include "util/painterscope.h"
 #include "waveform/renderers/waveformwidgetrenderer.h"
-#include "waveform/waveform.h"
 #include "widget/wskincolor.h"
-#include "widget/wwidget.h"
-#include "util/painterscope.h"
 
 WaveformRendererPreroll::WaveformRendererPreroll(WaveformWidgetRenderer* waveformWidgetRenderer)
   : WaveformRendererAbstract(waveformWidgetRenderer) {
diff --git a/src/waveform/renderers/waveformrendererrgb.cpp b/src/waveform/renderers/waveformrendererrgb.cpp
index 9896183b154..57397da8975 100644
--- a/src/waveform/renderers/waveformrendererrgb.cpp
+++ b/src/waveform/renderers/waveformrendererrgb.cpp
@@ -2,10 +2,6 @@
 
 #include "waveformwidgetrenderer.h"
 #include "waveform/waveform.h"
-#include "waveform/waveformwidgetfactory.h"
-#include "widget/wskincolor.h"
-#include "track/track.h"
-#include "widget/wwidget.h"
 #include "util/math.h"
 #include "util/painterscope.h"
 
diff --git a/src/waveform/renderers/waveformrenderersignalbase.cpp b/src/waveform/renderers/waveformrenderersignalbase.cpp
index 08eda6de9c8..11a28bec7c1 100644
--- a/src/waveform/renderers/waveformrenderersignalbase.cpp
+++ b/src/waveform/renderers/waveformrenderersignalbase.cpp
@@ -1,14 +1,9 @@
 #include "waveformrenderersignalbase.h"
 
-#include <QDomNode>
-
-#include "control/controlobject.h"
 #include "control/controlproxy.h"
 #include "util/colorcomponents.h"
 #include "waveform/waveformwidgetfactory.h"
 #include "waveformwidgetrenderer.h"
-#include "widget/wskincolor.h"
-#include "widget/wwidget.h"
 
 namespace {
 const QString kEffectGroupFormat = QStringLiteral("[EqualizerRack1_%1_Effect1]");
diff --git a/src/waveform/renderers/waveformrenderersignalbase.h b/src/waveform/renderers/waveformrenderersignalbase.h
index a41c5bad99d..f22a241867d 100644
--- a/src/waveform/renderers/waveformrenderersignalbase.h
+++ b/src/waveform/renderers/waveformrenderersignalbase.h
@@ -1,11 +1,10 @@
 #pragma once
 
 #include "waveformrendererabstract.h"
-#include "waveformsignalcolors.h"
 #include "skin/legacy/skincontext.h"
 
-class ControlObject;
 class ControlProxy;
+class WaveformSignalColors;
 
 class WaveformRendererSignalBase : public WaveformRendererAbstract {
 public:
diff --git a/src/waveform/renderers/waveformrendermark.cpp b/src/waveform/renderers/waveformrendermark.cpp
index 113e7f608bf..d521e86afe0 100644
--- a/src/waveform/renderers/waveformrendermark.cpp
+++ b/src/waveform/renderers/waveformrendermark.cpp
@@ -1,19 +1,10 @@
 #include "waveform/renderers/waveformrendermark.h"
 
-#include <QDomNode>
-#include <QPainter>
-#include <QPainterPath>
-
-#include "control/controlproxy.h"
-#include "engine/controls/cuecontrol.h"
 #include "moc_waveformrendermark.cpp"
 #include "track/track.h"
-#include "util/color/color.h"
 #include "util/painterscope.h"
 #include "waveform/renderers/waveformwidgetrenderer.h"
-#include "waveform/waveform.h"
-#include "widget/wskincolor.h"
-#include "widget/wwidget.h"
+#include "widget/wimagestore.h"
 
 class ImageGraphics : public WaveformMark::Graphics {
     QImage m_image;
diff --git a/src/waveform/renderers/waveformrendermark.h b/src/waveform/renderers/waveformrendermark.h
index 1df86471e45..1419194e89b 100644
--- a/src/waveform/renderers/waveformrendermark.h
+++ b/src/waveform/renderers/waveformrendermark.h
@@ -4,11 +4,8 @@
 
 #include "skin/legacy/skincontext.h"
 #include "util/class.h"
-#include "util/color/color.h"
 #include "waveform/renderers/waveformmarkset.h"
 #include "waveform/renderers/waveformrendererabstract.h"
-#include "track/cue.h"
-#include "preferences/configobject.h"
 
 class WaveformRenderMark : public QObject, public WaveformRendererAbstract {
     Q_OBJECT
diff --git a/src/waveform/renderers/waveformrendermarkrange.cpp b/src/waveform/renderers/waveformrendermarkrange.cpp
index bf5e5da4fdc..32064b3f6fd 100644
--- a/src/waveform/renderers/waveformrendermarkrange.cpp
+++ b/src/waveform/renderers/waveformrendermarkrange.cpp
@@ -1,19 +1,10 @@
-#include <QtDebug>
-#include <QColor>
-#include <QDomNode>
-#include <QPaintEvent>
-#include <QPainter>
-#include <QObject>
-#include <QVector>
-
 #include "waveform/renderers/waveformrendermarkrange.h"
 
-#include "preferences/usersettings.h"
-#include "track/track.h"
-#include "waveform/renderers/waveformwidgetrenderer.h"
-#include "widget/wskincolor.h"
-#include "widget/wwidget.h"
+#include <QPainter>
+#include <QtDebug>
+
 #include "util/painterscope.h"
+#include "waveform/renderers/waveformwidgetrenderer.h"
 
 WaveformRenderMarkRange::WaveformRenderMarkRange(WaveformWidgetRenderer* waveformWidgetRenderer) :
     WaveformRendererAbstract(waveformWidgetRenderer) {
diff --git a/src/waveform/renderers/waveformrendermarkrange.h b/src/waveform/renderers/waveformrendermarkrange.h
index df268e7affe..b8df8529eb1 100644
--- a/src/waveform/renderers/waveformrendermarkrange.h
+++ b/src/waveform/renderers/waveformrendermarkrange.h
@@ -1,20 +1,14 @@
 #pragma once
 
-#include <QObject>
-#include <QColor>
-#include <QDomNode>
-#include <QPainter>
-#include <QPaintEvent>
-
 #include <vector>
 
-#include "preferences/usersettings.h"
 #include "skin/legacy/skincontext.h"
 #include "waveform/renderers/waveformmarkrange.h"
 #include "waveform/renderers/waveformrendererabstract.h"
 
-class ConfigKey;
-class ControlObject;
+class QPaintEvent;
+class QPainter;
+class WaveformWidgetRenderer;
 
 class WaveformRenderMarkRange : public WaveformRendererAbstract {
   public:
diff --git a/src/waveform/renderers/waveformsignalcolors.cpp b/src/waveform/renderers/waveformsignalcolors.cpp
index c8c7061dc61..c30bc5c3201 100644
--- a/src/waveform/renderers/waveformsignalcolors.cpp
+++ b/src/waveform/renderers/waveformsignalcolors.cpp
@@ -1,10 +1,9 @@
 #include "waveformsignalcolors.h"
 
-#include <QDomNode>
-
 #include "util/colorcomponents.h"
 #include "widget/wskincolor.h"
-#include "widget/wwidget.h"
+
+class QDomNode;
 
 namespace {
 constexpr int kDefaultDimBrightThreshold = 127;
diff --git a/src/waveform/renderers/waveformwidgetrenderer.cpp b/src/waveform/renderers/waveformwidgetrenderer.cpp
index 6670a508079..91c853b1d2c 100644
--- a/src/waveform/renderers/waveformwidgetrenderer.cpp
+++ b/src/waveform/renderers/waveformwidgetrenderer.cpp
@@ -3,14 +3,12 @@
 #include <QPainter>
 #include <QPainterPath>
 
-#include "control/controlobject.h"
 #include "control/controlproxy.h"
 #include "track/track.h"
 #include "util/math.h"
-#include "util/performancetimer.h"
+#include "waveform/renderers/waveformrendererabstract.h"
 #include "waveform/visualplayposition.h"
 #include "waveform/waveform.h"
-#include "widget/wwidget.h"
 
 const double WaveformWidgetRenderer::s_waveformMinZoom = 1.0;
 const double WaveformWidgetRenderer::s_waveformMaxZoom = 10.0;
diff --git a/src/waveform/renderers/waveformwidgetrenderer.h b/src/waveform/renderers/waveformwidgetrenderer.h
index cb319d85435..daa9038059d 100644
--- a/src/waveform/renderers/waveformwidgetrenderer.h
+++ b/src/waveform/renderers/waveformwidgetrenderer.h
@@ -1,15 +1,8 @@
 #pragma once
 
-#include <QPainter>
-#include <QTime>
-#include <QVector>
-#include <QtDebug>
-
 #include "track/track_decl.h"
 #include "util/class.h"
-#include "util/performancetimer.h"
 #include "waveform/renderers/waveformmark.h"
-#include "waveform/renderers/waveformrendererabstract.h"
 #include "waveform/renderers/waveformsignalcolors.h"
 #include "waveform/waveform.h"
 
@@ -18,6 +11,8 @@
 class ControlProxy;
 class VisualPlayPosition;
 class VSyncThread;
+class QPainter;
+class WaveformRendererAbstract;
 
 class WaveformWidgetRenderer {
   public:
diff --git a/src/waveform/sharedglcontext.cpp b/src/waveform/sharedglcontext.cpp
index 386310fe80a..d6f6e86b0cc 100644
--- a/src/waveform/sharedglcontext.cpp
+++ b/src/waveform/sharedglcontext.cpp
@@ -1,13 +1,12 @@
 #include "waveform/sharedglcontext.h"
 
-#include <QtDebug>
-
 #ifndef MIXXX_USE_QOPENGL
+#include <QDebug>
 #include <QGLContext>
 #include <QGLFormat>
-#endif
 
 #include "widget/wglwidget.h"
+#endif
 
 WGLWidget* SharedGLContext::s_pSharedGLWidget = nullptr;
 
diff --git a/src/waveform/sharedglcontext.h b/src/waveform/sharedglcontext.h
index 9246db33523..73ea204f9c0 100644
--- a/src/waveform/sharedglcontext.h
+++ b/src/waveform/sharedglcontext.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#include <QtGlobal>
-
-QT_FORWARD_DECLARE_CLASS(WGLWidget);
+class WGLWidget;
 
 // Creating a QGLContext on its own doesn't work. We've tried that. You can't
 // create a context on your own. It has to be associated with a real paint
diff --git a/src/waveform/visualplayposition.cpp b/src/waveform/visualplayposition.cpp
index 06d390b2139..62880b21863 100644
--- a/src/waveform/visualplayposition.cpp
+++ b/src/waveform/visualplayposition.cpp
@@ -1,9 +1,5 @@
 #include "waveform/visualplayposition.h"
 
-#include <QtDebug>
-
-#include "control/controlobject.h"
-#include "control/controlproxy.h"
 #include "moc_visualplayposition.cpp"
 #include "util/math.h"
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
diff --git a/src/waveform/visualsmanager.cpp b/src/waveform/visualsmanager.cpp
index b02c8ddd511..d5fd0a3490d 100644
--- a/src/waveform/visualsmanager.cpp
+++ b/src/waveform/visualsmanager.cpp
@@ -1,8 +1,7 @@
 #include "waveform/visualsmanager.h"
 
-#include "waveform/waveformwidgetfactory.h"
 #include "control/controlobject.h"
-
+#include "waveform/visualplayposition.h"
 
 DeckVisuals::DeckVisuals(const QString& group)
         : m_group(group),
diff --git a/src/waveform/visualsmanager.h b/src/waveform/visualsmanager.h
index ef59283e665..42c65669b1e 100644
--- a/src/waveform/visualsmanager.h
+++ b/src/waveform/visualsmanager.h
@@ -7,7 +7,8 @@
 #include "util/duration.h"
 #include "util/memory.h"
 #include "util/performancetimer.h"
-#include "waveform/visualplayposition.h"
+
+class VisualPlayPosition;
 
 namespace {
 
diff --git a/src/waveform/vsyncthread.cpp b/src/waveform/vsyncthread.cpp
index 5b196eb80de..756a4199603 100644
--- a/src/waveform/vsyncthread.cpp
+++ b/src/waveform/vsyncthread.cpp
@@ -1,13 +1,8 @@
 #include "vsyncthread.h"
 
-#include <QThread>
-#include <QTime>
-#include <QtDebug>
-
 #include "moc_vsyncthread.cpp"
 #include "util/math.h"
 #include "util/performancetimer.h"
-#include "waveform/guitick.h"
 
 VSyncThread::VSyncThread(QObject* pParent)
         : QThread(pParent),
diff --git a/src/waveform/vsyncthread.h b/src/waveform/vsyncthread.h
index 1059a4d456f..85f00aef365 100644
--- a/src/waveform/vsyncthread.h
+++ b/src/waveform/vsyncthread.h
@@ -3,10 +3,10 @@
 #include <QPair>
 #include <QSemaphore>
 #include <QThread>
-#include <QTime>
 
 #include "util/performancetimer.h"
-#include "widget/wglwidget.h"
+
+class WGLWidget;
 
 class VSyncThread : public QThread {
     Q_OBJECT
diff --git a/src/waveform/waveformfactory.cpp b/src/waveform/waveformfactory.cpp
index 0c3b93fbc0a..fbd499e5b33 100644
--- a/src/waveform/waveformfactory.cpp
+++ b/src/waveform/waveformfactory.cpp
@@ -1,5 +1,3 @@
-#include <QtDebug>
-
 #include "waveform/waveformfactory.h"
 #include "waveform/waveform.h"
 
diff --git a/src/waveform/waveformmarklabel.cpp b/src/waveform/waveformmarklabel.cpp
index f7c6aa4b284..8768d930ddf 100644
--- a/src/waveform/waveformmarklabel.cpp
+++ b/src/waveform/waveformmarklabel.cpp
@@ -1,4 +1,9 @@
 #include "waveform/waveformmarklabel.h"
+
+#include <QBrush>
+#include <QFontMetrics>
+#include <QPainter>
+
 #include "util/math.h"
 
 void WaveformMarkLabel::prerender(QPointF bottomLeft,
diff --git a/src/waveform/waveformmarklabel.h b/src/waveform/waveformmarklabel.h
index fdb87badfe1..42a4a3b9529 100644
--- a/src/waveform/waveformmarklabel.h
+++ b/src/waveform/waveformmarklabel.h
@@ -2,12 +2,12 @@
 
 #include <QColor>
 #include <QFont>
-#include <QFontMetrics>
-#include <QPainter>
 #include <QPixmap>
 #include <QString>
 #include <QRectF>
 
+class QPainter;
+
 // WaveformMarkLabel renders the label for a WaveformMark to an offscreen buffer
 // and calculates its area. This allows the areas of all WaveformMarkLabels
 // to be compared so overlapping labels are not drawn.
diff --git a/src/waveform/waveformwidgetfactory.cpp b/src/waveform/waveformwidgetfactory.cpp
index c111710c888..30ededd47ef 100644
--- a/src/waveform/waveformwidgetfactory.cpp
+++ b/src/waveform/waveformwidgetfactory.cpp
@@ -8,16 +8,12 @@
 #include <QGLShaderProgram>
 #endif
 
-#include <QGuiApplication>
 #include <QOpenGLFunctions>
 #include <QRegularExpression>
 #include <QStringList>
-#include <QTime>
 #include <QWidget>
 #include <QWindow>
-#include <QtDebug>
 
-#include "control/controlpotmeter.h"
 #include "moc_waveformwidgetfactory.cpp"
 #include "util/cmdlineargs.h"
 #include "util/math.h"
@@ -47,11 +43,10 @@
 #include "waveform/widgets/glvsynctestwidget.h"
 #include "waveform/widgets/glwaveformwidget.h"
 #include "waveform/widgets/hsvwaveformwidget.h"
-#include "waveform/widgets/nonglwaveformwidgetabstract.h"
 #include "waveform/widgets/rgbwaveformwidget.h"
 #include "waveform/widgets/softwarewaveformwidget.h"
 #include "waveform/widgets/waveformwidgetabstract.h"
-#include "widget/wvumeter.h"
+#include "widget/wvumeterbase.h"
 #include "widget/wvumeterlegacy.h"
 #include "widget/wwaveformviewer.h"
 
diff --git a/src/waveform/waveformwidgetfactory.h b/src/waveform/waveformwidgetfactory.h
index 56f8ccf6fad..14d12701de6 100644
--- a/src/waveform/waveformwidgetfactory.h
+++ b/src/waveform/waveformwidgetfactory.h
@@ -9,7 +9,6 @@
 #include "skin/legacy/skincontext.h"
 #include "util/performancetimer.h"
 #include "util/singleton.h"
-#include "waveform/waveform.h"
 #include "waveform/widgets/waveformwidgettype.h"
 
 class WVuMeterLegacy;
diff --git a/src/waveform/widgets/allshader/waveformwidget.cpp b/src/waveform/widgets/allshader/waveformwidget.cpp
index a2d3ca92511..bc18dd25dc2 100644
--- a/src/waveform/widgets/allshader/waveformwidget.cpp
+++ b/src/waveform/widgets/allshader/waveformwidget.cpp
@@ -4,6 +4,7 @@
 
 #include "moc_waveformwidget.cpp"
 #include "waveform/renderers/allshader/waveformrendererabstract.h"
+#include "waveform/renderers/waveformrendererabstract.h"
 
 namespace allshader {
 
diff --git a/src/waveform/widgets/emptywaveformwidget.cpp b/src/waveform/widgets/emptywaveformwidget.cpp
index c3c32cc951f..cba8eec3637 100644
--- a/src/waveform/widgets/emptywaveformwidget.cpp
+++ b/src/waveform/widgets/emptywaveformwidget.cpp
@@ -4,7 +4,6 @@
 
 #include "moc_emptywaveformwidget.cpp"
 #include "waveform/renderers/waveformrenderbackground.h"
-#include "waveform/renderers/waveformwidgetrenderer.h"
 
 EmptyWaveformWidget::EmptyWaveformWidget(const QString& group, QWidget* parent)
         : NonGLWaveformWidgetAbstract(group, parent) {
diff --git a/src/waveform/widgets/emptywaveformwidget.h b/src/waveform/widgets/emptywaveformwidget.h
index 3c2bb45ccc0..cc2ff386068 100644
--- a/src/waveform/widgets/emptywaveformwidget.h
+++ b/src/waveform/widgets/emptywaveformwidget.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <QWidget>
-
 #include "waveform/widgets/nonglwaveformwidgetabstract.h"
 
+class QWidget;
+
 // This class can be used as a template file to create new WaveformWidgets it
 // contain minimal set of method to re-implement
 
diff --git a/src/waveform/widgets/glrgbwaveformwidget.cpp b/src/waveform/widgets/glrgbwaveformwidget.cpp
index e1f06abd7ee..5aea9e13e05 100644
--- a/src/waveform/widgets/glrgbwaveformwidget.cpp
+++ b/src/waveform/widgets/glrgbwaveformwidget.cpp
@@ -9,8 +9,6 @@
 #include "waveform/renderers/waveformrendererpreroll.h"
 #include "waveform/renderers/waveformrendermark.h"
 #include "waveform/renderers/waveformrendermarkrange.h"
-#include "waveform/renderers/waveformwidgetrenderer.h"
-#include "waveform/sharedglcontext.h"
 
 GLRGBWaveformWidget::GLRGBWaveformWidget(const QString& group, QWidget* parent)
         : GLWaveformWidgetAbstract(group, parent) {
diff --git a/src/waveform/widgets/glsimplewaveformwidget.cpp b/src/waveform/widgets/glsimplewaveformwidget.cpp
index c8b25579c3a..fe931b04c6f 100644
--- a/src/waveform/widgets/glsimplewaveformwidget.cpp
+++ b/src/waveform/widgets/glsimplewaveformwidget.cpp
@@ -1,7 +1,6 @@
 #include "glsimplewaveformwidget.h"
 
 #include <QPainter>
-#include <QtDebug>
 
 #include "moc_glsimplewaveformwidget.cpp"
 #include "util/performancetimer.h"
@@ -12,8 +11,6 @@
 #include "waveform/renderers/waveformrendererpreroll.h"
 #include "waveform/renderers/waveformrendermark.h"
 #include "waveform/renderers/waveformrendermarkrange.h"
-#include "waveform/renderers/waveformwidgetrenderer.h"
-#include "waveform/sharedglcontext.h"
 
 GLSimpleWaveformWidget::GLSimpleWaveformWidget(const QString& group, QWidget* parent)
         : GLWaveformWidgetAbstract(group, parent) {
diff --git a/src/waveform/widgets/glslwaveformwidget.cpp b/src/waveform/widgets/glslwaveformwidget.cpp
index e1344c07d1a..65fc318b726 100644
--- a/src/waveform/widgets/glslwaveformwidget.cpp
+++ b/src/waveform/widgets/glslwaveformwidget.cpp
@@ -1,7 +1,6 @@
 #include "glslwaveformwidget.h"
 
 #include <QPainter>
-#include <QtDebug>
 
 #include "moc_glslwaveformwidget.cpp"
 #include "util/performancetimer.h"
@@ -12,8 +11,6 @@
 #include "waveform/renderers/waveformrendererpreroll.h"
 #include "waveform/renderers/waveformrendermark.h"
 #include "waveform/renderers/waveformrendermarkrange.h"
-#include "waveform/renderers/waveformwidgetrenderer.h"
-#include "waveform/sharedglcontext.h"
 
 GLSLFilteredWaveformWidget::GLSLFilteredWaveformWidget(
         const QString& group,
diff --git a/src/waveform/widgets/glslwaveformwidget.h b/src/waveform/widgets/glslwaveformwidget.h
index 7a82554b8f1..ccfbf3169ae 100644
--- a/src/waveform/widgets/glslwaveformwidget.h
+++ b/src/waveform/widgets/glslwaveformwidget.h
@@ -2,7 +2,6 @@
 
 #include "waveform/widgets/glwaveformwidgetabstract.h"
 
-class GLSLWaveformRendererSignal;
 
 class GLSLWaveformWidget : public GLWaveformWidgetAbstract {
     Q_OBJECT
diff --git a/src/waveform/widgets/glvsynctestwidget.cpp b/src/waveform/widgets/glvsynctestwidget.cpp
index 753c7c63901..cbf88525cf1 100644
--- a/src/waveform/widgets/glvsynctestwidget.cpp
+++ b/src/waveform/widgets/glvsynctestwidget.cpp
@@ -1,19 +1,11 @@
 #include "waveform/widgets/glvsynctestwidget.h"
 
 #include <QPainter>
-#include <QtDebug>
 
 #include "moc_glvsynctestwidget.cpp"
 #include "util/performancetimer.h"
 #include "waveform/renderers/glvsynctestrenderer.h"
 #include "waveform/renderers/glwaveformrenderbackground.h"
-#include "waveform/renderers/glwaveformrenderersimplesignal.h"
-#include "waveform/renderers/waveformrenderbeat.h"
-#include "waveform/renderers/waveformrendererendoftrack.h"
-#include "waveform/renderers/waveformrendererpreroll.h"
-#include "waveform/renderers/waveformrendermark.h"
-#include "waveform/renderers/waveformrendermarkrange.h"
-#include "waveform/sharedglcontext.h"
 
 GLVSyncTestWidget::GLVSyncTestWidget(const QString& group, QWidget* parent)
         : GLWaveformWidgetAbstract(group, parent) {
diff --git a/src/waveform/widgets/glwaveformwidget.cpp b/src/waveform/widgets/glwaveformwidget.cpp
index 9cdc74a0c0c..e1eb08d3b0b 100644
--- a/src/waveform/widgets/glwaveformwidget.cpp
+++ b/src/waveform/widgets/glwaveformwidget.cpp
@@ -1,21 +1,16 @@
 #include "waveform/widgets/glwaveformwidget.h"
 
-#include <QGLContext>
 #include <QPainter>
-#include <QtDebug>
 
 #include "moc_glwaveformwidget.cpp"
 #include "util/performancetimer.h"
 #include "waveform/renderers/glwaveformrenderbackground.h"
 #include "waveform/renderers/glwaveformrendererfilteredsignal.h"
-#include "waveform/renderers/qtwaveformrendererfilteredsignal.h"
 #include "waveform/renderers/waveformrenderbeat.h"
 #include "waveform/renderers/waveformrendererendoftrack.h"
 #include "waveform/renderers/waveformrendererpreroll.h"
 #include "waveform/renderers/waveformrendermark.h"
 #include "waveform/renderers/waveformrendermarkrange.h"
-#include "waveform/renderers/waveformwidgetrenderer.h"
-#include "waveform/sharedglcontext.h"
 
 GLWaveformWidget::GLWaveformWidget(const QString& group, QWidget* parent)
         : GLWaveformWidgetAbstract(group, parent) {
diff --git a/src/waveform/widgets/glwaveformwidgetabstract.h b/src/waveform/widgets/glwaveformwidgetabstract.h
index 7724c3394a1..7d080918c13 100644
--- a/src/waveform/widgets/glwaveformwidgetabstract.h
+++ b/src/waveform/widgets/glwaveformwidgetabstract.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "waveform/renderers/glwaveformrenderer.h"
-#include "waveform/sharedglcontext.h"
+#include "waveform/renderers/waveformrendererabstract.h"
 #include "waveform/widgets/waveformwidgetabstract.h"
 #include "widget/wglwidget.h"
 
diff --git a/src/waveform/widgets/hsvwaveformwidget.cpp b/src/waveform/widgets/hsvwaveformwidget.cpp
index 2a2f223d129..c3316889ff8 100644
--- a/src/waveform/widgets/hsvwaveformwidget.cpp
+++ b/src/waveform/widgets/hsvwaveformwidget.cpp
@@ -10,7 +10,6 @@
 #include "waveform/renderers/waveformrendererpreroll.h"
 #include "waveform/renderers/waveformrendermark.h"
 #include "waveform/renderers/waveformrendermarkrange.h"
-#include "waveform/renderers/waveformwidgetrenderer.h"
 
 HSVWaveformWidget::HSVWaveformWidget(const QString& group, QWidget* parent)
         : NonGLWaveformWidgetAbstract(group, parent) {
diff --git a/src/waveform/widgets/hsvwaveformwidget.h b/src/waveform/widgets/hsvwaveformwidget.h
index a98a474ba0e..ade92a4b8d5 100644
--- a/src/waveform/widgets/hsvwaveformwidget.h
+++ b/src/waveform/widgets/hsvwaveformwidget.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <QWidget>
-
 #include "nonglwaveformwidgetabstract.h"
 
+class QWidget;
+
 class HSVWaveformWidget : public NonGLWaveformWidgetAbstract {
     Q_OBJECT
   public:
diff --git a/src/waveform/widgets/rgbwaveformwidget.cpp b/src/waveform/widgets/rgbwaveformwidget.cpp
index 7ad4dbc8557..3c7a61805d2 100644
--- a/src/waveform/widgets/rgbwaveformwidget.cpp
+++ b/src/waveform/widgets/rgbwaveformwidget.cpp
@@ -10,7 +10,6 @@
 #include "waveform/renderers/waveformrendererrgb.h"
 #include "waveform/renderers/waveformrendermark.h"
 #include "waveform/renderers/waveformrendermarkrange.h"
-#include "waveform/renderers/waveformwidgetrenderer.h"
 
 RGBWaveformWidget::RGBWaveformWidget(const QString& group, QWidget* parent)
         : NonGLWaveformWidgetAbstract(group, parent) {
diff --git a/src/waveform/widgets/rgbwaveformwidget.h b/src/waveform/widgets/rgbwaveformwidget.h
index f9310f84501..e03170210fc 100644
--- a/src/waveform/widgets/rgbwaveformwidget.h
+++ b/src/waveform/widgets/rgbwaveformwidget.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <QWidget>
-
 #include "nonglwaveformwidgetabstract.h"
 
+class QWidget;
+
 class RGBWaveformWidget : public NonGLWaveformWidgetAbstract {
     Q_OBJECT
   public:
diff --git a/src/waveform/widgets/softwarewaveformwidget.cpp b/src/waveform/widgets/softwarewaveformwidget.cpp
index 0950f1602ab..69099904e60 100644
--- a/src/waveform/widgets/softwarewaveformwidget.cpp
+++ b/src/waveform/widgets/softwarewaveformwidget.cpp
@@ -10,7 +10,6 @@
 #include "waveform/renderers/waveformrendererpreroll.h"
 #include "waveform/renderers/waveformrendermark.h"
 #include "waveform/renderers/waveformrendermarkrange.h"
-#include "waveform/renderers/waveformwidgetrenderer.h"
 
 SoftwareWaveformWidget::SoftwareWaveformWidget(const QString& group, QWidget* parent)
         : NonGLWaveformWidgetAbstract(group, parent) {
diff --git a/src/waveform/widgets/softwarewaveformwidget.h b/src/waveform/widgets/softwarewaveformwidget.h
index d5243f425e2..02617400afe 100644
--- a/src/waveform/widgets/softwarewaveformwidget.h
+++ b/src/waveform/widgets/softwarewaveformwidget.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <QWidget>
-
 #include "nonglwaveformwidgetabstract.h"
 
+class QWidget;
+
 class SoftwareWaveformWidget : public NonGLWaveformWidgetAbstract {
     Q_OBJECT
   public:
diff --git a/src/waveform/widgets/waveformwidgetabstract.cpp b/src/waveform/widgets/waveformwidgetabstract.cpp
index dca831f7a06..f3dc9166cf8 100644
--- a/src/waveform/widgets/waveformwidgetabstract.cpp
+++ b/src/waveform/widgets/waveformwidgetabstract.cpp
@@ -1,7 +1,7 @@
+#include "waveform/widgets/waveformwidgetabstract.h"
+
 #include <QWidget>
-#include <QtDebug>
 
-#include "nonglwaveformwidgetabstract.h"
 #include "waveform/renderers/waveformwidgetrenderer.h"
 
 WaveformWidgetAbstract::WaveformWidgetAbstract(const QString& group)
diff --git a/src/waveform/widgets/waveformwidgetabstract.h b/src/waveform/widgets/waveformwidgetabstract.h
index b7f5b9fc606..ef5cec02071 100644
--- a/src/waveform/widgets/waveformwidgetabstract.h
+++ b/src/waveform/widgets/waveformwidgetabstract.h
@@ -1,15 +1,15 @@
 #pragma once
 
 #include <QString>
-#include <QWidget>
 
 #include "util/duration.h"
 #include "waveform/renderers/waveformwidgetrenderer.h"
-#include "waveformwidgetcategory.h"
+#include "waveform/widgets/waveformwidgetcategory.h"
 #include "waveformwidgettype.h"
-#include "widget/wglwidget.h"
 
 class VSyncThread;
+class QWidget;
+class WGLWidget;
 
 // NOTE(vRince) This class represent objects the waveformwidgetfactory can
 // holds, IMPORTANT all WaveformWidgetAbstract MUST inherist QWidget too !!  we
diff --git a/src/widget/tooltipqopengl.cpp b/src/widget/tooltipqopengl.cpp
index 69b11b33d8b..9c1a928700b 100644
--- a/src/widget/tooltipqopengl.cpp
+++ b/src/widget/tooltipqopengl.cpp
@@ -1,9 +1,7 @@
 #include "widget/tooltipqopengl.h"
 
 #include <QStyle>
-#include <QTimer>
 #include <QToolTip>
-#include <memory>
 
 #include "moc_tooltipqopengl.cpp"
 #include "widget/wglwidget.h"
diff --git a/src/widget/tooltipqopengl.h b/src/widget/tooltipqopengl.h
index ff5d8179166..812a901708f 100644
--- a/src/widget/tooltipqopengl.h
+++ b/src/widget/tooltipqopengl.h
@@ -2,7 +2,6 @@
 
 #include <QPoint>
 #include <QTimer>
-#include <QToolTip>
 
 class WGLWidget;
 
diff --git a/src/widget/woverview.cpp b/src/widget/woverview.cpp
index 5cb043a6862..bdf19eca3e3 100644
--- a/src/widget/woverview.cpp
+++ b/src/widget/woverview.cpp
@@ -1,34 +1,17 @@
-//
-// C++ Implementation: woverview
-//
-// Description:
-//
-//
-// Author: Tue Haste Andersen <haste@diku.dk>, (C) 2003
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
-
 #include "woverview.h"
 
 #include <QBrush>
-#include <QMimeData>
 #include <QMouseEvent>
 #include <QPaintEvent>
 #include <QPainter>
-#include <QUrl>
-#include <QtDebug>
 
 #include "analyzer/analyzerprogress.h"
-#include "control/controlobject.h"
 #include "control/controlproxy.h"
 #include "engine/engine.h"
 #include "mixer/playermanager.h"
 #include "moc_woverview.cpp"
 #include "preferences/colorpalettesettings.h"
 #include "track/track.h"
-#include "util/color/color.h"
 #include "util/dnd.h"
 #include "util/duration.h"
 #include "util/math.h"
diff --git a/src/widget/woverview.h b/src/widget/woverview.h
index 9d843196b26..d547bce4af8 100644
--- a/src/widget/woverview.h
+++ b/src/widget/woverview.h
@@ -1,27 +1,13 @@
-//
-// C++ Interface: woverview
-//
-// Description:
-//
-//
-// Author: Tue Haste Andersen <haste@diku.dk>, (C) 2003
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
 #pragma once
 
 #include <QColor>
 #include <QList>
-#include <QMouseEvent>
-#include <QPaintEvent>
 #include <QPixmap>
 
 #include "analyzer/analyzerprogress.h"
 #include "skin/legacy/skincontext.h"
 #include "track/track_decl.h"
 #include "track/trackid.h"
-#include "util/color/color.h"
 #include "util/parented_ptr.h"
 #include "waveform/renderers/waveformmarkrange.h"
 #include "waveform/renderers/waveformmarkset.h"
@@ -33,6 +19,8 @@
 
 class PlayerManager;
 class PainterScope;
+class QMouseEvent;
+class QPaintEvent;
 
 class WOverview : public WWidget, public TrackDropTarget {
     Q_OBJECT
diff --git a/src/widget/wspinnybase.cpp b/src/widget/wspinnybase.cpp
index a0800a992ca..12de463bf66 100644
--- a/src/widget/wspinnybase.cpp
+++ b/src/widget/wspinnybase.cpp
@@ -1,13 +1,8 @@
 #include "widget/wspinnybase.h"
 
 #include <QApplication>
-#include <QMimeData>
-#include <QStylePainter>
-#include <QUrl>
-#include <QWindow>
 #include <QtDebug>
 
-#include "control/controlobject.h"
 #include "control/controlproxy.h"
 #include "library/coverartcache.h"
 #include "library/coverartutils.h"
@@ -15,11 +10,8 @@
 #include "track/track.h"
 #include "util/dnd.h"
 #include "util/fpclassify.h"
-#include "vinylcontrol/vinylcontrol.h"
 #include "vinylcontrol/vinylcontrolmanager.h"
 #include "waveform/visualplayposition.h"
-#include "waveform/vsyncthread.h"
-#include "widget/wspinny.h"
 #include "wimagestore.h"
 
 // The SampleBuffers format enables antialiasing.
diff --git a/src/widget/wspinnyglsl.cpp b/src/widget/wspinnyglsl.cpp
index 37361927853..71f84f31a2a 100644
--- a/src/widget/wspinnyglsl.cpp
+++ b/src/widget/wspinnyglsl.cpp
@@ -1,7 +1,8 @@
 #include "widget/wspinnyglsl.h"
 
+#include <QOpenGLTexture>
+
 #include "moc_wspinnyglsl.cpp"
-#include "util/assert.h"
 #include "util/texture.h"
 
 WSpinnyGLSL::WSpinnyGLSL(
diff --git a/src/widget/wspinnyglsl.h b/src/widget/wspinnyglsl.h
index a77c4654eee..31e1cd099c6 100644
--- a/src/widget/wspinnyglsl.h
+++ b/src/widget/wspinnyglsl.h
@@ -1,12 +1,13 @@
 #pragma once
 
 #include <QOpenGLFunctions>
-#include <QOpenGLTexture>
 
 #include "shaders/textureshader.h"
 #include "shaders/vinylqualityshader.h"
 #include "widget/wspinnybase.h"
 
+class QOpenGLTexture;
+
 class WSpinnyGLSL : public WSpinnyBase, private QOpenGLFunctions {
     Q_OBJECT
   public:
diff --git a/src/widget/wvumeter.cpp b/src/widget/wvumeter.cpp
index 6f314167b61..e9878a50d17 100644
--- a/src/widget/wvumeter.cpp
+++ b/src/widget/wvumeter.cpp
@@ -1,6 +1,7 @@
 #include "widget/wvumeter.h"
 
 #include "moc_wvumeter.cpp"
+#include "util/duration.h"
 #include "util/math.h"
 
 WVuMeter::WVuMeter(QWidget* pParent)
diff --git a/src/widget/wvumeterbase.h b/src/widget/wvumeterbase.h
index cb7866c9d0b..5dc25d9b9c9 100644
--- a/src/widget/wvumeterbase.h
+++ b/src/widget/wvumeterbase.h
@@ -4,7 +4,6 @@
 #include "util/duration.h"
 #include "widget/wglwidget.h"
 #include "widget/wpixmapstore.h"
-#include "widget/wwidget.h"
 
 class VSyncThread;
 
diff --git a/src/widget/wvumeterglsl.cpp b/src/widget/wvumeterglsl.cpp
index 2e82b7a9a65..1a2f90f46ea 100644
--- a/src/widget/wvumeterglsl.cpp
+++ b/src/widget/wvumeterglsl.cpp
@@ -1,7 +1,9 @@
 #include "widget/wvumeterglsl.h"
 
+#include <QOpenGLTexture>
+
 #include "moc_wvumeterglsl.cpp"
-#include "util/assert.h"
+#include "util/duration.h"
 #include "util/math.h"
 #include "util/texture.h"
 
diff --git a/src/widget/wvumeterglsl.h b/src/widget/wvumeterglsl.h
index 62a7a00bb1d..1dfec3342e5 100644
--- a/src/widget/wvumeterglsl.h
+++ b/src/widget/wvumeterglsl.h
@@ -1,13 +1,12 @@
 #pragma once
 
 #include <QOpenGLFunctions>
-#include <QOpenGLTexture>
 #include <memory>
 
 #include "shaders/textureshader.h"
-#include "widget/wpixmapstore.h"
 #include "widget/wvumeterbase.h"
-#include "widget/wwidget.h"
+
+class QOpenGLTexture;
 
 class WVuMeterGLSL : public WVuMeterBase, private QOpenGLFunctions {
     Q_OBJECT
diff --git a/src/widget/wwaveformviewer.cpp b/src/widget/wwaveformviewer.cpp
index 532ad5ce115..2c400ec5150 100644
--- a/src/widget/wwaveformviewer.cpp
+++ b/src/widget/wwaveformviewer.cpp
@@ -1,21 +1,16 @@
 #include "widget/wwaveformviewer.h"
 
-#include <QDomNode>
 #include <QDragEnterEvent>
 #include <QEvent>
-#include <QMimeData>
-#include <QPainter>
-#include <QUrl>
-#include <QtDebug>
 
-#include "control/controlobject.h"
 #include "control/controlproxy.h"
 #include "moc_wwaveformviewer.cpp"
-#include "track/track.h"
 #include "util/dnd.h"
 #include "util/math.h"
 #include "waveform/waveformwidgetfactory.h"
-#include "waveform/widgets/nonglwaveformwidgetabstract.h"
+#include "waveform/widgets/waveformwidgetabstract.h"
+#include "widget/wcuemenupopup.h"
+#include "widget/wglwidget.h"
 
 WWaveformViewer::WWaveformViewer(
         const QString& group,
diff --git a/src/widget/wwaveformviewer.h b/src/widget/wwaveformviewer.h
index b486bf73089..6455bbff260 100644
--- a/src/widget/wwaveformviewer.h
+++ b/src/widget/wwaveformviewer.h
@@ -1,22 +1,18 @@
 #pragma once
 
-#include <QDateTime>
-#include <QDragEnterEvent>
-#include <QDropEvent>
-#include <QEvent>
-#include <QList>
-
 #include "skin/legacy/skincontext.h"
 #include "track/track_decl.h"
 #include "util/parented_ptr.h"
 #include "waveform/renderers/waveformmark.h"
 #include "widget/trackdroptarget.h"
-#include "widget/wcuemenupopup.h"
 #include "widget/wwidget.h"
 
 class ControlProxy;
 class WaveformWidgetAbstract;
-class ControlPotmeter;
+class QDragEnterEvent;
+class QDropEvent;
+class QEvent;
+class WCueMenuPopup;
 
 class WWaveformViewer : public WWidget, public TrackDropTarget {
     Q_OBJECT

From 9763c025523a0eec79ec4e6e73dd1d2cc93f0c20 Mon Sep 17 00:00:00 2001
From: Uwe Klotz <uwe.klotz@gmail.com>
Date: Mon, 6 Nov 2023 00:14:32 +0100
Subject: [PATCH 200/388] Fix Qt 6.6 build

---
 src/util/translations.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/util/translations.h b/src/util/translations.h
index 504342d33fe..6774d8ea341 100644
--- a/src/util/translations.h
+++ b/src/util/translations.h
@@ -70,12 +70,17 @@ class Translations {
         // English translation file and the fact that we don't ship a
         // mixxx_en.qm.
         if (locale.language() == QLocale::English &&
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+                (locale.territory() == QLocale::UnitedStates ||
+                        locale.territory() == QLocale::AnyCountry)
+#else
                 (locale.country() == QLocale::UnitedStates ||
-                        locale.country() == QLocale::AnyCountry)) {
+                        locale.country() == QLocale::AnyCountry)
+#endif
+        ) {
             qDebug() << "Skipping loading of translations because the locale is 'en' or 'en_US'.";
             return;
         }
-
         // Load Qt translations for this locale from the system translation
         // path. This is the lowest precedence QTranslator.
         bool qtFound = installTranslations(pApp,

From 90d206e1a8bcff58fb2b6478241897d551565d39 Mon Sep 17 00:00:00 2001
From: Uwe Klotz <uwe.klotz@gmail.com>
Date: Mon, 6 Nov 2023 01:00:53 +0100
Subject: [PATCH 201/388] Replace QColor::setNamedColor() with QColor() ctor

QColor::fromString() could be more efficient in some cases but would
require Qt 6.4.
---
 .../allshader/waveformrenderbeat.cpp          |  2 +-
 .../allshader/waveformrendererendoftrack.cpp  |  2 +-
 .../allshader/waveformrendererpreroll.cpp     |  2 +-
 src/waveform/renderers/waveformrenderbeat.cpp |  2 +-
 .../renderers/waveformrendererendoftrack.cpp  |  2 +-
 .../renderers/waveformrendererpreroll.cpp     |  2 +-
 .../renderers/waveformsignalcolors.cpp        | 20 +++++++++----------
 src/widget/woverview.cpp                      |  2 +-
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/waveform/renderers/allshader/waveformrenderbeat.cpp b/src/waveform/renderers/allshader/waveformrenderbeat.cpp
index e5a9c1df91d..c65d5187c53 100644
--- a/src/waveform/renderers/allshader/waveformrenderbeat.cpp
+++ b/src/waveform/renderers/allshader/waveformrenderbeat.cpp
@@ -22,7 +22,7 @@ void WaveformRenderBeat::initializeGL() {
 }
 
 void WaveformRenderBeat::setup(const QDomNode& node, const SkinContext& context) {
-    m_color.setNamedColor(context.selectString(node, "BeatColor"));
+    m_color = QColor(context.selectString(node, "BeatColor"));
     m_color = WSkinColor::getCorrectColor(m_color).toRgb();
 }
 
diff --git a/src/waveform/renderers/allshader/waveformrendererendoftrack.cpp b/src/waveform/renderers/allshader/waveformrendererendoftrack.cpp
index 4491270415f..3f4e42cf527 100644
--- a/src/waveform/renderers/allshader/waveformrendererendoftrack.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererendoftrack.cpp
@@ -44,7 +44,7 @@ void WaveformRendererEndOfTrack::setup(const QDomNode& node, const SkinContext&
     m_color = QColor(200, 25, 20);
     const QString endOfTrackColorName = context.selectString(node, "EndOfTrackColor");
     if (!endOfTrackColorName.isNull()) {
-        m_color.setNamedColor(endOfTrackColorName);
+        m_color = QColor(endOfTrackColorName);
         m_color = WSkinColor::getCorrectColor(m_color);
     }
 }
diff --git a/src/waveform/renderers/allshader/waveformrendererpreroll.cpp b/src/waveform/renderers/allshader/waveformrendererpreroll.cpp
index b39e73ba1b6..e0d2d1e7289 100644
--- a/src/waveform/renderers/allshader/waveformrendererpreroll.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererpreroll.cpp
@@ -69,7 +69,7 @@ WaveformRendererPreroll::~WaveformRendererPreroll() = default;
 
 void WaveformRendererPreroll::setup(
         const QDomNode& node, const SkinContext& context) {
-    m_color.setNamedColor(context.selectString(node, "SignalColor"));
+    m_color = QColor(context.selectString(node, "SignalColor"));
     m_color = WSkinColor::getCorrectColor(m_color);
 }
 
diff --git a/src/waveform/renderers/waveformrenderbeat.cpp b/src/waveform/renderers/waveformrenderbeat.cpp
index ef59fe74634..fa7ed34e399 100644
--- a/src/waveform/renderers/waveformrenderbeat.cpp
+++ b/src/waveform/renderers/waveformrenderbeat.cpp
@@ -20,7 +20,7 @@ WaveformRenderBeat::~WaveformRenderBeat() {
 }
 
 void WaveformRenderBeat::setup(const QDomNode& node, const SkinContext& context) {
-    m_beatColor.setNamedColor(context.selectString(node, "BeatColor"));
+    m_beatColor = QColor(context.selectString(node, "BeatColor"));
     m_beatColor = WSkinColor::getCorrectColor(m_beatColor).toRgb();
 }
 
diff --git a/src/waveform/renderers/waveformrendererendoftrack.cpp b/src/waveform/renderers/waveformrendererendoftrack.cpp
index edef583da39..326ba5a8d2b 100644
--- a/src/waveform/renderers/waveformrendererendoftrack.cpp
+++ b/src/waveform/renderers/waveformrendererendoftrack.cpp
@@ -46,7 +46,7 @@ void WaveformRendererEndOfTrack::setup(const QDomNode& node, const SkinContext&
     m_color = QColor(200, 25, 20);
     const QString endOfTrackColorName = context.selectString(node, "EndOfTrackColor");
     if (!endOfTrackColorName.isNull()) {
-        m_color.setNamedColor(endOfTrackColorName);
+        m_color = QColor(endOfTrackColorName);
         m_color = WSkinColor::getCorrectColor(m_color);
     }
     m_pen = QPen(QBrush(m_color), 2.5 * scaleFactor());
diff --git a/src/waveform/renderers/waveformrendererpreroll.cpp b/src/waveform/renderers/waveformrendererpreroll.cpp
index 1c0a4abb839..f6c83857007 100644
--- a/src/waveform/renderers/waveformrendererpreroll.cpp
+++ b/src/waveform/renderers/waveformrendererpreroll.cpp
@@ -20,7 +20,7 @@ WaveformRendererPreroll::~WaveformRendererPreroll() {
 
 void WaveformRendererPreroll::setup(
         const QDomNode& node, const SkinContext& context) {
-    m_color.setNamedColor(context.selectString(node, "SignalColor"));
+    m_color = QColor(context.selectString(node, "SignalColor"));
     m_color = WSkinColor::getCorrectColor(m_color);
 }
 
diff --git a/src/waveform/renderers/waveformsignalcolors.cpp b/src/waveform/renderers/waveformsignalcolors.cpp
index c8c7061dc61..4c7f5764fcb 100644
--- a/src/waveform/renderers/waveformsignalcolors.cpp
+++ b/src/waveform/renderers/waveformsignalcolors.cpp
@@ -19,51 +19,51 @@ bool WaveformSignalColors::setup(const QDomNode &node, const SkinContext& contex
     // toRgb(). Otherwise Mixxx will waste 3% of its CPU time while rendering
     // the filtered waveform doing RGB color space conversions!
 
-    m_signalColor.setNamedColor(context.selectString(node, "SignalColor"));
+    m_signalColor = QColor(context.selectString(node, "SignalColor"));
     m_signalColor = WSkinColor::getCorrectColor(m_signalColor).toRgb();
 
-    m_lowColor.setNamedColor(context.selectString(node, "SignalLowColor"));
+    m_lowColor = QColor(context.selectString(node, "SignalLowColor"));
     m_lowColor = WSkinColor::getCorrectColor(m_lowColor).toRgb();
 
-    m_midColor.setNamedColor(context.selectString(node, "SignalMidColor"));
+    m_midColor = QColor(context.selectString(node, "SignalMidColor"));
     m_midColor = WSkinColor::getCorrectColor(m_midColor).toRgb();
 
-    m_highColor.setNamedColor(context.selectString(node, "SignalHighColor"));
+    m_highColor = QColor(context.selectString(node, "SignalHighColor"));
     m_highColor = WSkinColor::getCorrectColor(m_highColor).toRgb();
 
-    m_rgbLowColor.setNamedColor(context.selectString(node, "SignalRGBLowColor"));
+    m_rgbLowColor = QColor(context.selectString(node, "SignalRGBLowColor"));
     if (!m_rgbLowColor.isValid()) {
         m_rgbLowColor = Qt::red;
     }
     m_rgbLowColor = WSkinColor::getCorrectColor(m_rgbLowColor).toRgb();
 
-    m_rgbMidColor.setNamedColor(context.selectString(node, "SignalRGBMidColor"));
+    m_rgbMidColor = QColor(context.selectString(node, "SignalRGBMidColor"));
     if (!m_rgbMidColor.isValid()) {
         m_rgbMidColor = Qt::green;
     }
     m_rgbMidColor = WSkinColor::getCorrectColor(m_rgbMidColor).toRgb();
 
-    m_rgbHighColor.setNamedColor(context.selectString(node, "SignalRGBHighColor"));
+    m_rgbHighColor = QColor(context.selectString(node, "SignalRGBHighColor"));
     if (!m_rgbHighColor.isValid()) {
         m_rgbHighColor = Qt::blue;
     }
     m_rgbHighColor = WSkinColor::getCorrectColor(m_rgbHighColor).toRgb();
 
     // filtered colors
-    m_rgbLowFilteredColor.setNamedColor(context.selectString(node, "SignalRGBLowFilteredColor"));
+    m_rgbLowFilteredColor = QColor(context.selectString(node, "SignalRGBLowFilteredColor"));
     if (!m_rgbLowFilteredColor.isValid()) {
         m_rgbLowFilteredColor = m_rgbLowColor.darker(300);
     }
     m_rgbLowFilteredColor = WSkinColor::getCorrectColor(m_rgbLowFilteredColor).toRgb();
 
-    m_rgbMidFilteredColor.setNamedColor(context.selectString(node, "SignalRGBMidFilteredColor"));
+    m_rgbMidFilteredColor = QColor(context.selectString(node, "SignalRGBMidFilteredColor"));
     if (!m_rgbMidFilteredColor.isValid()) {
         m_rgbMidFilteredColor = m_rgbMidColor.darker(300);
         ;
     }
     m_rgbMidFilteredColor = WSkinColor::getCorrectColor(m_rgbMidFilteredColor).toRgb();
 
-    m_rgbHighFilteredColor.setNamedColor(context.selectString(node, "SignalRGBHighFilteredColor"));
+    m_rgbHighFilteredColor = QColor(context.selectString(node, "SignalRGBHighFilteredColor"));
     if (!m_rgbHighFilteredColor.isValid()) {
         m_rgbHighFilteredColor = m_rgbHighColor.darker(300);
         ;
diff --git a/src/widget/woverview.cpp b/src/widget/woverview.cpp
index 5cb043a6862..436d7ca4007 100644
--- a/src/widget/woverview.cpp
+++ b/src/widget/woverview.cpp
@@ -140,7 +140,7 @@ void WOverview::setup(const QDomNode& node, const SkinContext& context) {
     m_endOfTrackColor = QColor(200, 25, 20);
     const QString endOfTrackColorName = context.selectString(node, "EndOfTrackColor");
     if (!endOfTrackColorName.isNull()) {
-        m_endOfTrackColor.setNamedColor(endOfTrackColorName);
+        m_endOfTrackColor = QColor(endOfTrackColorName);
         m_endOfTrackColor = WSkinColor::getCorrectColor(m_endOfTrackColor);
     }
 

From 382b55131a52d389b14b62a8df102af83b514517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Mon, 16 Oct 2023 00:24:03 +0200
Subject: [PATCH 202/388] Improve header of widget classes

---
 src/controllers/dlgprefcontroller.cpp         |  1 +
 src/dialog/dlgreplacecuecolor.cpp             |  1 +
 src/effects/defs.h                            |  1 +
 src/library/librarycontrol.cpp                |  1 +
 src/mixxxmainwindow.cpp                       | 32 ++----------
 src/mixxxmainwindow.h                         |  5 +-
 .../widgets/glwaveformwidgetabstract.cpp      |  1 +
 src/widget/controlwidgetconnection.cpp        |  1 -
 src/widget/controlwidgetconnection.h          |  2 -
 src/widget/findonwebmenufactory.cpp           |  1 +
 src/widget/findonwebmenufactory.h             |  3 +-
 .../findonwebmenudiscogs.h                    |  5 +-
 .../findonwebmenulastfm.h                     |  5 +-
 .../findonwebmenusoundcloud.h                 |  4 +-
 src/widget/hexspinbox.h                       |  1 -
 src/widget/paintable.cpp                      |  8 ++-
 src/widget/wanalysislibrarytableview.cpp      |  1 -
 src/widget/wanalysislibrarytableview.h        |  2 -
 src/widget/wbasewidget.cpp                    |  2 -
 src/widget/wbattery.cpp                       |  1 +
 src/widget/wbattery.h                         | 11 ++--
 src/widget/wbeatspinbox.cpp                   |  4 +-
 src/widget/wbeatspinbox.h                     | 10 ++--
 src/widget/wcolorpicker.cpp                   |  4 +-
 src/widget/wcolorpicker.h                     |  8 ++-
 src/widget/wcolorpickeraction.cpp             |  2 +
 src/widget/wcolorpickeraction.h               |  2 -
 src/widget/wcombobox.cpp                      |  4 +-
 src/widget/wcombobox.h                        |  6 +--
 src/widget/wcoverart.cpp                      |  7 +--
 src/widget/wcoverart.h                        | 16 +++---
 src/widget/wcoverartlabel.cpp                 |  3 +-
 src/widget/wcoverartlabel.h                   |  2 -
 src/widget/wcoverartmenu.h                    |  5 +-
 src/widget/wcuemenupopup.cpp                  |  3 --
 src/widget/wdisplay.cpp                       |  3 +-
 src/widget/wdisplay.h                         |  6 +--
 src/widget/weffectbuttonparametername.cpp     |  3 --
 src/widget/weffectbuttonparametername.h       |  4 --
 src/widget/weffectchain.cpp                   |  3 --
 src/widget/weffectchain.h                     |  7 +--
 src/widget/weffectchainpresetbutton.h         |  5 +-
 src/widget/weffectchainpresetselector.cpp     |  5 +-
 src/widget/weffectchainpresetselector.h       |  7 +--
 src/widget/weffectknobparametername.cpp       |  3 --
 src/widget/weffectknobparametername.h         |  4 --
 src/widget/weffectname.cpp                    |  3 --
 src/widget/weffectname.h                      |  5 +-
 src/widget/weffectparameterknob.h             |  2 +-
 src/widget/weffectparameterknobcomposed.h     |  2 +-
 src/widget/weffectparameternamebase.cpp       |  4 +-
 src/widget/weffectparameternamebase.h         |  4 +-
 src/widget/weffectpushbutton.cpp              |  3 +-
 src/widget/weffectpushbutton.h                | 12 ++---
 src/widget/weffectselector.cpp                |  1 -
 src/widget/weffectselector.h                  |  7 +--
 src/widget/wfindonwebmenu.cpp                 |  3 --
 src/widget/whotcuebutton.cpp                  |  5 +-
 src/widget/whotcuebutton.h                    |  4 --
 src/widget/wimagestore.cpp                    |  1 -
 src/widget/wimagestore.h                      |  8 +--
 src/widget/wkey.cpp                           |  2 +-
 src/widget/wkey.h                             |  2 -
 src/widget/wknob.cpp                          |  5 --
 src/widget/wknob.h                            |  6 ---
 src/widget/wknobcomposed.cpp                  |  1 -
 src/widget/wknobcomposed.h                    |  6 ---
 src/widget/wlabel.cpp                         |  2 +
 src/widget/wlabel.h                           |  5 +-
 src/widget/wlibrary.cpp                       |  2 +-
 src/widget/wlibrary.h                         |  8 +--
 src/widget/wlibrarysidebar.cpp                |  2 -
 src/widget/wlibrarysidebar.h                  |  8 +--
 src/widget/wlibrarytableview.cpp              |  6 +--
 src/widget/wlibrarytableview.h                |  4 +-
 src/widget/wmainmenubar.cpp                   |  1 -
 src/widget/wmainmenubar.h                     |  3 +-
 src/widget/wnumber.cpp                        |  1 +
 src/widget/wnumber.h                          |  3 --
 src/widget/wnumberdb.cpp                      |  3 --
 src/widget/wnumberdb.h                        |  1 -
 src/widget/wnumberpos.cpp                     |  4 +-
 src/widget/wnumberpos.h                       |  1 -
 src/widget/wnumberrate.cpp                    | 13 -----
 src/widget/woverview.cpp                      |  1 +
 src/widget/woverview.h                        |  7 ++-
 src/widget/wpixmapstore.cpp                   |  5 --
 src/widget/wpushbutton.cpp                    |  3 +-
 src/widget/wpushbutton.h                      |  9 ++--
 src/widget/wraterange.cpp                     |  3 +-
 src/widget/wrecordingduration.cpp             |  2 +
 src/widget/wrecordingduration.h               |  4 +-
 src/widget/wscrollable.cpp                    |  1 +
 src/widget/wscrollable.h                      |  7 ++-
 src/widget/wsearchlineedit.cpp                |  4 +-
 src/widget/wsearchlineedit.h                  |  8 +--
 src/widget/wsingletoncontainer.cpp            |  2 -
 src/widget/wsizeawarestack.cpp                |  2 -
 src/widget/wsizeawarestack.h                  |  3 +-
 src/widget/wskincolor.h                       |  3 +-
 src/widget/wslidercomposed.cpp                |  2 -
 src/widget/wslidercomposed.h                  | 10 ++--
 src/widget/wspinnybase.cpp                    |  2 +
 src/widget/wspinnybase.h                      | 12 ++---
 src/widget/wsplitter.cpp                      |  2 +
 src/widget/wsplitter.h                        |  6 +--
 src/widget/wstarrating.cpp                    |  7 +--
 src/widget/wstarrating.h                      |  9 +---
 src/widget/wstatuslight.cpp                   |  3 +-
 src/widget/wstatuslight.h                     |  8 ++-
 src/widget/wtime.cpp                          |  4 +-
 src/widget/wtime.h                            |  3 --
 src/widget/wtrackmenu.cpp                     | 10 ++--
 src/widget/wtrackproperty.cpp                 |  3 +-
 src/widget/wtrackproperty.h                   | 51 +++++++++----------
 src/widget/wtracktableviewheader.cpp          |  2 +-
 src/widget/wtracktableviewheader.h            |  6 +--
 src/widget/wtracktext.cpp                     |  4 --
 src/widget/wtracktext.h                       |  4 --
 src/widget/wtrackwidgetgroup.cpp              |  4 +-
 src/widget/wtrackwidgetgroup.h                |  1 -
 src/widget/wvumeterbase.cpp                   |  1 +
 src/widget/wvumeterbase.h                     |  4 +-
 src/widget/wvumeterlegacy.cpp                 |  1 +
 src/widget/wvumeterlegacy.h                   |  4 +-
 src/widget/wwaveformviewer.h                  |  6 +--
 src/widget/wwidget.cpp                        |  1 -
 src/widget/wwidget.h                          |  5 +-
 src/widget/wwidgetgroup.cpp                   |  3 +-
 src/widget/wwidgetgroup.h                     |  5 +-
 src/widget/wwidgetstack.cpp                   |  2 +-
 src/widget/wwidgetstack.h                     |  6 +--
 132 files changed, 222 insertions(+), 401 deletions(-)

diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
index e753f156e64..42e7e0de1dc 100644
--- a/src/controllers/dlgprefcontroller.cpp
+++ b/src/controllers/dlgprefcontroller.cpp
@@ -5,6 +5,7 @@
 #include <QFileDialog>
 #include <QFileInfo>
 #include <QInputDialog>
+#include <QKeyEvent>
 #include <QStandardPaths>
 #include <QTableWidget>
 #include <QTableWidgetItem>
diff --git a/src/dialog/dlgreplacecuecolor.cpp b/src/dialog/dlgreplacecuecolor.cpp
index bae68ec50fc..d34454416d9 100644
--- a/src/dialog/dlgreplacecuecolor.cpp
+++ b/src/dialog/dlgreplacecuecolor.cpp
@@ -6,6 +6,7 @@
 #include <QMessageBox>
 #include <QResizeEvent>
 #include <QtConcurrent>
+#include <QStyleFactory>
 
 #include "engine/controls/cuecontrol.h"
 #include "library/dao/cuedao.h"
diff --git a/src/effects/defs.h b/src/effects/defs.h
index b714915b80f..c333739ab98 100644
--- a/src/effects/defs.h
+++ b/src/effects/defs.h
@@ -1,4 +1,5 @@
 #pragma once
+
 #include <QSharedPointer>
 #include <array>
 #include <memory>
diff --git a/src/library/librarycontrol.cpp b/src/library/librarycontrol.cpp
index 29010554fce..8e057a5982f 100644
--- a/src/library/librarycontrol.cpp
+++ b/src/library/librarycontrol.cpp
@@ -2,6 +2,7 @@
 
 #include <QApplication>
 #include <QItemSelectionModel>
+#include <QKeyEvent>
 #include <QModelIndex>
 #include <QModelIndexList>
 #include <QWindow>
diff --git a/src/mixxxmainwindow.cpp b/src/mixxxmainwindow.cpp
index e258ce5442d..b0d25442978 100644
--- a/src/mixxxmainwindow.cpp
+++ b/src/mixxxmainwindow.cpp
@@ -14,17 +14,17 @@
 #include <QtDBus>
 #endif
 
-#include "widget/wglwidget.h"
-
 #ifdef MIXXX_USE_QOPENGL
 #include "widget/tooltipqopengl.h"
 #include "widget/winitialglwidget.h"
 #endif
 
+#include "controllers/keyboard/keyboardeventfilter.h"
+#include "coreservices.h"
+#include "defs_urls.h"
 #include "dialog/dlgabout.h"
 #include "dialog/dlgdevelopertools.h"
 #include "dialog/dlgkeywheel.h"
-#include "effects/effectsmanager.h"
 #include "moc_mixxxmainwindow.cpp"
 #include "preferences/constants.h"
 #include "preferences/dialog/dlgpreferences.h"
@@ -32,20 +32,14 @@
 #include "broadcast/broadcastmanager.h"
 #endif
 #include "control/controlindicatortimer.h"
-#include "controllers/controllermanager.h"
-#include "controllers/keyboard/keyboardeventfilter.h"
-#include "database/mixxxdb.h"
-#include "engine/sidechain/enginenetworkstream.h"
 #include "library/library.h"
 #include "library/library_prefs.h"
 #ifdef __ENGINEPRIME__
 #include "library/export/libraryexporter.h"
 #endif
-#include "library/trackcollection.h"
 #include "library/trackcollectionmanager.h"
 #include "mixer/playerinfo.h"
 #include "mixer/playermanager.h"
-#include "preferences/settingsmanager.h"
 #include "recording/recordingmanager.h"
 #include "skin/legacy/launchimage.h"
 #include "skin/skinloader.h"
@@ -53,38 +47,20 @@
 #include "sources/soundsourceproxy.h"
 #include "track/track.h"
 #include "util/debug.h"
-#include "util/experiment.h"
-#include "util/font.h"
-#include "util/logger.h"
-#include "util/math.h"
 #include "util/sandbox.h"
-#include "util/screensaver.h"
-#include "util/time.h"
 #include "util/timer.h"
-#include "util/translations.h"
 #include "util/versionstore.h"
-#include "util/widgethelper.h"
 #include "waveform/guitick.h"
 #include "waveform/sharedglcontext.h"
 #include "waveform/visualsmanager.h"
 #include "waveform/waveformwidgetfactory.h"
+#include "widget/wglwidget.h"
 #include "widget/wmainmenubar.h"
 
 #ifdef __VINYLCONTROL__
 #include "vinylcontrol/vinylcontrolmanager.h"
 #endif
 
-#if defined(Q_OS_LINUX)
-#include <X11/Xlib.h>
-#include <X11/Xlibint.h>
-// Xlibint.h predates C++ and defines macros which conflict
-// with references to std::max and std::min
-#undef max
-#undef min
-
-#include <QtX11Extras/QX11Info>
-#endif
-
 namespace {
 #ifdef __LINUX__
 // Detect if the desktop supports a global menu to decide whether we need to rebuild
diff --git a/src/mixxxmainwindow.h b/src/mixxxmainwindow.h
index eeeb755162c..fae4ce61697 100644
--- a/src/mixxxmainwindow.h
+++ b/src/mixxxmainwindow.h
@@ -4,13 +4,12 @@
 #include <QString>
 #include <memory>
 
-#include "coreservices.h"
-#include "preferences/configobject.h"
 #include "preferences/constants.h"
 #include "soundio/sounddevicestatus.h"
 #include "track/track_decl.h"
 #include "util/parented_ptr.h"
 
+class ControlObject;
 class DlgDeveloperTools;
 class DlgPreferences;
 class DlgKeywheel;
@@ -21,6 +20,8 @@ class WMainMenuBar;
 
 namespace mixxx {
 
+class CoreServices;
+
 namespace skin {
 class SkinLoader;
 }
diff --git a/src/waveform/widgets/glwaveformwidgetabstract.cpp b/src/waveform/widgets/glwaveformwidgetabstract.cpp
index ed7610a9060..62cbdb22194 100644
--- a/src/waveform/widgets/glwaveformwidgetabstract.cpp
+++ b/src/waveform/widgets/glwaveformwidgetabstract.cpp
@@ -1,6 +1,7 @@
 #include "waveform/widgets/glwaveformwidgetabstract.h"
 
 #include <QApplication>
+#include <QWheelEvent>
 
 GLWaveformWidgetAbstract::GLWaveformWidgetAbstract(const QString& group, QWidget* parent)
         : WaveformWidgetAbstract(group),
diff --git a/src/widget/controlwidgetconnection.cpp b/src/widget/controlwidgetconnection.cpp
index 291806dc63a..b04a1ca3323 100644
--- a/src/widget/controlwidgetconnection.cpp
+++ b/src/widget/controlwidgetconnection.cpp
@@ -5,7 +5,6 @@
 #include "control/controlproxy.h"
 #include "moc_controlwidgetconnection.cpp"
 #include "util/assert.h"
-#include "util/debug.h"
 #include "util/valuetransformer.h"
 #include "widget/wbasewidget.h"
 
diff --git a/src/widget/controlwidgetconnection.h b/src/widget/controlwidgetconnection.h
index 50f96e7af5e..1fc4417612d 100644
--- a/src/widget/controlwidgetconnection.h
+++ b/src/widget/controlwidgetconnection.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <QByteArray>
 #include <QMetaProperty>
 #include <QObject>
 #include <QScopedPointer>
@@ -10,7 +9,6 @@
 #include "util/valuetransformer.h"
 
 class WBaseWidget;
-class ValueTransformer;
 
 class ControlWidgetConnection : public QObject {
     Q_OBJECT
diff --git a/src/widget/findonwebmenufactory.cpp b/src/widget/findonwebmenufactory.cpp
index f61e8bbf0dc..e3762a10d54 100644
--- a/src/widget/findonwebmenufactory.cpp
+++ b/src/widget/findonwebmenufactory.cpp
@@ -5,6 +5,7 @@
 #include "findonwebmenuservices/findonwebmenudiscogs.h"
 #include "findonwebmenuservices/findonwebmenulastfm.h"
 #include "findonwebmenuservices/findonwebmenusoundcloud.h"
+#include "util/parented_ptr.h"
 
 namespace mixxx {
 
diff --git a/src/widget/findonwebmenufactory.h b/src/widget/findonwebmenufactory.h
index 98ff0bf2de8..4389d437613 100644
--- a/src/widget/findonwebmenufactory.h
+++ b/src/widget/findonwebmenufactory.h
@@ -1,8 +1,7 @@
 #pragma once
 
-#include <QMenu>
-
 class Track;
+class QMenu;
 
 namespace mixxx {
 
diff --git a/src/widget/findonwebmenuservices/findonwebmenudiscogs.h b/src/widget/findonwebmenuservices/findonwebmenudiscogs.h
index 5cd77497f96..b2a31aa599b 100644
--- a/src/widget/findonwebmenuservices/findonwebmenudiscogs.h
+++ b/src/widget/findonwebmenuservices/findonwebmenudiscogs.h
@@ -1,9 +1,10 @@
 #pragma once
 
-#include "track/track.h"
-#include "util/parented_ptr.h"
 #include "widget/wfindonwebmenu.h"
 
+class QMenu;
+class Track;
+
 class FindOnWebMenuDiscogs : public WFindOnWebMenu {
     Q_OBJECT
   public:
diff --git a/src/widget/findonwebmenuservices/findonwebmenulastfm.h b/src/widget/findonwebmenuservices/findonwebmenulastfm.h
index 383c6e562b2..b72a41fc1a0 100644
--- a/src/widget/findonwebmenuservices/findonwebmenulastfm.h
+++ b/src/widget/findonwebmenuservices/findonwebmenulastfm.h
@@ -1,9 +1,10 @@
 #pragma once
 
-#include "track/track.h"
-#include "util/parented_ptr.h"
 #include "widget/wfindonwebmenu.h"
 
+class QMenu;
+class Track;
+
 class FindOnWebMenuLastfm : public WFindOnWebMenu {
     Q_OBJECT
   public:
diff --git a/src/widget/findonwebmenuservices/findonwebmenusoundcloud.h b/src/widget/findonwebmenuservices/findonwebmenusoundcloud.h
index b55d586bd25..4d1b932beb9 100644
--- a/src/widget/findonwebmenuservices/findonwebmenusoundcloud.h
+++ b/src/widget/findonwebmenuservices/findonwebmenusoundcloud.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "track/track.h"
-#include "util/parented_ptr.h"
 #include "widget/wfindonwebmenu.h"
 
+class Track;
+
 class FindOnWebMenuSoundcloud : public WFindOnWebMenu {
     Q_OBJECT
   public:
diff --git a/src/widget/hexspinbox.h b/src/widget/hexspinbox.h
index 709bd99fa59..94ccec77294 100644
--- a/src/widget/hexspinbox.h
+++ b/src/widget/hexspinbox.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <QSpinBox>
-#include <QValidator>
 
 class HexSpinBox : public QSpinBox {
     Q_OBJECT
diff --git a/src/widget/paintable.cpp b/src/widget/paintable.cpp
index 8968447693f..4bf5b4d0a34 100644
--- a/src/widget/paintable.cpp
+++ b/src/widget/paintable.cpp
@@ -1,14 +1,12 @@
-#include "widget/wpixmapstore.h"
-
-#include <QDir>
+#include <QFile>
+#include <QFileInfo>
 #include <QString>
 #include <QtDebug>
 
-#include "skin/legacy/imgloader.h"
-
 #include "util/math.h"
 #include "util/memory.h"
 #include "util/painterscope.h"
+#include "widget/wpixmapstore.h"
 
 // static
 Paintable::DrawMode Paintable::DrawModeFromString(const QString& str) {
diff --git a/src/widget/wanalysislibrarytableview.cpp b/src/widget/wanalysislibrarytableview.cpp
index 11478e7b149..13832666137 100644
--- a/src/widget/wanalysislibrarytableview.cpp
+++ b/src/widget/wanalysislibrarytableview.cpp
@@ -1,6 +1,5 @@
 #include "widget/wanalysislibrarytableview.h"
 
-#include "library/trackcollection.h"
 #include "moc_wanalysislibrarytableview.cpp"
 
 WAnalysisLibraryTableView::WAnalysisLibraryTableView(
diff --git a/src/widget/wanalysislibrarytableview.h b/src/widget/wanalysislibrarytableview.h
index 32924655ab2..12cb5b668d3 100644
--- a/src/widget/wanalysislibrarytableview.h
+++ b/src/widget/wanalysislibrarytableview.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <QWidget>
-
 #include "preferences/usersettings.h"
 #include "widget/wtracktableview.h"
 
diff --git a/src/widget/wbasewidget.cpp b/src/widget/wbasewidget.cpp
index 40a4b7b43c1..27427e25ff7 100644
--- a/src/widget/wbasewidget.cpp
+++ b/src/widget/wbasewidget.cpp
@@ -1,5 +1,3 @@
-#include <QtDebug>
-
 #include "widget/wbasewidget.h"
 
 #include "widget/controlwidgetconnection.h"
diff --git a/src/widget/wbattery.cpp b/src/widget/wbattery.cpp
index d6d4fabdc40..855e6d38e0f 100644
--- a/src/widget/wbattery.cpp
+++ b/src/widget/wbattery.cpp
@@ -4,6 +4,7 @@
 #include <QStylePainter>
 
 #include "moc_wbattery.cpp"
+#include "skin/legacy/skincontext.h"
 #include "util/battery/battery.h"
 #include "util/math.h"
 
diff --git a/src/widget/wbattery.h b/src/widget/wbattery.h
index 1698e9a037c..924bc6b2f9b 100644
--- a/src/widget/wbattery.h
+++ b/src/widget/wbattery.h
@@ -1,15 +1,16 @@
 #pragma once
 
-#include <QList>
-#include <QPixmap>
 #include <QScopedPointer>
 #include <QVector>
 
-#include "skin/legacy/skincontext.h"
-#include "widget/wlabel.h"
+#include "widget/paintable.h"
 #include "widget/wpixmapstore.h"
 #include "widget/wwidget.h"
-#include "util/battery/battery.h"
+
+class SkinContext;
+class QDomNode;
+class PixmapSource;
+class Battery;
 
 class WBattery : public WWidget {
     Q_OBJECT
diff --git a/src/widget/wbeatspinbox.cpp b/src/widget/wbeatspinbox.cpp
index 5a81465a53b..69d79e880ac 100644
--- a/src/widget/wbeatspinbox.cpp
+++ b/src/widget/wbeatspinbox.cpp
@@ -1,12 +1,12 @@
 #include "widget/wbeatspinbox.h"
 
-#include <QLineEdit>
+#include <QKeyEvent>
 #include <QRegularExpression>
 
 #include "control/controlobject.h"
 #include "control/controlproxy.h"
-#include "library/library_decl.h"
 #include "moc_wbeatspinbox.cpp"
+#include "skin/legacy/skincontext.h"
 #include "util/math.h"
 
 namespace {
diff --git a/src/widget/wbeatspinbox.h b/src/widget/wbeatspinbox.h
index bf60833a5cc..917f9524ed8 100644
--- a/src/widget/wbeatspinbox.h
+++ b/src/widget/wbeatspinbox.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include "control/controlobject.h"
-#include "control/controlproxy.h"
-#include "widget/wbasewidget.h"
-#include "skin/legacy/skincontext.h"
 #include <QDoubleSpinBox>
 #include <QLineEdit>
 
-class ControlProxy;
+#include "control/controlproxy.h"
+#include "widget/wbasewidget.h"
+
+class QDomNode;
+class SkinContext;
 
 class WBeatSpinBox : public QDoubleSpinBox, public WBaseWidget {
     Q_OBJECT
diff --git a/src/widget/wcolorpicker.cpp b/src/widget/wcolorpicker.cpp
index 7913a0f5caa..6bc3296a320 100644
--- a/src/widget/wcolorpicker.cpp
+++ b/src/widget/wcolorpicker.cpp
@@ -1,12 +1,12 @@
 #include "widget/wcolorpicker.h"
 
 #include <QColorDialog>
-#include <QMapIterator>
+#include <QGridLayout>
 #include <QPushButton>
 #include <QStyle>
+#include <QStyleFactory>
 
 #include "moc_wcolorpicker.cpp"
-#include "util/color/color.h"
 #include "util/parented_ptr.h"
 
 namespace {
diff --git a/src/widget/wcolorpicker.h b/src/widget/wcolorpicker.h
index c27f6c9cde4..0250f87a6e0 100644
--- a/src/widget/wcolorpicker.h
+++ b/src/widget/wcolorpicker.h
@@ -1,16 +1,14 @@
 #pragma once
 
-#include <QGridLayout>
-#include <QMap>
-#include <QPushButton>
 #include <QStyle>
-#include <QStyleFactory>
 #include <QWidget>
 
-#include "util/color/color.h"
 #include "util/color/colorpalette.h"
 #include "util/parented_ptr.h"
 
+class QGridLayout;
+class QPushButton;
+
 class WColorPicker : public QWidget {
     Q_OBJECT
   public:
diff --git a/src/widget/wcolorpickeraction.cpp b/src/widget/wcolorpickeraction.cpp
index 642a2f20fb0..21cbb48ae22 100644
--- a/src/widget/wcolorpickeraction.cpp
+++ b/src/widget/wcolorpickeraction.cpp
@@ -1,5 +1,7 @@
 #include "widget/wcolorpickeraction.h"
 
+#include <QHBoxLayout>
+
 #include "moc_wcolorpickeraction.cpp"
 
 WColorPickerAction::WColorPickerAction(WColorPicker::Options options, const ColorPalette& palette, QWidget* parent)
diff --git a/src/widget/wcolorpickeraction.h b/src/widget/wcolorpickeraction.h
index 66cdebe0205..9cd491b86d5 100644
--- a/src/widget/wcolorpickeraction.h
+++ b/src/widget/wcolorpickeraction.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <QHBoxLayout>
-#include <QWidget>
 #include <QWidgetAction>
 
 #include "util/parented_ptr.h"
diff --git a/src/widget/wcombobox.cpp b/src/widget/wcombobox.cpp
index 7fc52220463..79462d72469 100644
--- a/src/widget/wcombobox.cpp
+++ b/src/widget/wcombobox.cpp
@@ -1,9 +1,11 @@
 #include "widget/wcombobox.h"
 
+#include <QDomNode>
+#include <QEvent>
 #include <QIcon>
-#include <QtDebug>
 
 #include "moc_wcombobox.cpp"
+#include "skin/legacy/skincontext.h"
 
 WComboBox::WComboBox(QWidget* pParent)
         : QComboBox(pParent),
diff --git a/src/widget/wcombobox.h b/src/widget/wcombobox.h
index 1d0395458df..aff631c426e 100644
--- a/src/widget/wcombobox.h
+++ b/src/widget/wcombobox.h
@@ -1,11 +1,11 @@
 #pragma once
 
 #include <QComboBox>
-#include <QDomNode>
-#include <QEvent>
 
 #include "widget/wbasewidget.h"
-#include "skin/legacy/skincontext.h"
+
+class QDomNode;
+class SkinContext;
 
 class WComboBox : public QComboBox, public WBaseWidget {
     Q_OBJECT
diff --git a/src/widget/wcoverart.cpp b/src/widget/wcoverart.cpp
index ee04a7b3ab5..87f79fe0e75 100644
--- a/src/widget/wcoverart.cpp
+++ b/src/widget/wcoverart.cpp
@@ -1,18 +1,13 @@
 #include "widget/wcoverart.h"
 
-#include <QAction>
-#include <QApplication>
-#include <QBitmap>
-#include <QIcon>
-#include <QLabel>
 #include <QStyleOption>
 #include <QStylePainter>
 
-#include "control/controlobject.h"
 #include "library/coverartcache.h"
 #include "library/coverartutils.h"
 #include "library/dlgcoverartfullsize.h"
 #include "moc_wcoverart.cpp"
+#include "skin/legacy/skincontext.h"
 #include "track/track.h"
 #include "util/dnd.h"
 #include "util/math.h"
diff --git a/src/widget/wcoverart.h b/src/widget/wcoverart.h
index fcc07fb0661..9cb8c7f5ab7 100644
--- a/src/widget/wcoverart.h
+++ b/src/widget/wcoverart.h
@@ -1,20 +1,20 @@
 #pragma once
 
-#include <QColor>
-#include <QDomNode>
-#include <QMouseEvent>
-#include <QWidget>
 #include <QTimer>
+#include <QWidget>
 
-#include "mixer/basetrackplayer.h"
+#include "library/coverart.h"
 #include "preferences/usersettings.h"
-#include "library/coverartcache.h"
-#include "skin/legacy/skincontext.h"
+#include "track/track_decl.h"
+#include "util/cache.h"
 #include "widget/trackdroptarget.h"
 #include "widget/wbasewidget.h"
-#include "widget/wcoverartmenu.h"
 
 class DlgCoverArtFullSize;
+class QDomNode;
+class SkinContext;
+class WCoverArtMenu;
+class BaseTrackPlayer;
 
 class WCoverArt : public QWidget, public WBaseWidget, public TrackDropTarget {
     Q_OBJECT
diff --git a/src/widget/wcoverartlabel.cpp b/src/widget/wcoverartlabel.cpp
index c064d549479..a2d4e548408 100644
--- a/src/widget/wcoverartlabel.cpp
+++ b/src/widget/wcoverartlabel.cpp
@@ -1,11 +1,10 @@
 #include "widget/wcoverartlabel.h"
 
-#include <QtDebug>
+#include <QContextMenuEvent>
 
 #include "library/coverartutils.h"
 #include "library/dlgcoverartfullsize.h"
 #include "moc_wcoverartlabel.cpp"
-#include "track/track.h"
 #include "widget/wcoverartmenu.h"
 
 namespace {
diff --git a/src/widget/wcoverartlabel.h b/src/widget/wcoverartlabel.h
index 58937c152e4..1dc99ff14bb 100644
--- a/src/widget/wcoverartlabel.h
+++ b/src/widget/wcoverartlabel.h
@@ -2,9 +2,7 @@
 
 #include <QByteArray>
 #include <QLabel>
-#include <QMouseEvent>
 #include <QPixmap>
-#include <QWidget>
 
 #include "track/track_decl.h"
 #include "util/parented_ptr.h"
diff --git a/src/widget/wcoverartmenu.h b/src/widget/wcoverartmenu.h
index ce69608c5c6..aa827b20c4b 100644
--- a/src/widget/wcoverartmenu.h
+++ b/src/widget/wcoverartmenu.h
@@ -1,13 +1,12 @@
 #pragma once
 
-#include <QAction>
 #include <QMenu>
-#include <QPixmap>
-#include <QWidget>
 
 #include "library/coverart.h"
 #include "library/export/coverartcopyworker.h"
 
+class QAction;
+
 // This class implements a context-menu with all CoverArt user actions. Callers
 // must call setCoverArt before calling exec or popup. This class does
 // not change the database -- it emits a coverArtSelected signal when the user
diff --git a/src/widget/wcuemenupopup.cpp b/src/widget/wcuemenupopup.cpp
index 0686b1abe7f..022ce3f22b4 100644
--- a/src/widget/wcuemenupopup.cpp
+++ b/src/widget/wcuemenupopup.cpp
@@ -1,13 +1,10 @@
 #include "widget/wcuemenupopup.h"
 
 #include <QHBoxLayout>
-#include <QInputDialog>
 #include <QVBoxLayout>
 
-#include "engine/engine.h"
 #include "moc_wcuemenupopup.cpp"
 #include "track/track.h"
-#include "util/color/color.h"
 
 WCueMenuPopup::WCueMenuPopup(UserSettingsPointer pConfig, QWidget* parent)
         : QWidget(parent),
diff --git a/src/widget/wdisplay.cpp b/src/widget/wdisplay.cpp
index d3a78e12064..f9ccf38c5f9 100644
--- a/src/widget/wdisplay.cpp
+++ b/src/widget/wdisplay.cpp
@@ -1,12 +1,11 @@
 #include "widget/wdisplay.h"
 
-#include <QPaintEvent>
-#include <QPixmap>
 #include <QStyleOption>
 #include <QStylePainter>
 #include <QtDebug>
 
 #include "moc_wdisplay.cpp"
+#include "skin/legacy/skincontext.h"
 #include "widget/wpixmapstore.h"
 
 WDisplay::WDisplay(QWidget * parent)
diff --git a/src/widget/wdisplay.h b/src/widget/wdisplay.h
index 3f4143884f8..99d5fa4423a 100644
--- a/src/widget/wdisplay.h
+++ b/src/widget/wdisplay.h
@@ -1,14 +1,14 @@
 #pragma once
 
-#include <QPaintEvent>
-#include <QPixmap>
 #include <QString>
 #include <QVector>
 
-#include "skin/legacy/skincontext.h"
 #include "widget/wpixmapstore.h"
 #include "widget/wwidget.h"
 
+class QDomNode;
+class SkinContext;
+
 class WDisplay : public WWidget {
    Q_OBJECT
   public:
diff --git a/src/widget/weffectbuttonparametername.cpp b/src/widget/weffectbuttonparametername.cpp
index 8ae4a90c388..f0fdc74afb4 100644
--- a/src/widget/weffectbuttonparametername.cpp
+++ b/src/widget/weffectbuttonparametername.cpp
@@ -1,8 +1,5 @@
 #include "widget/weffectbuttonparametername.h"
 
-#include <QtDebug>
-
-#include "effects/effectsmanager.h"
 #include "moc_weffectbuttonparametername.cpp"
 #include "widget/effectwidgetutils.h"
 
diff --git a/src/widget/weffectbuttonparametername.h b/src/widget/weffectbuttonparametername.h
index fcc3085e4f9..2d85551c89f 100644
--- a/src/widget/weffectbuttonparametername.h
+++ b/src/widget/weffectbuttonparametername.h
@@ -1,10 +1,6 @@
 #pragma once
 
-#include <QDomNode>
-
-#include "skin/legacy/skincontext.h"
 #include "widget/weffectparameternamebase.h"
-#include "widget/wlabel.h"
 
 class EffectsManager;
 
diff --git a/src/widget/weffectchain.cpp b/src/widget/weffectchain.cpp
index 6ec1216b71a..cf217ffdcf2 100644
--- a/src/widget/weffectchain.cpp
+++ b/src/widget/weffectchain.cpp
@@ -1,8 +1,5 @@
 #include "widget/weffectchain.h"
 
-#include <QtDebug>
-
-#include "effects/effectsmanager.h"
 #include "moc_weffectchain.cpp"
 #include "widget/effectwidgetutils.h"
 
diff --git a/src/widget/weffectchain.h b/src/widget/weffectchain.h
index e8b25927fae..abdaa6661eb 100644
--- a/src/widget/weffectchain.h
+++ b/src/widget/weffectchain.h
@@ -1,11 +1,6 @@
 #pragma once
 
-#include <QDomNode>
-#include <QLabel>
-#include <QWidget>
-
-#include "effects/effectchain.h"
-#include "skin/legacy/skincontext.h"
+#include "effects/defs.h"
 #include "widget/wlabel.h"
 
 class EffectsManager;
diff --git a/src/widget/weffectchainpresetbutton.h b/src/widget/weffectchainpresetbutton.h
index 2b0fa6242ae..62d16b86a2d 100644
--- a/src/widget/weffectchainpresetbutton.h
+++ b/src/widget/weffectchainpresetbutton.h
@@ -3,12 +3,13 @@
 #include <QMenu>
 #include <QPushButton>
 
-#include "effects/effectsmanager.h"
 #include "effects/presets/effectchainpresetmanager.h"
-#include "skin/legacy/skincontext.h"
 #include "util/parented_ptr.h"
 #include "widget/wbasewidget.h"
 
+class QDomNode;
+class SkinContext;
+
 class WEffectChainPresetButton : public QPushButton, public WBaseWidget {
     Q_OBJECT
   public:
diff --git a/src/widget/weffectchainpresetselector.cpp b/src/widget/weffectchainpresetselector.cpp
index bfed3191968..90f4d1b9a47 100644
--- a/src/widget/weffectchainpresetselector.cpp
+++ b/src/widget/weffectchainpresetselector.cpp
@@ -1,17 +1,16 @@
 #include "widget/weffectchainpresetselector.h"
 
 #include <QAbstractItemView>
-#include <QPaintEvent>
 #include <QStyleOption>
 #include <QStylePainter>
-#include <QtDebug>
 
 #include "effects/chains/quickeffectchain.h"
 #include "effects/effectsmanager.h"
-#include "library/library_decl.h"
 #include "moc_weffectchainpresetselector.cpp"
 #include "widget/effectwidgetutils.h"
 
+class QPaintEvent;
+
 WEffectChainPresetSelector::WEffectChainPresetSelector(
         QWidget* pParent, EffectsManager* pEffectsManager)
         : QComboBox(pParent),
diff --git a/src/widget/weffectchainpresetselector.h b/src/widget/weffectchainpresetselector.h
index bf751e844a6..e4feadcb193 100644
--- a/src/widget/weffectchainpresetselector.h
+++ b/src/widget/weffectchainpresetselector.h
@@ -1,12 +1,13 @@
 #pragma once
 
 #include <QComboBox>
-#include <QDomNode>
 
-#include "effects/effectchain.h"
-#include "skin/legacy/skincontext.h"
+#include "effects/defs.h"
+#include "widget/wbasewidget.h"
 
 class EffectsManager;
+class QDomNode;
+class SkinContext;
 
 class WEffectChainPresetSelector : public QComboBox, public WBaseWidget {
     Q_OBJECT
diff --git a/src/widget/weffectknobparametername.cpp b/src/widget/weffectknobparametername.cpp
index 66004391eac..ff3b8a92307 100644
--- a/src/widget/weffectknobparametername.cpp
+++ b/src/widget/weffectknobparametername.cpp
@@ -1,8 +1,5 @@
 #include "widget/weffectknobparametername.h"
 
-#include <QtDebug>
-
-#include "effects/effectsmanager.h"
 #include "moc_weffectknobparametername.cpp"
 #include "widget/effectwidgetutils.h"
 
diff --git a/src/widget/weffectknobparametername.h b/src/widget/weffectknobparametername.h
index cc0270c5bc2..18a759f3180 100644
--- a/src/widget/weffectknobparametername.h
+++ b/src/widget/weffectknobparametername.h
@@ -1,10 +1,6 @@
 #pragma once
 
-#include <QDomNode>
-
-#include "skin/legacy/skincontext.h"
 #include "widget/weffectparameternamebase.h"
-#include "widget/wlabel.h"
 
 class EffectsManager;
 
diff --git a/src/widget/weffectname.cpp b/src/widget/weffectname.cpp
index 1984449d701..1b4eadd6c03 100644
--- a/src/widget/weffectname.cpp
+++ b/src/widget/weffectname.cpp
@@ -1,8 +1,5 @@
 #include "widget/weffectname.h"
 
-#include <QtDebug>
-
-#include "effects/effectsmanager.h"
 #include "moc_weffectname.cpp"
 #include "widget/effectwidgetutils.h"
 
diff --git a/src/widget/weffectname.h b/src/widget/weffectname.h
index 66888c76b68..70df1699e59 100644
--- a/src/widget/weffectname.h
+++ b/src/widget/weffectname.h
@@ -1,9 +1,6 @@
 #pragma once
 
-#include <QDomNode>
-
-#include "effects/effectslot.h"
-#include "skin/legacy/skincontext.h"
+#include "effects/defs.h"
 #include "widget/wlabel.h"
 
 class EffectsManager;
diff --git a/src/widget/weffectparameterknob.h b/src/widget/weffectparameterknob.h
index fcd463225f5..1297168c799 100644
--- a/src/widget/weffectparameterknob.h
+++ b/src/widget/weffectparameterknob.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "effects/effectknobparameterslot.h"
+#include "effects/defs.h"
 #include "widget/wknob.h"
 
 class EffectsManager;
diff --git a/src/widget/weffectparameterknobcomposed.h b/src/widget/weffectparameterknobcomposed.h
index 9333e710530..459de3f3da2 100644
--- a/src/widget/weffectparameterknobcomposed.h
+++ b/src/widget/weffectparameterknobcomposed.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "effects/effectknobparameterslot.h"
+#include "effects/defs.h"
 #include "widget/wknobcomposed.h"
 
 class EffectsManager;
diff --git a/src/widget/weffectparameternamebase.cpp b/src/widget/weffectparameternamebase.cpp
index ebcac087b43..5110408567c 100644
--- a/src/widget/weffectparameternamebase.cpp
+++ b/src/widget/weffectparameternamebase.cpp
@@ -1,11 +1,11 @@
 #include "widget/weffectparameternamebase.h"
 
 #include <QDrag>
+#include <QDragEnterEvent>
+#include <QDropEvent>
 #include <QMimeData>
-#include <QtDebug>
 
 #include "effects/effectslot.h"
-#include "effects/effectsmanager.h"
 #include "moc_weffectparameternamebase.cpp"
 
 namespace {
diff --git a/src/widget/weffectparameternamebase.h b/src/widget/weffectparameternamebase.h
index 8b1eb8b54a0..728a21c07c9 100644
--- a/src/widget/weffectparameternamebase.h
+++ b/src/widget/weffectparameternamebase.h
@@ -1,10 +1,8 @@
 #pragma once
 
-#include <QDomNode>
 #include <QTimer>
 
-#include "effects/effectparameterslotbase.h"
-#include "skin/legacy/skincontext.h"
+#include "effects/defs.h"
 #include "widget/wlabel.h"
 
 class EffectsManager;
diff --git a/src/widget/weffectpushbutton.cpp b/src/widget/weffectpushbutton.cpp
index d9a02796468..904af10491a 100644
--- a/src/widget/weffectpushbutton.cpp
+++ b/src/widget/weffectpushbutton.cpp
@@ -1,7 +1,8 @@
 #include "widget/weffectpushbutton.h"
 
 #include <QActionGroup>
-#include <QtDebug>
+#include <QMenu>
+#include <QMouseEvent>
 
 #include "moc_weffectpushbutton.cpp"
 #include "widget/effectwidgetutils.h"
diff --git a/src/widget/weffectpushbutton.h b/src/widget/weffectpushbutton.h
index adb514affe6..63aa28cbb7c 100644
--- a/src/widget/weffectpushbutton.h
+++ b/src/widget/weffectpushbutton.h
@@ -1,16 +1,12 @@
 #pragma once
 
-#include <QAction>
-#include <QDomNode>
-#include <QMenu>
-#include <QMouseEvent>
-#include <QWidget>
-
 #include "effects/defs.h"
-#include "effects/effectsmanager.h"
-#include "skin/legacy/skincontext.h"
 #include "widget/wpushbutton.h"
 
+class QAction;
+class QMenu;
+class EffectsManager;
+
 class WEffectPushButton : public WPushButton {
     Q_OBJECT
   public:
diff --git a/src/widget/weffectselector.cpp b/src/widget/weffectselector.cpp
index ab1e21170a0..d6d38ee0397 100644
--- a/src/widget/weffectselector.cpp
+++ b/src/widget/weffectselector.cpp
@@ -5,7 +5,6 @@
 
 #include "effects/effectsmanager.h"
 #include "effects/visibleeffectslist.h"
-#include "library/library_decl.h"
 #include "moc_weffectselector.cpp"
 #include "widget/effectwidgetutils.h"
 
diff --git a/src/widget/weffectselector.h b/src/widget/weffectselector.h
index c8c5b5b5624..ace12b2c0a1 100644
--- a/src/widget/weffectselector.h
+++ b/src/widget/weffectselector.h
@@ -1,12 +1,13 @@
 #pragma once
 
 #include <QComboBox>
-#include <QDomNode>
 
-#include "effects/effectslot.h"
-#include "skin/legacy/skincontext.h"
+#include "effects/defs.h"
+#include "widget/wbasewidget.h"
 
 class EffectsManager;
+class QDomNode;
+class SkinContext;
 
 class WEffectSelector : public QComboBox, public WBaseWidget {
     Q_OBJECT
diff --git a/src/widget/wfindonwebmenu.cpp b/src/widget/wfindonwebmenu.cpp
index fed1f44df1c..2d6f67c427e 100644
--- a/src/widget/wfindonwebmenu.cpp
+++ b/src/widget/wfindonwebmenu.cpp
@@ -2,13 +2,10 @@
 
 #include <QDesktopServices>
 #include <QMenu>
-#include <QUrlQuery>
 #include <QtDebug>
 
 #include "moc_wfindonwebmenu.cpp"
 #include "track/track.h"
-#include "util/parented_ptr.h"
-#include "util/widgethelper.h"
 
 WFindOnWebMenu::WFindOnWebMenu(QWidget* parent)
         : QMenu(tr("Find on Web"), parent) {
diff --git a/src/widget/whotcuebutton.cpp b/src/widget/whotcuebutton.cpp
index 2a78f5885e3..ae1fca7a7ad 100644
--- a/src/widget/whotcuebutton.cpp
+++ b/src/widget/whotcuebutton.cpp
@@ -1,12 +1,11 @@
 #include "widget/whotcuebutton.h"
 
-#include <QStyleOption>
-#include <QStylePainter>
-#include <QtDebug>
+#include <QMouseEvent>
 
 #include "mixer/playerinfo.h"
 #include "moc_whotcuebutton.cpp"
 #include "track/track.h"
+#include "widget/controlwidgetconnection.h"
 
 namespace {
 constexpr int kDefaultDimBrightThreshold = 127;
diff --git a/src/widget/whotcuebutton.h b/src/widget/whotcuebutton.h
index 70bbe0e944b..48dd3395c74 100644
--- a/src/widget/whotcuebutton.h
+++ b/src/widget/whotcuebutton.h
@@ -1,11 +1,7 @@
 #pragma once
 
-#include <QDomNode>
-#include <QMouseEvent>
 #include <QString>
-#include <QWidget>
 
-#include "skin/legacy/skincontext.h"
 #include "util/parented_ptr.h"
 #include "widget/wcuemenupopup.h"
 #include "widget/wpushbutton.h"
diff --git a/src/widget/wimagestore.cpp b/src/widget/wimagestore.cpp
index 7451607fb41..6a6f4e188f0 100644
--- a/src/widget/wimagestore.cpp
+++ b/src/widget/wimagestore.cpp
@@ -5,7 +5,6 @@
 #include <QPainter>
 
 #include "skin/legacy/imgloader.h"
-#include "util/assert.h"
 
 
 // static
diff --git a/src/widget/wimagestore.h b/src/widget/wimagestore.h
index 01990bc2b59..d004700593e 100644
--- a/src/widget/wimagestore.h
+++ b/src/widget/wimagestore.h
@@ -1,13 +1,13 @@
 #pragma once
 
 #include <QHash>
-#include <QImage>
 #include <QSharedPointer>
-#include <unordered_map>
+#include <memory>
 
-#include "skin/legacy/imgsource.h"
 #include "skin/legacy/pixmapsource.h"
-#include "util/memory.h"
+
+class QImage;
+class ImgSource;
 
 class WImageStore {
   public:
diff --git a/src/widget/wkey.cpp b/src/widget/wkey.cpp
index deb04f62459..3186e227534 100644
--- a/src/widget/wkey.cpp
+++ b/src/widget/wkey.cpp
@@ -2,7 +2,7 @@
 
 #include "library/library_prefs.h"
 #include "moc_wkey.cpp"
-#include "track/keys.h"
+#include "skin/legacy/skincontext.h"
 #include "track/keyutils.h"
 
 WKey::WKey(const QString& group, QWidget* pParent)
diff --git a/src/widget/wkey.h b/src/widget/wkey.h
index 706337ea06e..99215b1fa9e 100644
--- a/src/widget/wkey.h
+++ b/src/widget/wkey.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <QLabel>
-
 #include "widget/wlabel.h"
 #include "control/controlproxy.h"
 
diff --git a/src/widget/wknob.cpp b/src/widget/wknob.cpp
index b3993d264a1..a60ef025831 100644
--- a/src/widget/wknob.cpp
+++ b/src/widget/wknob.cpp
@@ -1,11 +1,6 @@
 #include "widget/wknob.h"
 
-#include <QMouseEvent>
-#include <QWheelEvent>
-#include <QtDebug>
-
 #include "moc_wknob.cpp"
-#include "util/duration.h"
 
 WKnob::WKnob(QWidget* pParent)
         : WDisplay(pParent) {
diff --git a/src/widget/wknob.h b/src/widget/wknob.h
index d1801c7a292..fd775038853 100644
--- a/src/widget/wknob.h
+++ b/src/widget/wknob.h
@@ -1,11 +1,5 @@
 #pragma once
 
-#include <QPixmap>
-#include <QString>
-#include <QPaintEvent>
-#include <QMouseEvent>
-#include <QWheelEvent>
-
 #include "widget/wdisplay.h"
 #include "widget/knobeventhandler.h"
 
diff --git a/src/widget/wknobcomposed.cpp b/src/widget/wknobcomposed.cpp
index 108dfe85bde..2f1085519fc 100644
--- a/src/widget/wknobcomposed.cpp
+++ b/src/widget/wknobcomposed.cpp
@@ -5,7 +5,6 @@
 #include <QTransform>
 
 #include "moc_wknobcomposed.cpp"
-#include "util/duration.h"
 #include "widget/wskincolor.h"
 
 WKnobComposed::WKnobComposed(QWidget* pParent)
diff --git a/src/widget/wknobcomposed.h b/src/widget/wknobcomposed.h
index 21403dff90f..38aa3e62390 100644
--- a/src/widget/wknobcomposed.h
+++ b/src/widget/wknobcomposed.h
@@ -1,13 +1,7 @@
 #pragma once
 
-#include <QMouseEvent>
-#include <QPaintEvent>
-#include <QWheelEvent>
-#include <QWidget>
-
 #include "skin/legacy/skincontext.h"
 #include "widget/knobeventhandler.h"
-#include "widget/wimagestore.h"
 #include "widget/wpixmapstore.h"
 #include "widget/wwidget.h"
 
diff --git a/src/widget/wlabel.cpp b/src/widget/wlabel.cpp
index 8bd56847edf..7f91bff79be 100644
--- a/src/widget/wlabel.cpp
+++ b/src/widget/wlabel.cpp
@@ -1,8 +1,10 @@
 #include "widget/wlabel.h"
 
+#include <QEvent>
 #include <QFont>
 
 #include "moc_wlabel.cpp"
+#include "skin/legacy/skincontext.h"
 #include "widget/wskincolor.h"
 
 WLabel::WLabel(QWidget* pParent)
diff --git a/src/widget/wlabel.h b/src/widget/wlabel.h
index f045e333681..1d17a859704 100644
--- a/src/widget/wlabel.h
+++ b/src/widget/wlabel.h
@@ -1,10 +1,11 @@
 #pragma once
 
 #include <QLabel>
-#include <QEvent>
 
 #include "widget/wbasewidget.h"
-#include "skin/legacy/skincontext.h"
+
+class QDomNode;
+class SkinContext;
 
 class WLabel : public QLabel, public WBaseWidget {
     Q_OBJECT
diff --git a/src/widget/wlibrary.cpp b/src/widget/wlibrary.cpp
index 9165346bdf0..e3aadc6f54d 100644
--- a/src/widget/wlibrary.cpp
+++ b/src/widget/wlibrary.cpp
@@ -2,9 +2,9 @@
 
 #include <QtDebug>
 
-#include "controllers/keyboard/keyboardeventfilter.h"
 #include "library/libraryview.h"
 #include "moc_wlibrary.cpp"
+#include "skin/legacy/skincontext.h"
 #include "util/math.h"
 #include "widget/wtracktableview.h"
 
diff --git a/src/widget/wlibrary.h b/src/widget/wlibrary.h
index bfe4acb0e0d..531915975a6 100644
--- a/src/widget/wlibrary.h
+++ b/src/widget/wlibrary.h
@@ -1,16 +1,16 @@
 #pragma once
 
-#include <QEvent>
 #include <QMap>
 #include <QStackedWidget>
 #include <QString>
 
-#include "library/libraryview.h"
-#include "skin/legacy/skincontext.h"
 #include "util/compatibility/qmutex.h"
 #include "widget/wbasewidget.h"
 
-class KeyboardEventFilter;
+class LibraryView;
+class TrackId;
+class QDomNode;
+class SkinContext;
 
 class WLibrary : public QStackedWidget, public WBaseWidget {
     Q_OBJECT
diff --git a/src/widget/wlibrarysidebar.cpp b/src/widget/wlibrarysidebar.cpp
index 7407c3e3401..c13ac5c7b48 100644
--- a/src/widget/wlibrarysidebar.cpp
+++ b/src/widget/wlibrarysidebar.cpp
@@ -1,8 +1,6 @@
 #include "widget/wlibrarysidebar.h"
 
-#include <QFileInfo>
 #include <QHeaderView>
-#include <QMimeData>
 #include <QUrl>
 #include <QtDebug>
 
diff --git a/src/widget/wlibrarysidebar.h b/src/widget/wlibrarysidebar.h
index ece49c6fca9..4fa356e78b4 100644
--- a/src/widget/wlibrarysidebar.h
+++ b/src/widget/wlibrarysidebar.h
@@ -1,20 +1,14 @@
 #pragma once
 
 #include <QBasicTimer>
-#include <QContextMenuEvent>
-#include <QDragEnterEvent>
-#include <QDragMoveEvent>
-#include <QEvent>
-#include <QKeyEvent>
 #include <QModelIndex>
-#include <QPoint>
-#include <QTimerEvent>
 #include <QTreeView>
 
 #include "library/library_decl.h"
 #include "widget/wbasewidget.h"
 
 class LibraryFeature;
+class QPoint;
 
 class WLibrarySidebar : public QTreeView, public WBaseWidget {
     Q_OBJECT
diff --git a/src/widget/wlibrarytableview.cpp b/src/widget/wlibrarytableview.cpp
index b0547bcb72f..f92e7c8efd6 100644
--- a/src/widget/wlibrarytableview.cpp
+++ b/src/widget/wlibrarytableview.cpp
@@ -3,14 +3,12 @@
 #include <QFocusEvent>
 #include <QFontMetrics>
 #include <QHeaderView>
-#include <QPalette>
 #include <QScrollBar>
 
-#include "library/trackmodel.h"
 #include "moc_wlibrarytableview.cpp"
 #include "util/math.h"
-#include "widget/wskincolor.h"
-#include "widget/wwidget.h"
+
+class QFocusEvent;
 
 namespace {
 // number of entries in the model cache
diff --git a/src/widget/wlibrarytableview.h b/src/widget/wlibrarytableview.h
index c48a9c17175..7be8a461094 100644
--- a/src/widget/wlibrarytableview.h
+++ b/src/widget/wlibrarytableview.h
@@ -1,8 +1,6 @@
 #pragma once
 
 #include <QCache>
-#include <QFont>
-#include <QItemSelectionModel>
 #include <QString>
 #include <QTableView>
 
@@ -10,7 +8,7 @@
 #include "preferences/usersettings.h"
 #include "track/track_decl.h"
 
-class TrackModel;
+class QFont;
 
 class WLibraryTableView : public QTableView, public virtual LibraryView {
     Q_OBJECT
diff --git a/src/widget/wmainmenubar.cpp b/src/widget/wmainmenubar.cpp
index 6419b73416e..8bb72ef9162 100644
--- a/src/widget/wmainmenubar.cpp
+++ b/src/widget/wmainmenubar.cpp
@@ -5,7 +5,6 @@
 #include "config.h"
 #include "control/controlproxy.h"
 #include "defs_urls.h"
-#include "mixer/playermanager.h"
 #include "moc_wmainmenubar.cpp"
 #include "util/cmdlineargs.h"
 #include "util/experiment.h"
diff --git a/src/widget/wmainmenubar.h b/src/widget/wmainmenubar.h
index 6fd35a42345..aabe694cd59 100644
--- a/src/widget/wmainmenubar.h
+++ b/src/widget/wmainmenubar.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <QAction>
 #include <QList>
 #include <QMenuBar>
 #include <QObject>
@@ -10,6 +9,8 @@
 #include "preferences/configobject.h"
 #include "preferences/usersettings.h"
 
+class QAction;
+
 class VisibilityControlConnection : public QObject {
     Q_OBJECT
   public:
diff --git a/src/widget/wnumber.cpp b/src/widget/wnumber.cpp
index b0f8a9134aa..482eccb6e65 100644
--- a/src/widget/wnumber.cpp
+++ b/src/widget/wnumber.cpp
@@ -1,6 +1,7 @@
 #include "widget/wnumber.h"
 
 #include "moc_wnumber.cpp"
+#include "skin/legacy/skincontext.h"
 
 WNumber::WNumber(QWidget* pParent)
         : WLabel(pParent),
diff --git a/src/widget/wnumber.h b/src/widget/wnumber.h
index 0aaeffc7554..2dc99420709 100644
--- a/src/widget/wnumber.h
+++ b/src/widget/wnumber.h
@@ -1,9 +1,6 @@
 #pragma once
 
-#include <QLabel>
-
 #include "widget/wlabel.h"
-#include "skin/legacy/skincontext.h"
 
 class WNumber : public WLabel  {
     Q_OBJECT
diff --git a/src/widget/wnumberdb.cpp b/src/widget/wnumberdb.cpp
index 8a1371cb677..6eb41d50cf3 100644
--- a/src/widget/wnumberdb.cpp
+++ b/src/widget/wnumberdb.cpp
@@ -1,10 +1,7 @@
 #include "widget/wnumberdb.h"
 
-#include <QVBoxLayout>
-
 #include "moc_wnumberdb.cpp"
 #include "util/math.h"
-#include "widget/wskincolor.h"
 
 WNumberDb::WNumberDb(QWidget* pParent)
         : WNumber(pParent) {
diff --git a/src/widget/wnumberdb.h b/src/widget/wnumberdb.h
index 61295a0a6fa..bdd81c8ecd0 100644
--- a/src/widget/wnumberdb.h
+++ b/src/widget/wnumberdb.h
@@ -3,7 +3,6 @@
 #include <QLabel>
 
 #include "widget/wnumber.h"
-#include "skin/legacy/skincontext.h"
 
 class WNumberDb : public WNumber {
     Q_OBJECT
diff --git a/src/widget/wnumberpos.cpp b/src/widget/wnumberpos.cpp
index 9a6e65dfef9..ddf137add85 100644
--- a/src/widget/wnumberpos.cpp
+++ b/src/widget/wnumberpos.cpp
@@ -1,10 +1,10 @@
 #include "widget/wnumberpos.h"
 
-#include "control/controlobject.h"
+#include <QMouseEvent>
+
 #include "control/controlproxy.h"
 #include "moc_wnumberpos.cpp"
 #include "util/duration.h"
-#include "util/math.h"
 
 WNumberPos::WNumberPos(const QString& group, QWidget* parent)
         : WNumber(parent),
diff --git a/src/widget/wnumberpos.h b/src/widget/wnumberpos.h
index 0d22cbc7de7..c9dd62d9b2f 100644
--- a/src/widget/wnumberpos.h
+++ b/src/widget/wnumberpos.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <QMouseEvent>
 
 #include "wnumber.h"
 #include "preferences/dialog/dlgprefdeck.h"
diff --git a/src/widget/wnumberrate.cpp b/src/widget/wnumberrate.cpp
index 075ad3ba96c..b3539b2bcce 100644
--- a/src/widget/wnumberrate.cpp
+++ b/src/widget/wnumberrate.cpp
@@ -1,18 +1,5 @@
-//
-// C++ Implementation: wnumberrate
-//
-// Description:
-//
-//
-// Author: Tue Haste Andersen <haste@diku.dk>, (C) 2003
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
-
 #include "widget/wnumberrate.h"
 
-#include "control/controlobject.h"
 #include "control/controlproxy.h"
 #include "moc_wnumberrate.cpp"
 #include "util/math.h"
diff --git a/src/widget/woverview.cpp b/src/widget/woverview.cpp
index bdf19eca3e3..f1586fd37fa 100644
--- a/src/widget/woverview.cpp
+++ b/src/widget/woverview.cpp
@@ -4,6 +4,7 @@
 #include <QMouseEvent>
 #include <QPaintEvent>
 #include <QPainter>
+#include <QVBoxLayout>
 
 #include "analyzer/analyzerprogress.h"
 #include "control/controlproxy.h"
diff --git a/src/widget/woverview.h b/src/widget/woverview.h
index d547bce4af8..ea069fe3d7b 100644
--- a/src/widget/woverview.h
+++ b/src/widget/woverview.h
@@ -5,7 +5,6 @@
 #include <QPixmap>
 
 #include "analyzer/analyzerprogress.h"
-#include "skin/legacy/skincontext.h"
 #include "track/track_decl.h"
 #include "track/trackid.h"
 #include "util/parented_ptr.h"
@@ -18,9 +17,9 @@
 #include "widget/wwidget.h"
 
 class PlayerManager;
-class PainterScope;
-class QMouseEvent;
-class QPaintEvent;
+;
+class QDomNode;
+class SkinContext;
 
 class WOverview : public WWidget, public TrackDropTarget {
     Q_OBJECT
diff --git a/src/widget/wpixmapstore.cpp b/src/widget/wpixmapstore.cpp
index 519e150394c..6779d9d78b0 100644
--- a/src/widget/wpixmapstore.cpp
+++ b/src/widget/wpixmapstore.cpp
@@ -1,10 +1,5 @@
 #include "widget/wpixmapstore.h"
 
-#include <QDir>
-#include <QString>
-#include <QtDebug>
-
-#include "util/math.h"
 #include "skin/legacy/imgloader.h"
 
 // static
diff --git a/src/widget/wpushbutton.cpp b/src/widget/wpushbutton.cpp
index dd874db5a20..bed54640168 100644
--- a/src/widget/wpushbutton.cpp
+++ b/src/widget/wpushbutton.cpp
@@ -3,10 +3,8 @@
 #include <QApplication>
 #include <QMouseEvent>
 #include <QPaintEvent>
-#include <QPixmap>
 #include <QStyleOption>
 #include <QStylePainter>
-#include <QTouchEvent>
 #include <QtDebug>
 
 #include "control/controlbehavior.h"
@@ -14,6 +12,7 @@
 #include "control/controlpushbutton.h"
 #include "moc_wpushbutton.cpp"
 #include "util/debug.h"
+#include "widget/controlwidgetconnection.h"
 #include "widget/wpixmapstore.h"
 
 WPushButton::WPushButton(QWidget* pParent)
diff --git a/src/widget/wpushbutton.h b/src/widget/wpushbutton.h
index b5977f76990..0e0b3557d73 100644
--- a/src/widget/wpushbutton.h
+++ b/src/widget/wpushbutton.h
@@ -1,20 +1,17 @@
 #pragma once
 
-#include <QFocusEvent>
-#include <QMouseEvent>
-#include <QPaintEvent>
-#include <QPixmap>
 #include <QString>
 #include <QTimer>
 #include <QVector>
 
 #include "control/controlpushbutton.h"
-#include "skin/legacy/skincontext.h"
 #include "util/fpclassify.h"
-#include "widget/controlwidgetconnection.h"
 #include "widget/wpixmapstore.h"
 #include "widget/wwidget.h"
 
+class QDomNode;
+class SkinContext;
+
 class WPushButton : public WWidget {
     Q_OBJECT
   public:
diff --git a/src/widget/wraterange.cpp b/src/widget/wraterange.cpp
index d45e21f4c4d..2dab1abdf1b 100644
--- a/src/widget/wraterange.cpp
+++ b/src/widget/wraterange.cpp
@@ -1,9 +1,8 @@
 #include "widget/wraterange.h"
 
-#include "control/controlobject.h"
 #include "control/controlproxy.h"
 #include "moc_wraterange.cpp"
-#include "util/math.h"
+#include "skin/legacy/skincontext.h"
 
 WRateRange::WRateRange(const QString& group, QWidget* parent)
         : WNumber(parent),
diff --git a/src/widget/wrecordingduration.cpp b/src/widget/wrecordingduration.cpp
index 1fc66601b58..113390c0fc2 100644
--- a/src/widget/wrecordingduration.cpp
+++ b/src/widget/wrecordingduration.cpp
@@ -1,6 +1,8 @@
 #include "widget/wrecordingduration.h"
 
 #include "moc_wrecordingduration.cpp"
+#include "recording/recordingmanager.h"
+#include "skin/legacy/skincontext.h"
 
 WRecordingDuration::WRecordingDuration(QWidget *parent,
                                     RecordingManager* pRecordingManager)
diff --git a/src/widget/wrecordingduration.h b/src/widget/wrecordingduration.h
index 2fb545372ee..d1ec6f23baa 100644
--- a/src/widget/wrecordingduration.h
+++ b/src/widget/wrecordingduration.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #include "widget/wlabel.h"
-#include "skin/legacy/skincontext.h"
-#include "recording/recordingmanager.h"
+
+class RecordingManager;
 
 class WRecordingDuration: public WLabel {
     Q_OBJECT
diff --git a/src/widget/wscrollable.cpp b/src/widget/wscrollable.cpp
index 75cda081c86..f0fa6cdc14e 100644
--- a/src/widget/wscrollable.cpp
+++ b/src/widget/wscrollable.cpp
@@ -1,6 +1,7 @@
 #include "widget/wscrollable.h"
 
 #include "moc_wscrollable.cpp"
+#include "skin/legacy/skincontext.h"
 
 WScrollable::WScrollable(QWidget* pParent)
         : QScrollArea(pParent),
diff --git a/src/widget/wscrollable.h b/src/widget/wscrollable.h
index 9207f1a0027..d11a356c6f0 100644
--- a/src/widget/wscrollable.h
+++ b/src/widget/wscrollable.h
@@ -1,13 +1,12 @@
 #pragma once
 
-#include <QDomNode>
-#include <QEvent>
 #include <QScrollArea>
 
-#include "preferences/usersettings.h"
-#include "skin/legacy/skincontext.h"
 #include "widget/wbasewidget.h"
 
+class QDomNode;
+class SkinContext;
+
 /// Creates a QScrollArea. The QT default is to show scrollbars if needed.
 class WScrollable : public QScrollArea, public WBaseWidget {
     Q_OBJECT
diff --git a/src/widget/wsearchlineedit.cpp b/src/widget/wsearchlineedit.cpp
index c9c79fa2601..1154fdf88e4 100644
--- a/src/widget/wsearchlineedit.cpp
+++ b/src/widget/wsearchlineedit.cpp
@@ -4,11 +4,12 @@
 #include <QApplication>
 #include <QCompleter>
 #include <QFont>
+#include <QKeyEvent>
 #include <QLineEdit>
 #include <QShortcut>
 #include <QSizePolicy>
 #include <QStringLiteral>
-#include <QStyle>
+#include <QToolButton>
 
 #include "moc_wsearchlineedit.cpp"
 #include "preferences/configobject.h"
@@ -17,7 +18,6 @@
 #include "util/logger.h"
 #include "util/parented_ptr.h"
 #include "wskincolor.h"
-#include "wwidget.h"
 
 #define ENABLE_TRACE_LOG false
 
diff --git a/src/widget/wsearchlineedit.h b/src/widget/wsearchlineedit.h
index 87737927cd9..45d2d7910ca 100644
--- a/src/widget/wsearchlineedit.h
+++ b/src/widget/wsearchlineedit.h
@@ -1,18 +1,18 @@
 #pragma once
 
 #include <QComboBox>
-#include <QCompleter>
-#include <QDomNode>
-#include <QEvent>
 #include <QTimer>
-#include <QToolButton>
 
 #include "library/library_decl.h"
 #include "preferences/usersettings.h"
 #include "util/parented_ptr.h"
 #include "widget/wbasewidget.h"
 
+class QDomNode;
 class SkinContext;
+class QCompleter;
+class QEvent;
+class QToolButton;
 
 class WSearchLineEdit : public QComboBox, public WBaseWidget {
     Q_OBJECT
diff --git a/src/widget/wsingletoncontainer.cpp b/src/widget/wsingletoncontainer.cpp
index 225e2c5ce5b..7c82872f0ce 100644
--- a/src/widget/wsingletoncontainer.cpp
+++ b/src/widget/wsingletoncontainer.cpp
@@ -4,8 +4,6 @@
 
 #include "moc_wsingletoncontainer.cpp"
 #include "skin/legacy/skincontext.h"
-#include "util/assert.h"
-#include "widget/wlibrary.h"
 
 WSingletonContainer::WSingletonContainer(QWidget* pParent)
         : WWidgetGroup(pParent), m_pWidget(nullptr), m_pLayout(nullptr) { }
diff --git a/src/widget/wsizeawarestack.cpp b/src/widget/wsizeawarestack.cpp
index 5de9102a9c1..74832386c48 100644
--- a/src/widget/wsizeawarestack.cpp
+++ b/src/widget/wsizeawarestack.cpp
@@ -1,8 +1,6 @@
 #include "widget/wsizeawarestack.h"
 
 #include <QResizeEvent>
-#include <QStackedLayout>
-#include <QtDebug>
 
 #include "moc_wsizeawarestack.cpp"
 
diff --git a/src/widget/wsizeawarestack.h b/src/widget/wsizeawarestack.h
index 918c8d5d634..3d821fc0182 100644
--- a/src/widget/wsizeawarestack.h
+++ b/src/widget/wsizeawarestack.h
@@ -1,12 +1,13 @@
 #pragma once
 
-#include <QEvent>
 #include <QSize>
 #include <QStackedLayout>
 #include <QWidget>
 
 #include "widget/wbasewidget.h"
 
+class QEvent;
+
 class SizeAwareLayout : public QStackedLayout {
     Q_OBJECT
   public:
diff --git a/src/widget/wskincolor.h b/src/widget/wskincolor.h
index 9df081ee84e..7567215cd6e 100644
--- a/src/widget/wskincolor.h
+++ b/src/widget/wskincolor.h
@@ -1,7 +1,8 @@
 #pragma once
 
 #include <QSharedPointer>
-#include "skin/legacy/imgsource.h"
+
+class ImgSource;
 
 class WSkinColor {
   public:
diff --git a/src/widget/wslidercomposed.cpp b/src/widget/wslidercomposed.cpp
index f294e530fe3..c21f07ca229 100644
--- a/src/widget/wslidercomposed.cpp
+++ b/src/widget/wslidercomposed.cpp
@@ -6,8 +6,6 @@
 
 #include "moc_wslidercomposed.cpp"
 #include "util/debug.h"
-#include "util/duration.h"
-#include "util/math.h"
 #include "widget/controlwidgetconnection.h"
 #include "widget/wpixmapstore.h"
 #include "widget/wskincolor.h"
diff --git a/src/widget/wslidercomposed.h b/src/widget/wslidercomposed.h
index 19ff562c1dc..0d565d9cbdd 100644
--- a/src/widget/wslidercomposed.h
+++ b/src/widget/wslidercomposed.h
@@ -1,18 +1,14 @@
 #pragma once
 
 #include <QString>
-#include <QWidget>
-#include <QDomNode>
-#include <QWheelEvent>
-#include <QPaintEvent>
-#include <QMouseEvent>
-#include <QResizeEvent>
 
-#include "skin/legacy/skincontext.h"
 #include "widget/slidereventhandler.h"
 #include "widget/wwidget.h"
 #include "widget/wpixmapstore.h"
 
+class QDomNode;
+class SkinContext;
+
 /** A widget for a slider composed of a background pixmap and a handle. */
 class WSliderComposed : public WWidget  {
     Q_OBJECT
diff --git a/src/widget/wspinnybase.cpp b/src/widget/wspinnybase.cpp
index 12de463bf66..2f128497aed 100644
--- a/src/widget/wspinnybase.cpp
+++ b/src/widget/wspinnybase.cpp
@@ -6,7 +6,9 @@
 #include "control/controlproxy.h"
 #include "library/coverartcache.h"
 #include "library/coverartutils.h"
+#include "library/dlgcoverartfullsize.h"
 #include "moc_wspinnybase.cpp"
+#include "skin/legacy/skincontext.h"
 #include "track/track.h"
 #include "util/dnd.h"
 #include "util/fpclassify.h"
diff --git a/src/widget/wspinnybase.h b/src/widget/wspinnybase.h
index b930f937948..d695fc27b1a 100644
--- a/src/widget/wspinnybase.h
+++ b/src/widget/wspinnybase.h
@@ -1,26 +1,22 @@
 #pragma once
 
-#include <QEvent>
-#include <QHideEvent>
-#include <QShowEvent>
-
-#include "library/dlgcoverartfullsize.h"
-#include "mixer/basetrackplayer.h"
 #include "preferences/usersettings.h"
-#include "skin/legacy/skincontext.h"
 #include "track/track_decl.h"
 #include "vinylcontrol/vinylsignalquality.h"
 #include "widget/trackdroptarget.h"
 #include "widget/wbasewidget.h"
 #include "widget/wcoverartmenu.h"
 #include "widget/wglwidget.h"
-#include "widget/wwidget.h"
 
 class ConfigKey;
 class ControlProxy;
 class VisualPlayPosition;
 class VinylControlManager;
 class VSyncThread;
+class QDomNode;
+class SkinContext;
+class BaseTrackPlayer;
+class DlgCoverArtFullSize;
 
 class WSpinnyBase : public WGLWidget,
                     public WBaseWidget,
diff --git a/src/widget/wsplitter.cpp b/src/widget/wsplitter.cpp
index 61dcb8344a8..b1df96b8407 100644
--- a/src/widget/wsplitter.cpp
+++ b/src/widget/wsplitter.cpp
@@ -1,8 +1,10 @@
 #include "widget/wsplitter.h"
 
+#include <QEvent>
 #include <QList>
 
 #include "moc_wsplitter.cpp"
+#include "skin/legacy/skincontext.h"
 
 WSplitter::WSplitter(QWidget* pParent, UserSettingsPointer pConfig)
         : QSplitter(pParent),
diff --git a/src/widget/wsplitter.h b/src/widget/wsplitter.h
index af87706a41f..bd48d63c863 100644
--- a/src/widget/wsplitter.h
+++ b/src/widget/wsplitter.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include <QDomNode>
-#include <QEvent>
 #include <QSplitter>
 
 #include "preferences/usersettings.h"
-#include "skin/legacy/skincontext.h"
 #include "widget/wbasewidget.h"
 
+class QDomNode;
+class SkinContext;
+
 class WSplitter : public QSplitter, public WBaseWidget {
     Q_OBJECT
   public:
diff --git a/src/widget/wstarrating.cpp b/src/widget/wstarrating.cpp
index 419eafb7a61..6644aadcb08 100644
--- a/src/widget/wstarrating.cpp
+++ b/src/widget/wstarrating.cpp
@@ -1,12 +1,13 @@
 #include "widget/wstarrating.h"
 
-#include <QApplication>
-#include <QSize>
+#include <QMouseEvent>
 #include <QStyleOption>
 #include <QStylePainter>
 
 #include "moc_wstarrating.cpp"
-#include "track/track.h"
+
+class QEvent;
+class QWidgets;
 
 WStarRating::WStarRating(const QString& group, QWidget* pParent)
         : WWidget(pParent),
diff --git a/src/widget/wstarrating.h b/src/widget/wstarrating.h
index 88a05074410..292e6b9e77d 100644
--- a/src/widget/wstarrating.h
+++ b/src/widget/wstarrating.h
@@ -1,18 +1,13 @@
 #pragma once
 
-#include <QEvent>
-#include <QMouseEvent>
-#include <QStylePainter>
-
 #include "control/controlpushbutton.h"
 #include "library/starrating.h"
-#include "skin/legacy/skincontext.h"
-#include "track/track_decl.h"
-#include "track/trackid.h"
 #include "widget/wwidget.h"
 
 class ControlObject;
 class ControlPushButton;
+class QDomNode;
+class SkinContext;
 
 class WStarRating : public WWidget {
     Q_OBJECT
diff --git a/src/widget/wstatuslight.cpp b/src/widget/wstatuslight.cpp
index 7cf486322eb..87b9681cef5 100644
--- a/src/widget/wstatuslight.cpp
+++ b/src/widget/wstatuslight.cpp
@@ -1,12 +1,11 @@
 #include "widget/wstatuslight.h"
 
-#include <QPaintEvent>
-#include <QPixmap>
 #include <QStyleOption>
 #include <QStylePainter>
 #include <QtDebug>
 
 #include "moc_wstatuslight.cpp"
+#include "skin/legacy/skincontext.h"
 
 WStatusLight::WStatusLight(QWidget * parent)
         : WWidget(parent),
diff --git a/src/widget/wstatuslight.h b/src/widget/wstatuslight.h
index 42206b24ce4..2345da60049 100644
--- a/src/widget/wstatuslight.h
+++ b/src/widget/wstatuslight.h
@@ -1,15 +1,13 @@
 #pragma once
 
-#include <QPaintEvent>
-#include <QWidget>
 #include <QString>
-#include <QDomNode>
-#include <QPixmap>
 #include <QVector>
 
 #include "widget/wwidget.h"
 #include "widget/wpixmapstore.h"
-#include "skin/legacy/skincontext.h"
+
+class QDomNode;
+class SkinContext;
 
 /// A general purpose status light for indicating boolean events.
 class WStatusLight : public WWidget  {
diff --git a/src/widget/wtime.cpp b/src/widget/wtime.cpp
index bc5d3cab52d..892a64274e2 100644
--- a/src/widget/wtime.cpp
+++ b/src/widget/wtime.cpp
@@ -2,10 +2,10 @@
 
 #include <QLocale>
 #include <QTime>
-#include <QtDebug>
+#include <QTimer>
 
 #include "moc_wtime.cpp"
-#include "util/cmdlineargs.h"
+#include "skin/legacy/skincontext.h"
 
 WTime::WTime(QWidget* parent)
         : WLabel(parent),
diff --git a/src/widget/wtime.h b/src/widget/wtime.h
index c11c6669396..70a0f80afde 100644
--- a/src/widget/wtime.h
+++ b/src/widget/wtime.h
@@ -3,10 +3,7 @@
 
 #pragma once
 
-#include <QTimer>
-
 #include "widget/wlabel.h"
-#include "skin/legacy/skincontext.h"
 
 class WTime: public WLabel {
     Q_OBJECT
diff --git a/src/widget/wtrackmenu.cpp b/src/widget/wtrackmenu.cpp
index c704b529703..bd3d3277377 100644
--- a/src/widget/wtrackmenu.cpp
+++ b/src/widget/wtrackmenu.cpp
@@ -1,10 +1,9 @@
 #include "widget/wtrackmenu.h"
 
-#include <qlist.h>
-
 #include <QCheckBox>
 #include <QDialogButtonBox>
 #include <QInputDialog>
+#include <QList>
 #include <QListWidget>
 #include <QModelIndex>
 #include <QVBoxLayout>
@@ -15,20 +14,20 @@
 #include "control/controlobject.h"
 #include "control/controlproxy.h"
 #include "library/coverartutils.h"
-#include "library/dao/trackdao.h"
 #include "library/dao/trackschema.h"
 #include "library/dlgtagfetcher.h"
 #include "library/dlgtrackinfo.h"
 #include "library/dlgtrackmetadataexport.h"
 #include "library/externaltrackcollection.h"
 #include "library/library.h"
-#include "library/librarytablemodel.h"
 #include "library/trackcollection.h"
 #include "library/trackcollectionmanager.h"
 #include "library/trackmodel.h"
 #include "library/trackmodeliterator.h"
 #include "library/trackprocessing.h"
+#include "library/trackset/crate/crate.h"
 #include "library/trackset/crate/cratefeaturehelper.h"
+#include "library/trackset/crate/cratesummary.h"
 #include "mixer/playermanager.h"
 #include "moc_wtrackmenu.cpp"
 #include "preferences/colorpalettesettings.h"
@@ -43,13 +42,10 @@
 #include "util/widgethelper.h"
 #include "widget/findonwebmenufactory.h"
 #include "widget/wcolorpickeraction.h"
-#include "widget/wcoverartlabel.h"
 #include "widget/wcoverartmenu.h"
 #include "widget/wfindonwebmenu.h"
 #include "widget/wsearchrelatedtracksmenu.h"
-#include "widget/wskincolor.h"
 #include "widget/wstarrating.h"
-#include "widget/wwidget.h"
 
 namespace {
 const QString kAppGroup = QStringLiteral("[App]");
diff --git a/src/widget/wtrackproperty.cpp b/src/widget/wtrackproperty.cpp
index 85ee08486d9..553a518114c 100644
--- a/src/widget/wtrackproperty.cpp
+++ b/src/widget/wtrackproperty.cpp
@@ -1,10 +1,9 @@
 #include "widget/wtrackproperty.h"
 
 #include <QDebug>
-#include <QUrl>
 
-#include "control/controlobject.h"
 #include "moc_wtrackproperty.cpp"
+#include "skin/legacy/skincontext.h"
 #include "track/track.h"
 #include "util/dnd.h"
 #include "widget/wtrackmenu.h"
diff --git a/src/widget/wtrackproperty.h b/src/widget/wtrackproperty.h
index 7ee8a751c2d..7450a367d0e 100644
--- a/src/widget/wtrackproperty.h
+++ b/src/widget/wtrackproperty.h
@@ -1,11 +1,6 @@
 #pragma once
 
-#include <QDragEnterEvent>
-#include <QDropEvent>
-#include <QMouseEvent>
-
 #include "preferences/usersettings.h"
-#include "skin/legacy/skincontext.h"
 #include "track/track_decl.h"
 #include "track/trackid.h"
 #include "util/parented_ptr.h"
@@ -27,35 +22,35 @@ class WTrackProperty : public WLabel, public TrackDropTarget {
 
     void setup(const QDomNode& node, const SkinContext& context) override;
 
-signals:
-  void trackDropped(const QString& filename, const QString& group) override;
-  void cloneDeck(const QString& sourceGroup, const QString& targetGroup) override;
+  signals:
+    void trackDropped(const QString& filename, const QString& group) override;
+    void cloneDeck(const QString& sourceGroup, const QString& targetGroup) override;
 
-public slots:
-  void slotTrackLoaded(TrackPointer pTrack);
-  void slotLoadingTrack(TrackPointer pNewTrack, TrackPointer pOldTrack);
+  public slots:
+    void slotTrackLoaded(TrackPointer pTrack);
+    void slotLoadingTrack(TrackPointer pNewTrack, TrackPointer pOldTrack);
 
-protected:
-  void contextMenuEvent(QContextMenuEvent* event) override;
+  protected:
+    void contextMenuEvent(QContextMenuEvent* event) override;
 
-private slots:
-  void slotTrackChanged(TrackId);
+  private slots:
+    void slotTrackChanged(TrackId);
 
-private:
-  void dragEnterEvent(QDragEnterEvent* event) override;
-  void dropEvent(QDropEvent* event) override;
-  void mouseMoveEvent(QMouseEvent* event) override;
-  void mouseDoubleClickEvent(QMouseEvent* event) override;
+  private:
+    void dragEnterEvent(QDragEnterEvent* event) override;
+    void dropEvent(QDropEvent* event) override;
+    void mouseMoveEvent(QMouseEvent* event) override;
+    void mouseDoubleClickEvent(QMouseEvent* event) override;
 
-  void updateLabel();
+    void updateLabel();
 
-  void ensureTrackMenuIsCreated();
+    void ensureTrackMenuIsCreated();
 
-  const QString m_group;
-  const UserSettingsPointer m_pConfig;
-  Library* m_pLibrary;
-  TrackPointer m_pCurrentTrack;
-  QString m_property;
+    const QString m_group;
+    const UserSettingsPointer m_pConfig;
+    Library* m_pLibrary;
+    TrackPointer m_pCurrentTrack;
+    QString m_property;
 
-  parented_ptr<WTrackMenu> m_pTrackMenu;
+    parented_ptr<WTrackMenu> m_pTrackMenu;
 };
diff --git a/src/widget/wtracktableviewheader.cpp b/src/widget/wtracktableviewheader.cpp
index 81b06f3b31f..be428ad08ed 100644
--- a/src/widget/wtracktableviewheader.cpp
+++ b/src/widget/wtracktableviewheader.cpp
@@ -1,6 +1,6 @@
 #include "widget/wtracktableviewheader.h"
 
-#include <QtDebug>
+#include <QContextMenuEvent>
 
 #include "library/trackmodel.h"
 #include "moc_wtracktableviewheader.cpp"
diff --git a/src/widget/wtracktableviewheader.h b/src/widget/wtracktableviewheader.h
index aa784b5ff03..b7556ac416a 100644
--- a/src/widget/wtracktableviewheader.h
+++ b/src/widget/wtracktableviewheader.h
@@ -1,15 +1,15 @@
 #pragma once
 
-#include <QAction>
 #include <QHeaderView>
 #include <QMap>
 #include <QMenu>
-#include <QWidget>
-#include <QContextMenuEvent>
 
 #include "proto/headers.pb.h"
 
 class TrackModel;
+class QAction;
+class QWidget;
+class QContextMenuEvent;
 
 // Thanks to StackOverflow http://stackoverflow.com/questions/1163030/qt-qtableview-and-horizontalheader-restorestate
 // answer with this code snippet: http://codepad.org/2gPIMPYU
diff --git a/src/widget/wtracktext.cpp b/src/widget/wtracktext.cpp
index cab74256760..74451b92f9a 100644
--- a/src/widget/wtracktext.cpp
+++ b/src/widget/wtracktext.cpp
@@ -1,9 +1,5 @@
 #include "widget/wtracktext.h"
 
-#include <QDebug>
-#include <QUrl>
-
-#include "control/controlobject.h"
 #include "moc_wtracktext.cpp"
 #include "track/track.h"
 #include "util/dnd.h"
diff --git a/src/widget/wtracktext.h b/src/widget/wtracktext.h
index 415978cd4c5..4f30036cba0 100644
--- a/src/widget/wtracktext.h
+++ b/src/widget/wtracktext.h
@@ -1,9 +1,5 @@
 #pragma once
 
-#include <QDragEnterEvent>
-#include <QDropEvent>
-#include <QMouseEvent>
-
 #include "preferences/usersettings.h"
 #include "track/track_decl.h"
 #include "track/trackid.h"
diff --git a/src/widget/wtrackwidgetgroup.cpp b/src/widget/wtrackwidgetgroup.cpp
index 91c2355f8db..7887ba1667b 100644
--- a/src/widget/wtrackwidgetgroup.cpp
+++ b/src/widget/wtrackwidgetgroup.cpp
@@ -1,11 +1,9 @@
 #include "widget/wtrackwidgetgroup.h"
 
-#include <QDebug>
 #include <QStylePainter>
-#include <QUrl>
 
-#include "control/controlobject.h"
 #include "moc_wtrackwidgetgroup.cpp"
+#include "skin/legacy/skincontext.h"
 #include "track/track.h"
 #include "util/dnd.h"
 #include "widget/wtrackmenu.h"
diff --git a/src/widget/wtrackwidgetgroup.h b/src/widget/wtrackwidgetgroup.h
index 880ecb77eb7..698aada2fba 100644
--- a/src/widget/wtrackwidgetgroup.h
+++ b/src/widget/wtrackwidgetgroup.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "skin/legacy/skincontext.h"
 #include "track/track_decl.h"
 #include "track/trackid.h"
 #include "util/parented_ptr.h"
diff --git a/src/widget/wvumeterbase.cpp b/src/widget/wvumeterbase.cpp
index 34216b9433c..60998ee4588 100644
--- a/src/widget/wvumeterbase.cpp
+++ b/src/widget/wvumeterbase.cpp
@@ -1,5 +1,6 @@
 #include "widget/wvumeterbase.h"
 
+#include "skin/legacy/skincontext.h"
 #include "util/math.h"
 #include "util/timer.h"
 #include "util/widgethelper.h"
diff --git a/src/widget/wvumeterbase.h b/src/widget/wvumeterbase.h
index 5dc25d9b9c9..cd687bdbaa2 100644
--- a/src/widget/wvumeterbase.h
+++ b/src/widget/wvumeterbase.h
@@ -1,11 +1,13 @@
 #pragma once
 
-#include "skin/legacy/skincontext.h"
 #include "util/duration.h"
+#include "widget/wbasewidget.h"
 #include "widget/wglwidget.h"
 #include "widget/wpixmapstore.h"
 
 class VSyncThread;
+class QDomNode;
+class SkinContext;
 
 class WVuMeterBase : public WGLWidget, public WBaseWidget {
     Q_OBJECT
diff --git a/src/widget/wvumeterlegacy.cpp b/src/widget/wvumeterlegacy.cpp
index a530d3e9e31..951d4cfd951 100644
--- a/src/widget/wvumeterlegacy.cpp
+++ b/src/widget/wvumeterlegacy.cpp
@@ -1,6 +1,7 @@
 #include "widget/wvumeterlegacy.h"
 
 #include "moc_wvumeterlegacy.cpp"
+#include "skin/legacy/skincontext.h"
 #include "util/math.h"
 #include "util/timer.h"
 #include "util/widgethelper.h"
diff --git a/src/widget/wvumeterlegacy.h b/src/widget/wvumeterlegacy.h
index 6519fc3bd7d..cd9a610eb69 100644
--- a/src/widget/wvumeterlegacy.h
+++ b/src/widget/wvumeterlegacy.h
@@ -1,10 +1,12 @@
 #pragma once
 
-#include "skin/legacy/skincontext.h"
 #include "util/performancetimer.h"
 #include "widget/wpixmapstore.h"
 #include "widget/wwidget.h"
 
+class QDomNode;
+class SkinContext;
+
 class WVuMeterLegacy : public WWidget {
     Q_OBJECT
   public:
diff --git a/src/widget/wwaveformviewer.h b/src/widget/wwaveformviewer.h
index 6455bbff260..505288ed974 100644
--- a/src/widget/wwaveformviewer.h
+++ b/src/widget/wwaveformviewer.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "skin/legacy/skincontext.h"
 #include "track/track_decl.h"
 #include "util/parented_ptr.h"
 #include "waveform/renderers/waveformmark.h"
@@ -9,10 +8,9 @@
 
 class ControlProxy;
 class WaveformWidgetAbstract;
-class QDragEnterEvent;
-class QDropEvent;
-class QEvent;
 class WCueMenuPopup;
+class QDomNode;
+class SkinContext;
 
 class WWaveformViewer : public WWidget, public TrackDropTarget {
     Q_OBJECT
diff --git a/src/widget/wwidget.cpp b/src/widget/wwidget.cpp
index 642263b300c..5d5c30711fb 100644
--- a/src/widget/wwidget.cpp
+++ b/src/widget/wwidget.cpp
@@ -1,7 +1,6 @@
 #include "widget/wwidget.h"
 
 #include <QTouchEvent>
-#include <QtDebug>
 
 #include "control/controlproxy.h"
 #include "moc_wwidget.cpp"
diff --git a/src/widget/wwidget.h b/src/widget/wwidget.h
index 10436189458..042c3e0ad1e 100644
--- a/src/widget/wwidget.h
+++ b/src/widget/wwidget.h
@@ -1,14 +1,11 @@
 #pragma once
 
 #include <QWidget>
-#include <QEvent>
-#include <QString>
 
-#include "preferences/usersettings.h"
-#include "util/color/color.h"
 #include "widget/wbasewidget.h"
 
 class ControlProxy;
+class QEvent;
 
 /** Abstract class used in widgets connected to ControlObjects. Derived
   * widgets can implement the signal and slot for manipulating the widgets
diff --git a/src/widget/wwidgetgroup.cpp b/src/widget/wwidgetgroup.cpp
index 9787c0e5f08..a2385834f31 100644
--- a/src/widget/wwidgetgroup.cpp
+++ b/src/widget/wwidgetgroup.cpp
@@ -1,7 +1,7 @@
 #include "widget/wwidgetgroup.h"
 
+#include <QEvent>
 #include <QLayout>
-#include <QMap>
 #include <QStackedLayout>
 #include <QStylePainter>
 
@@ -9,7 +9,6 @@
 #include "skin/legacy/skincontext.h"
 #include "util/debug.h"
 #include "widget/wpixmapstore.h"
-#include "widget/wwidget.h"
 
 WWidgetGroup::WWidgetGroup(QWidget* pParent)
         : QFrame(pParent),
diff --git a/src/widget/wwidgetgroup.h b/src/widget/wwidgetgroup.h
index 4cc21ad27f1..317ebec00c8 100644
--- a/src/widget/wwidgetgroup.h
+++ b/src/widget/wwidgetgroup.h
@@ -1,17 +1,14 @@
 #pragma once
 
-#include <QDomNode>
 #include <QFrame>
-#include <QPaintEvent>
 #include <QPixmap>
-#include <QResizeEvent>
 #include <QString>
 #include <QWidget>
-#include <QEvent>
 
 #include "widget/wbasewidget.h"
 #include "widget/wpixmapstore.h"
 
+class QDomNode;
 class SkinContext;
 
 class WWidgetGroup : public QFrame, public WBaseWidget {
diff --git a/src/widget/wwidgetstack.cpp b/src/widget/wwidgetstack.cpp
index 183a68975ef..631478ca159 100644
--- a/src/widget/wwidgetstack.cpp
+++ b/src/widget/wwidgetstack.cpp
@@ -1,8 +1,8 @@
 #include "widget/wwidgetstack.h"
 
 #include <QApplication>
-#include <QtDebug>
 
+#include "control/controlobject.h"
 #include "moc_wwidgetstack.cpp"
 
 WidgetStackControlListener::WidgetStackControlListener(
diff --git a/src/widget/wwidgetstack.h b/src/widget/wwidgetstack.h
index 5e19d37b14c..b290c7e688d 100644
--- a/src/widget/wwidgetstack.h
+++ b/src/widget/wwidgetstack.h
@@ -1,14 +1,14 @@
 #pragma once
 
-#include <QWidget>
 #include <QObject>
 #include <QStackedWidget>
-#include <QEvent>
 
-#include "control/controlobject.h"
 #include "control/controlproxy.h"
 #include "widget/wbasewidget.h"
 
+class QEvent;
+class QWidget;
+
 class WidgetStackControlListener : public QObject {
     Q_OBJECT
   public:

From 1b80b58a1df7206523f49ba9be44ba336048107f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Fri, 20 Oct 2023 09:05:08 +0200
Subject: [PATCH 203/388] Improve header of util classes

---
 src/util/console.cpp             | 6 ------
 src/util/db/dbconnection.cpp     | 1 -
 src/util/db/fwdsqlquery.cpp      | 2 --
 src/util/dnd.cpp                 | 3 +--
 src/util/imagefiledata.cpp       | 2 --
 src/util/imageutils.cpp          | 1 -
 src/util/indexrange.cpp          | 1 -
 src/util/parented_ptr.h          | 1 +
 src/util/performancetimer.cpp    | 1 -
 src/util/safelywritablefile.cpp  | 1 -
 src/util/screensaver.cpp         | 5 ++---
 src/util/screensaver.h           | 2 ++
 src/util/stat.cpp                | 1 -
 src/util/taskmonitor.cpp         | 1 -
 src/util/threadcputimer.cpp      | 1 -
 src/util/timer.cpp               | 1 -
 src/util/valuetransformer.cpp    | 2 --
 src/util/versionstore.cpp        | 6 ++----
 src/util/workerthreadscheduler.h | 3 ---
 19 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/src/util/console.cpp b/src/util/console.cpp
index daffcc9ccb3..7238253ce7a 100644
--- a/src/util/console.cpp
+++ b/src/util/console.cpp
@@ -1,11 +1,5 @@
 #include "console.h"
 
-#include <stdio.h>
-
-#include <QtDebug>
-
-#include "util/versionstore.h"
-
 #ifdef __WINDOWS__
 #include <io.h> // Debug Console
 #include <string.h>
diff --git a/src/util/db/dbconnection.cpp b/src/util/db/dbconnection.cpp
index d7322730073..e39c546e52f 100644
--- a/src/util/db/dbconnection.cpp
+++ b/src/util/db/dbconnection.cpp
@@ -8,7 +8,6 @@
 #include "util/db/dbconnection.h"
 
 #include "util/db/sqllikewildcards.h"
-#include "util/memory.h"
 #include "util/logger.h"
 #include "util/assert.h"
 
diff --git a/src/util/db/fwdsqlquery.cpp b/src/util/db/fwdsqlquery.cpp
index 82e5ddee442..5fea814c2c0 100644
--- a/src/util/db/fwdsqlquery.cpp
+++ b/src/util/db/fwdsqlquery.cpp
@@ -1,7 +1,5 @@
 #include "util/db/fwdsqlquery.h"
 
-#include <QSqlRecord>
-
 #include "util/performancetimer.h"
 #include "util/logger.h"
 #include "util/assert.h"
diff --git a/src/util/dnd.cpp b/src/util/dnd.cpp
index d89023c88c1..b1c333947c9 100644
--- a/src/util/dnd.cpp
+++ b/src/util/dnd.cpp
@@ -1,8 +1,7 @@
 #include "util/dnd.h"
 
 #include "control/controlobject.h"
-#include "library/parserm3u.h"
-#include "library/parserpls.h"
+#include "library/parser.h"
 #include "mixer/playermanager.h"
 #include "preferences/dialog/dlgprefdeck.h"
 #include "sources/soundsourceproxy.h"
diff --git a/src/util/imagefiledata.cpp b/src/util/imagefiledata.cpp
index 648cc52c985..48ecff1d5e9 100644
--- a/src/util/imagefiledata.cpp
+++ b/src/util/imagefiledata.cpp
@@ -1,10 +1,8 @@
 #include "util/imagefiledata.h"
 
 #include <QBuffer>
-#include <QByteArray>
 #include <QFile>
 #include <QFileInfo>
-#include <QImage>
 #include <QImageReader>
 
 #include "util/assert.h"
diff --git a/src/util/imageutils.cpp b/src/util/imageutils.cpp
index ed91f7c242a..eeadeca2dec 100644
--- a/src/util/imageutils.cpp
+++ b/src/util/imageutils.cpp
@@ -1,6 +1,5 @@
 #include "util/imageutils.h"
 
-#include <QByteArray>
 #include <QCryptographicHash>
 
 namespace {
diff --git a/src/util/indexrange.cpp b/src/util/indexrange.cpp
index cde8371a3e3..ca9521a9c8b 100644
--- a/src/util/indexrange.cpp
+++ b/src/util/indexrange.cpp
@@ -1,6 +1,5 @@
 #include "util/indexrange.h"
 
-#include <ostream>
 #include <sstream>
 
 
diff --git a/src/util/parented_ptr.h b/src/util/parented_ptr.h
index dd5d4ba2a7e..d0884f47c5e 100644
--- a/src/util/parented_ptr.h
+++ b/src/util/parented_ptr.h
@@ -4,6 +4,7 @@
 #include <memory>
 
 #include "util/assert.h"
+#include "util/parented_ptr.h"
 
 // Use this wrapper class to clearly represent a raw pointer that is owned by the QT object tree.
 // Objects which both derive from QObject AND have a parent object, have their lifetime governed by
diff --git a/src/util/performancetimer.cpp b/src/util/performancetimer.cpp
index 8f2769cf0c7..a72855356c9 100644
--- a/src/util/performancetimer.cpp
+++ b/src/util/performancetimer.cpp
@@ -51,7 +51,6 @@
 #include <hal.h>
 #include <hal_data.h>
 #elif defined(Q_OS_UNIX)
-#include <sys/time.h>
 #include <time.h>
 #include <unistd.h>
 #elif defined(Q_OS_WIN)
diff --git a/src/util/safelywritablefile.cpp b/src/util/safelywritablefile.cpp
index fedfcc2d7a7..25fdbbe06ab 100644
--- a/src/util/safelywritablefile.cpp
+++ b/src/util/safelywritablefile.cpp
@@ -1,7 +1,6 @@
 #include "util/safelywritablefile.h"
 
 #include <QFileInfo>
-#include <QThread>
 
 #include "util/assert.h"
 #include "util/logger.h"
diff --git a/src/util/screensaver.cpp b/src/util/screensaver.cpp
index 82836f4ddc7..d5a11aaa556 100644
--- a/src/util/screensaver.cpp
+++ b/src/util/screensaver.cpp
@@ -1,5 +1,3 @@
-#include <QtDebug>
-
 /**
 Documentation:
 OSX: https://developer.apple.com/reference/iokit/1557134-iopmassertioncreatewithname
@@ -18,7 +16,8 @@ With the help of the following source codes:
 **/
 
 #include "util/screensaver.h"
-#include "util/assert.h"
+
+#include <QDebug>
 
 #if defined(Q_OS_MAC)
 #  include "util/mac.h"
diff --git a/src/util/screensaver.h b/src/util/screensaver.h
index 73d91835dbe..57e47122f13 100644
--- a/src/util/screensaver.h
+++ b/src/util/screensaver.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <QtGlobal>
+
 #ifdef Q_OS_MAC
 #include <IOKit/pwr_mgt/IOPMLib.h>
 #endif // Q_OS_MAC
diff --git a/src/util/stat.cpp b/src/util/stat.cpp
index 490d6031cf5..f54bda24919 100644
--- a/src/util/stat.cpp
+++ b/src/util/stat.cpp
@@ -1,7 +1,6 @@
 #include <limits>
 
 #include <QStringList>
-#include <QtDebug>
 
 #include "util/stat.h"
 #include "util/time.h"
diff --git a/src/util/taskmonitor.cpp b/src/util/taskmonitor.cpp
index 2163cd139a2..8e8d9be7fe5 100644
--- a/src/util/taskmonitor.cpp
+++ b/src/util/taskmonitor.cpp
@@ -1,7 +1,6 @@
 #include "util/taskmonitor.h"
 
 #include <QCoreApplication>
-#include <QThread>
 
 #include "moc_taskmonitor.cpp"
 #include "util/assert.h"
diff --git a/src/util/threadcputimer.cpp b/src/util/threadcputimer.cpp
index 31979c63b72..8759aee4531 100644
--- a/src/util/threadcputimer.cpp
+++ b/src/util/threadcputimer.cpp
@@ -10,7 +10,6 @@
 #include <hal.h>
 #include <hal_data.h>
 #elif defined(Q_OS_UNIX)
-#include <sys/time.h>
 #include <time.h>
 #include <unistd.h>
 #elif defined(Q_OS_WIN)
diff --git a/src/util/timer.cpp b/src/util/timer.cpp
index 9af8712ca5d..d34a165c0af 100644
--- a/src/util/timer.cpp
+++ b/src/util/timer.cpp
@@ -3,7 +3,6 @@
 #include "moc_timer.cpp"
 #include "util/experiment.h"
 #include "util/time.h"
-#include "waveform/guitick.h"
 
 Timer::Timer(const QString& key, Stat::ComputeFlags compute)
         : m_key(key),
diff --git a/src/util/valuetransformer.cpp b/src/util/valuetransformer.cpp
index fcd61cec5db..60c60fe08b0 100644
--- a/src/util/valuetransformer.cpp
+++ b/src/util/valuetransformer.cpp
@@ -1,5 +1,3 @@
-#include <QtDebug>
-
 #include "util/valuetransformer.h"
 
 ValueTransformer::ValueTransformer() {
diff --git a/src/util/versionstore.cpp b/src/util/versionstore.cpp
index 1bfdb01320d..b2ed18ed65f 100644
--- a/src/util/versionstore.cpp
+++ b/src/util/versionstore.cpp
@@ -1,11 +1,8 @@
 #include "util/versionstore.h"
 
-#include <soundtouch/SoundTouch.h>
-
 #include <QCoreApplication>
+#include <QDebug>
 #include <QStandardPaths>
-#include <QStringList>
-#include <QtDebug>
 #include <QtGlobal>
 
 // shout.h checks for WIN32 to see if we are on Windows.
@@ -25,6 +22,7 @@
 #include <portaudio.h>
 #include <rubberband/RubberBandStretcher.h>
 #include <sndfile.h>
+#include <soundtouch/SoundTouch.h>
 #include <taglib/taglib.h>
 #include <vorbis/codec.h>
 
diff --git a/src/util/workerthreadscheduler.h b/src/util/workerthreadscheduler.h
index 676bba768d1..9f28718b339 100644
--- a/src/util/workerthreadscheduler.h
+++ b/src/util/workerthreadscheduler.h
@@ -3,9 +3,6 @@
 #include "util/workerthread.h"
 #include "util/fifo.h"
 
-
-class WorkerThread;
-
 /// Non-blocking scheduler for worker threads which itself runs
 /// as a worker thread. The maximum number of worker threads is
 /// limited.

From 2c0c0990b79286971081a5964b8436d2e1529fa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Fri, 20 Oct 2023 09:05:32 +0200
Subject: [PATCH 204/388] Improve header of dialog classes

---
 src/dialog/dlgreplacecuecolor.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/dialog/dlgreplacecuecolor.cpp b/src/dialog/dlgreplacecuecolor.cpp
index d34454416d9..69e1f08ed84 100644
--- a/src/dialog/dlgreplacecuecolor.cpp
+++ b/src/dialog/dlgreplacecuecolor.cpp
@@ -5,6 +5,7 @@
 #include <QDialogButtonBox>
 #include <QMessageBox>
 #include <QResizeEvent>
+#include <QStyleFactory>
 #include <QtConcurrent>
 #include <QStyleFactory>
 
@@ -14,6 +15,7 @@
 #include "moc_dlgreplacecuecolor.cpp"
 #include "preferences/colorpalettesettings.h"
 #include "track/track.h"
+#include "util/color/color.h"
 #include "util/color/predefinedcolorpalettes.h"
 
 namespace {

From 5ddac7e15e1ea3e0ab42d1e75b05f5324439cae2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Fri, 20 Oct 2023 13:57:47 +0200
Subject: [PATCH 205/388] Improve taglib headers

---
 src/track/taglib/trackmetadata_riff.cpp | 2 ++
 src/track/taglib/trackmetadata_riff.h   | 2 +-
 src/track/taglib/trackmetadata_xiph.cpp | 1 +
 src/track/taglib/trackmetadata_xiph.h   | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/track/taglib/trackmetadata_riff.cpp b/src/track/taglib/trackmetadata_riff.cpp
index 7ca75aa9214..452b550ded2 100644
--- a/src/track/taglib/trackmetadata_riff.cpp
+++ b/src/track/taglib/trackmetadata_riff.cpp
@@ -1,5 +1,7 @@
 #include "track/taglib/trackmetadata_riff.h"
 
+#include "track/taglib/trackmetadata_common.h"
+
 namespace mixxx {
 
 namespace taglib {
diff --git a/src/track/taglib/trackmetadata_riff.h b/src/track/taglib/trackmetadata_riff.h
index 1ae7a8d722d..b170a08ad70 100644
--- a/src/track/taglib/trackmetadata_riff.h
+++ b/src/track/taglib/trackmetadata_riff.h
@@ -2,7 +2,7 @@
 
 #include <taglib/infotag.h>
 
-#include "track/taglib/trackmetadata_common.h"
+class TrackMetadata;
 
 namespace mixxx {
 
diff --git a/src/track/taglib/trackmetadata_xiph.cpp b/src/track/taglib/trackmetadata_xiph.cpp
index d7f3152e47e..bb7f4a43c17 100644
--- a/src/track/taglib/trackmetadata_xiph.cpp
+++ b/src/track/taglib/trackmetadata_xiph.cpp
@@ -4,6 +4,7 @@
 
 #include <array>
 
+#include "track/taglib/trackmetadata_common.h"
 #include "track/tracknumbers.h"
 #include "util/logger.h"
 
diff --git a/src/track/taglib/trackmetadata_xiph.h b/src/track/taglib/trackmetadata_xiph.h
index 8d63552f338..cca80bb6075 100644
--- a/src/track/taglib/trackmetadata_xiph.h
+++ b/src/track/taglib/trackmetadata_xiph.h
@@ -2,7 +2,7 @@
 
 #include <taglib/xiphcomment.h>
 
-#include "track/taglib/trackmetadata_common.h"
+#include "track/taglib/trackmetadata_file.h"
 
 namespace mixxx {
 

From 22452208cdd79f56807101937c1517290a471e86 Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Sun, 29 Oct 2023 21:22:29 +0100
Subject: [PATCH 206/388] moved ordered marks from WOverview to
 WaveformMarkSet, using as_const, hover in waveformviewer in reverse draw
 order

---
 .../allshader/waveformrendermark.cpp          | 20 +++----
 src/waveform/renderers/waveformmarkset.cpp    | 40 +++++++++++++
 src/waveform/renderers/waveformmarkset.h      | 55 +++++++++++++++--
 src/waveform/renderers/waveformrendermark.cpp | 29 +++------
 .../renderers/waveformwidgetrenderer.cpp      | 14 ++++-
 .../renderers/waveformwidgetrenderer.h        |  4 +-
 src/widget/woverview.cpp                      | 60 ++++---------------
 src/widget/woverview.h                        |  3 -
 8 files changed, 131 insertions(+), 94 deletions(-)

diff --git a/src/waveform/renderers/allshader/waveformrendermark.cpp b/src/waveform/renderers/allshader/waveformrendermark.cpp
index 0b7fd5c799c..59a8efc46d1 100644
--- a/src/waveform/renderers/allshader/waveformrendermark.cpp
+++ b/src/waveform/renderers/allshader/waveformrendermark.cpp
@@ -56,7 +56,7 @@ void allshader::WaveformRenderMark::initializeGL() {
     m_rgbaShader.init();
     m_textureShader.init();
 
-    for (const auto& pMark : m_marks) {
+    for (const auto& pMark : std::as_const(m_marks)) {
         generateMarkImage(pMark);
     }
     generatePlayPosMarkTexture();
@@ -159,22 +159,14 @@ void allshader::WaveformRenderMark::drawMark(const QRectF& rect, QColor color) {
 
 void allshader::WaveformRenderMark::paintGL() {
     const float devicePixelRatio = m_waveformRenderer->getDevicePixelRatio();
-    QMap<WaveformMarkPointer, int> marksOnScreen;
+    QList<QPair<WaveformMarkPointer, int>> marksOnScreen;
 
     checkCuesUpdated();
 
     glEnable(GL_BLEND);
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
-    for (const auto& pMark : m_marks) {
-        if (!pMark->isValid()) {
-            continue;
-        }
-
-        if (pMark->hasVisible() && !pMark->isVisible()) {
-            continue;
-        }
-
+    for (const auto& pMark : std::as_const(m_marks)) {
         if (!pMark->m_pGraphics || pMark->m_pGraphics->m_obsolete) {
             generateMarkImage(pMark);
         }
@@ -229,7 +221,7 @@ void allshader::WaveformRenderMark::paintGL() {
             }
 
             if (visible) {
-                marksOnScreen[pMark] = static_cast<int>(drawOffset);
+                marksOnScreen.append(qMakePair(pMark, drawOffset));
             }
         }
     }
@@ -327,7 +319,7 @@ void allshader::WaveformRenderMark::drawTriangle(QPainter* painter,
 }
 
 void allshader::WaveformRenderMark::resizeGL(int, int) {
-    for (const auto& pMark : m_marks) {
+    for (const auto& pMark : std::as_const(m_marks)) {
         generateMarkImage(pMark);
     }
     generatePlayPosMarkTexture();
@@ -386,6 +378,8 @@ void allshader::WaveformRenderMark::checkCuesUpdated() {
             generateMarkImage(pMark);
         }
     }
+
+    m_marks.update();
 }
 
 void allshader::WaveformRenderMark::generateMarkImage(WaveformMarkPointer pMark) {
diff --git a/src/waveform/renderers/waveformmarkset.cpp b/src/waveform/renderers/waveformmarkset.cpp
index 45ab38fda3a..bb14492722b 100644
--- a/src/waveform/renderers/waveformmarkset.cpp
+++ b/src/waveform/renderers/waveformmarkset.cpp
@@ -69,3 +69,43 @@ WaveformMarkPointer WaveformMarkSet::getHotCueMark(int hotCue) const {
 WaveformMarkPointer WaveformMarkSet::getDefaultMark() const {
     return m_pDefaultMark;
 }
+
+void WaveformMarkSet::update() {
+    std::map<WaveformMarkSortKey, WaveformMarkPointer> map;
+    for (const auto& pMark : std::as_const(m_marks)) {
+        if (pMark->isValid() && pMark->isVisible()) {
+            double samplePosition = pMark->getSamplePosition();
+            if (samplePosition != Cue::kNoPosition) {
+                // Create a stable key for sorting, because the WaveformMark's samplePosition is a
+                // ControlObject which can change at any time by other threads. Such a change causes
+                // another updateCues() call, rebuilding map.
+                auto key = WaveformMarkSortKey(samplePosition, pMark->getHotCue());
+                map.emplace(key, pMark);
+            }
+        }
+    }
+
+    m_marksToRender.clear();
+    m_marksToRender.reserve(static_cast<QList<WaveformMarkPointer>::size_type>(map.size()));
+    std::transform(map.begin(),
+            map.end(),
+            std::back_inserter(m_marksToRender),
+            [](auto const& pair) { return pair.second; });
+}
+
+WaveformMarkPointer WaveformMarkSet::findHoveredMark(
+        QPoint pos, Qt::Orientation orientation) const {
+    // Non-hotcue marks (intro/outro cues, main cue, loop in/out) are sorted
+    // before hotcues in m_marksToRender so if there is a hotcue in the same
+    // location, the hotcue gets rendered on top. When right clicking, the
+    // the hotcue rendered on top must be assigned to m_pHoveredMark to show
+    // the CueMenuPopup. To accomplish this, m_marksToRender is iterated in
+    // reverse and the loop breaks as soon as m_pHoveredMark is set.
+    for (auto it = m_marksToRender.crbegin(); it != m_marksToRender.crend(); ++it) {
+        const WaveformMarkPointer& pMark = *it;
+        if (pMark->contains(pos, orientation)) {
+            return pMark;
+        }
+    }
+    return nullptr;
+}
diff --git a/src/waveform/renderers/waveformmarkset.h b/src/waveform/renderers/waveformmarkset.h
index 2f893ca85dd..1d3d528da8d 100644
--- a/src/waveform/renderers/waveformmarkset.h
+++ b/src/waveform/renderers/waveformmarkset.h
@@ -9,7 +9,8 @@
 class WaveformWidgetRenderer;
 
 // This class helps share code between the WaveformRenderMark and WOverview
-// constructors.
+// constructors and allows to iterate over the orders marks that have to be
+// rendered.
 class WaveformMarkSet {
   public:
     WaveformMarkSet();
@@ -19,17 +20,63 @@ class WaveformMarkSet {
                const SkinContext& context,
                const WaveformSignalColors& signalColors);
 
-    inline QList<WaveformMarkPointer>::const_iterator begin() const { return m_marks.begin(); }
-    inline QList<WaveformMarkPointer>::const_iterator end() const { return m_marks.end(); }
+    template<typename Receiver, typename Slot>
+    void connectSamplePositionChanged(Receiver receiver, Slot slot) const {
+        for (const auto& pMark : std::as_const(m_marks)) {
+            if (pMark->isValid()) {
+                pMark->connectSamplePositionChanged(receiver, slot);
+            }
+        }
+    };
+
+    template<typename Receiver, typename Slot>
+    void connectSampleEndPositionChanged(Receiver receiver, Slot slot) const {
+        for (const auto& pMark : std::as_const(m_marks)) {
+            if (pMark->isValid()) {
+                pMark->connectSampleEndPositionChanged(receiver, slot);
+            }
+        }
+    };
+
+    template<typename Receiver, typename Slot>
+    void connectVisibleChanged(Receiver receiver, Slot slot) const {
+        for (const auto& pMark : std::as_const(m_marks)) {
+            if (pMark->hasVisible()) {
+                pMark->connectVisibleChanged(receiver, slot);
+            }
+        }
+    }
+
+    inline QList<WaveformMarkPointer>::const_iterator begin() const {
+        return m_marksToRender.begin();
+    }
+    inline QList<WaveformMarkPointer>::const_iterator end() const {
+        return m_marksToRender.end();
+    }
+    inline QList<WaveformMarkPointer>::const_iterator cbegin() const {
+        return m_marksToRender.cbegin();
+    }
+    inline QList<WaveformMarkPointer>::const_iterator cend() const {
+        return m_marksToRender.cend();
+    }
 
     // hotCue must be valid (>= 0 and < NUM_HOT_CUES)
     WaveformMarkPointer getHotCueMark(int hotCue) const;
     WaveformMarkPointer getDefaultMark() const;
+    WaveformMarkPointer findHoveredMark(QPoint point, Qt::Orientation orientation) const;
+
+    void update();
 
   private:
-    void clear() { m_marks.clear(); }
+    void clear() {
+        m_marks.clear();
+        m_marksToRender.clear();
+    }
     WaveformMarkPointer m_pDefaultMark;
     QList<WaveformMarkPointer> m_marks;
+    // List of visible WaveformMarks sorted by the order they appear in the track
+    QList<WaveformMarkPointer> m_marksToRender;
+
     QMap<int, WaveformMarkPointer> m_hotCueMarks;
 
     DISALLOW_COPY_AND_ASSIGN(WaveformMarkSet);
diff --git a/src/waveform/renderers/waveformrendermark.cpp b/src/waveform/renderers/waveformrendermark.cpp
index 113e7f608bf..6d9f8e4e426 100644
--- a/src/waveform/renderers/waveformrendermark.cpp
+++ b/src/waveform/renderers/waveformrendermark.cpp
@@ -40,27 +40,12 @@ void WaveformRenderMark::setup(const QDomNode& node, const SkinContext& context)
 
 void WaveformRenderMark::draw(QPainter* painter, QPaintEvent* /*event*/) {
     PainterScope PainterScope(painter);
-    // Maps mark objects to their positions in the widget.
-    QMap<WaveformMarkPointer, int> marksOnScreen;
-    /*
-    //DEBUG
-    for (int i = 0; i < m_markPoints.size(); i++) {
-        if (m_waveformWidget->getTrackSamples())
-            painter->drawText(40*i,12+12*(i%3),QString::number(m_markPoints[i]->get() / (double)m_waveformWidget->getTrackSamples()));
-    }
-    */
+    // Associates mark objects with their positions in the widget.
+    QList<QPair<WaveformMarkPointer, int>> marksOnScreen;
 
     painter->setWorldMatrixEnabled(false);
 
-    for (const auto& pMark : m_marks) {
-        if (!pMark->isValid()) {
-            continue;
-        }
-
-        if (pMark->hasVisible() && !pMark->isVisible()) {
-            continue;
-        }
-
+    for (const auto& pMark : std::as_const(m_marks)) {
         // Generate image on first paint can't be done in setup since we need to
         // wait for the render widget to be resized yet.
         if (!pMark->m_pGraphics || pMark->m_pGraphics->m_obsolete) {
@@ -117,7 +102,7 @@ void WaveformRenderMark::draw(QPainter* painter, QPaintEvent* /*event*/) {
                 }
 
                 if (visible) {
-                    marksOnScreen[pMark] = drawOffset;
+                    marksOnScreen.append(qMakePair(pMark, drawOffset));
                 }
             } else {
                 const int markHalfHeight =
@@ -161,7 +146,7 @@ void WaveformRenderMark::draw(QPainter* painter, QPaintEvent* /*event*/) {
                 }
 
                 if (visible) {
-                    marksOnScreen[pMark] = drawOffset;
+                    marksOnScreen.append(qMakePair(pMark, drawOffset));
                 }
             }
         }
@@ -171,7 +156,7 @@ void WaveformRenderMark::draw(QPainter* painter, QPaintEvent* /*event*/) {
 
 void WaveformRenderMark::onResize() {
     // Flag that the mark image has to be updated. New images will be created on next paint.
-    for (const auto& pMark : m_marks) {
+    for (const auto& pMark : std::as_const(m_marks)) {
         if (pMark->m_pGraphics) {
             pMark->m_pGraphics->m_obsolete = true;
         }
@@ -222,6 +207,8 @@ void WaveformRenderMark::slotCuesUpdated() {
             generateMarkImage(pMark);
         }
     }
+
+    m_marks.update();
 }
 
 void WaveformRenderMark::generateMarkImage(WaveformMarkPointer pMark) {
diff --git a/src/waveform/renderers/waveformwidgetrenderer.cpp b/src/waveform/renderers/waveformwidgetrenderer.cpp
index 6670a508079..699a5afbbc7 100644
--- a/src/waveform/renderers/waveformwidgetrenderer.cpp
+++ b/src/waveform/renderers/waveformwidgetrenderer.cpp
@@ -413,13 +413,21 @@ ConstWaveformPointer WaveformWidgetRenderer::getWaveform() const {
 }
 
 WaveformMarkPointer WaveformWidgetRenderer::getCueMarkAtPoint(QPoint point) const {
-    for (auto it = m_markPositions.constBegin(); it != m_markPositions.constEnd(); ++it) {
-        WaveformMarkPointer pMark = it.key();
+    // The m_markPositions list follows the order of drawing, so we search the list
+    // in reverse order to find the hovered mark.
+    //
+    // TODO It would be preferable to use WaveformMarkSet::findHoveredMark here, as
+    // done by WOverview, but that requires a) making WaveformMarkSet m_marks a member
+    // of this class and b) decoupling the calculation of the drawoffset from the 
+    // drawing and c) storing it in WaveformMark. 
+
+    for (auto it = m_markPositions.crbegin(); it != m_markPositions.crend(); ++it) {
+        const WaveformMarkPointer& pMark = it->first;
         VERIFY_OR_DEBUG_ASSERT(pMark) {
             continue;
         }
 
-        int markImagePositionInWidgetSpace = it.value();
+        int markImagePositionInWidgetSpace = it->second;
         QPoint pointInImageSpace;
         if (getOrientation() == Qt::Horizontal) {
             pointInImageSpace = QPoint(point.x() - markImagePositionInWidgetSpace, point.y());
diff --git a/src/waveform/renderers/waveformwidgetrenderer.h b/src/waveform/renderers/waveformwidgetrenderer.h
index cb319d85435..912ece5539c 100644
--- a/src/waveform/renderers/waveformwidgetrenderer.h
+++ b/src/waveform/renderers/waveformwidgetrenderer.h
@@ -149,7 +149,7 @@ class WaveformWidgetRenderer {
     }
 
     void setTrack(TrackPointer track);
-    void setMarkPositions(const QMap<WaveformMarkPointer, int>& markPositions) {
+    void setMarkPositions(const QList<QPair<WaveformMarkPointer, int>>& markPositions) {
         m_markPositions = markPositions;
     }
 
@@ -217,7 +217,7 @@ class WaveformWidgetRenderer {
 private:
     DISALLOW_COPY_AND_ASSIGN(WaveformWidgetRenderer);
     friend class WaveformWidgetFactory;
-    QMap<WaveformMarkPointer, int> m_markPositions;
+    QList<QPair<WaveformMarkPointer, int>> m_markPositions;
     // draw play position indicator triangles
     void drawPlayPosmarker(QPainter* painter);
     void drawTriangle(QPainter* painter,
diff --git a/src/widget/woverview.cpp b/src/widget/woverview.cpp
index 436d7ca4007..5de00ec3f2a 100644
--- a/src/widget/woverview.cpp
+++ b/src/widget/woverview.cpp
@@ -151,18 +151,9 @@ void WOverview::setup(const QDomNode& node, const SkinContext& context) {
     auto colorPalette = colorPaletteSettings.getHotcueColorPalette();
     m_pCueMenuPopup->setColorPalette(colorPalette);
 
-    for (const auto& pMark: m_marks) {
-        if (pMark->isValid()) {
-            pMark->connectSamplePositionChanged(this,
-                    &WOverview::onMarkChanged);
-            pMark->connectSampleEndPositionChanged(this,
-                    &WOverview::onMarkChanged);
-        }
-        if (pMark->hasVisible()) {
-            pMark->connectVisibleChanged(this,
-                    &WOverview::onMarkChanged);
-        }
-    }
+    m_marks.connectSamplePositionChanged(this, &WOverview::onMarkChanged);
+    m_marks.connectSampleEndPositionChanged(this, &WOverview::onMarkChanged);
+    m_marks.connectVisibleChanged(this, &WOverview::onMarkChanged);
 
     QDomNode child = node.firstChild();
     while (!child.isNull()) {
@@ -220,8 +211,8 @@ void WOverview::setup(const QDomNode& node, const SkinContext& context) {
 
     m_bShowCueTimes = context.selectBool(node, "ShowCueTimes", true);
 
-    //qDebug() << "WOverview : m_marks" << m_marks.size();
-    //qDebug() << "WOverview : m_markRanges" << m_markRanges.size();
+    // qDebug() << "WOverview : std::as_const(m_marks)" << m_marks.size();
+    // qDebug() << "WOverview : m_markRanges" << m_markRanges.size();
     if (!m_connections.isEmpty()) {
         ControlParameterWidgetConnection* defaultConnection = m_connections.at(0);
         if (defaultConnection) {
@@ -414,7 +405,6 @@ void WOverview::onPassthroughChange(double v) {
 }
 
 void WOverview::updateCues(const QList<CuePointer> &loadedCues) {
-    m_marksToRender.clear();
     for (const CuePointer& currentCue : loadedCues) {
         const WaveformMarkPointer pMark = m_marks.getHotCueMark(currentCue->getHotCue());
 
@@ -444,18 +434,7 @@ void WOverview::updateCues(const QList<CuePointer> &loadedCues) {
         }
     }
 
-    for (const auto& pMark : m_marks) {
-        if (pMark->isValid() && pMark->isVisible()) {
-            double samplePosition = pMark->getSamplePosition();
-            if (samplePosition != Cue::kNoPosition) {
-                // Create a stable key for sorting, because the WaveformMark's samplePosition is a
-                // ControlObject which can change at any time by other threads. Such a change causes
-                // another updateCues() call, rebuilding m_marksToRender.
-                auto key = WaveformMarkSortKey(samplePosition, pMark->getHotCue());
-                m_marksToRender.emplace(key, pMark);
-            }
-        }
-    }
+    m_marks.update();
 }
 
 // connecting the tracks cuesUpdated and onMarkChanged is not possible
@@ -492,21 +471,7 @@ void WOverview::mouseMoveEvent(QMouseEvent* e) {
         return;
     }
 
-    m_pHoveredMark.clear();
-
-    // Non-hotcue marks (intro/outro cues, main cue, loop in/out) are sorted
-    // before hotcues in m_marksToRender so if there is a hotcue in the same
-    // location, the hotcue gets rendered on top. When right clicking, the
-    // the hotcue rendered on top must be assigned to m_pHoveredMark to show
-    // the CueMenuPopup. To accomplish this, m_marksToRender is iterated in
-    // reverse and the loop breaks as soon as m_pHoveredMark is set.
-    for (auto i = m_marksToRender.crbegin(); i != m_marksToRender.crend(); ++i) {
-        const WaveformMarkPointer& pMark = i->second;
-        if (pMark->contains(e->pos(), m_orientation)) {
-            m_pHoveredMark = pMark;
-            break;
-        }
-    }
+    m_pHoveredMark = m_marks.findHoveredMark(e->pos(), m_orientation);
 
     //qDebug() << "WOverview::mouseMoveEvent" << e->pos() << m_iPos;
     update();
@@ -872,9 +837,9 @@ void WOverview::drawMarks(QPainter* pPainter, const float offset, const float ga
 
     bool markHovered = false;
 
-    for (auto i = m_marksToRender.cbegin(); i != m_marksToRender.cend(); ++i) {
+    for (auto it = m_marks.cbegin(); it != m_marks.cend(); ++it) {
         PainterScope painterScope(pPainter);
-        const WaveformMarkPointer& pMark = i->second;
+        const WaveformMarkPointer& pMark = *it;
         double samplePosition = pMark->getSamplePosition();
         const float markPosition = math_clamp(
                 offset + static_cast<float>(samplePosition) * gain,
@@ -932,8 +897,8 @@ void WOverview::drawMarks(QPainter* pPainter, const float offset, const float ga
 
             if (pMark != m_pHoveredMark) {
                 float nextMarkPosition = -1.0f;
-                for (auto m = std::next(i); m != m_marksToRender.cend(); ++m) {
-                    const WaveformMarkPointer& otherMark = m->second;
+                for (auto m = std::next(it); m != m_marks.cend(); ++m) {
+                    const WaveformMarkPointer& otherMark = *m;
                     bool otherAtSameHeight = valign == (otherMark->m_align & Qt::AlignVertical_Mask);
                     // Hotcues always show at least their number.
                     bool otherHasLabel = !otherMark->m_text.isEmpty() || otherMark->getHotCue() != Cue::kNoHotCue;
@@ -1184,8 +1149,7 @@ void WOverview::drawMarkLabels(QPainter* pPainter, const float offset, const flo
     QFontMetricsF fontMetrics(markerFont);
 
     // Draw WaveformMark labels
-    for (const auto& pair : m_marksToRender) {
-        const WaveformMarkPointer& pMark = pair.second;
+    for (const auto& pMark : std::as_const(m_marks)) {
         if (m_pHoveredMark != nullptr && pMark != m_pHoveredMark) {
             if (pMark->m_label.intersects(m_pHoveredMark->m_label)) {
                 continue;
diff --git a/src/widget/woverview.h b/src/widget/woverview.h
index 9d843196b26..adefc5de9c5 100644
--- a/src/widget/woverview.h
+++ b/src/widget/woverview.h
@@ -192,10 +192,7 @@ class WOverview : public WWidget, public TrackDropTarget {
     int m_dimBrightThreshold;
     QLabel* m_pPassthroughLabel;
 
-    // All WaveformMarks
     WaveformMarkSet m_marks;
-    // List of visible WaveformMarks sorted by the order they appear in the track
-    std::map<WaveformMarkSortKey, WaveformMarkPointer> m_marksToRender;
     std::vector<WaveformMarkRange> m_markRanges;
     WaveformMarkLabel m_cuePositionLabel;
     WaveformMarkLabel m_cueTimeDistanceLabel;

From b57201ef1215ffd43bb5b93ac2c2ece2cc01c02b Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Sat, 4 Nov 2023 02:33:08 +0100
Subject: [PATCH 207/388] change SKIN_WARNING to show the skin file:line first,
 then c++ context

---
 src/skin/legacy/legacyskinparser.cpp        | 159 +++++++++++++-------
 src/skin/legacy/skincontext.cpp             |  21 ++-
 src/skin/legacy/skincontext.h               |   8 +-
 src/widget/wcombobox.cpp                    |   6 +-
 src/widget/weffectbuttonparametername.cpp   |   6 +-
 src/widget/weffectchain.cpp                 |   6 +-
 src/widget/weffectchainpresetbutton.cpp     |   6 +-
 src/widget/weffectchainpresetselector.cpp   |   6 +-
 src/widget/weffectknobparametername.cpp     |   6 +-
 src/widget/weffectname.cpp                  |   6 +-
 src/widget/weffectparameterknob.cpp         |   2 +-
 src/widget/weffectparameterknobcomposed.cpp |   2 +-
 src/widget/weffectpushbutton.cpp            |   2 +-
 src/widget/weffectselector.cpp              |   6 +-
 src/widget/whotcuebutton.cpp                |   7 +-
 src/widget/wpushbutton.cpp                  |  10 +-
 src/widget/wsingletoncontainer.cpp          |  12 +-
 src/widget/wsplitter.cpp                    |  32 ++--
 src/widget/wvumeterbase.cpp                 |   6 +-
 19 files changed, 191 insertions(+), 118 deletions(-)

diff --git a/src/skin/legacy/legacyskinparser.cpp b/src/skin/legacy/legacyskinparser.cpp
index 7f41d448bbd..c61cdceed38 100644
--- a/src/skin/legacy/legacyskinparser.cpp
+++ b/src/skin/legacy/legacyskinparser.cpp
@@ -356,9 +356,10 @@ QWidget* LegacySkinParser::parseSkin(const QString& skinPath, QWidget* pParent)
         bool ok = false;
         double value = QString::fromStdString(attribute.value()).toDouble(&ok);
         if (!ok) {
-            SKIN_WARNING(skinDocument, *m_pContext)
-                    << "Error reading double value from skin attribute: "
-                    << QString::fromStdString(attribute.value());
+            SKIN_WARNING(skinDocument,
+                    *m_pContext,
+                    QStringLiteral("Failed reading double value from skin attribute: %1")
+                            .arg(QString::fromStdString(attribute.value())));
             continue;
         }
 
@@ -411,10 +412,12 @@ QWidget* LegacySkinParser::parseSkin(const QString& skinPath, QWidget* pParent)
     QList<QWidget*> widgets = parseNode(skinDocument);
 
     if (widgets.empty()) {
-        SKIN_WARNING(skinDocument, *m_pContext) << "Skin produced no widgets!";
+        SKIN_WARNING(skinDocument, *m_pContext, QStringLiteral("Skin produced no widgets!"));
         return nullptr;
     } else if (widgets.size() > 1) {
-        SKIN_WARNING(skinDocument, *m_pContext) << "Skin produced more than 1 widget!";
+        SKIN_WARNING(skinDocument,
+                *m_pContext,
+                QStringLiteral("Skin produced more than 1 widget!"));
     }
     return widgets[0];
 }
@@ -619,8 +622,10 @@ QList<QWidget*> LegacySkinParser::parseNode(const QDomElement& node) {
     } else if (nodeName == "SingletonContainer") {
         result = wrapWidget(parseStandardWidget<WSingletonContainer>(node));
     } else {
-        SKIN_WARNING(node, *m_pContext) << "Invalid node name in skin:"
-                                       << nodeName;
+        SKIN_WARNING(node,
+                *m_pContext,
+                QStringLiteral("Invalid node name in skin: %1")
+                        .arg(nodeName));
     }
 
     if (sDebug) {
@@ -673,14 +678,19 @@ QWidget* LegacySkinParser::parseScrollable(const QDomElement& node) {
     if (!childrenNode.isNull()) {
         QDomNodeList childNodes = childrenNode.childNodes();
         if (childNodes.count() != 1) {
-            SKIN_WARNING(node, *m_pContext) << "Scrollables must have exactly one child";
+            SKIN_WARNING(node,
+                    *m_pContext,
+                    QStringLiteral("Scrollables must have exactly one child"));
         }
 
         QDomNode childnode = childNodes.at(0);
         if (childnode.isElement()) {
             QList<QWidget*> children = parseNode(childnode.toElement());
             if (children.count() != 1) {
-                SKIN_WARNING(node, *m_pContext) << "Scrollables must have exactly one child";
+                SKIN_WARNING(node,
+                        *m_pContext,
+                        QStringLiteral(
+                                "Scrollables must have exactly one child"));
             } else if (children.at(0) != nullptr) {
                 pScrollable->setWidget(children.at(0));
             }
@@ -781,15 +791,19 @@ QWidget* LegacySkinParser::parseWidgetStack(const QDomElement& node) {
             QList<QWidget*> child_widgets = parseNode(element);
 
             if (child_widgets.empty()) {
-                SKIN_WARNING(node, *m_pContext)
-                        << "WidgetStack child produced no widget.";
+                SKIN_WARNING(node,
+                        *m_pContext,
+                        QStringLiteral(
+                                "WidgetStack child produced no widget."));
                 continue;
             }
 
             if (child_widgets.size() > 1) {
-                SKIN_WARNING(node, *m_pContext)
-                        << "WidgetStack child produced multiple widgets."
-                        << "All but the first are ignored.";
+                SKIN_WARNING(node,
+                        *m_pContext,
+                        QStringLiteral(
+                                "WidgetStack child produced multiple widgets. "
+                                "All but the first are ignored."));
             }
             QWidget* pChild = child_widgets[0];
 
@@ -849,15 +863,19 @@ QWidget* LegacySkinParser::parseSizeAwareStack(const QDomElement& node) {
             QList<QWidget*> children = parseNode(element);
 
             if (children.empty()) {
-                SKIN_WARNING(node, *m_pContext)
-                        << "SizeAwareStack child produced no widget.";
+                SKIN_WARNING(node,
+                        *m_pContext,
+                        QStringLiteral(
+                                "SizeAwareStack child produced no widget."));
                 continue;
             }
 
             if (children.size() > 1) {
-                SKIN_WARNING(node, *m_pContext)
-                        << "SizeAwareStack child produced multiple widgets."
-                        << "All but the first are ignored.";
+                SKIN_WARNING(node,
+                        *m_pContext,
+                        QStringLiteral(
+                                "SizeAwareStack child produced multiple "
+                                "widgets. All but the first are ignored."));
             }
             QWidget* pChild = children[0];
 
@@ -958,7 +976,7 @@ QWidget* LegacySkinParser::parseOverview(const QDomElement& node) {
     QString group = lookupNodeGroup(node);
     BaseTrackPlayer* pPlayer = m_pPlayerManager->getPlayer(group);
     if (!pPlayer) {
-        SKIN_WARNING(node, *m_pContext) << "No player found for group:" << group;
+        SKIN_WARNING(node, *m_pContext, QStringLiteral("No player found for group: %1").arg(group));
         return nullptr;
     }
 
@@ -1004,7 +1022,7 @@ QWidget* LegacySkinParser::parseVisual(const QDomElement& node) {
     QString group = lookupNodeGroup(node);
     BaseTrackPlayer* pPlayer = m_pPlayerManager->getPlayer(group);
     if (!pPlayer) {
-        SKIN_WARNING(node, *m_pContext) << "No player found for group:" << group;
+        SKIN_WARNING(node, *m_pContext, QStringLiteral("No player found for group: %1").arg(group));
         return nullptr;
     }
 
@@ -1049,7 +1067,7 @@ QWidget* LegacySkinParser::parseText(const QDomElement& node) {
     QString group = lookupNodeGroup(node);
     BaseTrackPlayer* pPlayer = m_pPlayerManager->getPlayer(group);
     if (!pPlayer) {
-        SKIN_WARNING(node, *m_pContext) << "No player found for group:" << group;
+        SKIN_WARNING(node, *m_pContext, QStringLiteral("No player found for group:").arg(group));
         return nullptr;
     }
 
@@ -1079,7 +1097,7 @@ QWidget* LegacySkinParser::parseTrackProperty(const QDomElement& node) {
     QString group = lookupNodeGroup(node);
     BaseTrackPlayer* pPlayer = m_pPlayerManager->getPlayer(group);
     if (!pPlayer) {
-        SKIN_WARNING(node, *m_pContext) << "No player found for group:" << group;
+        SKIN_WARNING(node, *m_pContext, QStringLiteral("No player found for group: %1").arg(group));
         return nullptr;
     }
 
@@ -1119,7 +1137,7 @@ QWidget* LegacySkinParser::parseTrackWidgetGroup(const QDomElement& node) {
     QString group = lookupNodeGroup(node);
     BaseTrackPlayer* pPlayer = m_pPlayerManager->getPlayer(group);
     if (!pPlayer) {
-        SKIN_WARNING(node, *m_pContext) << "No player found for group:" << group;
+        SKIN_WARNING(node, *m_pContext, QStringLiteral("No player found for group: %1").arg(group));
         return nullptr;
     }
 
@@ -1161,7 +1179,7 @@ QWidget* LegacySkinParser::parseStarRating(const QDomElement& node) {
     QString group = lookupNodeGroup(node);
     BaseTrackPlayer* pPlayer = m_pPlayerManager->getPlayer(group);
     if (!pPlayer) {
-        SKIN_WARNING(node, *m_pContext) << "No player found for group:" << group;
+        SKIN_WARNING(node, *m_pContext, QStringLiteral("No player found for group: %1").arg(group));
         return nullptr;
     }
 
@@ -1298,7 +1316,7 @@ QWidget* LegacySkinParser::parseSpinny(const QDomElement& node) {
     QString group = lookupNodeGroup(node);
     BaseTrackPlayer* pPlayer = m_pPlayerManager->getPlayer(group);
     if (!pPlayer) {
-        SKIN_WARNING(node, *m_pContext) << "No player found for group:" << group;
+        SKIN_WARNING(node, *m_pContext, QStringLiteral("No player found for group: %1").arg(group));
         return nullptr;
     }
     // Note: For some reasons on X11 we need to create the widget without a parent to avoid to
@@ -1443,7 +1461,9 @@ QWidget* LegacySkinParser::parseCoverArt(const QDomElement& node) {
     if (!group.isEmpty()) {
         pPlayer = m_pPlayerManager->getPlayer(group);
         if (!pPlayer) {
-            SKIN_WARNING(node, *m_pContext) << "No player found for group:" << group;
+            SKIN_WARNING(node,
+                    *m_pContext,
+                    QStringLiteral("No player found for group: %1").arg(group));
             return nullptr;
         }
     }
@@ -1472,14 +1492,17 @@ QWidget* LegacySkinParser::parseCoverArt(const QDomElement& node) {
 void LegacySkinParser::parseSingletonDefinition(const QDomElement& node) {
     QString objectName = m_pContext->selectString(node, "ObjectName");
     if (objectName.isEmpty()) {
-        SKIN_WARNING(node, *m_pContext)
-                << "SingletonDefinition requires an ObjectName";
+        SKIN_WARNING(node,
+                *m_pContext,
+                QStringLiteral("SingletonDefinition requires an ObjectName"));
     }
 
     QDomNode childrenNode = m_pContext->selectNode(node, "Children");
     if (childrenNode.isNull()) {
-        SKIN_WARNING(node, *m_pContext)
-                << "SingletonDefinition requires a Children tag with one child";
+        SKIN_WARNING(node,
+                *m_pContext,
+                QStringLiteral("SingletonDefinition requires a Children tag "
+                               "with one child"));
     }
 
     // Descend children, taking the first valid element.
@@ -1493,27 +1516,30 @@ void LegacySkinParser::parseSingletonDefinition(const QDomElement& node) {
     }
 
     if (child_node.isNull()) {
-        SKIN_WARNING(node, *m_pContext)
-                << "SingletonDefinition Children node is empty";
+        SKIN_WARNING(node,
+                *m_pContext,
+                QStringLiteral("SingletonDefinition Children node is empty"));
         return;
     }
 
     QDomElement element = child_node.toElement();
     QList<QWidget*> child_widgets = parseNode(element);
     if (child_widgets.empty()) {
-        SKIN_WARNING(node, *m_pContext)
-                << "SingletonDefinition child produced no widget.";
+        SKIN_WARNING(node,
+                *m_pContext,
+                QStringLiteral(
+                        "SingletonDefinition child produced no widget."));
         return;
     } else if (child_widgets.size() > 1) {
-        SKIN_WARNING(node, *m_pContext)
-                << "SingletonDefinition child produced multiple widgets."
-                << "All but the first are ignored.";
+        SKIN_WARNING(node,
+                *m_pContext,
+                QStringLiteral("SingletonDefinition child produced multiple "
+                               "widgets. All but the first are ignored."));
     }
 
     QWidget* pChild = child_widgets[0];
     if (pChild == nullptr) {
-        SKIN_WARNING(node, *m_pContext)
-                << "SingletonDefinition child widget is NULL";
+        SKIN_WARNING(node, *m_pContext, QStringLiteral("SingletonDefinition child widget is NULL"));
         return;
     }
 
@@ -1712,9 +1738,11 @@ QDomElement LegacySkinParser::loadTemplate(const QString& path) {
 
 QList<QWidget*> LegacySkinParser::parseTemplate(const QDomElement& node) {
     if (!node.hasAttribute("src")) {
-        SKIN_WARNING(node, *m_pContext)
-                << "Template instantiation without src attribute:"
-                << node.text();
+        SKIN_WARNING(node,
+                *m_pContext,
+                QStringLiteral(
+                        "Template instantiation without src attribute: %1")
+                        .arg(node.text()));
         return QList<QWidget*>();
     }
 
@@ -1726,7 +1754,10 @@ QList<QWidget*> LegacySkinParser::parseTemplate(const QDomElement& node) {
     QDomElement templateNode = loadTemplate(path);
 
     if (templateNode.isNull()) {
-        SKIN_WARNING(node, *m_pContext) << "Template instantiation for template failed:" << path;
+        SKIN_WARNING(node,
+                *m_pContext,
+                QStringLiteral("Template instantiation for template failed: %1")
+                        .arg(path));
         m_pContext = std::move(pOldContext);
         return QList<QWidget*>();
     }
@@ -1943,9 +1974,11 @@ void LegacySkinParser::setupSize(const QDomNode& node, QWidget* pWidget) {
         } else if (y >= 0 && x == -1) {
             pWidget->setMinimumHeight(y);
         } else if (x != -1 || y != -1) {
-            SKIN_WARNING(node, *m_pContext)
-                    << "Could not parse widget MinimumSize:" << size;
-	}
+            SKIN_WARNING(node,
+                    *m_pContext,
+                    QStringLiteral("Could not parse widget MinimumSize: %1")
+                            .arg(size));
+        }
     }
 
 
@@ -1965,8 +1998,10 @@ void LegacySkinParser::setupSize(const QDomNode& node, QWidget* pWidget) {
         } else if (y >= 0 && x == -1) {
             pWidget->setMaximumHeight(y);
         } else if (x != -1 || y != -1) {
-            SKIN_WARNING(node, *m_pContext)
-                    << "Could not parse widget MaximumSize:" << size;
+            SKIN_WARNING(node,
+                    *m_pContext,
+                    QStringLiteral("Could not parse widget MaximumSize: %1")
+                            .arg(size));
         }
     }
 
@@ -1982,16 +2017,20 @@ void LegacySkinParser::setupSize(const QDomNode& node, QWidget* pWidget) {
         if (parseSizePolicy(&xs, &horizontalPolicy)) {
             sizePolicy.setHorizontalPolicy(horizontalPolicy);
         } else if (!xs.isEmpty()) {
-            SKIN_WARNING(node, *m_pContext)
-                    << "Could not parse horizontal size policy:" << xs;
+            SKIN_WARNING(node,
+                    *m_pContext,
+                    QStringLiteral("Could not parse horizontal size policy: %1")
+                            .arg(xs));
         }
 
         QSizePolicy::Policy verticalPolicy;
         if (parseSizePolicy(&ys, &verticalPolicy)) {
             sizePolicy.setVerticalPolicy(verticalPolicy);
         } else if (!ys.isEmpty()) {
-            SKIN_WARNING(node, *m_pContext)
-                    << "Could not parse vertical size policy:" << ys;
+            SKIN_WARNING(node,
+                    *m_pContext,
+                    QStringLiteral("Could not parse vertical size policy: %1")
+                            .arg(ys));
         }
 
         hasSizePolicyNode = true;
@@ -2164,8 +2203,10 @@ void LegacySkinParser::setupBaseWidget(const QDomNode& node,
         } else if (!toolTipId.isEmpty()) {
             // Only warn if there was a tooltip ID specified and no tooltip for
             // that ID.
-            SKIN_WARNING(node, *m_pContext)
-                    << "Invalid <TooltipId> in skin.xml:" << toolTipId;
+            SKIN_WARNING(node,
+                    *m_pContext,
+                    QStringLiteral("Invalid <TooltipId> in skin.xml: %1")
+                            .arg(toolTipId));
         }
     }
 }
@@ -2275,9 +2316,11 @@ void LegacySkinParser::setupConnections(const QDomNode& node, WBaseWidget* pWidg
                 if (nodeValue) {
                     emitOption = ControlParameterWidgetConnection::EMIT_ON_PRESS_AND_RELEASE;
                 } else {
-                    SKIN_WARNING(con, *m_pContext)
-                            << "LegacySkinParser::setupConnections():"
-                            << "Setting EmitOnPressAndRelease to false is not necessary.";
+                    SKIN_WARNING(con,
+                            *m_pContext,
+                            QStringLiteral("LegacySkinParser::setupConnections("
+                                           "): Setting EmitOnPressAndRelease "
+                                           "to false is not necessary."));
                 }
             } else {
                 // default:
diff --git a/src/skin/legacy/skincontext.cpp b/src/skin/legacy/skincontext.cpp
index 06c89681952..7dfbbcaeb59 100644
--- a/src/skin/legacy/skincontext.cpp
+++ b/src/skin/legacy/skincontext.cpp
@@ -135,14 +135,19 @@ PixmapSource SkinContext::getPixmapSourceInner(const QString& filename) const {
     return PixmapSource();
 }
 
-QDebug SkinContext::logWarning(const char* file, const int line,
-                               const QDomNode& node) const {
-    return qWarning() << QString("%1:%2 SKIN ERROR at %3:%4 <%5>:")
-                             .arg(file, QString::number(line), m_xmlPath,
-                                  QString::number(node.lineNumber()),
-                                  node.nodeName())
-                             .toUtf8()
-                             .constData();
+QDebug SkinContext::logWarning(const char* file,
+        const int line,
+        const QDomNode& node,
+        const QString& message) const {
+    return qWarning() << QString("SKIN ERROR at %1:%2 <%3>: %4 | %5:%6")
+                                 .arg(m_xmlPath,
+                                         QString::number(node.lineNumber()),
+                                         node.nodeName(),
+                                         message,
+                                         file,
+                                         QString::number(line))
+                                 .toUtf8()
+                                 .constData();
 }
 
 int SkinContext::scaleToWidgetSize(QString& size) const {
diff --git a/src/skin/legacy/skincontext.h b/src/skin/legacy/skincontext.h
index d8d353003b3..9817f022bb2 100644
--- a/src/skin/legacy/skincontext.h
+++ b/src/skin/legacy/skincontext.h
@@ -15,7 +15,8 @@
 #include "widget/wpixmapstore.h"
 #include "widget/wsingletoncontainer.h"
 
-#define SKIN_WARNING(node, context) (context).logWarning(__FILE__, __LINE__, (node))
+#define SKIN_WARNING(node, context, message) \
+    (context).logWarning(__FILE__, __LINE__, (node), (message))
 
 // A class for managing the current context/environment when processing a
 // skin. Used hierarchically by LegacySkinParser to create new contexts and
@@ -225,7 +226,10 @@ class SkinContext {
         return defaultDrawMode;
     }
 
-    QDebug logWarning(const char* file, const int line, const QDomNode& node) const;
+    QDebug logWarning(const char* file,
+            const int line,
+            const QDomNode& node,
+            const QString& message) const;
 
     void defineSingleton(const QString& objectName, QWidget* widget) {
         m_pSharedState->singletons.insertSingleton(objectName, widget);
diff --git a/src/widget/wcombobox.cpp b/src/widget/wcombobox.cpp
index 7fc52220463..11b917823fd 100644
--- a/src/widget/wcombobox.cpp
+++ b/src/widget/wcombobox.cpp
@@ -25,8 +25,10 @@ void WComboBox::setup(const QDomNode& node, const SkinContext& context) {
                 QString icon = context.selectString(state, "Icon");
                 addItem(QIcon(icon), text, QVariant(iState));
             } else {
-                SKIN_WARNING(state, context)
-                        << "WComboBox ignoring <State> without <Number> node.";
+                SKIN_WARNING(state,
+                        context,
+                        QStringLiteral("WComboBox ignoring <State> without "
+                                       "<Number> node."));
             }
         }
         state = state.nextSibling();
diff --git a/src/widget/weffectbuttonparametername.cpp b/src/widget/weffectbuttonparametername.cpp
index 8ae4a90c388..8eb8e17ed00 100644
--- a/src/widget/weffectbuttonparametername.cpp
+++ b/src/widget/weffectbuttonparametername.cpp
@@ -22,8 +22,10 @@ void WEffectButtonParameterName::setup(const QDomNode& node, const SkinContext&
             EffectWidgetUtils::getButtonParameterSlotFromNode(
                     node, context, m_pEffectSlot);
     VERIFY_OR_DEBUG_ASSERT(m_pParameterSlot) {
-        SKIN_WARNING(node, context)
-                << "EffectButtonParameter node could not attach to effect parameter";
+        SKIN_WARNING(node,
+                context,
+                QStringLiteral("EffectButtonParameter node could not attach to "
+                               "effect parameter"));
     }
     setEffectParameterSlot(m_pParameterSlot);
 }
diff --git a/src/widget/weffectchain.cpp b/src/widget/weffectchain.cpp
index 6ec1216b71a..a4275b2c3d7 100644
--- a/src/widget/weffectchain.cpp
+++ b/src/widget/weffectchain.cpp
@@ -19,8 +19,10 @@ void WEffectChain::setup(const QDomNode& node, const SkinContext& context) {
     if (pChainSlot) {
         setEffectChain(pChainSlot);
     } else {
-        SKIN_WARNING(node, context)
-                << "EffectChain node could not attach to effect chain slot.";
+        SKIN_WARNING(node,
+                context,
+                QStringLiteral("EffectChain node could not attach to effect "
+                               "chain slot."));
     }
 }
 
diff --git a/src/widget/weffectchainpresetbutton.cpp b/src/widget/weffectchainpresetbutton.cpp
index 3941259464a..9943d0e1a39 100644
--- a/src/widget/weffectchainpresetbutton.cpp
+++ b/src/widget/weffectchainpresetbutton.cpp
@@ -26,8 +26,10 @@ void WEffectChainPresetButton::setup(const QDomNode& node, const SkinContext& co
     m_pChain = EffectWidgetUtils::getEffectChainFromNode(
             node, context, m_pEffectsManager);
     VERIFY_OR_DEBUG_ASSERT(m_pChain) {
-        SKIN_WARNING(node, context)
-                << "EffectChainPresetButton node could not attach to effect chain";
+        SKIN_WARNING(node,
+                context,
+                QStringLiteral("EffectChainPresetButton node could not attach "
+                               "to effect chain"));
         return;
     }
     connect(m_pChain.get(),
diff --git a/src/widget/weffectchainpresetselector.cpp b/src/widget/weffectchainpresetselector.cpp
index bfed3191968..7a61c8b7e1f 100644
--- a/src/widget/weffectchainpresetselector.cpp
+++ b/src/widget/weffectchainpresetselector.cpp
@@ -31,8 +31,10 @@ void WEffectChainPresetSelector::setup(const QDomNode& node, const SkinContext&
             node, context, m_pEffectsManager);
 
     VERIFY_OR_DEBUG_ASSERT(m_pChain != nullptr) {
-        SKIN_WARNING(node, context)
-                << "EffectChainPresetSelector node could not attach to EffectChain";
+        SKIN_WARNING(node,
+                context,
+                QStringLiteral("EffectChainPresetSelector node could not "
+                               "attach to EffectChain"));
         return;
     }
 
diff --git a/src/widget/weffectknobparametername.cpp b/src/widget/weffectknobparametername.cpp
index 66004391eac..157e3eb5768 100644
--- a/src/widget/weffectknobparametername.cpp
+++ b/src/widget/weffectknobparametername.cpp
@@ -22,8 +22,10 @@ void WEffectKnobParameterName::setup(const QDomNode& node, const SkinContext& co
             EffectWidgetUtils::getParameterSlotFromNode(
                     node, context, m_pEffectSlot);
     VERIFY_OR_DEBUG_ASSERT(m_pParameterSlot) {
-        SKIN_WARNING(node, context)
-                << "EffectParameter node could not attach to effect parameter";
+        SKIN_WARNING(node,
+                context,
+                QStringLiteral("EffectParameter node could not attach to "
+                               "effect parameter"));
     }
     setEffectParameterSlot(m_pParameterSlot);
 }
diff --git a/src/widget/weffectname.cpp b/src/widget/weffectname.cpp
index 1984449d701..b5184764146 100644
--- a/src/widget/weffectname.cpp
+++ b/src/widget/weffectname.cpp
@@ -22,8 +22,10 @@ void WEffectName::setup(const QDomNode& node, const SkinContext& context) {
     if (pEffectSlot) {
         setEffectSlot(pEffectSlot);
     } else {
-        SKIN_WARNING(node, context)
-                << "EffectName node could not attach to effect slot.";
+        SKIN_WARNING(node,
+                context,
+                QStringLiteral(
+                        "EffectName node could not attach to effect slot."));
     }
 }
 
diff --git a/src/widget/weffectparameterknob.cpp b/src/widget/weffectparameterknob.cpp
index d77b9b491ae..656402746c0 100644
--- a/src/widget/weffectparameterknob.cpp
+++ b/src/widget/weffectparameterknob.cpp
@@ -12,7 +12,7 @@ void WEffectParameterKnob::setup(const QDomNode& node, const SkinContext& contex
     m_pEffectParameterSlot = EffectWidgetUtils::getParameterSlotFromNode(
             node, context, pEffectSlot);
     VERIFY_OR_DEBUG_ASSERT(m_pEffectParameterSlot) {
-        SKIN_WARNING(node, context) << "Could not find effect parameter slot";
+        SKIN_WARNING(node, context, QStringLiteral("Could not find effect parameter slot"));
         return;
     }
     connect(m_pEffectParameterSlot.data(),
diff --git a/src/widget/weffectparameterknobcomposed.cpp b/src/widget/weffectparameterknobcomposed.cpp
index aba1e6a9c35..5b7d516bafc 100644
--- a/src/widget/weffectparameterknobcomposed.cpp
+++ b/src/widget/weffectparameterknobcomposed.cpp
@@ -12,7 +12,7 @@ void WEffectParameterKnobComposed::setup(const QDomNode& node, const SkinContext
     m_pEffectParameterSlot = EffectWidgetUtils::getParameterSlotFromNode(
             node, context, pEffectSlot);
     VERIFY_OR_DEBUG_ASSERT(m_pEffectParameterSlot) {
-        SKIN_WARNING(node, context) << "Could not find effect parameter slot";
+        SKIN_WARNING(node, context, QStringLiteral("Could not find effect parameter slot"));
         return;
     }
     connect(m_pEffectParameterSlot.data(),
diff --git a/src/widget/weffectpushbutton.cpp b/src/widget/weffectpushbutton.cpp
index d9a02796468..8f60ed1b0ca 100644
--- a/src/widget/weffectpushbutton.cpp
+++ b/src/widget/weffectpushbutton.cpp
@@ -23,7 +23,7 @@ void WEffectPushButton::setup(const QDomNode& node, const SkinContext& context)
     m_pEffectParameterSlot = EffectWidgetUtils::getButtonParameterSlotFromNode(
             node, context, pEffectSlot);
     if (!m_pEffectParameterSlot) {
-        SKIN_WARNING(node, context) << "Could not find effect parameter slot";
+        SKIN_WARNING(node, context, QStringLiteral("Could not find effect parameter slot"));
         DEBUG_ASSERT(false);
     }
     connect(m_pEffectParameterSlot.data(),
diff --git a/src/widget/weffectselector.cpp b/src/widget/weffectselector.cpp
index ab1e21170a0..ba29aab3123 100644
--- a/src/widget/weffectselector.cpp
+++ b/src/widget/weffectselector.cpp
@@ -42,8 +42,10 @@ void WEffectSelector::setup(const QDomNode& node, const SkinContext& context) {
                 this,
                 &WEffectSelector::slotEffectSelected);
     } else {
-        SKIN_WARNING(node, context)
-                << "EffectSelector node could not attach to effect slot.";
+        SKIN_WARNING(node,
+                context,
+                QStringLiteral("EffectSelector node could not attach to effect "
+                               "slot."));
     }
 
     populate();
diff --git a/src/widget/whotcuebutton.cpp b/src/widget/whotcuebutton.cpp
index 98bad972db1..a48630692e7 100644
--- a/src/widget/whotcuebutton.cpp
+++ b/src/widget/whotcuebutton.cpp
@@ -33,7 +33,10 @@ void WHotcueButton::setup(const QDomNode& node, const SkinContext& context) {
     if (ok && hotcue > 0) {
         m_hotcue = hotcue - 1;
     } else {
-        SKIN_WARNING(node, context) << "Hotcue value invalid";
+        SKIN_WARNING(node,
+                context,
+                QStringLiteral("Hotcue index '%1' invalid")
+                        .arg(context.selectString(node, QStringLiteral("Hotcue"))));
     }
 
     bool okay;
@@ -84,7 +87,7 @@ void WHotcueButton::setup(const QDomNode& node, const SkinContext& context) {
 
     QDomNode con = context.selectNode(node, QStringLiteral("Connection"));
     if (!con.isNull()) {
-        SKIN_WARNING(node, context) << "Additional Connections are not allowed";
+        SKIN_WARNING(node, context, QStringLiteral("Additional Connections are not allowed"));
     }
 }
 
diff --git a/src/widget/wpushbutton.cpp b/src/widget/wpushbutton.cpp
index dd874db5a20..c13c1f9ddec 100644
--- a/src/widget/wpushbutton.cpp
+++ b/src/widget/wpushbutton.cpp
@@ -195,9 +195,13 @@ void WPushButton::setup(const QDomNode& node, const SkinContext& context) {
                 if (m_rightButtonMode != ControlPushButton::PUSH &&
                         m_rightButtonMode != ControlPushButton::TOGGLE &&
                         m_rightButtonMode != ControlPushButton::TRIGGER) {
-                    SKIN_WARNING(node, context)
-                            << "WPushButton::setup: Connecting a Pushbutton not in PUSH, TRIGGER or TOGGLE mode is not implemented\n"
-                            << "Please consider to set <RightClickIsPushButton>true</RightClickIsPushButton>";
+                    SKIN_WARNING(node,
+                            context,
+                            "WPushButton::setup: Connecting a Pushbutton not "
+                            "in PUSH, TRIGGER or TOGGLE mode is not "
+                            "implemented\n Please consider to set "
+                            "<RightClickIsPushButton>true</"
+                            "RightClickIsPushButton>");
                 }
             }
         }
diff --git a/src/widget/wsingletoncontainer.cpp b/src/widget/wsingletoncontainer.cpp
index 225e2c5ce5b..a90aa5ba050 100644
--- a/src/widget/wsingletoncontainer.cpp
+++ b/src/widget/wsingletoncontainer.cpp
@@ -20,19 +20,19 @@ void WSingletonContainer::setup(const QDomNode& node, const SkinContext& context
     QDomElement containerNode = node.toElement();
     QString objectName;
     if (!context.hasNodeSelectString(node, "ObjectName", &objectName)) {
-        SKIN_WARNING(node, context)
-                << "Need objectName attribute for Singleton tag";
+        SKIN_WARNING(node, context, QStringLiteral("Need ObjectName attribute for Singleton tag"));
         return;
     }
     if (objectName.isEmpty()) {
-        SKIN_WARNING(node, context)
-                << "Singleton tag's ObjectName is empty";
+        SKIN_WARNING(node, context, QStringLiteral("Singleton tag's ObjectName is empty"));
         return;
     }
     m_pWidget = context.getSingletonWidget(objectName);
     if (m_pWidget == nullptr) {
-        SKIN_WARNING(node, context)
-                << "Asked for an unknown singleton widget:" << objectName;
+        SKIN_WARNING(node,
+                context,
+                QStringLiteral("Asked for an unknown singleton widget: %1")
+                        .arg(objectName));
     }
 }
 
diff --git a/src/widget/wsplitter.cpp b/src/widget/wsplitter.cpp
index 61dcb8344a8..9c5667e26ef 100644
--- a/src/widget/wsplitter.cpp
+++ b/src/widget/wsplitter.cpp
@@ -35,22 +35,19 @@ void WSplitter::setup(const QDomNode& node, const SkinContext& context) {
 
         if (m_pConfig->exists(m_configKey)) {
             sizesJoined = m_pConfig->getValueString(m_configKey);
-            msg = "Reading .cfg file: '"
-                    + m_configKey.group + " "
-                    + m_configKey.item + " "
-                    + sizesJoined
-                    + "' does not match the number of children nodes:"
-                    + QString::number(this->count());
+            msg = "Reading .cfg file: '" + m_configKey.group + " " +
+                    m_configKey.item + " " + sizesJoined +
+                    "' does not match the number of children nodes:" +
+                    QString::number(count());
             ok = true;
         }
     }
 
     // nothing in mixxx.cfg? Load default values
     if (!ok && context.hasNodeSelectString(node, "SplitSizes", &sizesJoined)) {
-        msg = "<SplitSizes> for <Splitter> ("
-                + sizesJoined
-                + ") does not match the number of children nodes:"
-                + QString::number(this->count());
+        msg = "<SplitSizes> for <Splitter> (" + sizesJoined +
+                ") does not match the number of children nodes:" +
+                QString::number(count());
     }
 
     // found some value for splitsizes?
@@ -64,8 +61,8 @@ void WSplitter::setup(const QDomNode& node, const SkinContext& context) {
                 break;
             }
         }
-        if (sizesList.length() != this->count()) {
-            SKIN_WARNING(node, context) << msg;
+        if (sizesList.length() != count()) {
+            SKIN_WARNING(node, context, msg);
             ok = false;
         }
         if (ok) {
@@ -85,12 +82,11 @@ void WSplitter::setup(const QDomNode& node, const SkinContext& context) {
                 break;
             }
         }
-        if (collapsibleList.length() != this->count()) {
-            msg = "<Collapsible> for <Splitter> ("
-                            + collapsibleJoined
-                            + ") does not match the number of children nodes:"
-                            + QString::number(this->count());
-            SKIN_WARNING(node, context) << msg;
+        if (collapsibleList.length() != count()) {
+            msg = "<Collapsible> for <Splitter> (" + collapsibleJoined +
+                    ") does not match the number of children nodes:" +
+                    QString::number(count());
+            SKIN_WARNING(node, context, msg);
             ok = false;
         }
         if (ok) {
diff --git a/src/widget/wvumeterbase.cpp b/src/widget/wvumeterbase.cpp
index 34216b9433c..2696a197125 100644
--- a/src/widget/wvumeterbase.cpp
+++ b/src/widget/wvumeterbase.cpp
@@ -80,8 +80,10 @@ void WVuMeterBase::setup(const QDomNode& node, const SkinContext& context) {
     if (height() < 2 || width() < 2) {
         // This triggers a QT bug and displays a white widget instead.
         // We warn here, because the skin designer may not use the affected mode.
-        SKIN_WARNING(node, context)
-                << "VuMeterBase needs to have 2 pixel in all extents to be visible on all targets.";
+        SKIN_WARNING(node,
+                context,
+                QStringLiteral("VuMeterBase needs to have 2 pixel in all "
+                               "extents to be visible on all targets."));
     }
 
     setFocusPolicy(Qt::NoFocus);

From 72b6f1c1875ba63adb9904b7b406b1dc4624bf9c Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Sun, 5 Nov 2023 22:46:48 +0100
Subject: [PATCH 208/388] debug logging: rename SKIN ERROR to 'Skin parsing
 failed at'

---
 src/skin/legacy/skincontext.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/skin/legacy/skincontext.cpp b/src/skin/legacy/skincontext.cpp
index 7dfbbcaeb59..6cc751336a7 100644
--- a/src/skin/legacy/skincontext.cpp
+++ b/src/skin/legacy/skincontext.cpp
@@ -139,7 +139,7 @@ QDebug SkinContext::logWarning(const char* file,
         const int line,
         const QDomNode& node,
         const QString& message) const {
-    return qWarning() << QString("SKIN ERROR at %1:%2 <%3>: %4 | %5:%6")
+    return qWarning() << QString("Skin parsing failed at %1:%2 <%3>: %4 | %5:%6")
                                  .arg(m_xmlPath,
                                          QString::number(node.lineNumber()),
                                          node.nodeName(),

From 5c44e5411db482824c29d12f41a0d647bbece4ec Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Mon, 6 Nov 2023 20:41:27 +0100
Subject: [PATCH 209/388] formatting

---
 src/waveform/renderers/waveformwidgetrenderer.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/waveform/renderers/waveformwidgetrenderer.cpp b/src/waveform/renderers/waveformwidgetrenderer.cpp
index 699a5afbbc7..ec721502708 100644
--- a/src/waveform/renderers/waveformwidgetrenderer.cpp
+++ b/src/waveform/renderers/waveformwidgetrenderer.cpp
@@ -413,13 +413,13 @@ ConstWaveformPointer WaveformWidgetRenderer::getWaveform() const {
 }
 
 WaveformMarkPointer WaveformWidgetRenderer::getCueMarkAtPoint(QPoint point) const {
-    // The m_markPositions list follows the order of drawing, so we search the list
-    // in reverse order to find the hovered mark.
+    // The m_markPositions list follows the order of drawing, so we search the
+    // list in reverse order to find the hovered mark.
     //
-    // TODO It would be preferable to use WaveformMarkSet::findHoveredMark here, as
-    // done by WOverview, but that requires a) making WaveformMarkSet m_marks a member
-    // of this class and b) decoupling the calculation of the drawoffset from the 
-    // drawing and c) storing it in WaveformMark. 
+    // TODO It would be preferable to use WaveformMarkSet::findHoveredMark here,
+    // as done by WOverview, but that requires a) making WaveformMarkSet m_marks
+    // a member of this class and b) decoupling the calculation of the
+    // drawoffset from the drawing and c) storing it in WaveformMark.
 
     for (auto it = m_markPositions.crbegin(); it != m_markPositions.crend(); ++it) {
         const WaveformMarkPointer& pMark = it->first;

From df7dd680c3f8363a82ba8a3c53d068c1bcabb10c Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Mon, 6 Nov 2023 20:53:23 +0100
Subject: [PATCH 210/388] use struct instead of qpair

---
 .../renderers/allshader/waveformrendermark.cpp         |  6 ++++--
 src/waveform/renderers/waveformrendermark.cpp          | 10 +++++++---
 src/waveform/renderers/waveformwidgetrenderer.cpp      |  4 ++--
 src/waveform/renderers/waveformwidgetrenderer.h        |  9 +++++++--
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/waveform/renderers/allshader/waveformrendermark.cpp b/src/waveform/renderers/allshader/waveformrendermark.cpp
index 59a8efc46d1..17d113155c3 100644
--- a/src/waveform/renderers/allshader/waveformrendermark.cpp
+++ b/src/waveform/renderers/allshader/waveformrendermark.cpp
@@ -159,7 +159,7 @@ void allshader::WaveformRenderMark::drawMark(const QRectF& rect, QColor color) {
 
 void allshader::WaveformRenderMark::paintGL() {
     const float devicePixelRatio = m_waveformRenderer->getDevicePixelRatio();
-    QList<QPair<WaveformMarkPointer, int>> marksOnScreen;
+    QList<WaveformWidgetRenderer::WaveformMarkOnScreen> marksOnScreen;
 
     checkCuesUpdated();
 
@@ -221,7 +221,9 @@ void allshader::WaveformRenderMark::paintGL() {
             }
 
             if (visible) {
-                marksOnScreen.append(qMakePair(pMark, drawOffset));
+                marksOnScreen.append(
+                        WaveformWidgetRenderer::WaveformMarkOnScreen{
+                                pMark, static_cast<int>(drawOffset)});
             }
         }
     }
diff --git a/src/waveform/renderers/waveformrendermark.cpp b/src/waveform/renderers/waveformrendermark.cpp
index 6d9f8e4e426..df5e6025ce3 100644
--- a/src/waveform/renderers/waveformrendermark.cpp
+++ b/src/waveform/renderers/waveformrendermark.cpp
@@ -41,7 +41,7 @@ void WaveformRenderMark::setup(const QDomNode& node, const SkinContext& context)
 void WaveformRenderMark::draw(QPainter* painter, QPaintEvent* /*event*/) {
     PainterScope PainterScope(painter);
     // Associates mark objects with their positions in the widget.
-    QList<QPair<WaveformMarkPointer, int>> marksOnScreen;
+    QList<WaveformWidgetRenderer::WaveformMarkOnScreen> marksOnScreen;
 
     painter->setWorldMatrixEnabled(false);
 
@@ -102,7 +102,9 @@ void WaveformRenderMark::draw(QPainter* painter, QPaintEvent* /*event*/) {
                 }
 
                 if (visible) {
-                    marksOnScreen.append(qMakePair(pMark, drawOffset));
+                    marksOnScreen.append(
+                            WaveformWidgetRenderer::WaveformMarkOnScreen{
+                                    pMark, drawOffset});
                 }
             } else {
                 const int markHalfHeight =
@@ -146,7 +148,9 @@ void WaveformRenderMark::draw(QPainter* painter, QPaintEvent* /*event*/) {
                 }
 
                 if (visible) {
-                    marksOnScreen.append(qMakePair(pMark, drawOffset));
+                    marksOnScreen.append(
+                            WaveformWidgetRenderer::WaveformMarkOnScreen{
+                                    pMark, drawOffset});
                 }
             }
         }
diff --git a/src/waveform/renderers/waveformwidgetrenderer.cpp b/src/waveform/renderers/waveformwidgetrenderer.cpp
index ec721502708..a3e31555b56 100644
--- a/src/waveform/renderers/waveformwidgetrenderer.cpp
+++ b/src/waveform/renderers/waveformwidgetrenderer.cpp
@@ -422,12 +422,12 @@ WaveformMarkPointer WaveformWidgetRenderer::getCueMarkAtPoint(QPoint point) cons
     // drawoffset from the drawing and c) storing it in WaveformMark.
 
     for (auto it = m_markPositions.crbegin(); it != m_markPositions.crend(); ++it) {
-        const WaveformMarkPointer& pMark = it->first;
+        const WaveformMarkPointer& pMark = it->m_pMark;
         VERIFY_OR_DEBUG_ASSERT(pMark) {
             continue;
         }
 
-        int markImagePositionInWidgetSpace = it->second;
+        int markImagePositionInWidgetSpace = it->m_offsetOnScreen;
         QPoint pointInImageSpace;
         if (getOrientation() == Qt::Horizontal) {
             pointInImageSpace = QPoint(point.x() - markImagePositionInWidgetSpace, point.y());
diff --git a/src/waveform/renderers/waveformwidgetrenderer.h b/src/waveform/renderers/waveformwidgetrenderer.h
index 912ece5539c..f2c3a6e78b4 100644
--- a/src/waveform/renderers/waveformwidgetrenderer.h
+++ b/src/waveform/renderers/waveformwidgetrenderer.h
@@ -26,6 +26,11 @@ class WaveformWidgetRenderer {
     static const double s_waveformDefaultZoom;
     static const double s_defaultPlayMarkerPosition;
 
+    struct WaveformMarkOnScreen {
+        WaveformMarkPointer m_pMark;
+        int m_offsetOnScreen;
+    };
+
   public:
     explicit WaveformWidgetRenderer(const QString& group);
     virtual ~WaveformWidgetRenderer();
@@ -149,7 +154,7 @@ class WaveformWidgetRenderer {
     }
 
     void setTrack(TrackPointer track);
-    void setMarkPositions(const QList<QPair<WaveformMarkPointer, int>>& markPositions) {
+    void setMarkPositions(const QList<WaveformMarkOnScreen>& markPositions) {
         m_markPositions = markPositions;
     }
 
@@ -217,7 +222,7 @@ class WaveformWidgetRenderer {
 private:
     DISALLOW_COPY_AND_ASSIGN(WaveformWidgetRenderer);
     friend class WaveformWidgetFactory;
-    QList<QPair<WaveformMarkPointer, int>> m_markPositions;
+    QList<WaveformMarkOnScreen> m_markPositions;
     // draw play position indicator triangles
     void drawPlayPosmarker(QPainter* painter);
     void drawTriangle(QPainter* painter,

From af322b189905944c9aa9bd0778818c3ce28dc7a1 Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Tue, 7 Nov 2023 18:30:13 +0000
Subject: [PATCH 211/388] CI: Read codesign certificate from secret

---
 .github/workflows/build.yml                      |  13 +++++--------
 ...cos_developer_id_codesign_certificate.p12.enc | Bin 7568 -> 0 bytes
 2 files changed, 5 insertions(+), 8 deletions(-)
 delete mode 100644 packaging/certificates/macos_developer_id_codesign_certificate.p12.enc

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1eab7102d03..4d75e28b691 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -136,7 +136,7 @@ jobs:
       SCCACHE_VERSION: "0.3.0"
       # macOS codesigning
       APPLE_CODESIGN_IDENTITY: 2C2B5D3EDCE82BA55E22E9A67F16F8D03E390870
-      MACOS_CODESIGN_OPENSSL_PASSWORD: ${{ secrets.MACOS_CODESIGN_OPENSSL_PASSWORD }}
+      MACOS_CODESIGN_P12_BASE64: ${{ secrets.MACOS_CODESIGN_P12_BASE64 }}
       MACOS_CODESIGN_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CODESIGN_CERTIFICATE_PASSWORD }}
 
     runs-on: ${{ matrix.os }}
@@ -221,13 +221,10 @@ jobs:
 
       - name: "[macOS] Import Apple code signing identity"
         id: apple_codesign
-        if: runner.os == 'macOS' && env.MACOS_CODESIGN_OPENSSL_PASSWORD != null && env.MACOS_CODESIGN_CERTIFICATE_PASSWORD != null
+        if: runner.os == 'macOS' && env.MACOS_CODESIGN_CERTIFICATE_P12_BASE64 != null && env.MACOS_CODESIGN_CERTIFICATE_PASSWORD != null
         run: |
-          # Decrypt the certificate
-          openssl enc -aes-256-cbc -d -md sha512 \
-            -k "${MACOS_CODESIGN_OPENSSL_PASSWORD}" \
-            -in "${{ github.workspace }}/packaging/certificates/macos_developer_id_codesign_certificate.p12.enc" \
-            -out ~/certificate.p12
+          # Decode the certificate
+          echo "${{ env.MACOS_CODESIGN_CERTIFICATE_P12_BASE64 }}" | base64 -d -o ~/certificate.p12
 
           # Create a temporary keychain for the certificate and import it.
           security create-keychain -p mixxx Mixxx.keychain
@@ -386,7 +383,7 @@ jobs:
         working-directory: build
 
       - name: "[macOS] Sign, Notarize, and Staple Package"
-        if: runner.os == 'macOS' && env.MACOS_CODESIGN_OPENSSL_PASSWORD != null && env.MACOS_CODESIGN_CERTIFICATE_PASSWORD != null && env.APPLE_APP_SPECIFIC_PASSWORD != null
+        if: runner.os == 'macOS' && env.MACOS_CODESIGN_CERTIFICATE_P12_BASE64 != null && env.MACOS_CODESIGN_CERTIFICATE_PASSWORD != null && env.APPLE_APP_SPECIFIC_PASSWORD != null
         run: packaging/macos/sign_notarize_staple.sh build/*.dmg
         # TODO: This timeout may be a bit too conservative under some
         # circumstances. Feel free to increase the timeout once the
diff --git a/packaging/certificates/macos_developer_id_codesign_certificate.p12.enc b/packaging/certificates/macos_developer_id_codesign_certificate.p12.enc
deleted file mode 100644
index 63f2d0c33a7ae4e5bd5ec2bcc64d8211019477f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7568
zcmV;B9dF`OVQh3|WM5wk>*}bMs=qwpb*uGH@4;h0ChEhzY^T4^;%2&hmx$n~h0-Vd
zLIT)Pt_!Z(U=F-7c{Q<7WXFGVfL07D|J+aGtaq|YihldY?4E+kpmNlojk<aD0*jY9
zir=y}@MNH?l9+S3Ug&xsv}^Q9gkR8)KR&3U3w8>;=lUatSZ~7C-<6{l-dDk(fua!#
zKeBZ59+POB`R}?D>*@0pr*&hp3u)Nwj7R;xel<hxKqv=NlU}vaWI-eR)fT)8iJ89y
z<7CBIROVQ)N+2r5!7}g|6U%SjN2u$Ju8db*JlSJ7YSdi0gw!R%fv&L$`K;$3G)*$;
z&l#OsDY#E2`77UBS1`f@cuH~RhoIS!qL_gT87-=z9bpA~Z~|;$Gv*Q3{}x0jOq*2a
zO0#9tie&=wGo4b#sp~DvCMquK1p;LR4%;FaI|A1rp-tTWv`;jWT@uqg{e)_O%oLTV
zx+FT|oMOkcYw?(yBVLMPlOV9DRB1nuUs1dNhTyuh)#PX9a9D@}TIau76+c7Yh+eK8
z$pwy{I~OZ*3h9S3vY(WblKW%wbF^bN19vUIzO%`1Fc{>=>~n(2WhEH=fi3x)1r$ir
z_%L<)N!=D5JrH)&>vjf0Cm(^4?8nS`T=A2Dj+51hdj{`3Hk1f$ZNA(~-LMP9hJ)Z)
z&<jP2{IHFuP|cnC)h|$41SlOn7SU_+eEDJ*DgbKEpC(1yTfjb<p@C^K9-pKSnb4xb
z42lEO0qOBhqP}P@j@xCB2+Ci-Gq8c~*P0=31>#;KNvW6$4H?1@(pr4uWK(DqY4Pq&
zut<uxiRtYag8pTJNSw0I3%+kHW3O6qxh~}>D^@W})hvl3EJJcm4I5JU3ssw{k2u!n
zXtwPgd9Tp=x*?<8n3Y_pFNfY|!40>2wLOtz5VMW>6^Y3hFuVh)T_M=88$1~)36#zI
z_=!@mpQoM|q1I@>@v={JQP~s{`Mk2*$$jMns$L@+bx)G3*Cs_qhYh@I6p4p#ybOM4
z55?ot5>>Zo;&1nQ0H7{iRhA|(W!lQ>N4={k>-gNpgZ(_TaSgLx3vDre@I)Iz0p!+1
zk(Q2r?i|UK0H<{Rk`r{hZW`AejCG2ij-FP0BghrgjA%Lqz$8v(Swq^tu!8xdZ3p{N
z9kw#1zXEdIZ*R%3V8!VW|C4B@*hv=|=^v7f#7MrD4v_%<J!)FV)L;c!j?m>TsmD~K
zc2;-F)!qiEqfENSxtO@29g1vJzKaG?RX@#z(85yJ@AKvLKnkSD0~$5oY+ab1hC#z1
z-#8idi$b!72m75{FXRGI!E{CQy$3uHn@V7RlV;KlI%jhZYp~@wRvw3s6lnvSO`IB>
z9gfB@hrWwrB_zi(AEq@Z;99%NjahQXQbSNZGRvFA9hv2ZX=B>TtRytiC9fY3)1GP5
zVH6g(V#qWWrND#fXIc*n|Cs??GsKxPVeREAB~&q9bnXI=oqgf);&9!xtGn!zifH(s
z;2LLk29h!ud47UxIUS7E=^TiOZSVc0;mhBl&>1;%T9Ub@|9tw>?gSX52b4n;6;hya
zJ8Q!%%v07Vh4><iI>o0>hOR3^2jCN3uWB64^b_AWj)G@E_-1SiUR#A?*|=}d7EQ+A
zS+RuXg!4{fer#*R1P{ta)(*sK@9_ElLE9Cj=zCSX1eof<0`cRQe1?suu75KFn0Gp$
z#2u$DiZBUZroEuO+xxCtdZgHAcs5ThUftAjpv4ekw@&wIa&O;Wh|6I}sd=*=$muZC
z$P6K)xh$~`^G=c*X9VPSvI3Bb%R5EH3Ii4o_}t3K>uYIv)w0h9X*URw)u_D7txl2(
zZn#x5b2CGP=IlzPTQ8-fk!1V0K%M8nUct%P2WL6NgJur?o7sjKy1mCaCW5&+#!L(O
z)xDHrQjJV(vB@9}HB<i2taz=zKOpf#FGQqW46<>h_I^5XKyq5g=s+_7+&(aD1(4(Y
zB$S(%cJNGDKR<aQqE_ag1~b!uq%FO4VDW9C_1hgr+n+W7Rb0ekXiFsz@)0+x{kf1?
z8NUdqbo4I4$eod8T12jsBr{}<_YO$EjdOt1?Q53Ii}WoUEF~3L4Jx#Y6>vi=EWfyc
zCPvPWqdC^L(pKgFDMJq4%rKovcwS>KAYyL7o&8KpPt3qL@N*#vxKB$5u2emb`(~an
zJc>`^y*8__f%GX3q|PE&;{p$%-X5!en#2Ej8;D1B$OjgsSd9OT+nA+7{90ILwHOF)
zv+2y88f~YCGi2yXJ-*A6hA3UmKLvdFMNK>>?XoqXo!W@6o&4DI|CUC?l0)9-=b5fO
zx!?z7dAnz`PsW5a$J9yfL!$w@RWLaRABxnnqb$VR+$>M6f>>Y4Ada&LOb|DsO|n0J
zpAXGysI%XCy(5uS^q*gv@$c<q%zasUEeXObad1Ky_*@e+ojaxUHW>^aRt(87VVlU&
z5k!3@6gb!v9~OwrE^0AU;N4>FPG-9af@8(8YQ`hqjpJZ}66iVFluv`US55N8gWh@`
zkoPp)Of3Ks32L6L>k5=yUIDY8j7j|X-xfC3;1HO0c$eN?jCv#3NGhZ))!`EE!s-N5
z#r>U8KQCw2m%0?kR~3kBuy1~>zfw?0J}e2J-(NA2R4}G<W&|Zy)|%DotO`GuD(6Ps
z;$nQ7up(v#Av+5Nuy{heKMX*41r01>lYY$P8=TFh`V5x<v9vcVVmv3ckpQ?uH-<do
zc;ZuBR84z|?h&35uoFyp4F`o;8&S{Kb205Qa?b+XWFy5!)jKDK`JG|>nLvL@OVOd`
z(gyp3<ZBg~-neCJDQE_ah2nq4V4rhbH3r};_z^3x*fE%fZ7C3?G-OiBs$vn0Mp-BL
zSeJImlY1~Bl|=L3i(?eGmE8dC0i|G0&Wo}kX~VaD7+O)myfTNUi{2Np#;PpgU@*Mb
zDU?86$*Yvs!fp$2y5x3a=uqR_)e1b)_acm+_OVe99)qy0PrL@aJs+XIfoIvHn@;W4
zPDq1L=4o%KQ}G<?LPjY@R_PgfkHa4BN~@baoNCUXBE1iEz|!y|Obk#slmt_9Eyf<X
zS%QLZmQZ@>AzsE5??0QH9-bOMiO@ln?YN9*cr+S_7dqQuJ_natP_JzE9_@PutRwtm
zFl^%1U=)TW3Y{gq_ElpytNBJ!Edxb{)@i$Z9WGe86s95+tKzuqi>v*zt(PZ{j2yAF
zaSl4m56ILnPI}*IixIY5#(ZdJ-4O0V)?Bf8uJ{q-USZCCw<idTfl8RIc^)Yw=hpJ|
zR2)Rgf&Sdl+$J;bnz`1ia#t_yY3unt(WL0Jz+@B{jPXmg)TuepW4tRloW%=FbwApv
zGJrI7a8+{++EhqT+5isY0!z5|hlAJ%FawdLum8f(LW8{U8u1ApaF!@LXqVnugbz4g
zt#}9W7Auj+a36k?RutgEp;y%%r401ZULp3>nhR5cFSD(41NU4N+~`bZz3G8OA!z&p
zN@~(MT^eAiX7;5dtmMz|>2nQ4qa%C=O$u>CLDx(02EIKOfZ06qpMj+xZVz}TeH>}V
zV{i|eJ@^-dNn}S8pYDu}1oZe($|=9#YFsytPU*=EoO?fhkwv_tMHosI?WO<&mZGqw
zl#qBFKgJPTwDtvL);>afIVYwVLM<=012E8D^oQ?W!kd><4oV;d>_FI{Y7jWIu$cZW
z3U*g<%0%LoFw`qDf=-GLL4FEdS-3vB$y`Px@^o_AgvsbtcSBA<7KR1X9l_<JC`B^4
z-79?XMssy)=75yBC(pen{(DHlne78P(b^Q_7CPN25(n|-F;eN-z8ZU+Vw&KSZ`|Zy
zB|uA*z4))m2DIopv1|ahJ6M>JZg}ug=<AL;CPVi3+j=|!P7oxbKoIP}AZoQlFA5J}
z_m9!W<TCc1Q|v`lXInw^$h*p6qr(vb@wW}4uf>dgKWwRLLkL9GgjCLx=)VrqUq*?}
zXQg=%7UKV|m!IFkQR<t{erlyFqDQ75_x%Xjmj`QD9JU!lj}!-<kQUbMiUT%`EY8DO
zTZC+!7}K1L)l7?LR2jlsR0j=r20x)Cw-tED=r2koj9aGo3CsW8BMF+Evmml+^S$xY
z)G2f(b_rgA@1xg-4)OBcHh?DtHOj+4SZyZ|_MwH@aqobyY6`Le*!wxpd=^W_-6knZ
z`gn4qQ(+7G?qJK)Umfqmaswm+=C%(8<;lO3Ig2~mf#Y`baYUNi`$SV-fdW`9CcYVd
z7D5bK90CHO9Px4^sq}M25w!m^94}5B%p)R-*p$Dq3Db&MzZ#570E_raKX&Sf7pZq*
zq~ZV<jwGwo;W&tJMUH2`5!L#Z?gE-MKPMie5r#$4+PV18kLAsIhEJco;w9E>#;}CK
zqNVqdPcd3bz4<nRw!BH9tC2}*JnKs8kaq}XwE$gi=+p_{d#V*!B;d{}I-#VX4h*A<
zRH(WEc#s7=Wji}%Mbw<1c~VGY{S5=g9Gz_i@;1-XlBh}x^h<P+RKB8=qNi}3EDNWU
zMna;lU{KyPE!s+f;Z)hApZwQAxXhiqW!)AW1sbC0I%)8GbaHg(-I@5kAY(b1!MO8-
zW17ZWp#tF`#QVq#x5qvSUG;g}No=C4$r8LggADwZDvWR1j_k?r286`8g&PQDFfUkn
zVWUjRgN2QD6h{7>VZLm2tcqs;uQw1sRzN~w3Z;FN`?L+Bx>*c&n8RbrZaZKF>>*oK
z-=Jg0_!4(`>&Uo`gUehDyJx}D!OJGx{u23CN8SFZDjJ4|!;O=*kzAcxNqhu7<$?i=
zIU?(c?Y*>&L2i70ruYJG6-H;QuBp3B%{~1>7aYi;Rp4;De+%_Mm;ir-c&6Yt=8vaV
zy5~ou?j4>TW0c&iyBYt^W)#dZ<+{NpWg(xz=S}D8v2m<2BWuUgHi$US7}=)|?0KWx
zBEO;gP%zmqlg8TDX+_aQvQ4#O(rO3t+??6K<fNJr1+I(=db8;OSHJSg(*$l~GoBYV
zi5I}E-c?|CX#8<?&_L(Z#27&c3w^!b1Uz5GVR1$~X#_35ARik^nn2*cd9MYP2?&Hy
zPf5@RE?q&E`$x$Hs0boVp7jGF?R}C+T@|;#e!8qx9}S$Jp!8Ast-bTpGY8Sx+@zHM
z?r=0~^-`Uo)zrax3lEzDAC)Yxu=+JToEOU5q=gqZ|J}%^>Ge)FI5ut7YxZWJO8DGy
z3!BXg)J~J!N7+QHitwS~bo2|YZf@Ig2YCg+^Mk~mVhU;C-OdnoA-PNNmNCE8aifA*
z1ic`1LijQ#eTr(!gc#$Y@p?+55+saf7fS_MBEeP5vYd}O#AEa~-#YL@mHZ)mEanX`
z@7DQf<x!*woaJ$O@bB%rr$W{)&&)G;(C<FP2^Hq+TS+!$TsZ{zZ)YOFH?NJq>1fi6
z_!+!^clbspCz!~3$PEZ7CDH~zpB&qUur##DP^RaTHi4tLESU*lg8(Kt82F{GGt-;?
zfBpD}N&>28p3cP_{JGXh#oEXmlzWgZ&IceHpL#JI!Mw>~+^_YJHld%I9gC|TEX^8L
zL@H=c0+GY=gRX>#iE5V$l?qi=OvEFZ&j())RqWl@p``ry+8Cl-&O0IFYvM17HbBG;
z1e@%~X_N<5AU>tO;p|cbwOaxpWP0WR^3hYsKNiS?fxQBh#h+GM7B6<FIhT^*-X{Jj
zClwd>eB2?!H3_y0R(0(tV_z%&^I3+=!F{Ef9pNqBXf4%+$o#`m5Y?Ce>hWEWC_Par
z0ucB~+lF(q`3L2lkJsG_W~6%8;oe`Mt`F8!k&Azzjx_em(!oGacm#DLp&(GT)lVWU
z_{gI@!Z>0MDDp*V&Ilc7>d&kexTIBX-eNx{P=Btl7-!B?T^{H9E{pyXlkolgvRWG;
zDZt~eN+=YkMI;JD6;(KiFj-MEe>LUiGR$q=O5YZWQt&X$K`?bUQ62SUSdxv039G&z
zpKQrOHA|UXAOnd{PECUUk1`wzES3ILaJl?yOHbz(9>Ok)_59vEzN(4hWqS{dsEQgh
znZKe=oAkS-8WXM0RNz5Hlb1{W^Z%_jz6y|q3IRN7vn_!EeHkIjiyIdDsT1+V?-DU{
z!R2SP>}&nQ_+U(u4-a(pMmqS$GUGHiK@GuX{SjzstiN<Hsna4e=eezTQ@bF?#}22C
z5Y7V4(O&U!V941O$T2t++bhEwg%QfFhY?1LZBO_5q5X*lFHytK)r=rA8bDfWNz|Nq
zmcu)fdmlsYDBl)?r+P<Vk;4J&fc1AkvD*=m$D(_V){&gUK=_4^XLv=06861#vrsKr
z3r^qE+W6$TmX*E6KXASmrBNrfVT%g9n#2)eow?*F1R8nHjqeRKe=k=UtEayw$Pg5z
zY(VPwi~^h%O)%@_k+~6P(^BQyX2fmC3WiTX?dzBBqM-2)O&(isreNHXz-z1M8()8=
zREq-&O2mqB^1^Au6M2mc>X8Y<=)^QOO&?|KJMvey*?2?B30F3B7Ct<_>c}1c4*#C2
zN)@YCvdK=2Y`Mz@=U+x>9yaDhy@#Y5gu}?#8}5T&tp@M?U1=#5Zr9M_LJ_OMQNC#!
z^BD}A39vQp+tK6JJ$Fi&`ibY2r4MC3<rG%K>;H6sg(bpI4s+(ib`Mo~<Be~)8>^H1
z&!>dN+Xl!cHNl}CWWEpX<0#2z_5!PQVQN2@Du>e9)T1=V`((Q+wKf*;-k2C=IY%EA
z5A`K%{IA&3nen?<a|B~k?fliTjLR`QS~||5l+D#s1Vs5q0>rc(JNX-{)NG-y0D?kB
z6Pjo*Ot5pAw0Bbg$TJ4<z+`RC5T=Cl!^Yb@k2_By>G-Lp!;Jgs{rQl(kHQXgB&p-;
z@d4XD&ojUQJR0^67s!&v8n}Fe?qQ8|>R;PC?!yn5G&8y&wKEC*A<RIiYpC}?GJ^)N
zQM&nW_~3*SIGufxwr%D*9BqQ*R-i)%3_41ggOB5#5Vdio6K)xNFYJy)jww4(U4@z(
zQ#1(v>d9K45X#_rtdt^_hs1q7PpI<cPDB%oJLo|`RA~0`0TtKq39)f(VLkBcc0o-B
z)I4fJU;Nf=nS$4`1(pBw=n^7=@)K;QeeZ4Yy<Xp%zzoQ{7FAe`ivG4gU*CsP1ZUOK
zmwP<wxTtJ!>QSHIK0ZeZ<ss08$qxE3Pw6bEY4>w{6}3Pwy;NXt*f$bo5(MR)m|{Bs
zxx7c(-v|NLKI4_^t#7oa`sKhiO-BKl8Tqvv2g;d?1g8Y(0w=fR?R*}P6X9M2hcH@*
z%G6@BP1H0Lm!2{9Ck90Q!_vLr{Id+-`A9C_7G$V9me^4PQmCl=G>ksBVZP-uJQZ^Z
zkW}~c$r%9p029m*ILDlvW5WPc$dxQrRxj^>URpLoSEA&^5Tx8<KosF;=qB})N3jpN
zfOGhn&c_xu1I0|_)T$n5QjL*Hq;%OpVOHw&uKzp0X-@fKblJ1)%ZE4^pxaAp+I!7P
zd%WXOY!HXA4<QBe(AM8*ILD_?Fc+JFD|!7Y%G6-R5)H=fkjXTQ$pish#88(*)NzO^
zvODk}-C!fLx_z34n9aP`o1K$O8B);a`Fy5RKP*AN;<@1&yV*oL^+Oi&!7-BWtWcw>
zWj{f^M)3psX7hZlRu?|JZ0ID|5V{`0YMEGR+^r#&`|WVY!R-AyPIQ~Ku6j(4hQ(j}
zSb2gTqY|BTqoI2+l-bgK@;dH!S_x2$?a^-!)(<an&~I^<?a9KvNtq`~;p$<RYZZN3
zx*K4}pu`Mk^?{OlyN`u7E?6|p*Po`&v|!8K|JXZzrYL~hBXF3jMktLQ5YhdCUpcs=
z%Vp1$+KR8eElZxY!yI{+c1|)xG!-_wYSl}Gd5GMUD?$qaRA>EDifTR=79DkyMERrD
zze23zd~V@mkA_VBmB)zLOp3p3CIeveTo?yZZnELdWLC%8jl8udQ?oj6BW6qGQJ^vb
zI!ywP3M4{J?$Cspsy;GP_^`uOwQCFq1|t!IvFQsMv1-yjlRr($|2rzn70Svj*?u^G
z!J<62aiN*2dxR;rNzIHA-g|KBnBGzBtrEoopgtrV6vR0<`p+}VierZuBg@W9i2{+i
zpzrna5w_LD#cW=FN+WdSHcrmPwo^ZwTWE67a*(KD6L*Nu@A(NsuE@&EaJ!Y&E{*iN
z0Iy^=o;tguVy4B=PZ>q*BSAk^;VgLKB~17tz;fF(rIyDxN4T1s7{Xx^Re1^{_&>JB
zPL`*xBQfWizxB195;?(n)a=_FEynBa9%ynNZu$87AO)~bntvq|qVr%J4!S3wuRd_+
z5JK>2K(^7-P7p>Pg%75G4US@kBgnxxdC&>JR_GbK-ePVARpXMpc~72fNZ6PA%2%s?
zODugV>4&urNJ7+5Y9x+CwXa4iYgvygddUIp&=QMLCWb!A9r@yw*a0xj4#7<!38fn!
zJ3|H$m?gQSN*C+SISTG7(XujJ-bwaRjy5R&;}f^wOFx)dM-^^iOf%788zktrCGE~r
z#r*O9>or{n4Z5m5xg7ZZwN&9!m0JFeSXjtE^LWSCU&%oHnIKB{ezeT@t_M09@d5j=
zW^Z<Gcjd&;oMKj{!M(UfJK+#sTX@HAfhQ}@E~k+UrlpG~>vRPljXRYd1QKw%edHh?
zzB_7g4ywrfij4vCh<tm^k`3G*#dC?9sgZBW*Z3E|32<UgB~&fTjyKZbzKIy<{Pti-
zQ+L2_IyRX0=T5vq?U!*48r}=Z8{HCEp7v2;MhYf7f2qZ*X3tCz;pc98h2n~461In`
z)CDb|P<reeNA^wEIL3$(Qc8~I*c4{0$+)?XqBnuzi{P~#|ARvr;9}CVulLM)=F*S~
zhOYcy5jVPknW9iRCL(cuN)>LF9k^4+r(fQN(cQsc=8%QJk;W{>qso1@CZBWDZ_~ix
zIW`?`5M<ykY<Hzh)VUaFAPi?^BlArw0!?Xwe;(AmRpD5px97f@&23)lp(2Lh4eDJ>
zN8Th@aJl@q#_D5KiT$_9CfY))sPUtNd}R%Y5EvDt%X%pdzyUOSq<_-YvWRr52NL`>
z1CYE<juTtZR?csX=5FWk<ZVt2FtH-32w5fHsCAMvg>Jbf!MXv_&hFxeQc4`&(*Z>2
zVB4*HFQfU(cRh}TV#y`q152K=i4iKweb|B^27GQ8*jHU}X5z!~9gF~8y*_i~3l6oR
zKDy|)H>Dg-Jn%@N8?QPs5fI~M62Fh&Vt^G>2N%ArQb|lcdC^+&zMOqlAjZ!w5keBi
zqbi2pZ0|a7HDmco=4-DKP4ExQbcZVusO839WoPj9MYPjMG_uq&hFgFD@1gEOtirgP
zInvOXCGK>n^d}A9qzXnNl(@UZCXW{p56@TxNe6XDo*SmtU^oL#3r^w<sXWy7&#GPU
z6Eke`t+;{|E<1-R@hxF#Awci3u)Yk}up$r5^a)-Nf@Mw1;EDpj_hMMzj`LS#@UgD$
z?M{?Yqh?|>XtM73a|Aa~(xSxicMS9|WQ^i;^a<Q#KK*vrS<P5;$6uAV!TyPj=NCos
z6lB9}($&owg~wl7kK7}<GZ)GN{I4US8Wgqe&|qV5dE-obJY=(KoY{BOSR^-@jv(Q3
zgrdWF^tw7~S+9Ftf{S&%t7@ubM(8qX2EQR&mNYe4gx$=ia+X$!l53Fm{S*Eft+N30
z(Uvjx6Q1sJvwmKPVxhng<<`q<Hc&8L^c$F1Ic>0-;lb(U)|FSSlw+ae>U2a>LBl0!
z9zI?OQZbLLZq7w!{mhtU<kCS^^g>%vCnTGAT3ccnChZVmjMw+ESRxakIhGPD`Nmb}
z$Xf`dFhttB!fpQLbT;^C6^`;3?n-MMe>vCH9*@<KnRs{mxxW!r?C*NIP2jY#s8n4Q
zllkoDXEy^%lfnZTI6|%xAt8AZwsZk(J2bOUG=lJi6%_;v5-+=mTx#BNE-s%8`c+_x
mXzf@lII4bggmnV|wi-8)C+UU@ss-+Tmzd~8eF#S3o8<v>?WRot


From f39b355e5dba8b861bac6169365e4690d26d5e49 Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Tue, 7 Nov 2023 18:30:40 +0000
Subject: [PATCH 212/388] CI: No longer output identities and certificate
 expiry dates

---
 .github/workflows/build.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4d75e28b691..a5cf053a992 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -238,15 +238,6 @@ jobs:
           security set-keychain-settings Mixxx.keychain
           echo "CMAKE_ARGS_EXTRA=${CMAKE_ARGS_EXTRA} -DAPPLE_CODESIGN_IDENTITY=${APPLE_CODESIGN_IDENTITY}" >> "${GITHUB_ENV}"
 
-          # https://unix.stackexchange.com/questions/696224/using-openssl-to-display-all-certificates-of-a-pem-file
-          # https://stackoverflow.com/questions/16576537/how-can-i-find-exactly-what-my-codesign-identity-is
-
-          echo "==> Available certificates"
-          security find-certificate -a -p Mixxx.keychain | while openssl x509 -noout -text; do :; done | grep "Certificate\|Validity\|Subject\|Not"
-
-          echo "==> Available code signing identities"
-          security find-identity -v -p codesigning Mixxx.keychain
-
       - name: "[Windows] Set up Windows code signing"
         env:
           WINDOWS_CODESIGN_CERTIFICATE_PATH: ${{ github.workspace }}\packaging\certificates\windows_sectigo_codesign_certificate.pfx

From 81b8e431c00d43fc6557fd5c574ce725e83f299c Mon Sep 17 00:00:00 2001
From: fwcd <30873659+fwcd@users.noreply.github.com>
Date: Wed, 8 Nov 2023 13:28:14 +0000
Subject: [PATCH 213/388] CI: Fix typo

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a5cf053a992..fe1d90784f2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -136,7 +136,7 @@ jobs:
       SCCACHE_VERSION: "0.3.0"
       # macOS codesigning
       APPLE_CODESIGN_IDENTITY: 2C2B5D3EDCE82BA55E22E9A67F16F8D03E390870
-      MACOS_CODESIGN_P12_BASE64: ${{ secrets.MACOS_CODESIGN_P12_BASE64 }}
+      MACOS_CODESIGN_CERTIFICATE_P12_BASE64: ${{ secrets.MACOS_CODESIGN_CERTIFICATE_P12_BASE64 }}
       MACOS_CODESIGN_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CODESIGN_CERTIFICATE_PASSWORD }}
 
     runs-on: ${{ matrix.os }}

From 6a97fad31013e08d970a026f83be33473cfa1611 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Thu, 9 Nov 2023 12:03:19 +0100
Subject: [PATCH 214/388] Pref Mixer, xfader: avoid rounding issues (default
 value vs. Reset to defaults)

---
 src/preferences/dialog/dlgprefmixer.cpp   | 16 +++++++++-------
 src/preferences/dialog/dlgprefmixerdlg.ui | 11 ++++-------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index 02e9261936f..6a876f01dc5 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -437,7 +437,7 @@ void DlgPrefMixer::slotResetToDefaults() {
             EngineXfader::kTransformMax - EngineXfader::kTransformMin + 1,
             SliderXFader->minimum(),
             SliderXFader->maximum());
-    SliderXFader->setValue(static_cast<int>(sliderVal));
+    SliderXFader->setValue(static_cast<int>(std::round(sliderVal)));
 
     m_xFaderMode = MIXXX_XFADER_ADDITIVE;
     radioButtonAdditive->setChecked(true);
@@ -728,7 +728,7 @@ void DlgPrefMixer::slotUpdate() {
             EngineXfader::kTransformMax - EngineXfader::kTransformMin + 1,
             SliderXFader->minimum(),
             SliderXFader->maximum());
-    SliderXFader->setValue(static_cast<int>(sliderVal + 0.5));
+    SliderXFader->setValue(static_cast<int>(std::round(sliderVal)));
 
     m_xFaderMode = m_pConfig->getValueString(kXfaderModeKey).toInt();
     if (m_xFaderMode == MIXXX_XFADER_CONSTPWR) {
@@ -903,12 +903,14 @@ void DlgPrefMixer::slotUpdateXFader() {
 
     // m_transform is in the range of 1 to 1000 while 50 % slider results
     // to ~2, which represents a medium rounded fader curve.
-    m_transform = RescalerUtils::linearToOneByX(
-                          SliderXFader->value(),
-                          SliderXFader->minimum(),
-                          SliderXFader->maximum(),
-                          EngineXfader::kTransformMax) -
+    double transform = RescalerUtils::linearToOneByX(
+                               SliderXFader->value(),
+                               SliderXFader->minimum(),
+                               SliderXFader->maximum(),
+                               EngineXfader::kTransformMax) -
             1 + EngineXfader::kTransformMin;
+    // Round to 4 decimal places to avoid round-trip offsets with default 1.0
+    m_transform = std::round(transform * 10000) / 10000;
     m_cal = EngineXfader::getPowerCalibration(m_transform);
 
     drawXfaderDisplay();
diff --git a/src/preferences/dialog/dlgprefmixerdlg.ui b/src/preferences/dialog/dlgprefmixerdlg.ui
index 7b14a2641fc..28ff77cee58 100644
--- a/src/preferences/dialog/dlgprefmixerdlg.ui
+++ b/src/preferences/dialog/dlgprefmixerdlg.ui
@@ -94,23 +94,20 @@
              <number>0</number>
             </property>
             <property name="maximum">
-             <number>100</number>
+             <number>100000</number>
             </property>
             <property name="singleStep">
-             <number>1</number>
+             <number>1000</number>
             </property>
             <property name="pageStep">
-             <number>1</number>
+             <number>1000</number>
             </property>
             <property name="value">
-             <number>50</number>
+             <number>50000</number>
             </property>
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="tickInterval">
-             <number>5</number>
-            </property>
            </widget>
           </item>
           <item>

From 8668d9217ad19ee2c53e1daa184173320e1d3e6b Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Thu, 9 Nov 2023 12:04:19 +0100
Subject: [PATCH 215/388] Controller mapping: don't print warning if no mapping
 is configured

---
 src/controllers/legacycontrollermappingfilehandler.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/controllers/legacycontrollermappingfilehandler.cpp b/src/controllers/legacycontrollermappingfilehandler.cpp
index 20986456c8c..d1b48b02d78 100644
--- a/src/controllers/legacycontrollermappingfilehandler.cpp
+++ b/src/controllers/legacycontrollermappingfilehandler.cpp
@@ -33,6 +33,9 @@ QFileInfo findScriptFile(std::shared_ptr<LegacyControllerMapping> mapping,
 // static
 std::shared_ptr<LegacyControllerMapping> LegacyControllerMappingFileHandler::loadMapping(
         const QFileInfo& mappingFile, const QDir& systemMappingsPath) {
+    if (mappingFile.path().isEmpty()) {
+        return nullptr;
+    }
     if (!mappingFile.exists() || !mappingFile.isReadable()) {
         qDebug() << "Mapping" << mappingFile.absoluteFilePath()
                  << "does not exist or is unreadable.";

From 71af1b958009dcd04af9967117215fb5654dc04e Mon Sep 17 00:00:00 2001
From: Joerg <JoergAtGithub@worldwartweb.com>
Date: Thu, 9 Nov 2023 21:07:52 +0100
Subject: [PATCH 216/388] Add additional conditions to ensure, that loop
 boundary adjustment of the visual playposition is only done, when the engine
 playposition is inside the loop.

---
 src/waveform/visualplayposition.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/waveform/visualplayposition.cpp b/src/waveform/visualplayposition.cpp
index 06d390b2139..1b82f51e6b7 100644
--- a/src/waveform/visualplayposition.cpp
+++ b/src/waveform/visualplayposition.cpp
@@ -88,13 +88,17 @@ double VisualPlayPosition::determinePlayPosInLoopBoundries(
     if (data.m_loopEnabled) {
         double loopSize = data.m_loopEndPos - data.m_loopStartPos;
         if (loopSize > 0) {
-            if ((data.m_playRate < 0.0) && (interpolatedPlayPos < data.m_loopStartPos)) {
+            if ((data.m_playRate < 0.0) &&
+                    (interpolatedPlayPos < data.m_loopStartPos) &&
+                    (data.m_playPos >= data.m_loopStartPos)) {
                 interpolatedPlayPos = data.m_loopEndPos -
                         std::remainder(
                                 data.m_loopStartPos - interpolatedPlayPos,
                                 loopSize);
             }
-            if ((data.m_playRate > 0.0) && (interpolatedPlayPos > data.m_loopEndPos)) {
+            if ((data.m_playRate > 0.0) &&
+                    (interpolatedPlayPos > data.m_loopEndPos) &&
+                    (data.m_playPos <= data.m_loopEndPos)) {
                 interpolatedPlayPos = data.m_loopStartPos +
                         std::remainder(
                                 interpolatedPlayPos - data.m_loopEndPos,

From d30dd011837ed0d3a64f2f9fa8bdd0ce4dd04e09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Thu, 9 Nov 2023 22:43:03 +0100
Subject: [PATCH 217/388] Update APPLE_ID_USERNAME

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fe1d90784f2..60b176a6d48 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -381,9 +381,9 @@ jobs:
         # notarization step is fixed.
         timeout-minutes: 5
         env:
-          APPLE_ID_USERNAME: rryan@mixxx.org
+          APPLE_ID_USERNAME: daschuer@mixxx.org
           APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.MACOS_NOTARIZATION_APP_SPECIFIC_PASSWORD }}
-          APPLE_TEAM_ID: FLYL4D545V
+          APPLE_TEAM_ID: JBLRSP95FC
 
       - name: "[Windows] Sign Package"
         if: runner.os == 'Windows' && env.WINDOWS_CODESIGN_CERTIFICATE_PATH != null && env.WINDOWS_CODESIGN_CERTIFICATE_PASSWORD != null

From 6c5e5cd18cd03f342d2099784a3ee6c034cdb8d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Fri, 10 Nov 2023 00:10:21 +0100
Subject: [PATCH 218/388] Update APPLE_CODESIGN_IDENTITY to the new certificate
 SHA1

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 60b176a6d48..d7a2a945619 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -135,7 +135,7 @@ jobs:
     env:
       SCCACHE_VERSION: "0.3.0"
       # macOS codesigning
-      APPLE_CODESIGN_IDENTITY: 2C2B5D3EDCE82BA55E22E9A67F16F8D03E390870
+      APPLE_CODESIGN_IDENTITY: 4D57A15BE8C3F462595A99E479FBE934A4060703
       MACOS_CODESIGN_CERTIFICATE_P12_BASE64: ${{ secrets.MACOS_CODESIGN_CERTIFICATE_P12_BASE64 }}
       MACOS_CODESIGN_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CODESIGN_CERTIFICATE_PASSWORD }}
 

From ccfd8064bb6eabf1df7213e677001c7394b6468d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Fri, 10 Nov 2023 14:00:58 +0100
Subject: [PATCH 219/388] codesign macOS binary with --timestamp

---
 packaging/macos/sign_notarize_staple.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/macos/sign_notarize_staple.sh b/packaging/macos/sign_notarize_staple.sh
index 659303ab28c..caa6bb3cf59 100755
--- a/packaging/macos/sign_notarize_staple.sh
+++ b/packaging/macos/sign_notarize_staple.sh
@@ -15,7 +15,7 @@ tmp_dir="$(mktemp -dt mixxx_notarize)"
 trap "rm -rf '$tmp_dir'" EXIT
 
 echo "==> Signing $DMG_FILE"
-codesign --verbose=4 --sign "${APPLE_CODESIGN_IDENTITY}" "${DMG_FILE}"
+codesign --verbose=4 --timestamp --sign "${APPLE_CODESIGN_IDENTITY}" "${DMG_FILE}"
 
 credentials=(
     --apple-id "${APPLE_ID_USERNAME}"

From b6e6d00dac6cd75e58ca017417cf171e9692a30a Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Fri, 10 Nov 2023 23:08:06 +0100
Subject: [PATCH 220/388] Effects: read effect data for decks added after
 initial setup

---
 src/effects/effectsmanager.cpp                | 34 +++++++++++++++-
 src/effects/effectsmanager.h                  |  6 +++
 .../presets/effectchainpresetmanager.cpp      | 39 ++++++++++++++++++-
 .../presets/effectchainpresetmanager.h        |  4 ++
 4 files changed, 80 insertions(+), 3 deletions(-)

diff --git a/src/effects/effectsmanager.cpp b/src/effects/effectsmanager.cpp
index 76edf192aff..ee64cbf1003 100644
--- a/src/effects/effectsmanager.cpp
+++ b/src/effects/effectsmanager.cpp
@@ -27,7 +27,8 @@ EffectsManager::EffectsManager(
         : m_pConfig(pConfig),
           m_pChannelHandleFactory(pChannelHandleFactory),
           m_loEqFreq(ConfigKey(kMixerProfile, kLowEqFrequency), 0., 22040),
-          m_hiEqFreq(ConfigKey(kMixerProfile, kHighEqFrequency), 0., 22040) {
+          m_hiEqFreq(ConfigKey(kMixerProfile, kHighEqFrequency), 0., 22040),
+          m_initializedFromEffectsXml(false) {
     qRegisterMetaType<EffectChainMixMode>("EffectChainMixMode");
 
     m_pBackendManager = EffectsBackendManagerPointer(new EffectsBackendManager());
@@ -72,6 +73,12 @@ void EffectsManager::setup() {
     addStandardEffectChains();
     addOutputEffectChain();
     // EQ and QuickEffect chain slots are initialized when PlayerManager creates decks.
+    // Now read effects.xml to load defaults or restore previous states of standard
+    // effect chains and QuickEffect chain, though only for decks that have been
+    // created by now. For decks added later on see addDeck().
+    // Note: flip this bool now so any deck potentially being added while
+    // readEffectsXml() is running is also initialized.
+    m_initializedFromEffectsXml = true;
     readEffectsXml();
 }
 
@@ -131,6 +138,12 @@ EffectChainPointer EffectsManager::getStandardEffectChain(int unitNumber) const
 void EffectsManager::addDeck(const ChannelHandleAndGroup& deckHandleGroup) {
     addEqualizerEffectChain(deckHandleGroup);
     addQuickEffectChain(deckHandleGroup);
+    // If a deck is added after setup() was run we need to read effects.xml
+    // again to initialize its QuickEffect chain, either with defaults or the
+    // previous state.
+    if (m_initializedFromEffectsXml) {
+        readEffectsXmlSingleDeck(deckHandleGroup.m_name);
+    }
 }
 
 void EffectsManager::addEqualizerEffectChain(const ChannelHandleAndGroup& deckHandleGroup) {
@@ -202,6 +215,25 @@ void EffectsManager::readEffectsXml() {
     m_pVisibleEffectsList->readEffectsXml(doc, m_pBackendManager);
 }
 
+void EffectsManager::readEffectsXmlSingleDeck(const QString& deckGroup) {
+    QDir settingsPath(m_pConfig->getSettingsPath());
+    QFile file(settingsPath.absoluteFilePath(kEffectsXmlFile));
+    QDomDocument doc;
+
+    if (file.open(QIODevice::ReadOnly)) {
+        doc.setContent(&file);
+    }
+    file.close();
+
+    EffectChainPresetPointer pQuickEffectChainPreset =
+            m_pChainPresetManager->readEffectsXmlSingleDeck(doc, deckGroup);
+
+    auto pQuickEffectChainSlot = m_quickEffectChains.value(deckGroup);
+    if (pQuickEffectChainSlot) {
+        pQuickEffectChainSlot->loadChainPreset(pQuickEffectChainPreset);
+    }
+}
+
 void EffectsManager::saveEffectsXml() {
     QDomDocument doc(EffectXml::kRoot);
     doc.setContent(EffectXml::kFileHeader);
diff --git a/src/effects/effectsmanager.h b/src/effects/effectsmanager.h
index 10209cd44f1..de5109ab331 100644
--- a/src/effects/effectsmanager.h
+++ b/src/effects/effectsmanager.h
@@ -85,6 +85,7 @@ class EffectsManager {
     void addQuickEffectChain(const ChannelHandleAndGroup& deckHandleGroup);
 
     void readEffectsXml();
+    void readEffectsXmlSingleDeck(const QString& deckGroup);
     void saveEffectsXml();
 
     QSet<ChannelHandleAndGroup> m_registeredInputChannels;
@@ -112,5 +113,10 @@ class EffectsManager {
     ControlPotmeter m_loEqFreq;
     ControlPotmeter m_hiEqFreq;
 
+    // This is set true when setup() is run. Then, the initial decks (their EQ
+    // and QuickEffect chains) have been initialized, either with defaults or the
+    // previous state read from effects.xml
+    bool m_initializedFromEffectsXml;
+
     DISALLOW_COPY_AND_ASSIGN(EffectsManager);
 };
diff --git a/src/effects/presets/effectchainpresetmanager.cpp b/src/effects/presets/effectchainpresetmanager.cpp
index a9965ff8e56..8ad44594cf2 100644
--- a/src/effects/presets/effectchainpresetmanager.cpp
+++ b/src/effects/presets/effectchainpresetmanager.cpp
@@ -658,14 +658,19 @@ bool EffectChainPresetManager::savePresetXml(EffectChainPresetPointer pPreset) {
     return success;
 }
 
-EffectsXmlData EffectChainPresetManager::readEffectsXml(
-        const QDomDocument& doc, const QStringList& deckStrings) {
+EffectChainPresetPointer EffectChainPresetManager::getDefaultQuickEffectPreset() {
     EffectManifestPointer pDefaultQuickEffectManifest = m_pBackendManager->getManifest(
             FilterEffect::getId(), EffectBackendType::BuiltIn);
     auto defaultQuickEffectChainPreset =
             EffectChainPresetPointer(pDefaultQuickEffectManifest
                             ? new EffectChainPreset(pDefaultQuickEffectManifest)
                             : new EffectChainPreset());
+    return defaultQuickEffectChainPreset;
+}
+
+EffectsXmlData EffectChainPresetManager::readEffectsXml(
+        const QDomDocument& doc, const QStringList& deckStrings) {
+    auto defaultQuickEffectChainPreset = getDefaultQuickEffectPreset();
 
     QList<EffectChainPresetPointer> standardEffectChainPresets;
     QHash<QString, EffectChainPresetPointer> quickEffectPresets;
@@ -784,6 +789,36 @@ EffectsXmlData EffectChainPresetManager::readEffectsXml(
     return EffectsXmlData{quickEffectPresets, standardEffectChainPresets};
 }
 
+EffectChainPresetPointer EffectChainPresetManager::readEffectsXmlSingleDeck(
+        const QDomDocument& doc, const QString& deckString) {
+    QDomElement root = doc.documentElement();
+
+    auto pQuickEffectChainPreset = getDefaultQuickEffectPreset();
+
+    // Read name of last loaded QuickEffect preset
+    QDomElement quickEffectPresetsElement =
+            XmlParse::selectElement(root, EffectXml::kQuickEffectChainPresets);
+    QDomNodeList quickEffectNodeList =
+            quickEffectPresetsElement.elementsByTagName(
+                    EffectXml::kChainPresetName);
+    for (int i = 0; i < quickEffectNodeList.count(); ++i) {
+        QDomElement presetNameElement = quickEffectNodeList.at(i).toElement();
+        if (presetNameElement.isNull()) {
+            continue;
+        }
+        if (presetNameElement.attribute(QStringLiteral("group")) == deckString) {
+            auto pPreset = m_effectChainPresets.value(presetNameElement.text());
+            if (pPreset != nullptr || presetNameElement.text() == kNoEffectString) {
+                // Replace the default preset.
+                // Load empty preset if the chain was cleared explicitly ('---' preset)
+                pQuickEffectChainPreset = pPreset;
+            }
+        }
+    }
+
+    return pQuickEffectChainPreset;
+}
+
 void EffectChainPresetManager::saveEffectsXml(QDomDocument* pDoc, const EffectsXmlData& data) {
     // Save presets for current state of standard chains
     QDomElement rootElement = pDoc->documentElement();
diff --git a/src/effects/presets/effectchainpresetmanager.h b/src/effects/presets/effectchainpresetmanager.h
index 8bd326b9661..0482b302fa0 100644
--- a/src/effects/presets/effectchainpresetmanager.h
+++ b/src/effects/presets/effectchainpresetmanager.h
@@ -69,7 +69,11 @@ class EffectChainPresetManager : public QObject {
     bool savePreset(EffectChainPresetPointer pPreset);
     void updatePreset(EffectChainPointer pChainSlot);
 
+    EffectChainPresetPointer getDefaultQuickEffectPreset();
+
     EffectsXmlData readEffectsXml(const QDomDocument& doc, const QStringList& deckStrings);
+    EffectChainPresetPointer readEffectsXmlSingleDeck(
+            const QDomDocument& doc, const QString& deckString);
     void saveEffectsXml(QDomDocument* pDoc, const EffectsXmlData& data);
 
   signals:

From 2d34161ea22dfed53c516d094d27210d5aed73f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sat, 11 Nov 2023 11:15:53 +0100
Subject: [PATCH 221/388] Revert "codesign macOS binary with --timestamp"

This reverts commit ccfd8064bb6eabf1df7213e677001c7394b6468d.
---
 packaging/macos/sign_notarize_staple.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/macos/sign_notarize_staple.sh b/packaging/macos/sign_notarize_staple.sh
index caa6bb3cf59..659303ab28c 100755
--- a/packaging/macos/sign_notarize_staple.sh
+++ b/packaging/macos/sign_notarize_staple.sh
@@ -15,7 +15,7 @@ tmp_dir="$(mktemp -dt mixxx_notarize)"
 trap "rm -rf '$tmp_dir'" EXIT
 
 echo "==> Signing $DMG_FILE"
-codesign --verbose=4 --timestamp --sign "${APPLE_CODESIGN_IDENTITY}" "${DMG_FILE}"
+codesign --verbose=4 --sign "${APPLE_CODESIGN_IDENTITY}" "${DMG_FILE}"
 
 credentials=(
     --apple-id "${APPLE_ID_USERNAME}"

From 34e2620e745ea4b3e968feca303ed00b5ab56c0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sat, 11 Nov 2023 11:22:17 +0100
Subject: [PATCH 222/388] Update APPLE_CODESIGN_IDENTITY to the new certificate
 SHA1

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d7a2a945619..b324bf33c03 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -135,7 +135,7 @@ jobs:
     env:
       SCCACHE_VERSION: "0.3.0"
       # macOS codesigning
-      APPLE_CODESIGN_IDENTITY: 4D57A15BE8C3F462595A99E479FBE934A4060703
+      APPLE_CODESIGN_IDENTITY: EF241CF990A9BE5477438AEE1F308F76F33FD100
       MACOS_CODESIGN_CERTIFICATE_P12_BASE64: ${{ secrets.MACOS_CODESIGN_CERTIFICATE_P12_BASE64 }}
       MACOS_CODESIGN_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CODESIGN_CERTIFICATE_PASSWORD }}
 

From a0915684bc6f7790bdb25705d106a3455989b43e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sat, 11 Nov 2023 13:19:25 +0100
Subject: [PATCH 223/388] Split notarytool call for progress information

---
 packaging/macos/sign_notarize_staple.sh | 42 +++++++------------------
 1 file changed, 11 insertions(+), 31 deletions(-)

diff --git a/packaging/macos/sign_notarize_staple.sh b/packaging/macos/sign_notarize_staple.sh
index 659303ab28c..01eaadf4ffa 100755
--- a/packaging/macos/sign_notarize_staple.sh
+++ b/packaging/macos/sign_notarize_staple.sh
@@ -17,42 +17,22 @@ trap "rm -rf '$tmp_dir'" EXIT
 echo "==> Signing $DMG_FILE"
 codesign --verbose=4 --sign "${APPLE_CODESIGN_IDENTITY}" "${DMG_FILE}"
 
+
+echo "==> Notarizing $DMG_FILE"
+
 credentials=(
     --apple-id "${APPLE_ID_USERNAME}"
     --password "${APPLE_APP_SPECIFIC_PASSWORD}"
     --team-id "${APPLE_TEAM_ID}"
 )
-
-status_plist="$tmp_dir/status.plist"
-
-echo "==> Notarizing $DMG_FILE"
-xcrun notarytool submit "${credentials[@]}" --output-format plist --wait "${DMG_FILE}" \
-    > "$status_plist"
-
-cat "$status_plist"
-
-id="$(/usr/libexec/PlistBuddy -c 'Print id' "$status_plist")"
-status="$(/usr/libexec/PlistBuddy -c 'Print status' "$status_plist")"
-
-print_notary_log() {
-    xcrun notarytool log "${credentials[@]}" "$id"
-}
-
-case "${status}" in
-    Accepted)
-        echo "Notarization succeeded"
-        ;;
-    Invalid|Rejected)
-        echo "Notarization failed: ${status}"
-        print_notary_log
-        exit 1
-        ;;
-    *)
-        echo "Unknown notarization status: ${status}"
-        print_notary_log
-        exit 1
-        ;;
-esac
+submit_out="$tmp_dir/submit_out.txt"
+
+xcrun notarytool submit "${credentials[@]}" "${DMG_FILE}" 2>&1 | tee "$submit_out"
+REQUEST_ID="$(grep -e " id: " "$submit_out" | grep -oE '([0-9a-f-]{36})'| head -n1)"
+rm "$submit_out"
+xcrun notarytool wait "$REQUEST_ID" "${credentials[@]}" --timeout 15m ||:
+xcrun notarytool log "$REQUEST_ID" "${credentials[@]}" ||:
+xcrun notarytool info "$REQUEST_ID" "${credentials[@]}"
 
 echo "==> Stapling $DMG_FILE"
 xcrun stapler staple -q "${DMG_FILE}"

From 7f97c938d75275e32cde721b39a033f51fd42218 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sat, 11 Nov 2023 13:42:29 +0100
Subject: [PATCH 224/388] Fix passing CMAKE_OSX_DEPLOYMENT_TARGET to
 subprojects

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e3a4cbc5dfa..71a3e0cab0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2332,7 +2332,7 @@ if(ENGINEPRIME)
         -DCMAKE_INSTALL_LIBDIR:PATH=lib
         -DCMAKE_MODULE_PATH:PATH=${CMAKE_MODULE_PATH}
         -$<IF:$<BOOL:${CMAKE_TOOLCHAIN_FILE}>,D,U>CMAKE_TOOLCHAIN_FILE:PATH=${CMAKE_TOOLCHAIN_FILE}
-        -$<IF:$<BOOL:${CMAKE_OSX_DEPLOYMENT}>,D,U>CMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT}
+        -$<IF:$<BOOL:${CMAKE_OSX_DEPLOYMENT_TARGET}>,D,U>CMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
         -$<IF:$<BOOL:${CMAKE_OSX_ARCHITECTURES}>,D,U>CMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
         -DCMAKE_SYSTEM_PROCESSOR=${CMAKE_SYSTEM_PROCESSOR}
         -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
@@ -2429,7 +2429,7 @@ if(KEYFINDER)
         -DCMAKE_PREFIX_PATH=${PIPE_DELIMITED_CMAKE_PREFIX_PATH}
         -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
         -$<IF:$<BOOL:${CMAKE_TOOLCHAIN_FILE}>,D,U>CMAKE_TOOLCHAIN_FILE:PATH=${CMAKE_TOOLCHAIN_FILE}
-        -$<IF:$<BOOL:${CMAKE_OSX_DEPLOYMENT}>,D,U>CMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT}
+        -$<IF:$<BOOL:${CMAKE_OSX_DEPLOYMENT_TARGET}>,D,U>CMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMEN_TARGET}
         -$<IF:$<BOOL:${CMAKE_OSX_ARCHITECTURES}>,D,U>CMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
         -DCMAKE_SYSTEM_PROCESSOR=${CMAKE_SYSTEM_PROCESSOR}
         -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}

From 32d918a8e64fffea7039356de0fa94799e3fcc7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sat, 11 Nov 2023 13:54:38 +0100
Subject: [PATCH 225/388] Remove the workflow action timout. We have now a 15
 min timeout in the script

---
 .github/workflows/build.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b324bf33c03..8ac85a8be53 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -376,10 +376,6 @@ jobs:
       - name: "[macOS] Sign, Notarize, and Staple Package"
         if: runner.os == 'macOS' && env.MACOS_CODESIGN_CERTIFICATE_P12_BASE64 != null && env.MACOS_CODESIGN_CERTIFICATE_PASSWORD != null && env.APPLE_APP_SPECIFIC_PASSWORD != null
         run: packaging/macos/sign_notarize_staple.sh build/*.dmg
-        # TODO: This timeout may be a bit too conservative under some
-        # circumstances. Feel free to increase the timeout once the
-        # notarization step is fixed.
-        timeout-minutes: 5
         env:
           APPLE_ID_USERNAME: daschuer@mixxx.org
           APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.MACOS_NOTARIZATION_APP_SPECIFIC_PASSWORD }}

From 8e9d4d0dc8f9a60353497f64c710f988685e21db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sun, 15 Oct 2023 07:42:00 +0200
Subject: [PATCH 226/388] Addes the test SoftTakeoverTest, CatchOutOfBounds

---
 src/test/softtakeover_test.cpp | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/src/test/softtakeover_test.cpp b/src/test/softtakeover_test.cpp
index cc52ad4a14d..d481cece6d3 100644
--- a/src/test/softtakeover_test.cpp
+++ b/src/test/softtakeover_test.cpp
@@ -562,6 +562,32 @@ TEST_F(SoftTakeoverTest, PrevFarMore_NewFarMore_Late) {
     EXPECT_TRUE(st_control.ignore(co.get(), co->getParameterForValue(100)));
 }
 
+TEST_F(SoftTakeoverTest, CatchOutOfBounds) {
+    auto co = std::make_unique<ControlPotmeter>(
+            ConfigKey("[Channel1]", "test_pot"), -250, 250, true);
+
+    co->set(50);
+    SoftTakeoverCtrl st_control;
+    st_control.enable(co.get());
+
+    // First is always ignored.
+    EXPECT_TRUE(st_control.ignore(co.get(), co->getParameterForValue(45)));
+    // Cross the original value to take over
+    EXPECT_FALSE(st_control.ignore(co.get(), co->getParameterForValue(55)));
+
+    // Set value to an out of bounds value
+    co->set(300);
+    mixxx::Time::setTestElapsedTime(SoftTakeover::TestAccess::getTimeThreshold() * 2);
+    // Actions in the same direction shall be ignored
+    EXPECT_TRUE(st_control.ignore(co.get(), co->getParameterForValue(60)));
+    // actions in the other edirection shall be ignored
+    EXPECT_TRUE(st_control.ignore(co.get(), co->getParameterForValue(40)));
+    // reaching the lower border should be ignored
+    EXPECT_TRUE(st_control.ignore(co.get(), co->getParameterForValue(-250)));
+    // reaching the upper border near the out of bounds value should not be ignored.
+    EXPECT_FALSE(st_control.ignore(co.get(), co->getParameterForValue(250)));
+}
+
 // For the ignore cases, check that they work correctly with various signed values
 // TODO
 

From 988432c0bee41d04d810a82b73e748439aeb8ad1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sun, 5 Nov 2023 22:19:16 +0100
Subject: [PATCH 227/388] delete DbId(int) to make sure we have no extra in
 roundtrip

---
 src/dialog/dlgreplacecuecolor.cpp           |  2 +-
 src/library/dao/cuedao.cpp                  |  4 ++--
 src/library/dao/directorydao.cpp            |  2 +-
 src/library/dao/trackdao.cpp                | 10 +++++-----
 src/library/export/dlglibraryexport.cpp     |  2 +-
 src/library/scanner/libraryscanner.cpp      |  2 +-
 src/library/trackset/crate/cratestorage.cpp |  6 +++---
 src/test/globaltrackcache_test.cpp          |  6 +++---
 src/test/playermanagertest.cpp              |  3 ++-
 src/test/trackreftest.cpp                   | 11 +++++------
 src/util/db/dbid.h                          | 18 ++++++++++--------
 11 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/src/dialog/dlgreplacecuecolor.cpp b/src/dialog/dlgreplacecuecolor.cpp
index c67a6bceb1a..d159a44fb16 100644
--- a/src/dialog/dlgreplacecuecolor.cpp
+++ b/src/dialog/dlgreplacecuecolor.cpp
@@ -342,7 +342,7 @@ void DlgReplaceCueColor::slotApply() {
             continue;
         }
         CueDatabaseRow row = {DbId(selectQuery.value(idColumn)),
-                TrackId(selectQuery.value(trackIdColumn).toInt()),
+                TrackId(selectQuery.value(trackIdColumn)),
                 *color};
         rows << row;
         trackIds << row.trackId;
diff --git a/src/library/dao/cuedao.cpp b/src/library/dao/cuedao.cpp
index 9b0066fc9db..779e84735bf 100644
--- a/src/library/dao/cuedao.cpp
+++ b/src/library/dao/cuedao.cpp
@@ -85,7 +85,7 @@ QList<CuePointer> CueDAO::getCuesForTrack(TrackId trackId) const {
     DEBUG_ASSERT(
             query.isPrepared() &&
             !query.hasError());
-    query.bindValue(":id", trackId.toVariant());
+    query.bindValue(":id", trackId);
     if (!query.execPrepared()) {
         kLogger.warning()
                 << "Failed to load cues of track"
@@ -230,7 +230,7 @@ void CueDAO::saveTrackCues(
     DEBUG_ASSERT(
             query.isPrepared() &&
             !query.hasError());
-    query.bindValue(":track_id", trackId.toVariant());
+    query.bindValue(":track_id", trackId);
     if (!query.execPrepared()) {
         kLogger.warning()
                 << "Failed to delete orphaned cues of track"
diff --git a/src/library/dao/directorydao.cpp b/src/library/dao/directorydao.cpp
index af08f8d8925..bd46b430cf6 100644
--- a/src/library/dao/directorydao.cpp
+++ b/src/library/dao/directorydao.cpp
@@ -184,7 +184,7 @@ QList<RelocatedTrack> DirectoryDAO::relocateDirectory(
         const int oldSuffixLen = oldLocation.size() - oldDirectory.size();
         QString newLocation = newDirectory + oldLocation.right(oldSuffixLen);
         DEBUG_ASSERT(oldLocation.startsWith(oldDirectoryPrefix));
-        loc_ids.append(DbId(query.value(1).toInt()));
+        loc_ids.append(DbId(query.value(1)));
         const auto trackId = TrackId(query.value(0));
         auto missingTrackRef = TrackRef::fromFilePath(
                 oldLocation,
diff --git a/src/library/dao/trackdao.cpp b/src/library/dao/trackdao.cpp
index a27e6fa344d..2ecb3963fde 100644
--- a/src/library/dao/trackdao.cpp
+++ b/src/library/dao/trackdao.cpp
@@ -2289,7 +2289,7 @@ bool TrackDAO::updatePlayCounterFromPlayedHistory(
                         .arg(trackIdList));
         updatePlayed.bindValue(
                 QStringLiteral(":playlistHidden"),
-                PlaylistDAO::PLHT_SET_LOG);
+                QVariant(PlaylistDAO::PLHT_SET_LOG));
         VERIFY_OR_DEBUG_ASSERT(!updatePlayed.hasError()) {
             return false;
         }
@@ -2312,7 +2312,7 @@ bool TrackDAO::updatePlayCounterFromPlayedHistory(
                         .arg(trackIdList));
         updateNotPlayed.bindValue(
                 QStringLiteral(":playlistHidden"),
-                PlaylistDAO::PLHT_SET_LOG);
+                QVariant(PlaylistDAO::PLHT_SET_LOG));
         VERIFY_OR_DEBUG_ASSERT(!updateNotPlayed.hasError()) {
             return false;
         }
@@ -2335,7 +2335,7 @@ bool TrackDAO::updatePlayCounterFromPlayedHistory(
                         "AND PlaylistTracks.track_id=:trackId"));
         playCounterQuery.bindValue(
                 QStringLiteral(":playlistHidden"),
-                PlaylistDAO::PLHT_SET_LOG);
+                QVariant(PlaylistDAO::PLHT_SET_LOG));
         auto trackUpdateQuery = FwdSqlQuery(
                 m_database,
                 QStringLiteral(
@@ -2346,7 +2346,7 @@ bool TrackDAO::updatePlayCounterFromPlayedHistory(
         for (const auto& trackId : trackIds) {
             playCounterQuery.bindValue(
                     QStringLiteral(":trackId"),
-                    trackId.toVariant());
+                    trackId);
             VERIFY_OR_DEBUG_ASSERT(!playCounterQuery.hasError()) {
                 continue;
             }
@@ -2369,7 +2369,7 @@ bool TrackDAO::updatePlayCounterFromPlayedHistory(
             }
             trackUpdateQuery.bindValue(
                     QStringLiteral(":trackId"),
-                    trackId.toVariant());
+                    trackId);
             trackUpdateQuery.bindValue(
                     QStringLiteral(":timesplayed"),
                     timesplayed);
diff --git a/src/library/export/dlglibraryexport.cpp b/src/library/export/dlglibraryexport.cpp
index 957a49e9693..34dc394969d 100644
--- a/src/library/export/dlglibraryexport.cpp
+++ b/src/library/export/dlglibraryexport.cpp
@@ -210,7 +210,7 @@ void DlgLibraryExport::exportRequested() {
     if (m_pCratesList->isEnabled()) {
         const auto selectedItems = m_pCratesList->selectedItems();
         for (auto* pItem : selectedItems) {
-            CrateId id{pItem->data(Qt::UserRole).value<int>()};
+            CrateId id{pItem->data(Qt::UserRole)};
             pRequest->crateIdsToExport.insert(id);
         }
     }
diff --git a/src/library/scanner/libraryscanner.cpp b/src/library/scanner/libraryscanner.cpp
index 693a35eff8b..bf69e6a20ee 100644
--- a/src/library/scanner/libraryscanner.cpp
+++ b/src/library/scanner/libraryscanner.cpp
@@ -56,7 +56,7 @@ void cleanUpDatabase(const QSqlDatabase& database) {
     FwdSqlQuery query(database, sqlStmt);
     query.bindValue(
             QStringLiteral(":unequalHash"),
-            static_cast<mixxx::cache_key_signed_t>(mixxx::invalidCacheKey()));
+            QVariant(mixxx::invalidCacheKey()));
     const auto numRows = execRowCountQuery(query);
     VERIFY_OR_DEBUG_ASSERT(numRows >= 0) {
         kLogger.warning()
diff --git a/src/library/trackset/crate/cratestorage.cpp b/src/library/trackset/crate/cratestorage.cpp
index a4c02995ebb..7a94a270d2e 100644
--- a/src/library/trackset/crate/cratestorage.cpp
+++ b/src/library/trackset/crate/cratestorage.cpp
@@ -65,10 +65,10 @@ class CrateQueryBinder final {
         m_query.bindValue(placeholder, crate.getName());
     }
     void bindLocked(const QString& placeholder, const Crate& crate) const {
-        m_query.bindValue(placeholder, crate.isLocked());
+        m_query.bindValue(placeholder, QVariant(crate.isLocked()));
     }
     void bindAutoDjSource(const QString& placeholder, const Crate& crate) const {
-        m_query.bindValue(placeholder, crate.isAutoDjSource());
+        m_query.bindValue(placeholder, QVariant(crate.isAutoDjSource()));
     }
 
   protected:
@@ -351,7 +351,7 @@ CrateSelectResult CrateStorage::selectAutoDjCrates(bool autoDjSource) const {
                             .arg(CRATE_TABLE,
                                     CRATETABLE_AUTODJ_SOURCE,
                                     CRATETABLE_NAME)));
-    query.bindValue(":autoDjSource", autoDjSource);
+    query.bindValue(":autoDjSource", QVariant(autoDjSource));
     if (query.execPrepared()) {
         return CrateSelectResult(std::move(query));
     } else {
diff --git a/src/test/globaltrackcache_test.cpp b/src/test/globaltrackcache_test.cpp
index aab7823b91d..cde8a586897 100644
--- a/src/test/globaltrackcache_test.cpp
+++ b/src/test/globaltrackcache_test.cpp
@@ -29,7 +29,7 @@ class TrackTitleThread: public QThread {
             // same track twice
             m_recentTrackPtr.reset();
             // Try to resolve the next track by guessing the id
-            const TrackId trackId(loopCount % 2);
+            const TrackId trackId(QVariant(loopCount % 2));
             auto track = GlobalTrackCacheLocker().lookupTrackById(trackId);
             if (track) {
                 ASSERT_EQ(trackId, track->getId());
@@ -91,7 +91,7 @@ class GlobalTrackCacheTest: public MixxxTest, public virtual GlobalTrackCacheSav
 TEST_F(GlobalTrackCacheTest, resolveByFileInfo) {
     ASSERT_TRUE(GlobalTrackCacheLocker().isEmpty());
 
-    const TrackId trackId(1);
+    const TrackId trackId(QVariant(1));
 
     TrackPointer track;
     {
@@ -166,7 +166,7 @@ TEST_F(GlobalTrackCacheTest, concurrentDelete) {
             EXPECT_TRUE(static_cast<bool>(track));
             trackId = track->getId();
             if (!trackId.isValid()) {
-                trackId = TrackId(i % 2);
+                trackId = TrackId(QVariant(i % 2));
                 resolver.initTrackIdAndUnlockCache(trackId);
             }
         }
diff --git a/src/test/playermanagertest.cpp b/src/test/playermanagertest.cpp
index ef474ce01bc..95e9b7d490c 100644
--- a/src/test/playermanagertest.cpp
+++ b/src/test/playermanagertest.cpp
@@ -188,7 +188,8 @@ TEST_F(PlayerManagerTest, UnEjectReplaceTrackTest) {
 
 TEST_F(PlayerManagerTest, UnEjectInvalidTrackIdTest) {
     // Save an invalid trackid in playermanager.
-    auto pTrack = Track::newDummy(getTestDir().filePath(kTrackLocationTest1), TrackId(10));
+    auto pTrack = Track::newDummy(
+            getTestDir().filePath(kTrackLocationTest1), TrackId(QVariant(10)));
     ASSERT_NE(nullptr, pTrack);
     m_pPlayerManager->slotSaveEjectedTrack(pTrack);
     auto deck1 = m_pPlayerManager->getDeck(1);
diff --git a/src/test/trackreftest.cpp b/src/test/trackreftest.cpp
index f0735f5b386..60c5ce015ca 100644
--- a/src/test/trackreftest.cpp
+++ b/src/test/trackreftest.cpp
@@ -15,12 +15,11 @@ class TrackRefTest : public testing::Test {
     // if only the default constructor is used. This workaround was
     // needed for LLVM version 7.0.2 (clang-700.1.81).
     TrackRefTest()
-      : m_tempFile("TrackRefTest.tmp"),
-        m_tempFileDir(QDir::tempPath()),
-        m_tempFileName(m_tempFile.fileName()),
-        m_tempFileInfo(m_tempFileDir, m_tempFileName),
-        m_validTrackId(123),
-        m_invalidTrackId() {
+            : m_tempFile("TrackRefTest.tmp"),
+              m_tempFileDir(QDir::tempPath()),
+              m_tempFileName(m_tempFile.fileName()),
+              m_tempFileInfo(m_tempFileDir, m_tempFileName),
+              m_validTrackId(QVariant(123)) {
     }
 
     virtual void SetUp() {
diff --git a/src/util/db/dbid.h b/src/util/db/dbid.h
index 0bd3fb0104a..a001459df21 100644
--- a/src/util/db/dbid.h
+++ b/src/util/db/dbid.h
@@ -22,14 +22,16 @@
 // not add any additional state (= member variables). Inheritance is
 // only needed for type-safety.
 class DbId {
-protected:
-public:
-  constexpr DbId()
-          : m_value(kInvalidValue) {
-  }
-  explicit DbId(const QVariant& variant)
-          : m_value(valueOf(variant)) {
-  }
+  protected:
+  public:
+    constexpr DbId()
+            : m_value(kInvalidValue) {
+    }
+    explicit DbId(const QVariant& variant)
+            : m_value(valueOf(variant)) {
+    }
+
+    DbId(int) = delete;
 
     bool isValid() const {
         return isValidValue(m_value);

From fd790f652d313956f23defdc8bb8e83f617aef0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sun, 12 Nov 2023 14:58:04 +0100
Subject: [PATCH 228/388] Fix build error with Qt6 by using QFont::Bold

---
 src/waveform/renderers/waveformmark.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/waveform/renderers/waveformmark.cpp b/src/waveform/renderers/waveformmark.cpp
index 98672acabb5..6bc63af5cce 100644
--- a/src/waveform/renderers/waveformmark.cpp
+++ b/src/waveform/renderers/waveformmark.cpp
@@ -173,7 +173,7 @@ struct MarkerGeometry {
         // party the resulting font size is hard to predict (affects all supported OS).
 
         m_font.setPixelSize(13);
-        m_font.setWeight(75); // bold
+        m_font.setWeight(QFont::Bold);
         m_font.setItalic(false);
 
         const qreal margin{3.f};

From 94dde618a4e5448c92a24fe77f4ec22a3ef4f7ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sun, 12 Nov 2023 16:45:08 +0100
Subject: [PATCH 229/388] Fail Qt6 build not on GitHub Actions

---
 CMakeLists.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e3a4cbc5dfa..59d802ff54a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -130,6 +130,15 @@ if(NOT CMAKE_CONFIGURATION_TYPES)
 endif()
 
 option(QT6 "Build with Qt6" OFF)
+if(QT6)
+  if (DEFINED ENV{GITHUB_ACTIONS})
+    message("Running experimental Qt6 build for GitHub Actions")
+  else()
+    message(FATAL_ERROR
+        "Mixxx 2.4 does not fully support Qt6, use 2.5/main instead. "
+        "Qt6 support is available for CI checks only and requires the environment variable GITHUB_ACTIONS to be set.")
+  endif()
+endif()
 
 option(QOPENGL "Use QOpenGLWindow based widget instead of QGLWidget" ON)
 if(QOPENGL)

From 23980188d39ca4ce803e62bb6814c7110c508526 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sat, 28 Oct 2023 18:52:52 +0200
Subject: [PATCH 230/388] Improve track headers

---
 src/library/trackset/basetracksetfeature.cpp |  1 +
 src/sources/metadatasourcetaglib.cpp         |  3 +--
 src/sources/metadatasourcetaglib.h           |  2 --
 src/sources/soundsource.h                    |  1 -
 src/sources/soundsourceproxy.cpp             |  3 ---
 src/sources/soundsourceproxy.h               |  2 +-
 src/test/metadatatest.cpp                    | 10 ++++++----
 src/track/beatutils.cpp                      |  4 ----
 src/track/beatutils.h                        |  2 --
 src/track/cue.cpp                            |  4 ----
 src/track/cue.h                              |  3 ---
 src/track/globaltrackcache.h                 |  1 -
 src/track/keyfactory.h                       |  1 -
 src/track/keys.h                             |  2 --
 src/track/keyutils.cpp                       |  2 --
 src/track/serato/beatgrid.cpp                |  2 --
 src/track/serato/markers2.cpp                |  1 -
 src/track/taglib/trackmetadata_ape.cpp       |  1 +
 src/track/taglib/trackmetadata_ape.h         |  4 +++-
 src/track/taglib/trackmetadata_common.cpp    |  3 ---
 src/track/taglib/trackmetadata_id3v2.cpp     |  1 +
 src/track/taglib/trackmetadata_id3v2.h       |  4 +++-
 src/track/taglib/trackmetadata_mp4.cpp       |  1 +
 src/track/taglib/trackmetadata_mp4.h         |  4 +++-
 src/track/track.cpp                          |  4 ----
 25 files changed, 21 insertions(+), 45 deletions(-)

diff --git a/src/library/trackset/basetracksetfeature.cpp b/src/library/trackset/basetracksetfeature.cpp
index 8994ece86e8..a50b9b94019 100644
--- a/src/library/trackset/basetracksetfeature.cpp
+++ b/src/library/trackset/basetracksetfeature.cpp
@@ -1,5 +1,6 @@
 #include "library/trackset/basetracksetfeature.h"
 
+#include "analyzer/analyzerscheduledtrack.h"
 #include "moc_basetracksetfeature.cpp"
 
 BaseTrackSetFeature::BaseTrackSetFeature(
diff --git a/src/sources/metadatasourcetaglib.cpp b/src/sources/metadatasourcetaglib.cpp
index 75991518457..3893a42d8f7 100644
--- a/src/sources/metadatasourcetaglib.cpp
+++ b/src/sources/metadatasourcetaglib.cpp
@@ -4,11 +4,10 @@
 #include <taglib/vorbisfile.h>
 
 #include <QFile>
-#include <QFileInfo>
-#include <QThread>
 #include <memory>
 
 #include "track/taglib/trackmetadata.h"
+#include "track/taglib/trackmetadata_common.h"
 #include "util/logger.h"
 #include "util/safelywritablefile.h"
 
diff --git a/src/sources/metadatasourcetaglib.h b/src/sources/metadatasourcetaglib.h
index 22a1a6a37ca..7853b2b064f 100644
--- a/src/sources/metadatasourcetaglib.h
+++ b/src/sources/metadatasourcetaglib.h
@@ -2,8 +2,6 @@
 
 #include "sources/metadatasource.h"
 
-#include "track/taglib/trackmetadata.h"
-
 namespace mixxx {
 
 // Universal default implementation of IMetadataSource using TagLib.
diff --git a/src/sources/soundsource.h b/src/sources/soundsource.h
index f692177266f..9cbb2e679f7 100644
--- a/src/sources/soundsource.h
+++ b/src/sources/soundsource.h
@@ -4,7 +4,6 @@
 
 #include "sources/audiosource.h"
 #include "sources/metadatasourcetaglib.h"
-#include "util/assert.h"
 
 namespace mixxx {
 
diff --git a/src/sources/soundsourceproxy.cpp b/src/sources/soundsourceproxy.cpp
index f7b0423424c..1cf12dd2261 100644
--- a/src/sources/soundsourceproxy.cpp
+++ b/src/sources/soundsourceproxy.cpp
@@ -1,6 +1,5 @@
 #include "sources/soundsourceproxy.h"
 
-#include <QApplication>
 #include <QMimeDatabase>
 #include <QMimeType>
 #include <QRegularExpression>
@@ -38,11 +37,9 @@
 #include "sources/soundsourcemediafoundation.h"
 #endif
 
-#include "library/coverartcache.h"
 #include "library/coverartutils.h"
 #include "track/globaltrackcache.h"
 #include "track/track.h"
-#include "util/cmdlineargs.h"
 #include "util/logger.h"
 #include "util/regex.h"
 
diff --git a/src/sources/soundsourceproxy.h b/src/sources/soundsourceproxy.h
index fc6c83ba0c2..730fc584311 100644
--- a/src/sources/soundsourceproxy.h
+++ b/src/sources/soundsourceproxy.h
@@ -4,11 +4,11 @@
 
 #include "sources/soundsourceproviderregistry.h"
 #include "track/track_decl.h"
-#include "util/sandbox.h"
 
 namespace mixxx {
 
 class FileAccess;
+class FileInfo;
 
 } // namespace mixxx
 
diff --git a/src/test/metadatatest.cpp b/src/test/metadatatest.cpp
index 71ea50ff9ef..a18cfc08f63 100644
--- a/src/test/metadatatest.cpp
+++ b/src/test/metadatatest.cpp
@@ -1,12 +1,14 @@
 #include <gtest/gtest.h>
+#include <taglib/textidentificationframe.h>
+#include <taglib/tstring.h>
+
+#include <QtDebug>
 
+#include "track/bpm.h"
 #include "track/taglib/trackmetadata.h"
+#include "track/taglib/trackmetadata_common.h"
 #include "util/memory.h"
 
-#include <taglib/tstring.h>
-#include <taglib/textidentificationframe.h>
-#include <QtDebug>
-
 namespace {
 
 class MetadataTest : public testing::Test {
diff --git a/src/track/beatutils.cpp b/src/track/beatutils.cpp
index 9e097c6d005..e07e711fb72 100644
--- a/src/track/beatutils.cpp
+++ b/src/track/beatutils.cpp
@@ -1,10 +1,6 @@
 #include "track/beatutils.h"
 
-#include <QList>
-#include <QMap>
-#include <QString>
 #include <QtDebug>
-#include <algorithm>
 
 #include "util/math.h"
 
diff --git a/src/track/beatutils.h b/src/track/beatutils.h
index e3864afdd52..7466464146f 100644
--- a/src/track/beatutils.h
+++ b/src/track/beatutils.h
@@ -3,9 +3,7 @@
 #include <QVector>
 
 #include "audio/frame.h"
-#include "audio/types.h"
 #include "track/bpm.h"
-#include "util/math.h"
 
 class BeatUtils {
   public:
diff --git a/src/track/cue.cpp b/src/track/cue.cpp
index 7c515410bfb..28fe9cca19c 100644
--- a/src/track/cue.cpp
+++ b/src/track/cue.cpp
@@ -1,12 +1,8 @@
 #include "track/cue.h"
 
-#include <QtDebug>
-
 #include "audio/frame.h"
-#include "engine/engine.h"
 #include "moc_cue.cpp"
 #include "util/assert.h"
-#include "util/color/color.h"
 #include "util/color/predefinedcolorpalettes.h"
 #include "util/compatibility/qmutex.h"
 
diff --git a/src/track/cue.h b/src/track/cue.h
index 49af203cee2..c0474e76ae9 100644
--- a/src/track/cue.h
+++ b/src/track/cue.h
@@ -12,9 +12,6 @@
 #include "util/color/rgbcolor.h"
 #include "util/db/dbid.h"
 
-class CueDAO;
-class Track;
-
 class Cue : public QObject {
     Q_OBJECT
 
diff --git a/src/track/globaltrackcache.h b/src/track/globaltrackcache.h
index 68c04d42e08..d5e242a47df 100644
--- a/src/track/globaltrackcache.h
+++ b/src/track/globaltrackcache.h
@@ -7,7 +7,6 @@
 #include "track/trackref.h"
 #include "util/compatibility/qmutex.h"
 #include "util/fileaccess.h"
-#include "util/sandbox.h"
 
 // forward declaration(s)
 class GlobalTrackCache;
diff --git a/src/track/keyfactory.h b/src/track/keyfactory.h
index eab2e7d8779..f7d03cc8f87 100644
--- a/src/track/keyfactory.h
+++ b/src/track/keyfactory.h
@@ -2,7 +2,6 @@
 
 #include <QHash>
 #include <QString>
-#include <QVector>
 
 #include "proto/keys.pb.h"
 #include "track/keys.h"
diff --git a/src/track/keys.h b/src/track/keys.h
index b3c1e4180f8..365e534143b 100644
--- a/src/track/keys.h
+++ b/src/track/keys.h
@@ -10,8 +10,6 @@
 
 typedef QList<QPair<mixxx::track::io::key::ChromaticKey, double>> KeyChangeList;
 
-class KeyFactory;
-
 class Keys final {
   public:
     explicit Keys(const QByteArray* pByteArray = nullptr);
diff --git a/src/track/keyutils.cpp b/src/track/keyutils.cpp
index 59a07fe51ba..81db0585022 100644
--- a/src/track/keyutils.cpp
+++ b/src/track/keyutils.cpp
@@ -4,10 +4,8 @@
 #include <QPair>
 #include <QRegularExpression>
 #include <QtDebug>
-#include <array>
 
 #include "util/compatibility/qmutex.h"
-#include "util/math.h"
 
 using mixxx::track::io::key::ChromaticKey;
 using mixxx::track::io::key::ChromaticKey_IsValid;
diff --git a/src/track/serato/beatgrid.cpp b/src/track/serato/beatgrid.cpp
index faea3c8181f..f024883cfd6 100644
--- a/src/track/serato/beatgrid.cpp
+++ b/src/track/serato/beatgrid.cpp
@@ -1,7 +1,5 @@
 #include "track/serato/beatgrid.h"
 
-#include <QtEndian>
-
 #include "util/logger.h"
 
 namespace {
diff --git a/src/track/serato/markers2.cpp b/src/track/serato/markers2.cpp
index 89b7c003836..d4d714b05e5 100644
--- a/src/track/serato/markers2.cpp
+++ b/src/track/serato/markers2.cpp
@@ -2,7 +2,6 @@
 
 #include <QtEndian>
 
-#include "track/serato/tags.h"
 #include "util/logger.h"
 
 namespace {
diff --git a/src/track/taglib/trackmetadata_ape.cpp b/src/track/taglib/trackmetadata_ape.cpp
index b33d215fde6..c370c6a7f93 100644
--- a/src/track/taglib/trackmetadata_ape.cpp
+++ b/src/track/taglib/trackmetadata_ape.cpp
@@ -1,5 +1,6 @@
 #include "track/taglib/trackmetadata_ape.h"
 
+#include "track/taglib/trackmetadata_common.h"
 #include "track/tracknumbers.h"
 #include "util/logger.h"
 
diff --git a/src/track/taglib/trackmetadata_ape.h b/src/track/taglib/trackmetadata_ape.h
index 6f1db1d1e8c..778375ca546 100644
--- a/src/track/taglib/trackmetadata_ape.h
+++ b/src/track/taglib/trackmetadata_ape.h
@@ -2,10 +2,12 @@
 
 #include <taglib/apetag.h>
 
-#include "track/taglib/trackmetadata_common.h"
+class QImage;
 
 namespace mixxx {
 
+class TrackMetadata;
+
 namespace taglib {
 
 namespace ape {
diff --git a/src/track/taglib/trackmetadata_common.cpp b/src/track/taglib/trackmetadata_common.cpp
index d3f504201e0..c24d4925084 100644
--- a/src/track/taglib/trackmetadata_common.cpp
+++ b/src/track/taglib/trackmetadata_common.cpp
@@ -1,10 +1,7 @@
 #include "track/taglib/trackmetadata_common.h"
 
-#include <taglib/tmap.h>
-
 #include "track/tracknumbers.h"
 #include "util/assert.h"
-#include "util/duration.h"
 #include "util/logger.h"
 
 namespace mixxx {
diff --git a/src/track/taglib/trackmetadata_id3v2.cpp b/src/track/taglib/trackmetadata_id3v2.cpp
index c960bd854cd..bba76638e91 100644
--- a/src/track/taglib/trackmetadata_id3v2.cpp
+++ b/src/track/taglib/trackmetadata_id3v2.cpp
@@ -11,6 +11,7 @@
 #include <taglib/uniquefileidentifierframe.h>
 #endif // __EXTRA_METADATA__
 
+#include "track/taglib/trackmetadata_common.h"
 #include "track/tracknumbers.h"
 #include "util/logger.h"
 
diff --git a/src/track/taglib/trackmetadata_id3v2.h b/src/track/taglib/trackmetadata_id3v2.h
index ecf3e41c781..ba5f44e1dbf 100644
--- a/src/track/taglib/trackmetadata_id3v2.h
+++ b/src/track/taglib/trackmetadata_id3v2.h
@@ -2,10 +2,12 @@
 
 #include <taglib/id3v2tag.h>
 
-#include "track/taglib/trackmetadata_common.h"
+class QImage;
 
 namespace mixxx {
 
+class TrackMetadata;
+
 namespace taglib {
 
 namespace id3v2 {
diff --git a/src/track/taglib/trackmetadata_mp4.cpp b/src/track/taglib/trackmetadata_mp4.cpp
index cb9942582ce..8ffa4fabb23 100644
--- a/src/track/taglib/trackmetadata_mp4.cpp
+++ b/src/track/taglib/trackmetadata_mp4.cpp
@@ -1,5 +1,6 @@
 #include "track/taglib/trackmetadata_mp4.h"
 
+#include "track/taglib/trackmetadata_common.h"
 #include "track/tracknumbers.h"
 #include "util/logger.h"
 
diff --git a/src/track/taglib/trackmetadata_mp4.h b/src/track/taglib/trackmetadata_mp4.h
index f05e930de8e..71e61afcafa 100644
--- a/src/track/taglib/trackmetadata_mp4.h
+++ b/src/track/taglib/trackmetadata_mp4.h
@@ -2,10 +2,12 @@
 
 #include <taglib/mp4tag.h>
 
-#include "track/taglib/trackmetadata_common.h"
+class QImage;
 
 namespace mixxx {
 
+class TrackMetadata;
+
 namespace taglib {
 
 namespace mp4 {
diff --git a/src/track/track.cpp b/src/track/track.cpp
index ee73f655739..a62391eeb7d 100644
--- a/src/track/track.cpp
+++ b/src/track/track.cpp
@@ -1,16 +1,12 @@
 #include "track/track.h"
 
 #include <QDebug>
-#include <QDirIterator>
 #include <atomic>
 
-#include "engine/engine.h"
 #include "library/library_prefs.h"
 #include "moc_track.cpp"
 #include "sources/metadatasource.h"
-#include "track/trackref.h"
 #include "util/assert.h"
-#include "util/color/color.h"
 #include "util/logger.h"
 
 namespace {

From fb72dbfa6a656bf2dd9ec5057f9542d4aed3d7ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sat, 28 Oct 2023 19:16:30 +0200
Subject: [PATCH 231/388] Improve soundio headers

---
 src/soundio/sounddevice.cpp          | 4 ----
 src/soundio/sounddevice.h            | 3 ---
 src/soundio/sounddevicenetwork.cpp   | 1 -
 src/soundio/sounddevicenetwork.h     | 1 -
 src/soundio/sounddeviceportaudio.cpp | 2 --
 src/soundio/sounddeviceportaudio.h   | 2 +-
 src/soundio/soundmanager.cpp         | 4 ----
 src/soundio/soundmanager.h           | 7 -------
 src/soundio/soundmanagerconfig.h     | 1 -
 src/soundio/soundmanagerutil.h       | 1 -
 10 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/src/soundio/sounddevice.cpp b/src/soundio/sounddevice.cpp
index 20842a3b98b..45832f41af5 100644
--- a/src/soundio/sounddevice.cpp
+++ b/src/soundio/sounddevice.cpp
@@ -1,9 +1,5 @@
 #include "soundio/sounddevice.h"
 
-#include <QtDebug>
-#include <cstring> // for memcpy and strcmp
-
-#include "soundio/soundmanager.h"
 #include "soundio/soundmanagerutil.h"
 #include "util/debug.h"
 #include "util/defs.h"
diff --git a/src/soundio/sounddevice.h b/src/soundio/sounddevice.h
index 98343faab42..254c7c621e3 100644
--- a/src/soundio/sounddevice.h
+++ b/src/soundio/sounddevice.h
@@ -8,10 +8,7 @@
 #include "soundio/soundmanagerutil.h"
 #include "util/types.h"
 
-class SoundDevice;
 class SoundManager;
-class AudioOutput;
-class AudioInput;
 class AudioOutputBuffer;
 class AudioInputBuffer;
 
diff --git a/src/soundio/sounddevicenetwork.cpp b/src/soundio/sounddevicenetwork.cpp
index 9825743b20a..4ae8bd1c965 100644
--- a/src/soundio/sounddevicenetwork.cpp
+++ b/src/soundio/sounddevicenetwork.cpp
@@ -3,7 +3,6 @@
 #include <QtDebug>
 
 #include "control/controlobject.h"
-#include "control/controlproxy.h"
 #include "engine/sidechain/enginenetworkstream.h"
 #include "float.h"
 #include "moc_sounddevicenetwork.cpp"
diff --git a/src/soundio/sounddevicenetwork.h b/src/soundio/sounddevicenetwork.h
index a47c3ea4c80..03af40b2ee6 100644
--- a/src/soundio/sounddevicenetwork.h
+++ b/src/soundio/sounddevicenetwork.h
@@ -18,7 +18,6 @@
 #define CPU_OVERLOAD_DURATION 500 // in ms
 
 class SoundManager;
-class ControlProxy;
 class EngineNetworkStream;
 class SoundDeviceNetworkThread;
 
diff --git a/src/soundio/sounddeviceportaudio.cpp b/src/soundio/sounddeviceportaudio.cpp
index f553ac8efdb..4a8f5e19d59 100644
--- a/src/soundio/sounddeviceportaudio.cpp
+++ b/src/soundio/sounddeviceportaudio.cpp
@@ -7,7 +7,6 @@
 #include <QtDebug>
 
 #include "control/controlobject.h"
-#include "control/controlproxy.h"
 #include "soundio/sounddevice.h"
 #include "soundio/soundmanager.h"
 #include "soundio/soundmanagerutil.h"
@@ -18,7 +17,6 @@
 #include "util/sample.h"
 #include "util/timer.h"
 #include "util/trace.h"
-#include "vinylcontrol/defs_vinylcontrol.h"
 #include "waveform/visualplayposition.h"
 
 #ifdef PA_USE_ALSA
diff --git a/src/soundio/sounddeviceportaudio.h b/src/soundio/sounddeviceportaudio.h
index 3cbf8de9d40..077dbc9ca13 100644
--- a/src/soundio/sounddeviceportaudio.h
+++ b/src/soundio/sounddeviceportaudio.h
@@ -8,10 +8,10 @@
 #include "control/pollingcontrolproxy.h"
 #include "soundio/sounddevice.h"
 #include "util/duration.h"
+#include "util/fifo.h"
 #include "util/performancetimer.h"
 
 class SoundManager;
-class ControlProxy;
 
 class SoundDevicePortAudio : public SoundDevice {
   public:
diff --git a/src/soundio/soundmanager.cpp b/src/soundio/soundmanager.cpp
index 6188806be9f..b27cd174854 100644
--- a/src/soundio/soundmanager.cpp
+++ b/src/soundio/soundmanager.cpp
@@ -4,15 +4,11 @@
 
 #include <QLibrary>
 #include <QThread>
-#include <QtDebug>
 #include <cstring> // for memcpy and strcmp
 
 #include "control/controlobject.h"
-#include "control/controlproxy.h"
-#include "engine/enginebuffer.h"
 #include "engine/enginemixer.h"
 #include "engine/sidechain/enginenetworkstream.h"
-#include "engine/sidechain/enginesidechain.h"
 #include "moc_soundmanager.cpp"
 #include "soundio/sounddevice.h"
 #include "soundio/sounddevicenetwork.h"
diff --git a/src/soundio/soundmanager.h b/src/soundio/soundmanager.h
index 61a343fb1e6..28bf680fc2a 100644
--- a/src/soundio/soundmanager.h
+++ b/src/soundio/soundmanager.h
@@ -5,7 +5,6 @@
 #include <QObject>
 #include <QSharedPointer>
 #include <QString>
-#include <memory>
 
 #include "audio/types.h"
 #include "control/pollingcontrolproxy.h"
@@ -17,13 +16,7 @@
 #include "util/types.h"
 
 class EngineMixer;
-class AudioOutput;
-class AudioInput;
-class AudioSource;
-class AudioDestination;
 class ControlObject;
-class ControlProxy;
-class SoundDeviceNotFound;
 
 #define MIXXX_PORTAUDIO_JACK_STRING "JACK Audio Connection Kit"
 #define MIXXX_PORTAUDIO_ALSA_STRING "ALSA"
diff --git a/src/soundio/soundmanagerconfig.h b/src/soundio/soundmanagerconfig.h
index 2a5eba5c3cc..90ba1131c36 100644
--- a/src/soundio/soundmanagerconfig.h
+++ b/src/soundio/soundmanagerconfig.h
@@ -10,7 +10,6 @@
 
 #include "soundio/soundmanagerutil.h"
 
-class SoundDevice;
 class SoundManager;
 
 class SoundManagerConfig {
diff --git a/src/soundio/soundmanagerutil.h b/src/soundio/soundmanagerutil.h
index a0fa1ce7566..78cd146b175 100644
--- a/src/soundio/soundmanagerutil.h
+++ b/src/soundio/soundmanagerutil.h
@@ -6,7 +6,6 @@
 #include <QtDebug>
 
 #include "util/compatibility/qhash.h"
-#include "util/fifo.h"
 #include "util/types.h"
 
 /// Describes a group of channels, typically a pair for stereo sound in Mixxx.

From f8cd0da57e4098b047e37980ad431aa22d655e73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Fri, 13 Oct 2023 07:26:16 +0200
Subject: [PATCH 232/388] Improve skin headers

---
 src/skin/legacy/colorschemeparser.cpp | 1 -
 src/skin/legacy/imgloader.cpp         | 7 +++----
 src/skin/legacy/launchimage.cpp       | 2 --
 src/skin/legacy/legacyskin.h          | 5 +++--
 src/skin/legacy/legacyskinparser.cpp  | 3 ---
 src/skin/legacy/pixmapsource.cpp      | 4 ++--
 src/skin/legacy/skincontext.cpp       | 6 ++----
 src/skin/skinloader.cpp               | 6 ------
 src/skin/skinloader.h                 | 2 +-
 src/util/battery/batterylinux.cpp     | 2 --
 10 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/src/skin/legacy/colorschemeparser.cpp b/src/skin/legacy/colorschemeparser.cpp
index e2e58d56f33..363919344bf 100644
--- a/src/skin/legacy/colorschemeparser.cpp
+++ b/src/skin/legacy/colorschemeparser.cpp
@@ -3,7 +3,6 @@
 #include "widget/wpixmapstore.h"
 #include "widget/wimagestore.h"
 #include "widget/wskincolor.h"
-#include "widget/wwidget.h"
 #include "util/xml.h"
 #include "skin/legacy/imgsource.h"
 #include "skin/legacy/imgloader.h"
diff --git a/src/skin/legacy/imgloader.cpp b/src/skin/legacy/imgloader.cpp
index 439ec6722f4..e3cada529bf 100644
--- a/src/skin/legacy/imgloader.cpp
+++ b/src/skin/legacy/imgloader.cpp
@@ -1,8 +1,7 @@
-#include <QImageReader>
-#include <QFileInfo>
-
 #include "imgloader.h"
-#include "widget/wwidget.h"
+
+#include <QFileInfo>
+#include <QImageReader>
 
 ImgLoader::ImgLoader() {
 }
diff --git a/src/skin/legacy/launchimage.cpp b/src/skin/legacy/launchimage.cpp
index 5e09b8d90c0..ddef7b74a50 100644
--- a/src/skin/legacy/launchimage.cpp
+++ b/src/skin/legacy/launchimage.cpp
@@ -1,7 +1,5 @@
 #include "skin/legacy/launchimage.h"
 
-#include <util/assert.h>
-
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QPainter>
diff --git a/src/skin/legacy/legacyskin.h b/src/skin/legacy/legacyskin.h
index bd011813cd9..b2c5c128224 100644
--- a/src/skin/legacy/legacyskin.h
+++ b/src/skin/legacy/legacyskin.h
@@ -1,14 +1,15 @@
 #pragma once
 
-#include <QDir>
 #include <QFileInfo>
 #include <QList>
 #include <QPixmap>
-#include <QScreen>
 #include <QString>
 
 #include "skin/skin.h"
 
+class QScreen;
+class QDir;
+
 namespace mixxx {
 namespace skin {
 namespace legacy {
diff --git a/src/skin/legacy/legacyskinparser.cpp b/src/skin/legacy/legacyskinparser.cpp
index 17ba2f5d334..0f6acbabc43 100644
--- a/src/skin/legacy/legacyskinparser.cpp
+++ b/src/skin/legacy/legacyskinparser.cpp
@@ -10,18 +10,15 @@
 #include <QtGlobal>
 
 #include "control/controlobject.h"
-#include "control/controlproxy.h"
 #include "controllers/controllerlearningeventfilter.h"
 #include "controllers/controllermanager.h"
 #include "controllers/keyboard/keyboardeventfilter.h"
-#include "effects/effectsmanager.h"
 #include "library/basetracktablemodel.h"
 #include "library/library.h"
 #include "library/library_prefs.h"
 #include "mixer/basetrackplayer.h"
 #include "mixer/playermanager.h"
 #include "moc_legacyskinparser.cpp"
-#include "recording/recordingmanager.h"
 #include "skin/legacy/colorschemeparser.h"
 #include "skin/legacy/launchimage.h"
 #include "skin/legacy/skincontext.h"
diff --git a/src/skin/legacy/pixmapsource.cpp b/src/skin/legacy/pixmapsource.cpp
index 8b8cb698f3f..f24b33ead68 100644
--- a/src/skin/legacy/pixmapsource.cpp
+++ b/src/skin/legacy/pixmapsource.cpp
@@ -1,7 +1,7 @@
-#include <QtDebug>
+#include "skin/legacy/pixmapsource.h"
+
 #include <QCryptographicHash>
 
-#include "skin/legacy/pixmapsource.h"
 #include "util/assert.h"
 
 PixmapSource::PixmapSource()
diff --git a/src/skin/legacy/skincontext.cpp b/src/skin/legacy/skincontext.cpp
index 06c89681952..1ad9d1c67a7 100644
--- a/src/skin/legacy/skincontext.cpp
+++ b/src/skin/legacy/skincontext.cpp
@@ -1,9 +1,7 @@
+#include "skin/legacy/skincontext.h"
+
 #include <QtDebug>
-#include <QStringList>
-#include <QAction>
 
-#include "skin/legacy/skincontext.h"
-#include "util/cmdlineargs.h"
 #include "util/math.h"
 
 SkinContext::SkinContext(UserSettingsPointer pConfig,
diff --git a/src/skin/skinloader.cpp b/src/skin/skinloader.cpp
index 80b115dc059..ff344c9127d 100644
--- a/src/skin/skinloader.cpp
+++ b/src/skin/skinloader.cpp
@@ -1,24 +1,18 @@
 #include "skin/skinloader.h"
 
-#include <QApplication>
 #include <QDir>
 #include <QString>
 #include <QtDebug>
 
 #include "control/controlproxy.h"
 #include "control/controlpushbutton.h"
-#include "controllers/controllermanager.h"
-#include "effects/effectsmanager.h"
-#include "library/library.h"
 #include "mixer/playermanager.h"
 #include "moc_skinloader.cpp"
-#include "recording/recordingmanager.h"
 #include "skin/legacy/launchimage.h"
 #include "skin/legacy/legacyskin.h"
 #include "skin/legacy/legacyskinparser.h"
 #include "util/debug.h"
 #include "util/timer.h"
-#include "vinylcontrol/vinylcontrolmanager.h"
 
 namespace mixxx {
 namespace skin {
diff --git a/src/skin/skinloader.h b/src/skin/skinloader.h
index 544ecf07294..d306204fca7 100644
--- a/src/skin/skinloader.h
+++ b/src/skin/skinloader.h
@@ -4,7 +4,6 @@
 #include <QList>
 #include <QObject>
 #include <QSet>
-#include <QWidget>
 
 #include "preferences/usersettings.h"
 #include "skin/skin.h"
@@ -12,6 +11,7 @@
 
 class ControlProxy;
 class ControlPushButton;
+class QWidget;
 
 namespace mixxx {
 namespace skin {
diff --git a/src/util/battery/batterylinux.cpp b/src/util/battery/batterylinux.cpp
index 5ae4fa897bf..15f899975ae 100644
--- a/src/util/battery/batterylinux.cpp
+++ b/src/util/battery/batterylinux.cpp
@@ -4,8 +4,6 @@
 #undef signals
 #include <upower.h>
 
-#include <QtDebug>
-
 #include "moc_batterylinux.cpp"
 
 BatteryLinux::BatteryLinux(QObject* pParent)

From d22e4018e6ddea034d519273149ede3e31a7612e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sun, 29 Oct 2023 09:16:01 +0100
Subject: [PATCH 233/388] Improve headers of recording classes

---
 src/recording/recordingmanager.cpp | 3 +--
 src/recording/recordingmanager.h   | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/recording/recordingmanager.cpp b/src/recording/recordingmanager.cpp
index e42dfa9b3bd..5f461158ef3 100644
--- a/src/recording/recordingmanager.cpp
+++ b/src/recording/recordingmanager.cpp
@@ -1,12 +1,11 @@
 #include "recording/recordingmanager.h"
 
+#include <QDateTime>
 #include <QDir>
 #include <QMessageBox>
 #include <QMutex>
 #include <QStorageInfo>
-#include <climits>
 
-#include "control/controlproxy.h"
 #include "control/controlpushbutton.h"
 #include "engine/enginemixer.h"
 #include "engine/sidechain/enginerecord.h"
diff --git a/src/recording/recordingmanager.h b/src/recording/recordingmanager.h
index 353320543b3..918396e4e65 100644
--- a/src/recording/recordingmanager.h
+++ b/src/recording/recordingmanager.h
@@ -1,18 +1,16 @@
 #pragma once
 
-#include <QDateTime>
-#include <QList>
 #include <QObject>
 #include <QString>
+#include <memory>
 
 #include "control/controlobject.h"
-#include "encoder/encoder.h"
 #include "preferences/usersettings.h"
-#include "recording/defs_recording.h"
 
 class EngineMixer;
 class ControlPushButton;
 class ControlProxy;
+class QDateTime;
 
 /// The RecordingManager is a central class and manages
 /// the recording feature of Mixxx.

From 36225bdec8bacadea451c2bfd114fc09c4c17de4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Mon, 6 Nov 2023 07:54:44 +0100
Subject: [PATCH 234/388] Improve header of preferences

---
 src/controllers/dlgprefcontroller.cpp        |  1 +
 src/controllers/dlgprefcontrollers.cpp       |  1 +
 src/preferences/colorpaletteeditor.cpp       |  4 +--
 src/preferences/colorpaletteeditor.h         |  9 +++---
 src/preferences/colorpaletteeditormodel.h    |  1 +
 src/preferences/dialog/dlgprefautodj.h       |  4 +--
 src/preferences/dialog/dlgprefbeats.cpp      |  1 -
 src/preferences/dialog/dlgprefbeats.h        |  3 +-
 src/preferences/dialog/dlgprefcolors.cpp     |  8 ++----
 src/preferences/dialog/dlgprefcolors.h       |  5 +---
 src/preferences/dialog/dlgprefdeck.cpp       |  8 ------
 src/preferences/dialog/dlgprefdeck.h         |  3 +-
 src/preferences/dialog/dlgprefeffects.cpp    |  4 +--
 src/preferences/dialog/dlgprefeffects.h      |  5 ++--
 src/preferences/dialog/dlgpreferencepage.cpp |  1 -
 src/preferences/dialog/dlgpreferencepage.h   |  1 -
 src/preferences/dialog/dlgpreferences.cpp    | 12 +++-----
 src/preferences/dialog/dlgpreferences.h      | 29 ++------------------
 src/preferences/dialog/dlgprefinterface.cpp  |  3 --
 src/preferences/dialog/dlgprefinterface.h    |  7 +----
 src/preferences/dialog/dlgprefkey.cpp        |  5 +---
 src/preferences/dialog/dlgprefkey.h          |  5 ++--
 src/preferences/dialog/dlgpreflibrary.cpp    |  2 --
 src/preferences/dialog/dlgpreflibrary.h      |  3 +-
 src/preferences/dialog/dlgprefmixer.cpp      |  1 -
 src/preferences/dialog/dlgprefmixer.h        |  8 +++++-
 src/preferences/dialog/dlgprefmodplug.cpp    |  1 +
 src/preferences/dialog/dlgprefrecord.cpp     |  3 +-
 src/preferences/dialog/dlgprefrecord.h       |  4 +--
 src/preferences/dialog/dlgprefreplaygain.cpp |  1 -
 src/preferences/dialog/dlgprefreplaygain.h   |  3 +-
 src/preferences/dialog/dlgprefsounditem.h    |  1 -
 src/preferences/dialog/dlgprefwaveform.h     |  1 -
 src/preferences/effectmanifesttablemodel.cpp |  1 +
 src/preferences/effectmanifesttablemodel.h   |  4 +--
 src/preferences/upgrade.cpp                  |  2 --
 36 files changed, 50 insertions(+), 105 deletions(-)

diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
index 42e7e0de1dc..fc739b7d7ea 100644
--- a/src/controllers/dlgprefcontroller.cpp
+++ b/src/controllers/dlgprefcontroller.cpp
@@ -18,6 +18,7 @@
 #include "defs_urls.h"
 #include "moc_dlgprefcontroller.cpp"
 #include "preferences/usersettings.h"
+#include "util/string.h"
 #include "util/versionstore.h"
 
 namespace {
diff --git a/src/controllers/dlgprefcontrollers.cpp b/src/controllers/dlgprefcontrollers.cpp
index a689e4f9cf5..c5f1b612611 100644
--- a/src/controllers/dlgprefcontrollers.cpp
+++ b/src/controllers/dlgprefcontrollers.cpp
@@ -8,6 +8,7 @@
 #include "defs_urls.h"
 #include "moc_dlgprefcontrollers.cpp"
 #include "preferences/dialog/dlgpreferences.h"
+#include "util/string.h"
 
 DlgPrefControllers::DlgPrefControllers(DlgPreferences* pPreferences,
         UserSettingsPointer pConfig,
diff --git a/src/preferences/colorpaletteeditor.cpp b/src/preferences/colorpaletteeditor.cpp
index 6eb1209b20d..06136a461f6 100644
--- a/src/preferences/colorpaletteeditor.cpp
+++ b/src/preferences/colorpaletteeditor.cpp
@@ -5,9 +5,9 @@
 #include <QHBoxLayout>
 #include <QHeaderView>
 #include <QLabel>
-#include <QMenu>
+#include <QLineEdit>
 #include <QMessageBox>
-#include <QStandardItemModel>
+#include <QPushButton>
 #include <QTableView>
 
 #include "moc_colorpaletteeditor.cpp"
diff --git a/src/preferences/colorpaletteeditor.h b/src/preferences/colorpaletteeditor.h
index b2dd36a0bb5..c697f5dd94a 100644
--- a/src/preferences/colorpaletteeditor.h
+++ b/src/preferences/colorpaletteeditor.h
@@ -1,15 +1,16 @@
 #pragma once
 
-#include <QComboBox>
 #include <QDialog>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QTableView>
 
 #include "preferences/colorpaletteeditormodel.h"
 #include "preferences/usersettings.h"
 #include "util/parented_ptr.h"
 
+class QLineEdit;
+class QPushButton;
+class QTableView;
+class QItemSelection;
+
 // Widget for viewing, adding, editing and removing color palettes that can be
 // used for track/hotcue colors. Used by the Edit buttons in DlgPrefColors.
 class ColorPaletteEditor : public QDialog {
diff --git a/src/preferences/colorpaletteeditormodel.h b/src/preferences/colorpaletteeditormodel.h
index d57f7ace10e..e0159460de4 100644
--- a/src/preferences/colorpaletteeditormodel.h
+++ b/src/preferences/colorpaletteeditormodel.h
@@ -1,4 +1,5 @@
 #pragma once
+
 #include <QStandardItem>
 #include <QStandardItemModel>
 #include <QVariant>
diff --git a/src/preferences/dialog/dlgprefautodj.h b/src/preferences/dialog/dlgprefautodj.h
index f7c324ae05c..1822ed6a1b4 100644
--- a/src/preferences/dialog/dlgprefautodj.h
+++ b/src/preferences/dialog/dlgprefautodj.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <QWidget>
-
 #include "preferences/dialog/dlgpreferencepage.h"
 #include "preferences/dialog/ui_dlgprefautodjdlg.h"
 #include "preferences/usersettings.h"
 
+class QWidget;
+
 class DlgPrefAutoDJ : public DlgPreferencePage, public Ui::DlgPrefAutoDJDlg {
     Q_OBJECT
   public:
diff --git a/src/preferences/dialog/dlgprefbeats.cpp b/src/preferences/dialog/dlgprefbeats.cpp
index e4684e4d8cb..e2910464262 100644
--- a/src/preferences/dialog/dlgprefbeats.cpp
+++ b/src/preferences/dialog/dlgprefbeats.cpp
@@ -1,7 +1,6 @@
 #include "preferences/dialog/dlgprefbeats.h"
 
 #include "analyzer/analyzerbeats.h"
-#include "control/controlobject.h"
 #include "defs_urls.h"
 #include "moc_dlgprefbeats.cpp"
 
diff --git a/src/preferences/dialog/dlgprefbeats.h b/src/preferences/dialog/dlgprefbeats.h
index 783df9a0c1a..b63f56c5b90 100644
--- a/src/preferences/dialog/dlgprefbeats.h
+++ b/src/preferences/dialog/dlgprefbeats.h
@@ -2,7 +2,6 @@
 
 #include <QList>
 #include <QString>
-#include <QWidget>
 
 #include "analyzer/plugins/analyzerplugin.h"
 #include "preferences/beatdetectionsettings.h"
@@ -10,6 +9,8 @@
 #include "preferences/dialog/ui_dlgprefbeatsdlg.h"
 #include "preferences/usersettings.h"
 
+class QWidget;
+
 class DlgPrefBeats : public DlgPreferencePage, public Ui::DlgBeatsDlg {
     Q_OBJECT
   public:
diff --git a/src/preferences/dialog/dlgprefcolors.cpp b/src/preferences/dialog/dlgprefcolors.cpp
index 7be1ae13a96..134478c2225 100644
--- a/src/preferences/dialog/dlgprefcolors.cpp
+++ b/src/preferences/dialog/dlgprefcolors.cpp
@@ -1,18 +1,16 @@
 #include "preferences/dialog/dlgprefcolors.h"
 
-#include <QColorDialog>
+#include <QLineEdit>
 #include <QPainter>
-#include <QStandardItemModel>
-#include <QtDebug>
+#include <QTableView>
 
-#include "control/controlobject.h"
 #include "dialog/dlgreplacecuecolor.h"
 #include "library/library.h"
 #include "library/trackcollection.h"
 #include "moc_dlgprefcolors.cpp"
+#include "preferences/colorpaletteeditor.h"
 #include "util/color/predefinedcolorpalettes.h"
 #include "util/math.h"
-#include "util/memory.h"
 
 namespace {
 
diff --git a/src/preferences/dialog/dlgprefcolors.h b/src/preferences/dialog/dlgprefcolors.h
index 2196c3d0377..24c80202c18 100644
--- a/src/preferences/dialog/dlgprefcolors.h
+++ b/src/preferences/dialog/dlgprefcolors.h
@@ -1,14 +1,11 @@
 #pragma once
 
-#include <QWidget>
+#include <memory>
 
-#include "control/controlproxy.h"
-#include "preferences/colorpaletteeditor.h"
 #include "preferences/colorpalettesettings.h"
 #include "preferences/dialog/dlgpreferencepage.h"
 #include "preferences/dialog/ui_dlgprefcolorsdlg.h"
 #include "preferences/usersettings.h"
-#include "util/parented_ptr.h"
 
 class DlgReplaceCueColor;
 class Library;
diff --git a/src/preferences/dialog/dlgprefdeck.cpp b/src/preferences/dialog/dlgprefdeck.cpp
index b41bcc4e50c..752e5cb8297 100644
--- a/src/preferences/dialog/dlgprefdeck.cpp
+++ b/src/preferences/dialog/dlgprefdeck.cpp
@@ -1,24 +1,16 @@
 #include "preferences/dialog/dlgprefdeck.h"
 
-#include <QDir>
 #include <QDoubleSpinBox>
-#include <QList>
-#include <QLocale>
-#include <QToolTip>
-#include <QWidget>
 
 #include "control/controlobject.h"
 #include "control/controlproxy.h"
 #include "defs_urls.h"
 #include "engine/controls/ratecontrol.h"
-#include "engine/enginebuffer.h"
 #include "mixer/basetrackplayer.h"
-#include "mixer/playerinfo.h"
 #include "mixer/playermanager.h"
 #include "moc_dlgprefdeck.cpp"
 #include "preferences/usersettings.h"
 #include "util/duration.h"
-#include "widget/wnumberpos.h"
 
 namespace {
 constexpr int kDefaultRateRangePercent = 8;
diff --git a/src/preferences/dialog/dlgprefdeck.h b/src/preferences/dialog/dlgprefdeck.h
index 6d6a018ecd3..df64bd7af98 100644
--- a/src/preferences/dialog/dlgprefdeck.h
+++ b/src/preferences/dialog/dlgprefdeck.h
@@ -1,11 +1,9 @@
 #pragma once
 
-#include <QWidget>
 #include <memory>
 
 #include "engine/controls/cuecontrol.h"
 #include "engine/controls/ratecontrol.h"
-#include "preferences/constants.h"
 #include "preferences/dialog/dlgpreferencepage.h"
 #include "preferences/dialog/ui_dlgprefdeckdlg.h"
 #include "preferences/usersettings.h"
@@ -13,6 +11,7 @@
 
 class ControlProxy;
 class ControlObject;
+class QWidget;
 
 namespace {
 constexpr bool kDefaultCloneDeckOnLoad = true;
diff --git a/src/preferences/dialog/dlgprefeffects.cpp b/src/preferences/dialog/dlgprefeffects.cpp
index 20fd4ce25be..e62d7fdad04 100644
--- a/src/preferences/dialog/dlgprefeffects.cpp
+++ b/src/preferences/dialog/dlgprefeffects.cpp
@@ -1,7 +1,6 @@
 #include "preferences/dialog/dlgprefeffects.h"
 
-#include <QDropEvent>
-#include <QMimeData>
+#include <QFocusEvent>
 
 #include "effects/backends/effectmanifest.h"
 #include "effects/backends/effectsbackend.h"
@@ -9,6 +8,7 @@
 #include "effects/visibleeffectslist.h"
 #include "moc_dlgprefeffects.cpp"
 #include "preferences/effectchainpresetlistmodel.h"
+#include "preferences/effectmanifesttablemodel.h"
 
 DlgPrefEffects::DlgPrefEffects(QWidget* pParent,
         UserSettingsPointer pConfig,
diff --git a/src/preferences/dialog/dlgprefeffects.h b/src/preferences/dialog/dlgprefeffects.h
index d21824d3c13..e8f13c1f1ff 100644
--- a/src/preferences/dialog/dlgprefeffects.h
+++ b/src/preferences/dialog/dlgprefeffects.h
@@ -1,14 +1,13 @@
 #pragma once
 
-#include <QButtonGroup>
-
+#include "effects/defs.h"
 #include "preferences/dialog/dlgpreferencepage.h"
 #include "preferences/dialog/ui_dlgprefeffectsdlg.h"
-#include "preferences/effectmanifesttablemodel.h"
 #include "preferences/usersettings.h"
 #include "util/parented_ptr.h"
 
 class EffectsManager;
+class EffectManifestTableModel;
 
 class DlgPrefEffects : public DlgPreferencePage, public Ui::DlgPrefEffectsDlg {
     Q_OBJECT
diff --git a/src/preferences/dialog/dlgpreferencepage.cpp b/src/preferences/dialog/dlgpreferencepage.cpp
index 7a1d7aabae4..71728f60545 100644
--- a/src/preferences/dialog/dlgpreferencepage.cpp
+++ b/src/preferences/dialog/dlgpreferencepage.cpp
@@ -8,7 +8,6 @@
 #include <QSlider>
 #include <QSpinBox>
 
-#include "defs_urls.h"
 #include "moc_dlgpreferencepage.cpp"
 
 DlgPreferencePage::DlgPreferencePage(QWidget* pParent)
diff --git a/src/preferences/dialog/dlgpreferencepage.h b/src/preferences/dialog/dlgpreferencepage.h
index a513dffccab..2bb85d91ea0 100644
--- a/src/preferences/dialog/dlgpreferencepage.h
+++ b/src/preferences/dialog/dlgpreferencepage.h
@@ -5,7 +5,6 @@
 #include <QWidget>
 
 #include "util/color/color.h"
-#include "util/string.h"
 
 /// Interface that all preference pages have to implement.
 class DlgPreferencePage : public QWidget {
diff --git a/src/preferences/dialog/dlgpreferences.cpp b/src/preferences/dialog/dlgpreferences.cpp
index 2ac93ac45aa..a23eac53d88 100644
--- a/src/preferences/dialog/dlgpreferences.cpp
+++ b/src/preferences/dialog/dlgpreferences.cpp
@@ -7,13 +7,15 @@
 #include <QResizeEvent>
 #include <QScreen>
 #include <QScrollArea>
-#include <QTabBar>
-#include <QTabWidget>
 
 #include "controllers/dlgprefcontrollers.h"
+#include "library/library.h"
+#include "library/trackcollectionmanager.h"
 #include "moc_dlgpreferences.cpp"
 #include "preferences/dialog/dlgpreflibrary.h"
 #include "preferences/dialog/dlgprefsound.h"
+#include "util/color/color.h"
+#include "util/widgethelper.h"
 
 #ifdef __VINYLCONTROL__
 #include "preferences/dialog/dlgprefvinyl.h"
@@ -42,12 +44,6 @@
 #include "preferences/dialog/dlgprefmodplug.h"
 #endif // __MODPLUG__
 
-#include "controllers/controllermanager.h"
-#include "library/library.h"
-#include "library/trackcollectionmanager.h"
-#include "util/color/color.h"
-#include "util/widgethelper.h"
-
 #ifdef __APPLE__
 #include "util/darkappearance.h"
 #endif
diff --git a/src/preferences/dialog/dlgpreferences.h b/src/preferences/dialog/dlgpreferences.h
index 4904d231492..c5412839d98 100644
--- a/src/preferences/dialog/dlgpreferences.h
+++ b/src/preferences/dialog/dlgpreferences.h
@@ -15,42 +15,17 @@
 #include "preferences/usersettings.h"
 
 class SoundManager;
-class DlgPrefSound;
-class DlgPrefLibrary;
-class DlgPrefController;
-class DlgPrefControllers;
-#ifdef __VINYLCONTROL__
-class DlgPrefVinyl;
-#endif // __VINYLCONTROL__
-class DlgPrefInterface;
-class DlgPrefWaveform;
-class DlgPrefDeck;
-class DlgPrefColors;
-class DlgPrefEffects;
-class DlgPrefMixer;
-class DlgPrefAutoDJ;
-#ifdef __BROADCAST__
-class DlgPrefBroadcast;
-#endif // __BROADCAST__
-class DlgPrefRecord;
-class DlgPrefBeats;
-class DlgPrefKey;
-class DlgPrefReplayGain;
-class LV2Backend;
 class ControllerManager;
 class EffectsManager;
-class PlayerManager;
 class Library;
 class VinylControlManager;
-#ifdef __MODPLUG__
-class DlgPrefModplug;
-#endif // __MODPLUG__
+class DlgPrefControllers;
 
 namespace mixxx {
 class ScreensaverManager;
 namespace skin {
 class SkinLoader;
-}
+} // namespace skin
 } // namespace mixxx
 
 class DlgPreferences : public QDialog, public Ui::DlgPreferencesDlg {
diff --git a/src/preferences/dialog/dlgprefinterface.cpp b/src/preferences/dialog/dlgprefinterface.cpp
index 4b17c387241..9148b414c37 100644
--- a/src/preferences/dialog/dlgprefinterface.cpp
+++ b/src/preferences/dialog/dlgprefinterface.cpp
@@ -1,12 +1,9 @@
 #include "preferences/dialog/dlgprefinterface.h"
 
 #include <QDir>
-#include <QDoubleSpinBox>
 #include <QList>
 #include <QLocale>
 #include <QScreen>
-#include <QToolTip>
-#include <QWidget>
 
 #include "control/controlobject.h"
 #include "control/controlproxy.h"
diff --git a/src/preferences/dialog/dlgprefinterface.h b/src/preferences/dialog/dlgprefinterface.h
index 004e0759e8b..57dbe29abd9 100644
--- a/src/preferences/dialog/dlgprefinterface.h
+++ b/src/preferences/dialog/dlgprefinterface.h
@@ -1,9 +1,7 @@
 #pragma once
 
 #include <QMap>
-#include <QWidget>
 #include <memory>
-#include <optional>
 
 #include "preferences/constants.h"
 #include "preferences/dialog/dlgpreferencepage.h"
@@ -11,11 +9,8 @@
 #include "preferences/usersettings.h"
 #include "skin/skin.h"
 
-class ControlProxy;
-class ControlPotmeter;
-class PlayerManager;
-class MixxxMainWindow;
 class ControlObject;
+class QWidget;
 
 namespace mixxx {
 class ScreensaverManager;
diff --git a/src/preferences/dialog/dlgprefkey.cpp b/src/preferences/dialog/dlgprefkey.cpp
index 901a9544bc0..3337e88e4b0 100644
--- a/src/preferences/dialog/dlgprefkey.cpp
+++ b/src/preferences/dialog/dlgprefkey.cpp
@@ -1,13 +1,10 @@
 #include "preferences/dialog/dlgprefkey.h"
 
-#include <QLineEdit>
-#include <QMessageBox>
-
 #include "analyzer/analyzerkey.h"
 #include "control/controlproxy.h"
+#include "defs_urls.h"
 #include "library/library_prefs.h"
 #include "moc_dlgprefkey.cpp"
-#include "util/xml.h"
 
 DlgPrefKey::DlgPrefKey(QWidget* parent, UserSettingsPointer pConfig)
         : DlgPreferencePage(parent),
diff --git a/src/preferences/dialog/dlgprefkey.h b/src/preferences/dialog/dlgprefkey.h
index fa541a6533e..42edc479e2b 100644
--- a/src/preferences/dialog/dlgprefkey.h
+++ b/src/preferences/dialog/dlgprefkey.h
@@ -2,17 +2,16 @@
 
 #include <QList>
 #include <QMap>
-#include <QWidget>
 
 #include "analyzer/plugins/analyzerplugin.h"
-#include "control/controlproxy.h"
-#include "defs_urls.h"
 #include "preferences/dialog/dlgpreferencepage.h"
 #include "preferences/dialog/ui_dlgprefkeydlg.h"
 #include "preferences/keydetectionsettings.h"
 #include "preferences/usersettings.h"
 #include "track/keyutils.h"
 
+class QWidget;
+
 class DlgPrefKey : public DlgPreferencePage, Ui::DlgPrefKeyDlg {
     Q_OBJECT
   public:
diff --git a/src/preferences/dialog/dlgpreflibrary.cpp b/src/preferences/dialog/dlgpreflibrary.cpp
index 29a04de5bdb..e7880323be6 100644
--- a/src/preferences/dialog/dlgpreflibrary.cpp
+++ b/src/preferences/dialog/dlgpreflibrary.cpp
@@ -8,7 +8,6 @@
 #include <QFontMetrics>
 #include <QMessageBox>
 #include <QStandardPaths>
-#include <QStringList>
 #include <QUrl>
 
 #include "defs_urls.h"
@@ -19,7 +18,6 @@
 #include "library/trackcollection.h"
 #include "library/trackcollectionmanager.h"
 #include "moc_dlgpreflibrary.cpp"
-#include "sources/soundsourceproxy.h"
 #include "widget/wsearchlineedit.h"
 
 using namespace mixxx::library::prefs;
diff --git a/src/preferences/dialog/dlgpreflibrary.h b/src/preferences/dialog/dlgpreflibrary.h
index 08fd1ade196..ccb55cc95ad 100644
--- a/src/preferences/dialog/dlgpreflibrary.h
+++ b/src/preferences/dialog/dlgpreflibrary.h
@@ -2,7 +2,6 @@
 
 #include <QFont>
 #include <QStandardItemModel>
-#include <QWidget>
 #include <memory>
 
 #include "library/library_decl.h"
@@ -10,6 +9,8 @@
 #include "preferences/dialog/ui_dlgpreflibrarydlg.h"
 #include "preferences/usersettings.h"
 
+class QWidget;
+
 class DlgPrefLibrary : public DlgPreferencePage, public Ui::DlgPrefLibraryDlg  {
     Q_OBJECT
   public:
diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index 02e9261936f..c3aa7f9a8bb 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -1,7 +1,6 @@
 #include "preferences/dialog/dlgprefmixer.h"
 
 #include <QButtonGroup>
-#include <QHBoxLayout>
 #include <QPainterPath>
 #include <QStandardItemModel>
 
diff --git a/src/preferences/dialog/dlgprefmixer.h b/src/preferences/dialog/dlgprefmixer.h
index efb2c77f042..908214d3584 100644
--- a/src/preferences/dialog/dlgprefmixer.h
+++ b/src/preferences/dialog/dlgprefmixer.h
@@ -1,13 +1,19 @@
 #pragma once
 
+#include <memory>
+
 #include "control/controlproxy.h"
 #include "control/pollingcontrolproxy.h"
-#include "effects/effectsmanager.h"
+#include "effects/defs.h"
 #include "preferences/dialog/dlgpreferencepage.h"
 #include "preferences/dialog/ui_dlgprefmixerdlg.h"
 #include "preferences/usersettings.h"
 #include "util/parented_ptr.h"
 
+class QComboBox;
+class QWidget;
+class EffectsManager;
+
 class DlgPrefMixer : public DlgPreferencePage, public Ui::DlgPrefMixerDlg {
     Q_OBJECT
   public:
diff --git a/src/preferences/dialog/dlgprefmodplug.cpp b/src/preferences/dialog/dlgprefmodplug.cpp
index 1936906ea1f..a8b9c459648 100644
--- a/src/preferences/dialog/dlgprefmodplug.cpp
+++ b/src/preferences/dialog/dlgprefmodplug.cpp
@@ -4,6 +4,7 @@
 #include "preferences/dialog/ui_dlgprefmodplugdlg.h"
 #include "preferences/usersettings.h"
 #include "sources/soundsourcemodplug.h"
+#include "util/string.h"
 
 #define kConfigKey "[Modplug]"
 
diff --git a/src/preferences/dialog/dlgprefrecord.cpp b/src/preferences/dialog/dlgprefrecord.cpp
index 3432c2cb4c3..9bc4053d6dc 100644
--- a/src/preferences/dialog/dlgprefrecord.cpp
+++ b/src/preferences/dialog/dlgprefrecord.cpp
@@ -1,10 +1,9 @@
 #include "preferences/dialog/dlgprefrecord.h"
 
 #include <QFileDialog>
+#include <QRadioButton>
 #include <QStandardPaths>
 
-#include "control/controlobject.h"
-#include "control/controlproxy.h"
 #include "encoder/encoder.h"
 #include "encoder/encodermp3settings.h"
 #include "moc_dlgprefrecord.cpp"
diff --git a/src/preferences/dialog/dlgprefrecord.h b/src/preferences/dialog/dlgprefrecord.h
index 1f2df3f647f..17c47a1ea57 100644
--- a/src/preferences/dialog/dlgprefrecord.h
+++ b/src/preferences/dialog/dlgprefrecord.h
@@ -1,8 +1,6 @@
 #pragma once
 
 #include <QButtonGroup>
-#include <QRadioButton>
-#include <QWidget>
 
 #include "encoder/encoder.h"
 #include "preferences/dialog/dlgpreferencepage.h"
@@ -11,6 +9,8 @@
 
 class ControlObject;
 class ControlProxy;
+class QRadioButton;
+class QWidget;
 
 class DlgPrefRecord : public DlgPreferencePage, public Ui::DlgPrefRecordDlg  {
     Q_OBJECT
diff --git a/src/preferences/dialog/dlgprefreplaygain.cpp b/src/preferences/dialog/dlgprefreplaygain.cpp
index 70968311817..4f750719b40 100644
--- a/src/preferences/dialog/dlgprefreplaygain.cpp
+++ b/src/preferences/dialog/dlgprefreplaygain.cpp
@@ -1,6 +1,5 @@
 #include "preferences/dialog/dlgprefreplaygain.h"
 
-#include "control/controlobject.h"
 #include "moc_dlgprefreplaygain.cpp"
 #include "util/math.h"
 
diff --git a/src/preferences/dialog/dlgprefreplaygain.h b/src/preferences/dialog/dlgprefreplaygain.h
index b96c841d6e2..88e32deb410 100644
--- a/src/preferences/dialog/dlgprefreplaygain.h
+++ b/src/preferences/dialog/dlgprefreplaygain.h
@@ -1,13 +1,14 @@
 #pragma once
 
 #include <QButtonGroup>
-#include <QWidget>
 
 #include "control/pollingcontrolproxy.h"
 #include "preferences/dialog/dlgpreferencepage.h"
 #include "preferences/dialog/ui_dlgprefreplaygaindlg.h"
 #include "preferences/replaygainsettings.h"
 
+class QWidget;
+
 class DlgPrefReplayGain: public DlgPreferencePage,
                          public Ui::DlgPrefReplayGainDlg {
     Q_OBJECT
diff --git a/src/preferences/dialog/dlgprefsounditem.h b/src/preferences/dialog/dlgprefsounditem.h
index 73a3edd2c26..9de74d7c81c 100644
--- a/src/preferences/dialog/dlgprefsounditem.h
+++ b/src/preferences/dialog/dlgprefsounditem.h
@@ -4,7 +4,6 @@
 #include "soundio/soundmanagerutil.h"
 #include "soundio/sounddevice.h"
 
-class SoundDevice;
 class SoundManagerConfig;
 
 /**
diff --git a/src/preferences/dialog/dlgprefwaveform.h b/src/preferences/dialog/dlgprefwaveform.h
index 3f4a8ed43e3..4f21b490b57 100644
--- a/src/preferences/dialog/dlgprefwaveform.h
+++ b/src/preferences/dialog/dlgprefwaveform.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <QWidget>
 #include <memory>
 
 #include "preferences/dialog/dlgpreferencepage.h"
diff --git a/src/preferences/effectmanifesttablemodel.cpp b/src/preferences/effectmanifesttablemodel.cpp
index 5a946bc7bb0..9b730e5c714 100644
--- a/src/preferences/effectmanifesttablemodel.cpp
+++ b/src/preferences/effectmanifesttablemodel.cpp
@@ -2,6 +2,7 @@
 
 #include <QMimeData>
 
+#include "effects/backends/effectmanifest.h"
 #include "effects/backends/effectsbackend.h"
 #include "effects/backends/effectsbackendmanager.h"
 #include "moc_effectmanifesttablemodel.cpp"
diff --git a/src/preferences/effectmanifesttablemodel.h b/src/preferences/effectmanifesttablemodel.h
index 0d539c67f22..7a097ebc2d5 100644
--- a/src/preferences/effectmanifesttablemodel.h
+++ b/src/preferences/effectmanifesttablemodel.h
@@ -1,11 +1,9 @@
 #pragma once
 
-#include <QAbstractItemDelegate>
 #include <QAbstractTableModel>
-#include <QMap>
 #include <QVariant>
 
-#include "effects/backends/effectmanifest.h"
+#include "effects/defs.h"
 
 /// EffectManifestTableModel represents a list of EffectManifests as a table
 /// with a column for the BackendType and a column for the effect name.
diff --git a/src/preferences/upgrade.cpp b/src/preferences/upgrade.cpp
index c03ee8b48b8..ff8b90c59bb 100644
--- a/src/preferences/upgrade.cpp
+++ b/src/preferences/upgrade.cpp
@@ -4,7 +4,6 @@
 #include <QPixmap>
 #include <QPushButton>
 #include <QScopedPointer>
-#include <QTranslator>
 #include <QVersionNumber>
 
 #include "config.h"
@@ -15,7 +14,6 @@
 #include "library/trackcollection.h"
 #include "preferences/beatdetectionsettings.h"
 #include "preferences/usersettings.h"
-#include "util/cmdlineargs.h"
 #include "util/db/dbconnectionpooled.h"
 #include "util/db/dbconnectionpooler.h"
 #include "util/math.h"

From eae5327c514249fb5803aba356ecc2bbb27b6ab9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Mon, 6 Nov 2023 07:55:22 +0100
Subject: [PATCH 235/388] fixup waveforms

---
 src/waveform/renderers/allshader/waveformrendererrgb.cpp | 1 +
 src/waveform/widgets/allshader/waveformwidget.cpp        | 1 +
 src/widget/wspinny.cpp                                   | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/src/waveform/renderers/allshader/waveformrendererrgb.cpp b/src/waveform/renderers/allshader/waveformrendererrgb.cpp
index 238587f2d28..c7ee3aad621 100644
--- a/src/waveform/renderers/allshader/waveformrendererrgb.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererrgb.cpp
@@ -3,6 +3,7 @@
 #include "track/track.h"
 #include "util/math.h"
 #include "waveform/renderers/allshader/matrixforwidgetgeometry.h"
+#include "waveform/renderers/waveformwidgetrenderer.h"
 #include "waveform/waveform.h"
 
 namespace allshader {
diff --git a/src/waveform/widgets/allshader/waveformwidget.cpp b/src/waveform/widgets/allshader/waveformwidget.cpp
index bc18dd25dc2..0a64dd964ef 100644
--- a/src/waveform/widgets/allshader/waveformwidget.cpp
+++ b/src/waveform/widgets/allshader/waveformwidget.cpp
@@ -1,6 +1,7 @@
 #include "waveform/widgets/allshader/waveformwidget.h"
 
 #include <QApplication>
+#include <QWheelEvent>
 
 #include "moc_waveformwidget.cpp"
 #include "waveform/renderers/allshader/waveformrendererabstract.h"
diff --git a/src/widget/wspinny.cpp b/src/widget/wspinny.cpp
index 651f5130793..21290921baf 100644
--- a/src/widget/wspinny.cpp
+++ b/src/widget/wspinny.cpp
@@ -1,5 +1,7 @@
 #include "widget/wspinny.h"
 
+#include <QPainter>
+
 #include "moc_wspinny.cpp"
 
 WSpinny::WSpinny(

From 910848bb0d70ccb2bad0e43095c7f40de2109dfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sun, 29 Oct 2023 15:45:06 +0100
Subject: [PATCH 236/388] Improve headers of network classes

---
 src/network/jsonwebtask.cpp | 3 ---
 src/network/networktask.cpp | 2 ++
 src/network/networktask.h   | 4 ++--
 src/network/webtask.h       | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/network/jsonwebtask.cpp b/src/network/jsonwebtask.cpp
index 961d3a05430..e1bee0b0511 100644
--- a/src/network/jsonwebtask.cpp
+++ b/src/network/jsonwebtask.cpp
@@ -1,13 +1,10 @@
 #include "network/jsonwebtask.h"
 
-#include <QMetaMethod>
 #include <QMimeDatabase>
 #include <QNetworkRequest>
-#include <QTimerEvent>
 #include <mutex> // std::once_flag
 
 #include "moc_jsonwebtask.cpp"
-#include "util/counter.h"
 #include "util/logger.h"
 #include "util/thread_affinity.h"
 
diff --git a/src/network/networktask.cpp b/src/network/networktask.cpp
index 91c7dd84898..c056fca8225 100644
--- a/src/network/networktask.cpp
+++ b/src/network/networktask.cpp
@@ -1,5 +1,7 @@
 #include "network/networktask.h"
 
+#include <QNetworkAccessManager>
+
 #include "moc_networktask.cpp"
 #include "util/counter.h"
 #include "util/logger.h"
diff --git a/src/network/networktask.h b/src/network/networktask.h
index 16156ae2f91..3816d86c587 100644
--- a/src/network/networktask.h
+++ b/src/network/networktask.h
@@ -1,13 +1,13 @@
 #pragma once
 
 #include <QMetaMethod>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
 #include <QUrl>
 
 #include "util/assert.h"
 #include "util/qt.h"
 
+class QNetworkAccessManager;
+
 namespace mixxx {
 
 namespace network {
diff --git a/src/network/webtask.h b/src/network/webtask.h
index b4dc13cc307..aca9b428819 100644
--- a/src/network/webtask.h
+++ b/src/network/webtask.h
@@ -1,9 +1,7 @@
 #pragma once
 
 #include <QMimeType>
-#include <QNetworkAccessManager>
 #include <QNetworkReply>
-#include <QPointer>
 #include <QUrl>
 
 #include "network/httpstatuscode.h"
@@ -11,6 +9,8 @@
 #include "util/optional.h"
 #include "util/performancetimer.h"
 
+class QNetworkAccessManager;
+
 namespace mixxx {
 
 namespace network {

From 24db8b6dbd6712a2929024a6252a9ffa32d6e8a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sun, 29 Oct 2023 16:13:25 +0100
Subject: [PATCH 237/388] Improve header of musicbrainz classes

---
 src/musicbrainz/crc.cpp                           | 2 +-
 src/musicbrainz/crc.h                             | 1 -
 src/musicbrainz/musicbrainzxml.cpp                | 5 ++---
 src/musicbrainz/musicbrainzxml.h                  | 5 +++--
 src/musicbrainz/web/acoustidlookuptask.cpp        | 2 +-
 src/musicbrainz/web/acoustidlookuptask.h          | 3 ++-
 src/musicbrainz/web/coverartarchiveimagetask.cpp  | 4 ----
 src/musicbrainz/web/coverartarchivelinkstask.h    | 1 -
 src/musicbrainz/web/musicbrainzrecordingstask.cpp | 2 --
 9 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/musicbrainz/crc.cpp b/src/musicbrainz/crc.cpp
index 0340f152c76..e5c2d628b4d 100644
--- a/src/musicbrainz/crc.cpp
+++ b/src/musicbrainz/crc.cpp
@@ -14,7 +14,7 @@
  *    Algorithm    = table-driven
  *****************************************************************************/
 #include "musicbrainz/crc.h"
-#include <stdint.h>
+
 #include <stdlib.h>
 
 /**
diff --git a/src/musicbrainz/crc.h b/src/musicbrainz/crc.h
index 5cf5c8d5c43..b1fe2af6b9f 100644
--- a/src/musicbrainz/crc.h
+++ b/src/musicbrainz/crc.h
@@ -15,7 +15,6 @@
  *****************************************************************************/
 #pragma once
 
-#include <stdint.h>
 #include <stdlib.h>
 
 #ifdef __cplusplus
diff --git a/src/musicbrainz/musicbrainzxml.cpp b/src/musicbrainz/musicbrainzxml.cpp
index ee440e69d52..809d0055153 100644
--- a/src/musicbrainz/musicbrainzxml.cpp
+++ b/src/musicbrainz/musicbrainzxml.cpp
@@ -1,12 +1,11 @@
 #include "musicbrainz/musicbrainzxml.h"
 
-#include <QTextStream>
+#include <QUuid>
 #include <QXmlStreamReader>
-#include <QTextCodec>
 
+#include "musicbrainz/musicbrainz.h"
 #include "util/logger.h"
 
-
 namespace mixxx {
 
 namespace musicbrainz {
diff --git a/src/musicbrainz/musicbrainzxml.h b/src/musicbrainz/musicbrainzxml.h
index 9afa7a0cfb1..7c24854edc5 100644
--- a/src/musicbrainz/musicbrainzxml.h
+++ b/src/musicbrainz/musicbrainzxml.h
@@ -2,14 +2,15 @@
 
 #include <QList>
 #include <QPair>
-#include <QXmlStreamReader>
 
-#include "musicbrainz/musicbrainz.h"
+class QXmlStreamReader;
 
 namespace mixxx {
 
 namespace musicbrainz {
 
+struct TrackRelease;
+
 struct Error final {
     Error();
     explicit Error(QXmlStreamReader& reader);
diff --git a/src/musicbrainz/web/acoustidlookuptask.cpp b/src/musicbrainz/web/acoustidlookuptask.cpp
index 9319641f754..c59b12fad98 100644
--- a/src/musicbrainz/web/acoustidlookuptask.cpp
+++ b/src/musicbrainz/web/acoustidlookuptask.cpp
@@ -2,7 +2,7 @@
 
 #include <QJsonArray>
 #include <QJsonObject>
-#include <QMetaMethod>
+#include <QUuid>
 
 #include "moc_acoustidlookuptask.cpp"
 #include "musicbrainz/gzip.h"
diff --git a/src/musicbrainz/web/acoustidlookuptask.h b/src/musicbrainz/web/acoustidlookuptask.h
index 74317b8c10f..dfebed23c48 100644
--- a/src/musicbrainz/web/acoustidlookuptask.h
+++ b/src/musicbrainz/web/acoustidlookuptask.h
@@ -2,10 +2,11 @@
 
 #include <QString>
 #include <QList>
-#include <QUuid>
 
 #include "network/jsonwebtask.h"
 
+class QUuid;
+
 namespace mixxx {
 
 class AcoustIdLookupTask : public network::JsonWebTask {
diff --git a/src/musicbrainz/web/coverartarchiveimagetask.cpp b/src/musicbrainz/web/coverartarchiveimagetask.cpp
index d041506273b..909b1451cbd 100644
--- a/src/musicbrainz/web/coverartarchiveimagetask.cpp
+++ b/src/musicbrainz/web/coverartarchiveimagetask.cpp
@@ -1,14 +1,10 @@
 #include "musicbrainz/web/coverartarchiveimagetask.h"
 
-#include <QMetaMethod>
-
-#include "defs_urls.h"
 #include "moc_coverartarchiveimagetask.cpp"
 #include "network/httpstatuscode.h"
 #include "util/assert.h"
 #include "util/logger.h"
 #include "util/thread_affinity.h"
-#include "util/versionstore.h"
 
 namespace mixxx {
 
diff --git a/src/musicbrainz/web/coverartarchivelinkstask.h b/src/musicbrainz/web/coverartarchivelinkstask.h
index 434ab699235..f0ce76034bc 100644
--- a/src/musicbrainz/web/coverartarchivelinkstask.h
+++ b/src/musicbrainz/web/coverartarchivelinkstask.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <QList>
-#include <QMap>
 #include <QString>
 #include <QUuid>
 
diff --git a/src/musicbrainz/web/musicbrainzrecordingstask.cpp b/src/musicbrainz/web/musicbrainzrecordingstask.cpp
index 5b1f9febfe7..cb83f93c8bb 100644
--- a/src/musicbrainz/web/musicbrainzrecordingstask.cpp
+++ b/src/musicbrainz/web/musicbrainzrecordingstask.cpp
@@ -1,11 +1,9 @@
 #include "musicbrainz/web/musicbrainzrecordingstask.h"
 
-#include <QMetaMethod>
 #include <QXmlStreamReader>
 
 #include "defs_urls.h"
 #include "moc_musicbrainzrecordingstask.cpp"
-#include "musicbrainz/gzip.h"
 #include "musicbrainz/musicbrainzxml.h"
 #include "network/httpstatuscode.h"
 #include "util/assert.h"

From bb71ffc4aca1bb455458adb497c3040999080b65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sun, 29 Oct 2023 16:25:57 +0100
Subject: [PATCH 238/388] Improve coreservice includes

---
 src/coreservices.cpp | 3 +--
 src/coreservices.h   | 8 ++------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/coreservices.cpp b/src/coreservices.cpp
index 5cada442658..9d1f3c4bcc9 100644
--- a/src/coreservices.cpp
+++ b/src/coreservices.cpp
@@ -2,7 +2,6 @@
 
 #include <QApplication>
 #include <QFileDialog>
-#include <QPushButton>
 #include <QStandardPaths>
 
 #ifdef __BROADCAST__
@@ -26,12 +25,12 @@
 #ifdef __MODPLUG__
 #include "preferences/dialog/dlgprefmodplug.h"
 #endif
+#include "skin/skincontrols.h"
 #include "soundio/soundmanager.h"
 #include "sources/soundsourceproxy.h"
 #include "util/db/dbconnectionpooled.h"
 #include "util/font.h"
 #include "util/logger.h"
-#include "util/screensaver.h"
 #include "util/screensavermanager.h"
 #include "util/statsmanager.h"
 #include "util/time.h"
diff --git a/src/coreservices.h b/src/coreservices.h
index 1b8e1a27936..01995d16a62 100644
--- a/src/coreservices.h
+++ b/src/coreservices.h
@@ -2,13 +2,7 @@
 
 #include <memory>
 
-#include "control/controlpushbutton.h"
-#include "preferences/configobject.h"
-#include "preferences/constants.h"
 #include "preferences/settingsmanager.h"
-#include "skin/skincontrols.h"
-#include "soundio/sounddevicestatus.h"
-#include "util/cmdlineargs.h"
 #include "util/timer.h"
 
 class QApplication;
@@ -26,6 +20,8 @@ class ControllerManager;
 class VinylControlManager;
 class TrackCollectionManager;
 class Library;
+class SkinControls;
+class ControlPushButton;
 
 namespace mixxx {
 

From a604823e908171a89a42fb3132b9b4d53a745416 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Mon, 30 Oct 2023 09:17:12 +0100
Subject: [PATCH 239/388] Improve header of mixer classes

---
 src/mixer/baseplayer.cpp       | 1 +
 src/mixer/baseplayer.h         | 2 +-
 src/mixer/basetrackplayer.cpp  | 3 ---
 src/mixer/basetrackplayer.h    | 9 +++------
 src/mixer/microphone.h         | 4 +---
 src/mixer/playerinfo.cpp       | 1 -
 src/mixer/playerinfo.h         | 1 -
 src/mixer/playermanager.cpp    | 2 ++
 src/mixer/playermanager.h      | 2 --
 src/mixer/sampler.cpp          | 1 -
 src/test/playermanagertest.cpp | 1 +
 11 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/mixer/baseplayer.cpp b/src/mixer/baseplayer.cpp
index c6514b1bd56..08d88972daa 100644
--- a/src/mixer/baseplayer.cpp
+++ b/src/mixer/baseplayer.cpp
@@ -1,5 +1,6 @@
 #include "mixer/baseplayer.h"
 
+#include "mixer/playermanager.h"
 #include "moc_baseplayer.cpp"
 
 BasePlayer::BasePlayer(PlayerManager* pParent, const QString& group)
diff --git a/src/mixer/baseplayer.h b/src/mixer/baseplayer.h
index 3b208d6586d..515da1a354d 100644
--- a/src/mixer/baseplayer.h
+++ b/src/mixer/baseplayer.h
@@ -3,7 +3,7 @@
 #include <QObject>
 #include <QString>
 
-#include "mixer/playermanager.h"
+class PlayerManager;
 
 class BasePlayer : public QObject {
     Q_OBJECT
diff --git a/src/mixer/basetrackplayer.cpp b/src/mixer/basetrackplayer.cpp
index 5b6dbf343cc..110d3058cf6 100644
--- a/src/mixer/basetrackplayer.cpp
+++ b/src/mixer/basetrackplayer.cpp
@@ -3,7 +3,6 @@
 #include <QMessageBox>
 
 #include "control/controlobject.h"
-#include "effects/effectsmanager.h"
 #include "engine/channels/enginedeck.h"
 #include "engine/controls/enginecontrol.h"
 #include "engine/engine.h"
@@ -13,13 +12,11 @@
 #include "mixer/playerinfo.h"
 #include "mixer/playermanager.h"
 #include "moc_basetrackplayer.cpp"
-#include "sources/soundsourceproxy.h"
 #include "track/track.h"
 #include "util/sandbox.h"
 #include "vinylcontrol/defs_vinylcontrol.h"
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include "waveform/renderers/waveformwidgetrenderer.h"
-#include "waveform/visualsmanager.h"
 #endif
 
 namespace {
diff --git a/src/mixer/basetrackplayer.h b/src/mixer/basetrackplayer.h
index dc0a57073f9..8a22cd9ea47 100644
--- a/src/mixer/basetrackplayer.h
+++ b/src/mixer/basetrackplayer.h
@@ -1,11 +1,6 @@
 #pragma once
 
-#include <QObject>
-#include <QScopedPointer>
-#include <QString>
-
 #include "engine/channels/enginechannel.h"
-#include "engine/channels/enginedeck.h"
 #include "mixer/baseplayer.h"
 #include "preferences/usersettings.h"
 #include "track/replaygain.h"
@@ -14,12 +9,14 @@
 #include "util/color/rgbcolor.h"
 #include "util/memory.h"
 #include "util/parented_ptr.h"
+#include "util/performancetimer.h"
 
 class EngineMixer;
 class ControlObject;
-class ControlPotmeter;
 class ControlProxy;
 class EffectsManager;
+class QString;
+class EngineDeck;
 
 constexpr int kUnreplaceDelay = 500;
 
diff --git a/src/mixer/microphone.h b/src/mixer/microphone.h
index 1475b3fd6b1..e809c426093 100644
--- a/src/mixer/microphone.h
+++ b/src/mixer/microphone.h
@@ -1,8 +1,5 @@
 #pragma once
 
-#include <QObject>
-#include <QString>
-
 #include "mixer/baseplayer.h"
 #include "util/parented_ptr.h"
 
@@ -10,6 +7,7 @@ class ControlProxy;
 class EffectsManager;
 class EngineMixer;
 class SoundManager;
+class QString;
 
 class Microphone : public BasePlayer {
     Q_OBJECT
diff --git a/src/mixer/playerinfo.cpp b/src/mixer/playerinfo.cpp
index 670a7fa39df..9ecb29913a6 100644
--- a/src/mixer/playerinfo.cpp
+++ b/src/mixer/playerinfo.cpp
@@ -1,7 +1,6 @@
 // Helper class to have easy access
 #include "mixer/playerinfo.h"
 
-#include "control/controlobject.h"
 #include "engine/channels/enginechannel.h"
 #include "engine/enginexfader.h"
 #include "mixer/playermanager.h"
diff --git a/src/mixer/playerinfo.h b/src/mixer/playerinfo.h
index c5f7369e5c4..1699c581aaf 100644
--- a/src/mixer/playerinfo.h
+++ b/src/mixer/playerinfo.h
@@ -5,7 +5,6 @@
 #include <QMap>
 #include <QMutex>
 #include <QObject>
-#include <QTimerEvent>
 
 #include "control/controlproxy.h"
 #include "track/track_decl.h"
diff --git a/src/mixer/playermanager.cpp b/src/mixer/playermanager.cpp
index db76e22eb3f..04a247e28e5 100644
--- a/src/mixer/playermanager.cpp
+++ b/src/mixer/playermanager.cpp
@@ -6,6 +6,8 @@
 #include "effects/effectsmanager.h"
 #include "engine/channels/enginedeck.h"
 #include "engine/enginemixer.h"
+#include "library/library.h"
+#include "library/trackcollectionmanager.h"
 #include "mixer/auxiliary.h"
 #include "mixer/deck.h"
 #include "mixer/microphone.h"
diff --git a/src/mixer/playermanager.h b/src/mixer/playermanager.h
index b1402098898..54dc7b0055b 100644
--- a/src/mixer/playermanager.h
+++ b/src/mixer/playermanager.h
@@ -8,8 +8,6 @@
 
 #include "analyzer/trackanalysisscheduler.h"
 #include "engine/channelhandle.h"
-#include "library/library.h"
-#include "library/trackcollectionmanager.h"
 #include "preferences/usersettings.h"
 #include "track/track_decl.h"
 #include "util/compatibility/qmutex.h"
diff --git a/src/mixer/sampler.cpp b/src/mixer/sampler.cpp
index 736f9781a7b..06121a83518 100644
--- a/src/mixer/sampler.cpp
+++ b/src/mixer/sampler.cpp
@@ -1,6 +1,5 @@
 #include "mixer/sampler.h"
 
-#include "control/controlobject.h"
 #include "moc_sampler.cpp"
 
 Sampler::Sampler(PlayerManager* pParent,
diff --git a/src/test/playermanagertest.cpp b/src/test/playermanagertest.cpp
index ef474ce01bc..5a0f5f46a46 100644
--- a/src/test/playermanagertest.cpp
+++ b/src/test/playermanagertest.cpp
@@ -4,6 +4,7 @@
 
 #include "control/controlindicatortimer.h"
 #include "database/mixxxdb.h"
+#include "engine/channels/enginedeck.h"
 #include "engine/enginebuffer.h"
 #include "engine/enginemixer.h"
 #include "mixer/basetrackplayer.h"

From c8f308d9dc639a977c6f7b39f911675dcd1bd3bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sun, 12 Nov 2023 21:56:28 +0100
Subject: [PATCH 240/388] Improve code readability

Co-authored-by: JoergAtGithub <64457745+JoergAtGithub@users.noreply.github.com>
---
 src/library/basetracktablemodel.cpp |  1 +
 src/library/coverartcache.cpp       | 15 ++++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/library/basetracktablemodel.cpp b/src/library/basetracktablemodel.cpp
index ef5d6716be4..450eb5da5c1 100644
--- a/src/library/basetracktablemodel.cpp
+++ b/src/library/basetracktablemodel.cpp
@@ -555,6 +555,7 @@ QVariant BaseTrackTableModel::composeCoverArtToolTipHtml(
             absoluteHeightOfCoverartToolTip);
     if (pixmap.isNull()) {
         // Cache miss -> Don't show a tooltip, refresh cache
+        // Height used for the width, in assumption that covers are squares
         CoverArtCache::requestUncachedCover(
                 nullptr,
                 coverInfo,
diff --git a/src/library/coverartcache.cpp b/src/library/coverartcache.cpp
index f307ed6dc23..7d3ad723872 100644
--- a/src/library/coverartcache.cpp
+++ b/src/library/coverartcache.cpp
@@ -89,18 +89,19 @@ QPixmap CoverArtCache::getCachedCover(
     QString cacheKey = pixmapCacheKey(requestedCacheKey, desiredWidth);
 
     QPixmap pixmap;
-    if (QPixmapCache::find(cacheKey, &pixmap)) {
-        if (kLogger.traceEnabled()) {
-            kLogger.trace()
-                    << "requestCover cache hit"
-                    << coverInfo;
-        }
-    } else {
+    if (!QPixmapCache::find(cacheKey, &pixmap)) {
         if (kLogger.traceEnabled()) {
             kLogger.trace()
                     << "requestCover cache miss"
                     << coverInfo;
         }
+        return QPixmap();
+    }
+
+    if (kLogger.traceEnabled()) {
+        kLogger.trace()
+                << "requestCover cache hit"
+                << coverInfo;
     }
     return pixmap;
 }

From d5c5f1c22a96f893e41e61fa5b58147f82b1320f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sun, 12 Nov 2023 22:47:04 +0100
Subject: [PATCH 241/388] Manual inline requestUncachedCoverPrivate()

---
 src/library/coverartcache.cpp | 12 ++++++++----
 src/library/coverartcache.h   | 10 +---------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/library/coverartcache.cpp b/src/library/coverartcache.cpp
index 7d3ad723872..e9575af8ace 100644
--- a/src/library/coverartcache.cpp
+++ b/src/library/coverartcache.cpp
@@ -107,9 +107,8 @@ QPixmap CoverArtCache::getCachedCover(
 }
 
 // static
-void CoverArtCache::requestUncachedCoverPrivate(
+void CoverArtCache::requestUncachedCover(
         const QObject* pRequester,
-        const TrackPointer& pTrack,
         const CoverInfo& coverInfo,
         int desiredWidth) {
     CoverArtCache* pCache = CoverArtCache::instance();
@@ -118,7 +117,7 @@ void CoverArtCache::requestUncachedCoverPrivate(
     }
     pCache->tryLoadCover(
             pRequester,
-            pTrack,
+            TrackPointer(),
             coverInfo,
             desiredWidth);
 }
@@ -131,7 +130,12 @@ void CoverArtCache::requestUncachedCover(
     VERIFY_OR_DEBUG_ASSERT(pTrack) {
         return;
     }
-    requestUncachedCoverPrivate(
+
+    CoverArtCache* pCache = CoverArtCache::instance();
+    VERIFY_OR_DEBUG_ASSERT(pCache) {
+        return;
+    }
+    pCache->tryLoadCover(
             pRequester,
             pTrack,
             pTrack->getCoverInfoWithLocation(),
diff --git a/src/library/coverartcache.h b/src/library/coverartcache.h
index 1c51c3195bb..dae92eeb598 100644
--- a/src/library/coverartcache.h
+++ b/src/library/coverartcache.h
@@ -30,9 +30,7 @@ class CoverArtCache : public QObject, public Singleton<CoverArtCache> {
     static void requestUncachedCover(
             const QObject* pRequester,
             const CoverInfo& coverInfo,
-            int desiredWidth) {
-        requestUncachedCoverPrivate(pRequester, TrackPointer(), coverInfo, desiredWidth);
-    }
+            int desiredWidth);
 
     static void requestUncachedCover(
             const QObject* pRequester,
@@ -87,12 +85,6 @@ class CoverArtCache : public QObject, public Singleton<CoverArtCache> {
             const CoverInfo& coverInfo,
             int desiredWidth = 0); // <= 0: original size
 
-    static void requestUncachedCoverPrivate(
-            const QObject* pRequester,
-            const TrackPointer& /*optional*/ pTrack,
-            const CoverInfo& coverInfo,
-            int desiredWidth);
-
     void tryLoadCover(
             const QObject* pRequester,
             const TrackPointer& pTrack,

From 8ed71094ebc5934bd96081b25251da2ff117cfd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Mon, 30 Oct 2023 09:56:16 +0100
Subject: [PATCH 242/388] Improve header of library classes

---
 src/library/analysisfeature.cpp                 |  6 +-----
 src/library/analysisfeature.h                   |  6 +-----
 src/library/autodj/autodjprocessor.cpp          |  1 +
 src/library/baseexternalplaylistmodel.cpp       |  1 +
 src/library/baseexternalplaylistmodel.h         | 10 +++-------
 src/library/baseexternaltrackmodel.h            |  6 +++---
 src/library/basetrackcache.cpp                  |  1 +
 src/library/basetracktablemodel.h               |  1 -
 src/library/bpmdelegate.cpp                     |  4 +---
 src/library/bpmdelegate.h                       |  5 +----
 src/library/colordelegate.cpp                   |  2 --
 src/library/colordelegate.h                     |  8 ++++----
 src/library/columncache.h                       |  1 -
 src/library/coverart.cpp                        |  1 -
 src/library/coverartcache.cpp                   |  3 +--
 src/library/coverartdelegate.cpp                |  2 +-
 src/library/coverartdelegate.h                  |  3 +--
 src/library/coverartutils.h                     |  6 ++----
 src/library/dao/autodjcratesdao.cpp             |  1 +
 src/library/dlghidden.cpp                       |  5 ++++-
 src/library/dlghidden.h                         |  6 ++----
 src/library/dlgmissing.cpp                      |  5 ++++-
 src/library/dlgmissing.h                        |  7 +++----
 src/library/dlgtagfetcher.cpp                   |  2 ++
 src/library/dlgtagfetcher.h                     |  8 +++++---
 src/library/dlgtrackinfo.cpp                    |  5 -----
 src/library/dlgtrackinfo.h                      | 10 ++++------
 src/library/export/coverartcopyworker.cpp       |  1 -
 src/library/export/coverartcopyworker.h         |  4 ----
 src/library/export/dlglibraryexport.cpp         |  1 +
 src/library/export/trackexportdlg.cpp           |  1 -
 src/library/export/trackexportdlg.h             |  4 ++--
 src/library/export/trackexportwizard.cpp        |  3 ---
 src/library/export/trackexportwizard.h          |  1 -
 src/library/export/trackexportworker.cpp        |  1 -
 src/library/export/trackexportworker.h          |  7 ++++---
 src/library/externaltrackcollection.cpp         |  1 +
 src/library/externaltrackcollection.h           |  5 +++--
 src/library/itunes/itunesdao.cpp                |  1 +
 src/library/itunes/itunesdao.h                  |  7 ++++---
 src/library/itunes/itunesfeature.cpp            |  6 ++----
 src/library/itunes/itunesfeature.h              |  9 ++-------
 src/library/itunes/itunesplaylistmodel.h        |  2 --
 src/library/itunes/itunesxmlimporter.cpp        | 10 +---------
 src/library/itunes/itunesxmlimporter.h          |  4 ++--
 src/library/library.cpp                         |  9 ++-------
 src/library/library.h                           |  7 +------
 src/library/librarycontrol.cpp                  |  5 +----
 src/library/librarycontrol.h                    |  2 +-
 src/library/libraryfeature.h                    |  6 +-----
 src/library/missingtablemodel.h                 |  7 ++++---
 src/library/mixxxlibraryfeature.cpp             |  3 ---
 src/library/mixxxlibraryfeature.h               |  6 +-----
 src/library/multilineeditdelegate.cpp           |  2 +-
 src/library/parser.cpp                          |  2 --
 src/library/parser.h                            |  1 -
 src/library/parsercsv.cpp                       |  1 +
 src/library/parsercsv.h                         |  3 ++-
 src/library/parserm3u.h                         |  2 --
 src/library/parserpls.cpp                       |  3 ---
 src/library/playlisttablemodel.h                |  1 -
 src/library/previewbuttondelegate.cpp           |  1 -
 src/library/previewbuttondelegate.h             |  1 +
 src/library/proxytrackmodel.cpp                 |  2 --
 src/library/recording/dlgrecording.cpp          |  7 ++-----
 src/library/recording/dlgrecording.h            |  6 ++----
 src/library/recording/recordingfeature.cpp      |  5 +----
 src/library/recording/recordingfeature.h        |  6 +-----
 src/library/rhythmbox/rhythmboxfeature.cpp      |  2 +-
 src/library/rhythmbox/rhythmboxfeature.h        |  8 ++------
 src/library/scanner/importfilestask.cpp         |  1 -
 src/library/scanner/libraryscanner.h            |  3 +--
 src/library/scanner/libraryscannerdlg.h         |  4 ++--
 .../scanner/recursivescandirectorytask.h        |  2 --
 src/library/scanner/scannertask.cpp             |  1 -
 src/library/searchquery.cpp                     |  2 +-
 src/library/searchquery.h                       |  4 +++-
 src/library/searchqueryparser.cpp               |  1 +
 src/library/searchqueryparser.h                 |  7 +++++--
 src/library/serato/seratofeature.cpp            |  7 ++-----
 src/library/serato/seratofeature.h              |  9 +++------
 src/library/serato/seratoplaylistmodel.h        |  5 ++---
 src/library/sidebarmodel.cpp                    |  4 +---
 src/library/sidebarmodel.h                      |  2 +-
 src/library/stardelegate.cpp                    |  3 +--
 src/library/stareditor.cpp                      |  4 +++-
 src/library/stareditor.h                        | 17 +++++++----------
 src/library/starrating.h                        |  1 -
 src/library/tableitemdelegate.h                 |  3 ++-
 src/library/trackcollection.cpp                 |  3 +--
 src/library/trackcollection.h                   |  2 +-
 src/library/trackcollectioniterator.h           |  2 --
 src/library/trackcollectionmanager.h            |  3 +--
 src/library/trackloader.cpp                     |  2 +-
 src/library/trackloader.h                       |  2 +-
 src/library/trackprocessing.cpp                 |  1 -
 src/library/trackset/baseplaylistfeature.cpp    |  8 ++------
 src/library/trackset/baseplaylistfeature.h      |  8 ++------
 src/library/trackset/basetracksetfeature.h      |  3 ++-
 src/library/trackset/crate/cratefeature.cpp     |  5 +----
 src/library/trackset/crate/cratefeature.h       |  8 ++++----
 .../trackset/crate/cratefeaturehelper.cpp       |  2 ++
 src/library/trackset/crate/cratefeaturehelper.h |  4 ++--
 src/library/trackset/crate/cratestorage.cpp     |  2 ++
 src/library/trackset/crate/cratestorage.h       |  6 ++++--
 src/library/trackset/crate/cratetablemodel.cpp  |  2 +-
 src/library/trackset/crate/cratetablemodel.h    |  1 -
 src/library/trackset/playlistfeature.cpp        |  5 -----
 src/library/trackset/playlistfeature.h          |  6 +-----
 src/library/trackset/setlogfeature.cpp          |  3 ---
 src/library/trackset/setlogfeature.h            |  3 +--
 src/library/treeitem.h                          |  5 +++--
 src/library/treeitemmodel.h                     |  1 -
 src/test/cratestorage_test.cpp                  |  1 +
 src/test/itunesxmlimportertest.cpp              |  1 +
 src/test/playermanagertest.cpp                  |  2 ++
 src/test/searchqueryparsertest.cpp              |  2 ++
 117 files changed, 168 insertions(+), 287 deletions(-)

diff --git a/src/library/analysisfeature.cpp b/src/library/analysisfeature.cpp
index bcc0b61e7f8..ebe954c551d 100644
--- a/src/library/analysisfeature.cpp
+++ b/src/library/analysisfeature.cpp
@@ -1,19 +1,15 @@
 #include "library/analysisfeature.h"
 
-#include <qlist.h>
-
+#include <QList>
 #include <QtDebug>
 
 #include "analyzer/analyzerscheduledtrack.h"
 #include "controllers/keyboard/keyboardeventfilter.h"
 #include "library/dlganalysis.h"
 #include "library/library.h"
-#include "library/librarytablemodel.h"
 #include "library/trackcollectionmanager.h"
 #include "moc_analysisfeature.cpp"
 #include "sources/soundsourceproxy.h"
-#include "util/debug.h"
-#include "util/dnd.h"
 #include "util/logger.h"
 #include "widget/wlibrary.h"
 
diff --git a/src/library/analysisfeature.h b/src/library/analysisfeature.h
index 1bd7bd2bea7..c568056d449 100644
--- a/src/library/analysisfeature.h
+++ b/src/library/analysisfeature.h
@@ -1,21 +1,17 @@
 #pragma once
 
-#include <QIcon>
 #include <QList>
 #include <QObject>
-#include <QStringListModel>
 #include <QUrl>
 #include <QVariant>
 
-#include "analyzer/analyzerscheduledtrack.h"
 #include "analyzer/trackanalysisscheduler.h"
-#include "library/dlganalysis.h"
 #include "library/libraryfeature.h"
 #include "library/treeitemmodel.h"
 #include "preferences/usersettings.h"
 #include "util/parented_ptr.h"
 
-class TrackCollection;
+class DlgAnalysis;
 
 class AnalysisFeature : public LibraryFeature {
     Q_OBJECT
diff --git a/src/library/autodj/autodjprocessor.cpp b/src/library/autodj/autodjprocessor.cpp
index 38051d0d11d..0128cda47d8 100644
--- a/src/library/autodj/autodjprocessor.cpp
+++ b/src/library/autodj/autodjprocessor.cpp
@@ -2,6 +2,7 @@
 
 #include "control/controlproxy.h"
 #include "control/controlpushbutton.h"
+#include "engine/channels/enginedeck.h"
 #include "engine/engine.h"
 #include "library/trackcollection.h"
 #include "mixer/basetrackplayer.h"
diff --git a/src/library/baseexternalplaylistmodel.cpp b/src/library/baseexternalplaylistmodel.cpp
index 7b11e8e88bc..f8e643c4323 100644
--- a/src/library/baseexternalplaylistmodel.cpp
+++ b/src/library/baseexternalplaylistmodel.cpp
@@ -7,6 +7,7 @@
 #include "mixer/playermanager.h"
 #include "moc_baseexternalplaylistmodel.cpp"
 #include "track/track.h"
+#include "track/track_decl.h"
 
 namespace {
 
diff --git a/src/library/baseexternalplaylistmodel.h b/src/library/baseexternalplaylistmodel.h
index 68e31b31827..6244c0d16af 100644
--- a/src/library/baseexternalplaylistmodel.h
+++ b/src/library/baseexternalplaylistmodel.h
@@ -1,17 +1,13 @@
 #pragma once
 
-#include <QItemDelegate>
-#include <QModelIndex>
 #include <QObject>
 #include <QString>
-#include <QtSql>
 
 #include "library/basesqltablemodel.h"
-#include "library/dao/playlistdao.h"
-#include "library/dao/trackdao.h"
-#include "library/librarytablemodel.h"
 #include "library/trackmodel.h"
 
+class QModelIndex;
+
 class BaseExternalPlaylistModel : public BaseSqlTableModel {
     Q_OBJECT
   public:
@@ -27,7 +23,7 @@ class BaseExternalPlaylistModel : public BaseSqlTableModel {
     TrackPointer getTrack(const QModelIndex& index) const override;
     TrackId getTrackId(const QModelIndex& index) const override;
     bool isColumnInternal(int column) override;
-    Qt::ItemFlags flags(const QModelIndex &index) const override;
+    Qt::ItemFlags flags(const QModelIndex& index) const override;
     Capabilities getCapabilities() const override;
     QString modelKey(bool noSearch) const override;
 
diff --git a/src/library/baseexternaltrackmodel.h b/src/library/baseexternaltrackmodel.h
index 859267209c5..d08828e2359 100644
--- a/src/library/baseexternaltrackmodel.h
+++ b/src/library/baseexternaltrackmodel.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include <QModelIndex>
 #include <QObject>
-#include <QString>
 
 #include "library/trackmodel.h"
 #include "library/basesqltablemodel.h"
 
 class TrackCollection;
+class QModelIndex;
+class QString;
 
 class BaseExternalTrackModel : public BaseSqlTableModel {
     Q_OBJECT
@@ -23,7 +23,7 @@ class BaseExternalTrackModel : public BaseSqlTableModel {
     TrackId getTrackId(const QModelIndex& index) const override;
     TrackPointer getTrack(const QModelIndex& index) const override;
     bool isColumnInternal(int column) override;
-    Qt::ItemFlags flags(const QModelIndex &index) const override;
+    Qt::ItemFlags flags(const QModelIndex& index) const override;
 
   private:
     TrackId doGetTrackId(const TrackPointer& pTrack) const override;
diff --git a/src/library/basetrackcache.cpp b/src/library/basetrackcache.cpp
index 68b10b9b1fa..350cc1faf56 100644
--- a/src/library/basetrackcache.cpp
+++ b/src/library/basetrackcache.cpp
@@ -1,6 +1,7 @@
 #include "library/basetrackcache.h"
 
 #include "library/queryutil.h"
+#include "library/searchquery.h"
 #include "library/searchqueryparser.h"
 #include "library/trackcollection.h"
 #include "moc_basetrackcache.cpp"
diff --git a/src/library/basetracktablemodel.h b/src/library/basetracktablemodel.h
index 9b258e3dce3..53fe5209912 100644
--- a/src/library/basetracktablemodel.h
+++ b/src/library/basetracktablemodel.h
@@ -3,7 +3,6 @@
 #include <QAbstractTableModel>
 #include <QList>
 #include <QPointer>
-#include <QTableView>
 
 #include "library/columncache.h"
 #include "library/trackmodel.h"
diff --git a/src/library/bpmdelegate.cpp b/src/library/bpmdelegate.cpp
index 1b311c287d5..695aac99835 100644
--- a/src/library/bpmdelegate.cpp
+++ b/src/library/bpmdelegate.cpp
@@ -1,14 +1,12 @@
 #include "library/bpmdelegate.h"
 
+#include <QCheckBox>
 #include <QDoubleSpinBox>
 #include <QItemEditorCreatorBase>
 #include <QItemEditorFactory>
 #include <QPainter>
-#include <QPalette>
-#include <QRect>
 #include <QTableView>
 
-#include "library/trackmodel.h"
 #include "moc_bpmdelegate.cpp"
 
 // We override the typical QDoubleSpinBox editor by registering this class with
diff --git a/src/library/bpmdelegate.h b/src/library/bpmdelegate.h
index 9d543a22c0b..137f28bdb0e 100644
--- a/src/library/bpmdelegate.h
+++ b/src/library/bpmdelegate.h
@@ -1,11 +1,8 @@
 #pragma once
 
-#include <QCheckBox>
-#include <QModelIndex>
-#include <QStyleOptionViewItem>
-
 #include "library/tableitemdelegate.h"
 
+class QCheckBox;
 
 class BPMDelegate : public TableItemDelegate {
     Q_OBJECT
diff --git a/src/library/colordelegate.cpp b/src/library/colordelegate.cpp
index 453939c96ec..8cac49109cd 100644
--- a/src/library/colordelegate.cpp
+++ b/src/library/colordelegate.cpp
@@ -1,11 +1,9 @@
 #include "library/colordelegate.h"
 
-#include <QColor>
 #include <QPainter>
 #include <QStyle>
 #include <QTableView>
 
-#include "library/trackmodel.h"
 #include "moc_colordelegate.cpp"
 #include "util/color/rgbcolor.h"
 
diff --git a/src/library/colordelegate.h b/src/library/colordelegate.h
index ac05accf834..e0b0b9889e1 100644
--- a/src/library/colordelegate.h
+++ b/src/library/colordelegate.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <QModelIndex>
-#include <QPainter>
-#include <QStyleOptionViewItem>
-
 #include "library/tableitemdelegate.h"
 
+class QModelIndex;
+class QPainter;
+class QStyleOptionViewItem;
+
 class ColorDelegate : public TableItemDelegate {
     Q_OBJECT
   public:
diff --git a/src/library/columncache.h b/src/library/columncache.h
index 174fe9c3192..f429264ce3c 100644
--- a/src/library/columncache.h
+++ b/src/library/columncache.h
@@ -6,7 +6,6 @@
 
 #include "track/keyutils.h"
 #include "control/controlproxy.h"
-#include "preferences/usersettings.h"
 
 // Caches the index of frequently used columns and provides a lookup-table of
 // column name to index.
diff --git a/src/library/coverart.cpp b/src/library/coverart.cpp
index 5814b5fdb52..d0b573e34dd 100644
--- a/src/library/coverart.cpp
+++ b/src/library/coverart.cpp
@@ -4,7 +4,6 @@
 
 #include "library/coverartutils.h"
 #include "track/track.h"
-#include "util/debug.h"
 #include "util/logger.h"
 
 namespace {
diff --git a/src/library/coverartcache.cpp b/src/library/coverartcache.cpp
index 5891cc3d82b..77978a1d048 100644
--- a/src/library/coverartcache.cpp
+++ b/src/library/coverartcache.cpp
@@ -2,10 +2,9 @@
 
 #include <QFutureWatcher>
 #include <QPixmapCache>
-#include <QtConcurrentRun>
+#include <QtConcurrent>
 #include <QtDebug>
 
-#include "library/coverartutils.h"
 #include "moc_coverartcache.cpp"
 #include "track/track.h"
 #include "util/logger.h"
diff --git a/src/library/coverartdelegate.cpp b/src/library/coverartdelegate.cpp
index de4d7d504c9..5d233816903 100644
--- a/src/library/coverartdelegate.cpp
+++ b/src/library/coverartdelegate.cpp
@@ -1,10 +1,10 @@
 #include "library/coverartdelegate.h"
 
 #include <QPainter>
+#include <QTableView>
 #include <algorithm>
 
 #include "library/coverartcache.h"
-#include "library/dao/trackschema.h"
 #include "library/trackmodel.h"
 #include "moc_coverartdelegate.cpp"
 #include "track/track.h"
diff --git a/src/library/coverartdelegate.h b/src/library/coverartdelegate.h
index f8e2fb9ae07..62228548b47 100644
--- a/src/library/coverartdelegate.h
+++ b/src/library/coverartdelegate.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#include <QHash>
 #include <QList>
-#include <QTableView>
 
 #include "library/coverart.h"
 #include "library/tableitemdelegate.h"
@@ -11,6 +9,7 @@
 
 class CoverArtCache;
 class TrackModel;
+class QTableView;
 
 class CoverArtDelegate : public TableItemDelegate {
     Q_OBJECT
diff --git a/src/library/coverartutils.h b/src/library/coverartutils.h
index b3229640cbb..68531b468ec 100644
--- a/src/library/coverartutils.h
+++ b/src/library/coverartutils.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <QFileInfo>
 #include <QFuture>
 #include <QImage>
 #include <QList>
@@ -8,15 +9,12 @@
 #include <QStringList>
 
 #include "track/track_decl.h"
-#include "util/cache.h"
-#include "util/fileinfo.h"
-#include "util/imageutils.h"
 
-class CoverInfo;
 class CoverInfoRelative;
 
 namespace mixxx {
 
+class FileInfo;
 class FileAccess;
 
 } // namespace mixxx
diff --git a/src/library/dao/autodjcratesdao.cpp b/src/library/dao/autodjcratesdao.cpp
index b537dd5cb52..a03ec273d16 100644
--- a/src/library/dao/autodjcratesdao.cpp
+++ b/src/library/dao/autodjcratesdao.cpp
@@ -10,6 +10,7 @@
 #include "library/queryutil.h"
 #include "library/trackcollection.h"
 #include "library/trackcollectionmanager.h"
+#include "library/trackset/crate/crate.h"
 #include "library/trackset/crate/crateschema.h"
 #include "mixer/playerinfo.h"
 #include "mixer/playermanager.h"
diff --git a/src/library/dlghidden.cpp b/src/library/dlghidden.cpp
index f7355e92731..a43bd67ce10 100644
--- a/src/library/dlghidden.cpp
+++ b/src/library/dlghidden.cpp
@@ -1,7 +1,10 @@
 #include "library/dlghidden.h"
 
+#include <QItemSelection>
+
+#include "controllers/keyboard/keyboardeventfilter.h"
 #include "library/hiddentablemodel.h"
-#include "library/trackcollectionmanager.h"
+#include "library/library.h"
 #include "moc_dlghidden.cpp"
 #include "util/assert.h"
 #include "widget/wlibrary.h"
diff --git a/src/library/dlghidden.h b/src/library/dlghidden.h
index 33e65e382d8..8bd6ca3b70f 100644
--- a/src/library/dlghidden.h
+++ b/src/library/dlghidden.h
@@ -1,9 +1,5 @@
 #pragma once
 
-#include <QItemSelection>
-
-#include "controllers/keyboard/keyboardeventfilter.h"
-#include "library/library.h"
 #include "library/libraryview.h"
 #include "library/ui_dlghidden.h"
 #include "preferences/usersettings.h"
@@ -11,6 +7,8 @@
 class WLibrary;
 class WTrackTableView;
 class HiddenTableModel;
+class Library;
+class KeyboardEventFilter;
 
 class DlgHidden : public QWidget, public Ui::DlgHidden, public LibraryView {
     Q_OBJECT
diff --git a/src/library/dlgmissing.cpp b/src/library/dlgmissing.cpp
index 294366caed8..24b4b3a42ee 100644
--- a/src/library/dlgmissing.cpp
+++ b/src/library/dlgmissing.cpp
@@ -1,7 +1,10 @@
 #include "library/dlgmissing.h"
 
+#include <QItemSelection>
+
+#include "controllers/keyboard/keyboardeventfilter.h"
+#include "library/library.h"
 #include "library/missingtablemodel.h"
-#include "library/trackcollectionmanager.h"
 #include "moc_dlgmissing.cpp"
 #include "util/assert.h"
 #include "widget/wlibrary.h"
diff --git a/src/library/dlgmissing.h b/src/library/dlgmissing.h
index bb706e48a9f..99c74ee013a 100644
--- a/src/library/dlgmissing.h
+++ b/src/library/dlgmissing.h
@@ -1,9 +1,5 @@
 #pragma once
 
-#include <QItemSelection>
-
-#include "controllers/keyboard/keyboardeventfilter.h"
-#include "library/library.h"
 #include "library/libraryview.h"
 #include "library/ui_dlgmissing.h"
 #include "preferences/usersettings.h"
@@ -11,6 +7,9 @@
 class WLibrary;
 class WTrackTableView;
 class MissingTableModel;
+class QItemSelection;
+class Library;
+class KeyboardEventFilter;
 
 class DlgMissing : public QWidget, public Ui::DlgMissing, public LibraryView {
     Q_OBJECT
diff --git a/src/library/dlgtagfetcher.cpp b/src/library/dlgtagfetcher.cpp
index a6fc8f936ad..d5107becfeb 100644
--- a/src/library/dlgtagfetcher.cpp
+++ b/src/library/dlgtagfetcher.cpp
@@ -7,10 +7,12 @@
 #include "library/coverartcache.h"
 #include "library/coverartutils.h"
 #include "library/library_prefs.h"
+#include "library/trackmodel.h"
 #include "moc_dlgtagfetcher.cpp"
 #include "preferences/dialog/dlgpreflibrary.h"
 #include "track/track.h"
 #include "track/tracknumbers.h"
+#include "util/imagefiledata.h"
 
 namespace {
 
diff --git a/src/library/dlgtagfetcher.h b/src/library/dlgtagfetcher.h
index c50a659eca0..f1303a013dc 100644
--- a/src/library/dlgtagfetcher.h
+++ b/src/library/dlgtagfetcher.h
@@ -2,16 +2,18 @@
 
 #include <QDialog>
 #include <QList>
-#include <QTreeWidget>
+#include <future>
 
-#include "library/trackmodel.h"
+#include "library/export/coverartcopyworker.h"
 #include "library/ui_dlgtagfetcher.h"
 #include "musicbrainz/tagfetcher.h"
 #include "track/track_decl.h"
 #include "track/trackrecord.h"
 #include "util/parented_ptr.h"
 #include "widget/wcoverartlabel.h"
-#include "widget/wcoverartmenu.h"
+
+class QTreeWidget;
+class TrackModel;
 
 /// A dialog box to fetch track metadata from MusicBrainz.
 /// Use TrackPointer to load a track into the dialog or
diff --git a/src/library/dlgtrackinfo.cpp b/src/library/dlgtrackinfo.cpp
index 149f62f0a91..5bd5653a2c2 100644
--- a/src/library/dlgtrackinfo.cpp
+++ b/src/library/dlgtrackinfo.cpp
@@ -1,9 +1,7 @@
 #include "library/dlgtrackinfo.h"
 
 #include <QSignalBlocker>
-#include <QStringBuilder>
 #include <QStyleFactory>
-#include <QTreeWidget>
 #include <QtDebug>
 
 #include "defs_urls.h"
@@ -16,11 +14,8 @@
 #include "preferences/colorpalettesettings.h"
 #include "sources/soundsourceproxy.h"
 #include "track/beatutils.h"
-#include "track/keyfactory.h"
-#include "track/keyutils.h"
 #include "track/track.h"
 #include "util/color/color.h"
-#include "util/color/colorpalette.h"
 #include "util/datetime.h"
 #include "util/desktophelper.h"
 #include "util/duration.h"
diff --git a/src/library/dlgtrackinfo.h b/src/library/dlgtrackinfo.h
index b99bd7d1fcf..a3e43580d2d 100644
--- a/src/library/dlgtrackinfo.h
+++ b/src/library/dlgtrackinfo.h
@@ -5,11 +5,9 @@
 #include <QModelIndex>
 #include <memory>
 
-#include "library/coverart.h"
 #include "library/ui_dlgtrackinfo.h"
 #include "preferences/usersettings.h"
 #include "track/beats.h"
-#include "track/keys.h"
 #include "track/track_decl.h"
 #include "track/trackrecord.h"
 #include "util/parented_ptr.h"
@@ -17,11 +15,11 @@
 #include "widget/wcolorpickeraction.h"
 
 class TrackModel;
-class DlgTagFetcher;
-class WCoverArtLabel;
-class WCoverArtMenu;
-class WStarRating;
 class WColorPickerAction;
+class WStarRating;
+class WCoverArtMenu;
+class WCoverArtLabel;
+class DlgTagFetcher;
 
 /// A dialog box to display and edit track properties.
 /// Use TrackPointer to load a track into the dialog or
diff --git a/src/library/export/coverartcopyworker.cpp b/src/library/export/coverartcopyworker.cpp
index 33cdb4a5ca0..01ac4a35b72 100644
--- a/src/library/export/coverartcopyworker.cpp
+++ b/src/library/export/coverartcopyworker.cpp
@@ -2,7 +2,6 @@
 
 #include <QDebug>
 #include <QFileInfo>
-#include <QMessageBox>
 
 #include "moc_coverartcopyworker.cpp"
 #include "util/fileaccess.h"
diff --git a/src/library/export/coverartcopyworker.h b/src/library/export/coverartcopyworker.h
index f5f1ec93a1c..1899b735d6a 100644
--- a/src/library/export/coverartcopyworker.h
+++ b/src/library/export/coverartcopyworker.h
@@ -1,15 +1,11 @@
 #pragma once
 
 #include <QObject>
-#include <QScopedPointer>
 #include <QString>
 #include <QThread>
 #include <future>
 
 #include "library/coverart.h"
-#include "library/coverartutils.h"
-#include "util/fileinfo.h"
-#include "util/imagefiledata.h"
 
 // This is a QThread class for copying the cover art.
 
diff --git a/src/library/export/dlglibraryexport.cpp b/src/library/export/dlglibraryexport.cpp
index 71e1600f7cb..e460044b2ec 100644
--- a/src/library/export/dlglibraryexport.cpp
+++ b/src/library/export/dlglibraryexport.cpp
@@ -11,6 +11,7 @@
 #include "library/export/engineprimeexportrequest.h"
 #include "library/trackcollection.h"
 #include "library/trackcollectionmanager.h"
+#include "library/trackset/crate/crate.h"
 #include "library/trackset/crate/crateid.h"
 #include "library/trackset/crate/cratestorage.h"
 #include "moc_dlglibraryexport.cpp"
diff --git a/src/library/export/trackexportdlg.cpp b/src/library/export/trackexportdlg.cpp
index 40044552dc6..80e0896c5db 100644
--- a/src/library/export/trackexportdlg.cpp
+++ b/src/library/export/trackexportdlg.cpp
@@ -1,6 +1,5 @@
 #include "library/export/trackexportdlg.h"
 
-#include <QFileInfo>
 #include <QMessageBox>
 
 #include "moc_trackexportdlg.cpp"
diff --git a/src/library/export/trackexportdlg.h b/src/library/export/trackexportdlg.h
index f4b2776aeb8..8c1bc1d39a3 100644
--- a/src/library/export/trackexportdlg.h
+++ b/src/library/export/trackexportdlg.h
@@ -1,8 +1,6 @@
 #pragma once
 
 #include <QDialog>
-#include <QScopedPointer>
-#include <QString>
 #include <future>
 
 #include "library/export/trackexportworker.h"
@@ -10,6 +8,8 @@
 #include "preferences/usersettings.h"
 #include "track/track_decl.h"
 
+class QString;
+
 // A dialog for interacting with the track exporter in an interactive manner.
 // Handles errors and user interactions.
 class TrackExportDlg : public QDialog, public Ui::DlgTrackExport {
diff --git a/src/library/export/trackexportwizard.cpp b/src/library/export/trackexportwizard.cpp
index 932b865b3f2..fb0288e5541 100644
--- a/src/library/export/trackexportwizard.cpp
+++ b/src/library/export/trackexportwizard.cpp
@@ -1,12 +1,9 @@
 #include "library/export/trackexportwizard.h"
 
 #include <QFileDialog>
-#include <QFileInfo>
-#include <QMessageBox>
 #include <QStandardPaths>
 
 #include "moc_trackexportwizard.cpp"
-#include "util/assert.h"
 
 void TrackExportWizard::exportTracks() {
     if (!selectDestinationDirectory()) {
diff --git a/src/library/export/trackexportwizard.h b/src/library/export/trackexportwizard.h
index 9954b8fa39f..18dcf4b16bf 100644
--- a/src/library/export/trackexportwizard.h
+++ b/src/library/export/trackexportwizard.h
@@ -9,7 +9,6 @@
 #pragma once
 
 #include <QScopedPointer>
-#include <QString>
 
 #include "library/export/trackexportdlg.h"
 #include "library/export/trackexportworker.h"
diff --git a/src/library/export/trackexportworker.cpp b/src/library/export/trackexportworker.cpp
index 7304f1d8c83..d83a8a850dc 100644
--- a/src/library/export/trackexportworker.cpp
+++ b/src/library/export/trackexportworker.cpp
@@ -2,7 +2,6 @@
 
 #include <QDebug>
 #include <QFileInfo>
-#include <QMessageBox>
 
 #include "moc_trackexportworker.cpp"
 #include "track/track.h"
diff --git a/src/library/export/trackexportworker.h b/src/library/export/trackexportworker.h
index 0dd7d660550..2c84712a28e 100644
--- a/src/library/export/trackexportworker.h
+++ b/src/library/export/trackexportworker.h
@@ -1,13 +1,14 @@
 #pragma once
 
-#include <QObject>
-#include <QScopedPointer>
 #include <QString>
 #include <QThread>
 #include <future>
 
 #include "track/track_decl.h"
-#include "util/fileinfo.h"
+
+namespace mixxx {
+class FileInfo;
+} // namespace mixxx
 
 // A QThread class for copying a list of files to a single destination directory.
 // Currently does not preserve subdirectory relationships.  This class performs
diff --git a/src/library/externaltrackcollection.cpp b/src/library/externaltrackcollection.cpp
index 13556b7a30f..b31b05d36e6 100644
--- a/src/library/externaltrackcollection.cpp
+++ b/src/library/externaltrackcollection.cpp
@@ -1,5 +1,6 @@
 #include "library/externaltrackcollection.h"
 
+#include "library/relocatedtrack.h"
 #include "moc_externaltrackcollection.cpp"
 
 void ExternalTrackCollection::relocateTracks(
diff --git a/src/library/externaltrackcollection.h b/src/library/externaltrackcollection.h
index 6ef6ccd8ad6..82338090c9e 100644
--- a/src/library/externaltrackcollection.h
+++ b/src/library/externaltrackcollection.h
@@ -1,15 +1,16 @@
 #pragma once
 
-#include <QDir>
 #include <QList>
 #include <QString>
 
-#include "library/relocatedtrack.h"
 #include "preferences/usersettings.h"
 
 class Library;
 class LibraryFeature;
 class Track;
+class QDir;
+class TrackRef;
+class RelocatedTrack;
 
 // This interface and base class enable to synchronize external
 // track collections with Mixxx. It provides methods that will
diff --git a/src/library/itunes/itunesdao.cpp b/src/library/itunes/itunesdao.cpp
index a3b20b4a63a..b5af7e07d8d 100644
--- a/src/library/itunes/itunesdao.cpp
+++ b/src/library/itunes/itunesdao.cpp
@@ -7,6 +7,7 @@
 #include "library/itunes/ituneslocalhosttoken.h"
 #include "library/itunes/itunespathmapping.h"
 #include "library/queryutil.h"
+#include "library/treeitem.h"
 
 std::ostream& operator<<(std::ostream& os, const ITunesTrack& track) {
     os << "ITunesTrack { "
diff --git a/src/library/itunes/itunesdao.h b/src/library/itunes/itunesdao.h
index a261135d9d0..5113e54ee61 100644
--- a/src/library/itunes/itunesdao.h
+++ b/src/library/itunes/itunesdao.h
@@ -2,15 +2,16 @@
 
 #include <QDateTime>
 #include <QHash>
-#include <QSqlDatabase>
 #include <QSqlQuery>
 #include <QString>
 #include <gsl/pointers>
 #include <map>
 
 #include "library/dao/dao.h"
-#include "library/itunes/itunespathmapping.h"
-#include "library/treeitem.h"
+
+class QSqlDatabase;
+struct ITunesPathMapping;
+class TreeItem;
 
 const int kRootITunesPlaylistId = -1;
 
diff --git a/src/library/itunes/itunesfeature.cpp b/src/library/itunes/itunesfeature.cpp
index 9eb42ae9ed3..f59e3f79c08 100644
--- a/src/library/itunes/itunesfeature.cpp
+++ b/src/library/itunes/itunesfeature.cpp
@@ -2,11 +2,9 @@
 
 #include <QAction>
 #include <QFileDialog>
-#include <QFileInfo>
 #include <QMenu>
 #include <QMessageBox>
-#include <QUrl>
-#include <QXmlStreamReader>
+#include <QtConcurrent>
 #include <QtDebug>
 #include <memory>
 #include <utility>
@@ -17,11 +15,11 @@
 #include "library/dao/settingsdao.h"
 #include "library/itunes/itunesdao.h"
 #include "library/itunes/itunesimporter.h"
-#include "library/itunes/ituneslocalhosttoken.h"
 #include "library/itunes/itunesplaylistmodel.h"
 #include "library/itunes/itunesxmlimporter.h"
 #include "library/library.h"
 #include "library/queryutil.h"
+#include "library/trackcollection.h"
 #include "library/trackcollectionmanager.h"
 #include "library/treeitem.h"
 #include "library/treeitemmodel.h"
diff --git a/src/library/itunes/itunesfeature.h b/src/library/itunes/itunesfeature.h
index a2864262981..73e00f78d84 100644
--- a/src/library/itunes/itunesfeature.h
+++ b/src/library/itunes/itunesfeature.h
@@ -3,21 +3,16 @@
 #include <QFuture>
 #include <QFutureWatcher>
 #include <QPointer>
-#include <QStringListModel>
-#include <QtConcurrentRun>
-#include <QtSql>
 #include <atomic>
 
 #include "library/baseexternallibraryfeature.h"
-#include "library/itunes/itunesimporter.h"
-#include "library/trackcollection.h"
-#include "library/treeitem.h"
-#include "library/treeitemmodel.h"
 #include "util/parented_ptr.h"
 
 class BaseExternalTrackModel;
 class BaseExternalPlaylistModel;
 class WLibrarySidebar;
+class ITunesImporter;
+class BaseTrackCache;
 
 class ITunesFeature : public BaseExternalLibraryFeature {
     Q_OBJECT
diff --git a/src/library/itunes/itunesplaylistmodel.h b/src/library/itunes/itunesplaylistmodel.h
index 93a96da2a43..99c03085bb4 100644
--- a/src/library/itunes/itunesplaylistmodel.h
+++ b/src/library/itunes/itunesplaylistmodel.h
@@ -3,8 +3,6 @@
 #include <QObject>
 
 #include "library/baseexternalplaylistmodel.h"
-#include "library/basetrackcache.h"
-#include "library/trackcollectionmanager.h"
 
 class ITunesPlaylistModel : public BaseExternalPlaylistModel {
     Q_OBJECT
diff --git a/src/library/itunes/itunesxmlimporter.cpp b/src/library/itunes/itunesxmlimporter.cpp
index aaccac6573f..db11ad25c37 100644
--- a/src/library/itunes/itunesxmlimporter.cpp
+++ b/src/library/itunes/itunesxmlimporter.cpp
@@ -1,7 +1,6 @@
 #include "library/itunes/itunesxmlimporter.h"
 
 #include <QDateTime>
-#include <QSqlQuery>
 #include <QString>
 #include <QUrl>
 #include <memory>
@@ -11,16 +10,9 @@
 #include "library/itunes/itunesfeature.h"
 #include "library/itunes/itunesimporter.h"
 #include "library/itunes/ituneslocalhosttoken.h"
-#include "library/queryutil.h"
-#include "library/treeitemmodel.h"
+#include "library/treeitem.h"
 #include "util/lcs.h"
 
-#ifdef __SQLITE3__
-#include <sqlite3.h>
-#else                        // __SQLITE3__
-#define SQLITE_CONSTRAINT 19 // Abort due to constraint violation
-#endif                       // __SQLITE3__
-
 namespace {
 
 const QString kDict = "dict";
diff --git a/src/library/itunes/itunesxmlimporter.h b/src/library/itunes/itunesxmlimporter.h
index 9ff868aa992..b5ede6fb98e 100644
--- a/src/library/itunes/itunesxmlimporter.h
+++ b/src/library/itunes/itunesxmlimporter.h
@@ -1,9 +1,8 @@
 #pragma once
 
+#include <QFile>
 #include <QHash>
-#include <QSqlDatabase>
 #include <QXmlStreamReader>
-#include <atomic>
 #include <memory>
 
 #include "library/itunes/itunesdao.h"
@@ -11,6 +10,7 @@
 #include "library/itunes/itunespathmapping.h"
 
 class ITunesFeature;
+class TrackRef;
 
 /// An importer that parses an iTunes XML library.
 class ITunesXMLImporter : public ITunesImporter {
diff --git a/src/library/library.cpp b/src/library/library.cpp
index 1f2e4b53cac..04d2dfc204c 100644
--- a/src/library/library.cpp
+++ b/src/library/library.cpp
@@ -1,13 +1,11 @@
 #include "library/library.h"
 
+#include <QApplication>
 #include <QDir>
-#include <QItemSelectionModel>
 #include <QMessageBox>
-#include <QPointer>
-#include <QTranslator>
 
+#include "control/controlobject.h"
 #include "controllers/keyboard/keyboardeventfilter.h"
-#include "database/mixxxdb.h"
 #include "library/analysisfeature.h"
 #include "library/autodj/autodjfeature.h"
 #include "library/banshee/bansheefeature.h"
@@ -20,7 +18,6 @@
 #include "library/library_prefs.h"
 #include "library/librarycontrol.h"
 #include "library/libraryfeature.h"
-#include "library/librarytablemodel.h"
 #include "library/mixxxlibraryfeature.h"
 #include "library/recording/recordingfeature.h"
 #include "library/rekordbox/rekordboxfeature.h"
@@ -36,9 +33,7 @@
 #include "library/traktor/traktorfeature.h"
 #include "mixer/playermanager.h"
 #include "moc_library.cpp"
-#include "recording/recordingmanager.h"
 #include "util/assert.h"
-#include "util/db/dbconnectionpooled.h"
 #include "util/logger.h"
 #include "util/sandbox.h"
 #include "widget/wlibrary.h"
diff --git a/src/library/library.h b/src/library/library.h
index 42a4abd5db8..e0227e9ba6f 100644
--- a/src/library/library.h
+++ b/src/library/library.h
@@ -1,12 +1,10 @@
 #pragma once
 
-#include <QAbstractItemModel>
 #include <QFont>
 #include <QList>
 #include <QObject>
 #include <QPointer>
 
-#include "analyzer/analyzerscheduledtrack.h"
 #include "analyzer/trackanalysisscheduler.h"
 #include "library/library_decl.h"
 #ifdef __ENGINEPRIME__
@@ -14,7 +12,6 @@
 #endif
 #include "preferences/usersettings.h"
 #include "track/track_decl.h"
-#include "track/trackid.h"
 #include "util/db/dbconnectionpool.h"
 #include "util/parented_ptr.h"
 
@@ -22,7 +19,6 @@ class AnalysisFeature;
 class BrowseFeature;
 class ControlObject;
 class CrateFeature;
-class ExternalTrackCollection;
 class LibraryControl;
 class LibraryFeature;
 class LibraryTableModel;
@@ -32,12 +28,11 @@ class PlayerManager;
 class PlaylistFeature;
 class RecordingManager;
 class SidebarModel;
-class TrackCollection;
 class TrackCollectionManager;
-class TrackModel;
 class WSearchLineEdit;
 class WLibrarySidebar;
 class WLibrary;
+class QAbstractItemModel;
 
 #ifdef __ENGINEPRIME__
 namespace mixxx {
diff --git a/src/library/librarycontrol.cpp b/src/library/librarycontrol.cpp
index 8e057a5982f..6980c4adc0b 100644
--- a/src/library/librarycontrol.cpp
+++ b/src/library/librarycontrol.cpp
@@ -1,24 +1,21 @@
 #include "library/librarycontrol.h"
 
 #include <QApplication>
-#include <QItemSelectionModel>
 #include <QKeyEvent>
 #include <QModelIndex>
-#include <QModelIndexList>
 #include <QWindow>
 #include <QtDebug>
 
+#include "control/controlencoder.h"
 #include "control/controlobject.h"
 #include "control/controlpushbutton.h"
 #include "library/library.h"
 #include "library/libraryview.h"
 #include "mixer/playermanager.h"
 #include "moc_librarycontrol.cpp"
-#include "util/cmdlineargs.h"
 #include "widget/wlibrary.h"
 #include "widget/wlibrarysidebar.h"
 #include "widget/wsearchlineedit.h"
-#include "widget/wtracktableview.h"
 
 namespace {
 const QString kAppGroup = QStringLiteral("[App]");
diff --git a/src/library/librarycontrol.h b/src/library/librarycontrol.h
index f4680a9d1de..78c852e90e4 100644
--- a/src/library/librarycontrol.h
+++ b/src/library/librarycontrol.h
@@ -2,11 +2,11 @@
 
 #include <QObject>
 
-#include "control/controlencoder.h"
 #include "control/controlproxy.h"
 #include "library/library_decl.h"
 #include "util/memory.h"
 
+class ControlEncoder;
 class ControlObject;
 class ControlPushButton;
 class Library;
diff --git a/src/library/libraryfeature.h b/src/library/libraryfeature.h
index e3aa6b46db8..5ba3ffa7da2 100644
--- a/src/library/libraryfeature.h
+++ b/src/library/libraryfeature.h
@@ -1,16 +1,12 @@
 #pragma once
 
-#include <QAbstractItemModel>
-#include <QDesktopServices>
 #include <QFileDialog>
 #include <QIcon>
 #include <QList>
-#include <QModelIndex>
 #include <QObject>
 #include <QString>
 #include <QUrl>
 #include <QVariant>
-#include <QtDebug>
 
 #include "library/coverartcache.h"
 #include "library/dao/trackdao.h"
@@ -19,9 +15,9 @@
 
 class KeyboardEventFilter;
 class Library;
-class TrackModel;
 class WLibrary;
 class WLibrarySidebar;
+class QAbstractItemModel;
 
 // pure virtual (abstract) class to provide an interface for libraryfeatures
 class LibraryFeature : public QObject {
diff --git a/src/library/missingtablemodel.h b/src/library/missingtablemodel.h
index 94761a9449e..a97a0580dbe 100644
--- a/src/library/missingtablemodel.h
+++ b/src/library/missingtablemodel.h
@@ -1,13 +1,14 @@
 #pragma once
 
 #include <QItemDelegate>
-#include <QModelIndex>
 #include <QObject>
-#include <QtSql>
 
 #include "library/basesqltablemodel.h"
 #include "library/trackmodel.h"
 
+class QModelIndex;
+typedef QList<QModelIndex> QModelIndexList;
+
 class MissingTableModel final : public BaseSqlTableModel {
     Q_OBJECT
   public:
@@ -18,7 +19,7 @@ class MissingTableModel final : public BaseSqlTableModel {
 
     bool isColumnInternal(int column) final;
     void purgeTracks(const QModelIndexList& indices) final;
-    Qt::ItemFlags flags(const QModelIndex &index) const final;
+    Qt::ItemFlags flags(const QModelIndex& index) const final;
     Capabilities getCapabilities() const final;
 
     QString modelKey(bool noSearch) const override;
diff --git a/src/library/mixxxlibraryfeature.cpp b/src/library/mixxxlibraryfeature.cpp
index a9202287164..84400b7a939 100644
--- a/src/library/mixxxlibraryfeature.cpp
+++ b/src/library/mixxxlibraryfeature.cpp
@@ -9,10 +9,8 @@
 #include "library/dao/trackschema.h"
 #include "library/dlghidden.h"
 #include "library/dlgmissing.h"
-#include "library/hiddentablemodel.h"
 #include "library/library.h"
 #include "library/librarytablemodel.h"
-#include "library/missingtablemodel.h"
 #include "library/parser.h"
 #include "library/queryutil.h"
 #include "library/trackcollection.h"
@@ -20,7 +18,6 @@
 #include "library/treeitem.h"
 #include "moc_mixxxlibraryfeature.cpp"
 #include "sources/soundsourceproxy.h"
-#include "util/dnd.h"
 #include "widget/wlibrary.h"
 #ifdef __ENGINEPRIME__
 #include "widget/wlibrarysidebar.h"
diff --git a/src/library/mixxxlibraryfeature.h b/src/library/mixxxlibraryfeature.h
index b53dd966534..50eb06258a7 100644
--- a/src/library/mixxxlibraryfeature.h
+++ b/src/library/mixxxlibraryfeature.h
@@ -1,18 +1,13 @@
 #pragma once
 
 #include <QAction>
-#include <QIcon>
-#include <QList>
-#include <QModelIndex>
 #include <QObject>
 #include <QPointer>
 #include <QSharedPointer>
 #include <QString>
-#include <QStringListModel>
 #include <QUrl>
 #include <QVariant>
 
-#include "library/dao/trackdao.h"
 #include "library/libraryfeature.h"
 #include "library/treeitemmodel.h"
 #include "preferences/usersettings.h"
@@ -23,6 +18,7 @@ class DlgMissing;
 class BaseTrackCache;
 class LibraryTableModel;
 class TrackCollection;
+class QModelIndex;
 
 class MixxxLibraryFeature final : public LibraryFeature {
     Q_OBJECT
diff --git a/src/library/multilineeditdelegate.cpp b/src/library/multilineeditdelegate.cpp
index c4f5b895c1b..5c49d2e54a6 100644
--- a/src/library/multilineeditdelegate.cpp
+++ b/src/library/multilineeditdelegate.cpp
@@ -1,8 +1,8 @@
 #include "library/multilineeditdelegate.h"
 
 #include <QAbstractTextDocumentLayout>
-#include <QDebug>
 #include <QScrollBar>
+#include <QTableView>
 #include <cmath>
 
 #include "moc_multilineeditdelegate.cpp"
diff --git a/src/library/parser.cpp b/src/library/parser.cpp
index 762ec68272c..ee8b5057e90 100644
--- a/src/library/parser.cpp
+++ b/src/library/parser.cpp
@@ -1,8 +1,6 @@
 #include "library/parser.h"
 
 #include <QDir>
-#include <QFile>
-#include <QIODevice>
 #include <QUrl>
 #include <QtDebug>
 
diff --git a/src/library/parser.h b/src/library/parser.h
index eeb5878462e..e33044af0f6 100644
--- a/src/library/parser.h
+++ b/src/library/parser.h
@@ -21,7 +21,6 @@ it afterwards for proper functioning
 **/
 
 #include <QList>
-#include <QObject>
 #include <QString>
 
 #include "util/fileinfo.h"
diff --git a/src/library/parsercsv.cpp b/src/library/parsercsv.cpp
index 64cbb60c850..6b1435a27fd 100644
--- a/src/library/parsercsv.cpp
+++ b/src/library/parsercsv.cpp
@@ -6,6 +6,7 @@
 #include <QtDebug>
 
 #include "errordialoghandler.h"
+#include "library/basesqltablemodel.h"
 #include "library/parser.h"
 
 namespace {
diff --git a/src/library/parsercsv.h b/src/library/parsercsv.h
index 398c490966f..6685fa69a60 100644
--- a/src/library/parsercsv.h
+++ b/src/library/parsercsv.h
@@ -5,7 +5,8 @@
 #include <QByteArray>
 
 #include "library/parser.h"
-#include "library/basesqltablemodel.h"
+
+class BaseSqlTableModel;
 
 class ParserCsv : public Parser {
   public:
diff --git a/src/library/parserm3u.h b/src/library/parserm3u.h
index 3836ede7f77..b46e01acb46 100644
--- a/src/library/parserm3u.h
+++ b/src/library/parserm3u.h
@@ -12,8 +12,6 @@
 //
 #pragma once
 
-#include <QDir>
-#include <QTextStream>
 #include <QList>
 #include <QString>
 
diff --git a/src/library/parserpls.cpp b/src/library/parserpls.cpp
index 86e40eac8a3..52f86ea6a2f 100644
--- a/src/library/parserpls.cpp
+++ b/src/library/parserpls.cpp
@@ -2,12 +2,9 @@
 
 #include <QDir>
 #include <QFile>
-#include <QMessageBox>
-#include <QUrl>
 #include <QtDebug>
 
 #include "errordialoghandler.h"
-#include "library/parser.h"
 
 namespace {
 
diff --git a/src/library/playlisttablemodel.h b/src/library/playlisttablemodel.h
index bc68c9cf7c8..d71c46f67f3 100644
--- a/src/library/playlisttablemodel.h
+++ b/src/library/playlisttablemodel.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "library/basesqltablemodel.h"
 #include "library/trackset/tracksettablemodel.h"
 
 class PlaylistTableModel final : public TrackSetTableModel {
diff --git a/src/library/previewbuttondelegate.cpp b/src/library/previewbuttondelegate.cpp
index dfd739df873..89b690a651b 100644
--- a/src/library/previewbuttondelegate.cpp
+++ b/src/library/previewbuttondelegate.cpp
@@ -9,7 +9,6 @@
 #include "mixer/playerinfo.h"
 #include "mixer/playermanager.h"
 #include "moc_previewbuttondelegate.cpp"
-#include "track/track.h"
 #include "widget/wlibrarytableview.h"
 
 namespace {
diff --git a/src/library/previewbuttondelegate.h b/src/library/previewbuttondelegate.h
index 3b972813329..49e162a0b2f 100644
--- a/src/library/previewbuttondelegate.h
+++ b/src/library/previewbuttondelegate.h
@@ -2,6 +2,7 @@
 
 #include <QPushButton>
 #include <QStyleOptionButton>
+#include <QTableView>
 
 #include "library/tableitemdelegate.h"
 #include "track/track_decl.h"
diff --git a/src/library/proxytrackmodel.cpp b/src/library/proxytrackmodel.cpp
index 11618784045..73c374e2838 100644
--- a/src/library/proxytrackmodel.cpp
+++ b/src/library/proxytrackmodel.cpp
@@ -1,7 +1,5 @@
 #include "library/proxytrackmodel.h"
 
-#include <QVariant>
-
 #include "library/searchqueryparser.h"
 #include "moc_proxytrackmodel.cpp"
 #include "util/assert.h"
diff --git a/src/library/recording/dlgrecording.cpp b/src/library/recording/dlgrecording.cpp
index 3171b194f83..f7cce739e1c 100644
--- a/src/library/recording/dlgrecording.cpp
+++ b/src/library/recording/dlgrecording.cpp
@@ -1,14 +1,11 @@
 #include "library/recording/dlgrecording.h"
 
-
-#include "control/controlobject.h"
-#include "library/trackcollectionmanager.h"
+#include "controllers/keyboard/keyboardeventfilter.h"
+#include "library/library.h"
 #include "moc_dlgrecording.cpp"
 #include "util/assert.h"
 #include "widget/wlibrary.h"
-#include "widget/wskincolor.h"
 #include "widget/wtracktableview.h"
-#include "widget/wwidget.h"
 
 DlgRecording::DlgRecording(
         WLibrary* parent,
diff --git a/src/library/recording/dlgrecording.h b/src/library/recording/dlgrecording.h
index 06f5fd58cf6..6980cfbc5ee 100644
--- a/src/library/recording/dlgrecording.h
+++ b/src/library/recording/dlgrecording.h
@@ -1,18 +1,16 @@
 #pragma once
 
-#include "controllers/keyboard/keyboardeventfilter.h"
 #include "library/browse/browsetablemodel.h"
-#include "library/library.h"
 #include "library/libraryview.h"
 #include "library/proxytrackmodel.h"
 #include "library/recording/ui_dlgrecording.h"
-#include "library/trackcollection.h"
 #include "preferences/usersettings.h"
-#include "recording/recordingmanager.h"
 #include "track/track_decl.h"
 
 class WLibrary;
 class WTrackTableView;
+class Library;
+class KeyboardEventFilter;
 
 class DlgRecording : public QWidget, public Ui::DlgRecording, public virtual LibraryView {
     Q_OBJECT
diff --git a/src/library/recording/recordingfeature.cpp b/src/library/recording/recordingfeature.cpp
index 381bf9ae2a0..cb4b7eac0cb 100644
--- a/src/library/recording/recordingfeature.cpp
+++ b/src/library/recording/recordingfeature.cpp
@@ -1,12 +1,9 @@
 #include "library/recording/recordingfeature.h"
 
 #include "controllers/keyboard/keyboardeventfilter.h"
-#include "library/library.h"
+#include "library/browse/foldertreemodel.h"
 #include "library/recording/dlgrecording.h"
-#include "library/treeitem.h"
 #include "moc_recordingfeature.cpp"
-#include "recording/recordingmanager.h"
-#include "track/track.h"
 #include "widget/wlibrary.h"
 
 namespace {
diff --git a/src/library/recording/recordingfeature.h b/src/library/recording/recordingfeature.h
index 9a5c8d5abd9..b082a0f6e32 100644
--- a/src/library/recording/recordingfeature.h
+++ b/src/library/recording/recordingfeature.h
@@ -1,14 +1,10 @@
 #pragma once
 
-#include <QStringListModel>
-#include <QSortFilterProxyModel>
-
 #include "preferences/usersettings.h"
-#include "library/browse/browsetablemodel.h"
-#include "library/browse/foldertreemodel.h"
 #include "library/libraryfeature.h"
 
 class RecordingManager;
+class FolderTreeModel;
 
 class RecordingFeature final : public LibraryFeature {
     Q_OBJECT
diff --git a/src/library/rhythmbox/rhythmboxfeature.cpp b/src/library/rhythmbox/rhythmboxfeature.cpp
index 7e01c10d8b5..f324d8d02fc 100644
--- a/src/library/rhythmbox/rhythmboxfeature.cpp
+++ b/src/library/rhythmbox/rhythmboxfeature.cpp
@@ -1,8 +1,8 @@
 #include "library/rhythmbox/rhythmboxfeature.h"
 
-#include <QMessageBox>
 #include <QStringList>
 #include <QUrl>
+#include <QtConcurrent>
 #include <QtDebug>
 
 #include "library/baseexternalplaylistmodel.h"
diff --git a/src/library/rhythmbox/rhythmboxfeature.h b/src/library/rhythmbox/rhythmboxfeature.h
index 4d75ffaa49e..b862bdc5f64 100644
--- a/src/library/rhythmbox/rhythmboxfeature.h
+++ b/src/library/rhythmbox/rhythmboxfeature.h
@@ -2,18 +2,14 @@
 
 #include <QFuture>
 #include <QFutureWatcher>
-#include <QStringListModel>
-#include <QXmlStreamReader>
-#include <QtConcurrentRun>
-#include <QtSql>
 
 #include "library/baseexternallibraryfeature.h"
-#include "library/trackcollection.h"
-#include "library/treeitemmodel.h"
 #include "util/parented_ptr.h"
 
 class BaseExternalTrackModel;
 class BaseExternalPlaylistModel;
+class QXmlStreamReader;
+class BaseTrackCache;
 
 class RhythmboxFeature : public BaseExternalLibraryFeature {
     Q_OBJECT
diff --git a/src/library/scanner/importfilestask.cpp b/src/library/scanner/importfilestask.cpp
index 62de43bc0ce..6f4b6fede3c 100644
--- a/src/library/scanner/importfilestask.cpp
+++ b/src/library/scanner/importfilestask.cpp
@@ -1,6 +1,5 @@
 #include "library/scanner/importfilestask.h"
 
-#include "library/scanner/libraryscanner.h"
 #include "moc_importfilestask.cpp"
 #include "util/timer.h"
 
diff --git a/src/library/scanner/libraryscanner.h b/src/library/scanner/libraryscanner.h
index f89608323ad..9cda0d72d0c 100644
--- a/src/library/scanner/libraryscanner.h
+++ b/src/library/scanner/libraryscanner.h
@@ -5,7 +5,6 @@
 #include <QList>
 #include <QScopedPointer>
 #include <QSemaphore>
-#include <QString>
 #include <QThread>
 #include <QThreadPool>
 
@@ -17,11 +16,11 @@
 #include "library/dao/trackdao.h"
 #include "library/scanner/scannerglobal.h"
 #include "track/track_decl.h"
-#include "track/trackid.h"
 #include "util/db/dbconnectionpool.h"
 
 class ScannerTask;
 class LibraryScannerDlg;
+class QString;
 
 class LibraryScanner : public QThread {
     FRIEND_TEST(LibraryScannerTest, ScannerRoundtrip);
diff --git a/src/library/scanner/libraryscannerdlg.h b/src/library/scanner/libraryscannerdlg.h
index 076427335f7..dc50f684db4 100644
--- a/src/library/scanner/libraryscannerdlg.h
+++ b/src/library/scanner/libraryscannerdlg.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <QThread>
 #include <QWidget>
-#include <QString>
 
 #include "util/performancetimer.h"
 
+class QString;
+
 class LibraryScannerDlg : public QWidget {
     Q_OBJECT
   public:
diff --git a/src/library/scanner/recursivescandirectorytask.h b/src/library/scanner/recursivescandirectorytask.h
index d22950740fe..90c963a3f32 100644
--- a/src/library/scanner/recursivescandirectorytask.h
+++ b/src/library/scanner/recursivescandirectorytask.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <QDir>
-
 #include "library/scanner/scannertask.h"
 #include "util/fileaccess.h"
 
diff --git a/src/library/scanner/scannertask.cpp b/src/library/scanner/scannertask.cpp
index 6d55a415124..15dfcee8cd7 100644
--- a/src/library/scanner/scannertask.cpp
+++ b/src/library/scanner/scannertask.cpp
@@ -1,6 +1,5 @@
 #include "library/scanner/scannertask.h"
 
-#include "library/scanner/libraryscanner.h"
 #include "moc_scannertask.cpp"
 
 ScannerTask::ScannerTask(LibraryScanner* pScanner,
diff --git a/src/library/searchquery.cpp b/src/library/searchquery.cpp
index a7d269f1286..c52f777a0cc 100644
--- a/src/library/searchquery.cpp
+++ b/src/library/searchquery.cpp
@@ -1,11 +1,11 @@
 #include "library/searchquery.h"
 
 #include <QRegularExpression>
-#include <QtDebug>
 
 #include "library/dao/trackschema.h"
 #include "library/queryutil.h"
 #include "library/trackset/crate/crateschema.h"
+#include "library/trackset/crate/cratestorage.h" // for CrateTrackSelectResult
 #include "track/keyutils.h"
 #include "track/track.h"
 #include "util/db/dbconnection.h"
diff --git a/src/library/searchquery.h b/src/library/searchquery.h
index 522d092a7b9..7bf49b5873b 100644
--- a/src/library/searchquery.h
+++ b/src/library/searchquery.h
@@ -8,12 +8,14 @@
 #include <utility>
 #include <vector>
 
-#include "library/trackset/crate/cratestorage.h"
 #include "proto/keys.pb.h"
 #include "track/track_decl.h"
 #include "util/assert.h"
 #include "util/memory.h"
 
+class CrateStorage;
+class TrackId;
+
 const QString kMissingFieldSearchTerm = "\"\""; // "" searches for an empty string
 
 enum class StringMatch {
diff --git a/src/library/searchqueryparser.cpp b/src/library/searchqueryparser.cpp
index 5270b97ce52..9da50166a1b 100644
--- a/src/library/searchqueryparser.cpp
+++ b/src/library/searchqueryparser.cpp
@@ -4,6 +4,7 @@
 #include <utility>
 
 #include "library/searchquery.h"
+#include "library/trackcollection.h"
 #include "track/keyutils.h"
 #include "util/assert.h"
 
diff --git a/src/library/searchqueryparser.h b/src/library/searchqueryparser.h
index 5aa13b28390..bb993cd6b14 100644
--- a/src/library/searchqueryparser.h
+++ b/src/library/searchqueryparser.h
@@ -2,12 +2,15 @@
 
 #include <QRegularExpression>
 #include <QString>
-#include <QtSql>
+#include <memory>
 
 #include "library/searchquery.h"
-#include "library/trackcollection.h"
 #include "util/class.h"
 
+class TrackCollection;
+class QueryNode;
+class AndNode;
+
 class SearchQueryParser {
   public:
     explicit SearchQueryParser(TrackCollection* pTrackCollection, QStringList searchColumns);
diff --git a/src/library/serato/seratofeature.cpp b/src/library/serato/seratofeature.cpp
index e2166aa33ba..6f1803647ee 100644
--- a/src/library/serato/seratofeature.cpp
+++ b/src/library/serato/seratofeature.cpp
@@ -1,22 +1,19 @@
 #include "library/serato/seratofeature.h"
 
 #include <QMap>
-#include <QMessageBox>
-#include <QSettings>
 #include <QTextCodec>
+#include <QtConcurrent>
 #include <QtDebug>
 
 #include "library/dao/trackschema.h"
 #include "library/library.h"
 #include "library/queryutil.h"
+#include "library/serato/seratoplaylistmodel.h"
 #include "library/trackcollection.h"
 #include "library/trackcollectionmanager.h"
 #include "library/treeitem.h"
 #include "moc_seratofeature.cpp"
-#include "track/cue.h"
-#include "track/keyfactory.h"
 #include "util/assert.h"
-#include "util/color/color.h"
 #include "util/db/dbconnectionpooled.h"
 #include "util/db/dbconnectionpooler.h"
 #include "widget/wlibrary.h"
diff --git a/src/library/serato/seratofeature.h b/src/library/serato/seratofeature.h
index 6ae991c4360..8129b59e6ef 100644
--- a/src/library/serato/seratofeature.h
+++ b/src/library/serato/seratofeature.h
@@ -13,16 +13,13 @@
 
 #include <QFuture>
 #include <QFutureWatcher>
-#include <QStringListModel>
-#include <QtConcurrentRun>
-#include <fstream>
 
 #include "library/baseexternallibraryfeature.h"
-#include "library/baseexternaltrackmodel.h"
-#include "library/serato/seratoplaylistmodel.h"
-#include "library/treeitemmodel.h"
 #include "util/parented_ptr.h"
 
+class SeratoPlaylistModel;
+class BaseTrackCache;
+
 class SeratoFeature : public BaseExternalLibraryFeature {
     Q_OBJECT
   public:
diff --git a/src/library/serato/seratoplaylistmodel.h b/src/library/serato/seratoplaylistmodel.h
index f2daa327bf4..ae6a23cdcf0 100644
--- a/src/library/serato/seratoplaylistmodel.h
+++ b/src/library/serato/seratoplaylistmodel.h
@@ -1,10 +1,9 @@
 #pragma once
-// seratoplaylistmodel.h
-// Created 2020-02-15 by Jan Holthuis
+
 #include "library/baseexternalplaylistmodel.h"
 
 class TrackCollectionManager;
-class BaseExternalPlaylistModel;
+class SeratoPlaylistModel;
 
 class SeratoPlaylistModel : public BaseExternalPlaylistModel {
     Q_OBJECT
diff --git a/src/library/sidebarmodel.cpp b/src/library/sidebarmodel.cpp
index e0539fd95d9..1dd2786fbc4 100644
--- a/src/library/sidebarmodel.cpp
+++ b/src/library/sidebarmodel.cpp
@@ -1,10 +1,8 @@
 #include "library/sidebarmodel.h"
 
-#include <QApplication>
+#include <QTimer>
 #include <QUrl>
-#include <QtDebug>
 
-#include "library/browse/browsefeature.h"
 #include "library/libraryfeature.h"
 #include "library/treeitem.h"
 #include "moc_sidebarmodel.cpp"
diff --git a/src/library/sidebarmodel.h b/src/library/sidebarmodel.h
index debaa338a6b..c0d7a6ca063 100644
--- a/src/library/sidebarmodel.h
+++ b/src/library/sidebarmodel.h
@@ -3,10 +3,10 @@
 #include <QAbstractItemModel>
 #include <QList>
 #include <QModelIndex>
-#include <QTimer>
 #include <QVariant>
 
 class LibraryFeature;
+class QTimer;
 
 class SidebarModel : public QAbstractItemModel {
     Q_OBJECT
diff --git a/src/library/stardelegate.cpp b/src/library/stardelegate.cpp
index 6df2122ea7a..82e52735389 100644
--- a/src/library/stardelegate.cpp
+++ b/src/library/stardelegate.cpp
@@ -1,7 +1,6 @@
 #include "library/stardelegate.h"
 
-#include <QPainter>
-#include <QtDebug>
+#include <QTableView>
 
 #include "library/stareditor.h"
 #include "library/starrating.h"
diff --git a/src/library/stareditor.cpp b/src/library/stareditor.cpp
index 8c38f9d8d56..e46daef8879 100644
--- a/src/library/stareditor.cpp
+++ b/src/library/stareditor.cpp
@@ -1,6 +1,8 @@
 #include "library/stareditor.h"
 
-#include <QStylePainter>
+#include <QItemSelectionModel>
+#include <QMouseEvent>
+#include <QTableView>
 
 #include "library/starrating.h"
 #include "moc_stareditor.cpp"
diff --git a/src/library/stareditor.h b/src/library/stareditor.h
index 6393473830c..432a0474f5a 100644
--- a/src/library/stareditor.h
+++ b/src/library/stareditor.h
@@ -1,15 +1,12 @@
 #pragma once
 
 #include <QWidget>
-#include <QMouseEvent>
-#include <QEvent>
-#include <QStyle>
 #include <QSize>
-#include <QPaintEvent>
 #include <QStyleOptionViewItem>
-#include <QTableView>
 #include <QModelIndex>
 
+class QTableView;
+
 #include "library/starrating.h"
 
 class StarEditor : public QWidget {
@@ -19,7 +16,7 @@ class StarEditor : public QWidget {
                const QModelIndex& index,
                const QStyleOptionViewItem& option);
 
-    QSize sizeHint() const;
+    QSize sizeHint() const override;
     void setStarRating(const StarRating& starRating) {
         m_starRating = starRating;
     }
@@ -33,11 +30,11 @@ class StarEditor : public QWidget {
     void editingFinished();
 
   protected:
-    void paintEvent(QPaintEvent* event);
-    void mouseMoveEvent(QMouseEvent* event);
-    void mouseReleaseEvent(QMouseEvent* event);
+    void paintEvent(QPaintEvent* event) override;
+    void mouseMoveEvent(QMouseEvent* event) override;
+    void mouseReleaseEvent(QMouseEvent* event) override;
     //if the mouse leaves the editing index set starCount to 0
-    void leaveEvent(QEvent*);
+    void leaveEvent(QEvent*) override;
 
   private:
     int starAtPosition(int x);
diff --git a/src/library/starrating.h b/src/library/starrating.h
index 02a5c5c4421..152a22aef0d 100644
--- a/src/library/starrating.h
+++ b/src/library/starrating.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <QMetaType>
 #include <QPolygonF>
 #include <QSize>
 
diff --git a/src/library/tableitemdelegate.h b/src/library/tableitemdelegate.h
index 058df3f9875..8b5c9cb2469 100644
--- a/src/library/tableitemdelegate.h
+++ b/src/library/tableitemdelegate.h
@@ -1,7 +1,8 @@
 #pragma once
 
 #include <QStyledItemDelegate>
-#include <QTableView>
+
+class QTableView;
 
 class TableItemDelegate : public QStyledItemDelegate {
     Q_OBJECT
diff --git a/src/library/trackcollection.cpp b/src/library/trackcollection.cpp
index b6ad00cde3e..e0bd45487ed 100644
--- a/src/library/trackcollection.cpp
+++ b/src/library/trackcollection.cpp
@@ -1,8 +1,7 @@
 #include "library/trackcollection.h"
 
-#include <QApplication>
-
 #include "library/basetrackcache.h"
+#include "library/trackset/crate/crate.h"
 #include "moc_trackcollection.cpp"
 #include "track/globaltrackcache.h"
 #include "util/assert.h"
diff --git a/src/library/trackcollection.h b/src/library/trackcollection.h
index 71fe79d9ccd..3396e2a7546 100644
--- a/src/library/trackcollection.h
+++ b/src/library/trackcollection.h
@@ -2,7 +2,6 @@
 
 #include <gtest/gtest_prod.h>
 
-#include <QDir>
 #include <QList>
 #include <QSharedPointer>
 #include <QSqlDatabase>
@@ -19,6 +18,7 @@
 
 // forward declaration(s)
 class BaseTrackCache;
+class QDir;
 
 // Manages the internal database.
 class TrackCollection : public QObject,
diff --git a/src/library/trackcollectioniterator.h b/src/library/trackcollectioniterator.h
index d8fe83743e1..6076637ab95 100644
--- a/src/library/trackcollectioniterator.h
+++ b/src/library/trackcollectioniterator.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include <QModelIndex>
-
 #include "track/trackiterator.h"
 
 class TrackCollectionManager;
diff --git a/src/library/trackcollectionmanager.h b/src/library/trackcollectionmanager.h
index 7c6a28ba3b0..7fe8545bcb4 100644
--- a/src/library/trackcollectionmanager.h
+++ b/src/library/trackcollectionmanager.h
@@ -5,17 +5,16 @@
 #include <QSet>
 #include <memory>
 
-#include "library/relocatedtrack.h"
 #include "preferences/usersettings.h"
 #include "track/globaltrackcache.h"
 #include "util/db/dbconnectionpool.h"
-#include "util/fileinfo.h"
 #include "util/parented_ptr.h"
 #include "util/thread_affinity.h"
 
 class LibraryScanner;
 class TrackCollection;
 class ExternalTrackCollection;
+class RelocatedTrack;
 
 // Manages Mixxx's internal database of tracks as well as external track collections.
 //
diff --git a/src/library/trackloader.cpp b/src/library/trackloader.cpp
index 645bea5a4cc..390f99b59fb 100644
--- a/src/library/trackloader.cpp
+++ b/src/library/trackloader.cpp
@@ -1,11 +1,11 @@
 #include "library/trackloader.h"
 
-#include <QMetaMethod>
 #include <QThread>
 #include <mutex>
 
 #include "library/trackcollectionmanager.h"
 #include "moc_trackloader.cpp"
+#include "track/trackref.h"
 #include "util/logger.h"
 
 namespace mixxx {
diff --git a/src/library/trackloader.h b/src/library/trackloader.h
index d3eebc52a63..c5c4f47e1d9 100644
--- a/src/library/trackloader.h
+++ b/src/library/trackloader.h
@@ -4,9 +4,9 @@
 #include <QPointer>
 
 #include "track/track_decl.h"
-#include "track/trackref.h"
 
 class TrackCollectionManager;
+class TrackRef;
 
 namespace mixxx {
 
diff --git a/src/library/trackprocessing.cpp b/src/library/trackprocessing.cpp
index f5d8abd4f71..6d3f98c7198 100644
--- a/src/library/trackprocessing.cpp
+++ b/src/library/trackprocessing.cpp
@@ -2,7 +2,6 @@
 
 #include <QThread>
 
-#include "library/trackcollection.h"
 #include "library/trackcollectionmanager.h"
 #include "moc_trackprocessing.cpp"
 #include "util/logger.h"
diff --git a/src/library/trackset/baseplaylistfeature.cpp b/src/library/trackset/baseplaylistfeature.cpp
index ca7be6403ff..9cd8acf3556 100644
--- a/src/library/trackset/baseplaylistfeature.cpp
+++ b/src/library/trackset/baseplaylistfeature.cpp
@@ -1,19 +1,15 @@
 #include "library/trackset/baseplaylistfeature.h"
 
-#include <qlist.h>
-
-#include <QFileDialog>
+#include <QAction>
 #include <QFileInfo>
 #include <QInputDialog>
+#include <QList>
 
-#include "controllers/keyboard/keyboardeventfilter.h"
 #include "library/export/trackexportwizard.h"
 #include "library/library.h"
 #include "library/library_prefs.h"
 #include "library/parser.h"
 #include "library/parsercsv.h"
-#include "library/parserm3u.h"
-#include "library/parserpls.h"
 #include "library/playlisttablemodel.h"
 #include "library/trackcollection.h"
 #include "library/trackcollectionmanager.h"
diff --git a/src/library/trackset/baseplaylistfeature.h b/src/library/trackset/baseplaylistfeature.h
index 3eb0829e6cb..ce16c79e36c 100644
--- a/src/library/trackset/baseplaylistfeature.h
+++ b/src/library/trackset/baseplaylistfeature.h
@@ -1,14 +1,9 @@
 #pragma once
 
-#include <QAction>
-#include <QList>
 #include <QModelIndex>
-#include <QObject>
-#include <QPair>
 #include <QPointer>
 #include <QSet>
 #include <QString>
-#include <QUrl>
 
 #include "library/dao/playlistdao.h"
 #include "library/trackset/basetracksetfeature.h"
@@ -17,9 +12,10 @@
 class WLibrary;
 class KeyboardEventFilter;
 class PlaylistTableModel;
-class TrackCollectionManager;
 class TreeItem;
 class WLibrarySidebar;
+class QAction;
+class QUrl;
 
 class BasePlaylistFeature : public BaseTrackSetFeature {
     Q_OBJECT
diff --git a/src/library/trackset/basetracksetfeature.h b/src/library/trackset/basetracksetfeature.h
index 1a2b3948b43..6869d97ac46 100644
--- a/src/library/trackset/basetracksetfeature.h
+++ b/src/library/trackset/basetracksetfeature.h
@@ -1,9 +1,10 @@
 #pragma once
 
-#include "analyzer/analyzerscheduledtrack.h"
 #include "library/libraryfeature.h"
 #include "util/parented_ptr.h"
 
+class AnalyzerScheduledTrack;
+
 class BaseTrackSetFeature : public LibraryFeature {
     Q_OBJECT
 
diff --git a/src/library/trackset/crate/cratefeature.cpp b/src/library/trackset/crate/cratefeature.cpp
index cdcb66b8585..6b6fbbfce84 100644
--- a/src/library/trackset/crate/cratefeature.cpp
+++ b/src/library/trackset/crate/cratefeature.cpp
@@ -1,6 +1,5 @@
 #include "library/trackset/crate/cratefeature.h"
 
-#include <QFileDialog>
 #include <QInputDialog>
 #include <QLineEdit>
 #include <QMenu>
@@ -13,17 +12,15 @@
 #include "library/library_prefs.h"
 #include "library/parser.h"
 #include "library/parsercsv.h"
-#include "library/parserm3u.h"
-#include "library/parserpls.h"
 #include "library/trackcollection.h"
 #include "library/trackcollectionmanager.h"
 #include "library/trackset/crate/cratefeaturehelper.h"
+#include "library/trackset/crate/cratesummary.h"
 #include "library/treeitem.h"
 #include "moc_cratefeature.cpp"
 #include "sources/soundsourceproxy.h"
 #include "track/track.h"
 #include "util/defs.h"
-#include "util/dnd.h"
 #include "util/file.h"
 #include "widget/wlibrary.h"
 #include "widget/wlibrarysidebar.h"
diff --git a/src/library/trackset/crate/cratefeature.h b/src/library/trackset/crate/cratefeature.h
index b7e746d201b..0289a6e2060 100644
--- a/src/library/trackset/crate/cratefeature.h
+++ b/src/library/trackset/crate/cratefeature.h
@@ -1,17 +1,14 @@
 #pragma once
 
-#include <QAction>
 #include <QList>
 #include <QModelIndex>
-#include <QPoint>
 #include <QPointer>
 #include <QUrl>
 #include <QVariant>
 
 #include "library/trackset/basetracksetfeature.h"
-#include "library/trackset/crate/cratestorage.h"
+#include "library/trackset/crate/crate.h"
 #include "library/trackset/crate/cratetablemodel.h"
-#include "library/treeitemmodel.h"
 #include "preferences/usersettings.h"
 #include "track/trackid.h"
 #include "util/parented_ptr.h"
@@ -19,6 +16,9 @@
 // forward declaration(s)
 class Library;
 class WLibrarySidebar;
+class QAction;
+class QPoint;
+class CrateSummary;
 
 class CrateFeature : public BaseTrackSetFeature {
     Q_OBJECT
diff --git a/src/library/trackset/crate/cratefeaturehelper.cpp b/src/library/trackset/crate/cratefeaturehelper.cpp
index 78527ad74f5..d78802330a3 100644
--- a/src/library/trackset/crate/cratefeaturehelper.cpp
+++ b/src/library/trackset/crate/cratefeaturehelper.cpp
@@ -4,6 +4,8 @@
 #include <QLineEdit>
 
 #include "library/trackcollection.h"
+#include "library/trackset/crate/crate.h"
+#include "library/trackset/crate/cratesummary.h"
 #include "moc_cratefeaturehelper.cpp"
 
 CrateFeatureHelper::CrateFeatureHelper(
diff --git a/src/library/trackset/crate/cratefeaturehelper.h b/src/library/trackset/crate/cratefeaturehelper.h
index cd729988d20..8b02b81abe1 100644
--- a/src/library/trackset/crate/cratefeaturehelper.h
+++ b/src/library/trackset/crate/cratefeaturehelper.h
@@ -2,11 +2,11 @@
 
 #include <QObject>
 
-#include "library/trackset/crate/crate.h"
+#include "library/trackset/crate/crateid.h"
 #include "preferences/usersettings.h"
 
-// forward declaration(s)
 class TrackCollection;
+class Crate;
 
 class CrateFeatureHelper : public QObject {
     Q_OBJECT
diff --git a/src/library/trackset/crate/cratestorage.cpp b/src/library/trackset/crate/cratestorage.cpp
index a4c02995ebb..afee63e5a12 100644
--- a/src/library/trackset/crate/cratestorage.cpp
+++ b/src/library/trackset/crate/cratestorage.cpp
@@ -2,7 +2,9 @@
 
 #include "library/dao/trackschema.h"
 #include "library/queryutil.h"
+#include "library/trackset/crate/crate.h"
 #include "library/trackset/crate/crateschema.h"
+#include "library/trackset/crate/cratesummary.h"
 #include "util/db/dbconnection.h"
 #include "util/db/fwdsqlquery.h"
 #include "util/db/sqllikewildcards.h"
diff --git a/src/library/trackset/crate/cratestorage.h b/src/library/trackset/crate/cratestorage.h
index baa91fbdd48..89be4671054 100644
--- a/src/library/trackset/crate/cratestorage.h
+++ b/src/library/trackset/crate/cratestorage.h
@@ -1,15 +1,17 @@
 #pragma once
 
 #include <QList>
-#include <QObject>
 #include <QSet>
 
-#include "library/trackset/crate/cratesummary.h"
+#include "library/trackset/crate/crateid.h"
 #include "track/trackid.h"
 #include "util/db/fwdsqlqueryselectresult.h"
 #include "util/db/sqlstorage.h"
 #include "util/db/sqlsubselectmode.h"
 
+class Crate;
+class CrateSummary;
+
 class CrateQueryFields {
   public:
     CrateQueryFields() {
diff --git a/src/library/trackset/crate/cratetablemodel.cpp b/src/library/trackset/crate/cratetablemodel.cpp
index 43c5a6c59d7..6e612a378d2 100644
--- a/src/library/trackset/crate/cratetablemodel.cpp
+++ b/src/library/trackset/crate/cratetablemodel.cpp
@@ -5,7 +5,7 @@
 #include "library/dao/trackschema.h"
 #include "library/trackcollection.h"
 #include "library/trackcollectionmanager.h"
-#include "mixer/playermanager.h"
+#include "library/trackset/crate/crate.h"
 #include "moc_cratetablemodel.cpp"
 #include "track/track.h"
 #include "util/db/fwdsqlquery.h"
diff --git a/src/library/trackset/crate/cratetablemodel.h b/src/library/trackset/crate/cratetablemodel.h
index f146464bf4f..2050ebfbca6 100644
--- a/src/library/trackset/crate/cratetablemodel.h
+++ b/src/library/trackset/crate/cratetablemodel.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "library/basesqltablemodel.h"
 #include "library/trackset/crate/crateid.h"
 #include "library/trackset/tracksettablemodel.h"
 
diff --git a/src/library/trackset/playlistfeature.cpp b/src/library/trackset/playlistfeature.cpp
index 1498bf256ea..38ff2575c67 100644
--- a/src/library/trackset/playlistfeature.cpp
+++ b/src/library/trackset/playlistfeature.cpp
@@ -1,10 +1,8 @@
 #include "library/trackset/playlistfeature.h"
 
-#include <QFile>
 #include <QMenu>
 #include <QtDebug>
 
-#include "controllers/keyboard/keyboardeventfilter.h"
 #include "library/library.h"
 #include "library/parser.h"
 #include "library/playlisttablemodel.h"
@@ -15,11 +13,8 @@
 #include "moc_playlistfeature.cpp"
 #include "sources/soundsourceproxy.h"
 #include "util/db/dbconnection.h"
-#include "util/dnd.h"
 #include "util/duration.h"
-#include "widget/wlibrary.h"
 #include "widget/wlibrarysidebar.h"
-#include "widget/wlibrarytextbrowser.h"
 
 namespace {
 
diff --git a/src/library/trackset/playlistfeature.h b/src/library/trackset/playlistfeature.h
index 9f4d04db7dc..44a5da9905d 100644
--- a/src/library/trackset/playlistfeature.h
+++ b/src/library/trackset/playlistfeature.h
@@ -1,19 +1,15 @@
 #pragma once
 
-#include <QIcon>
 #include <QModelIndex>
 #include <QObject>
-#include <QPoint>
-#include <QPointer>
 #include <QUrl>
 #include <QVariant>
 
 #include "library/trackset/baseplaylistfeature.h"
 #include "preferences/usersettings.h"
 
-class TrackCollection;
 class TreeItem;
-class WLibrarySidebar;
+class QPoint;
 
 class PlaylistFeature : public BasePlaylistFeature {
     Q_OBJECT
diff --git a/src/library/trackset/setlogfeature.cpp b/src/library/trackset/setlogfeature.cpp
index d329a3be90d..160ca572332 100644
--- a/src/library/trackset/setlogfeature.cpp
+++ b/src/library/trackset/setlogfeature.cpp
@@ -2,9 +2,7 @@
 
 #include <QDateTime>
 #include <QMenu>
-#include <QtDebug>
 
-#include "control/controlobject.h"
 #include "library/library.h"
 #include "library/library_prefs.h"
 #include "library/playlisttablemodel.h"
@@ -13,7 +11,6 @@
 #include "library/trackcollectionmanager.h"
 #include "library/treeitem.h"
 #include "mixer/playerinfo.h"
-#include "mixer/playermanager.h"
 #include "moc_setlogfeature.cpp"
 #include "track/track.h"
 #include "widget/wlibrary.h"
diff --git a/src/library/trackset/setlogfeature.h b/src/library/trackset/setlogfeature.h
index c25babad3cf..38c005b9218 100644
--- a/src/library/trackset/setlogfeature.h
+++ b/src/library/trackset/setlogfeature.h
@@ -1,13 +1,12 @@
 #pragma once
 
-#include <QAction>
 #include <QPointer>
-#include <QSqlTableModel>
 
 #include "library/trackset/baseplaylistfeature.h"
 #include "preferences/usersettings.h"
 
 class Library;
+class QAction;
 
 class SetlogFeature : public BasePlaylistFeature {
     Q_OBJECT
diff --git a/src/library/treeitem.h b/src/library/treeitem.h
index 38844d1b765..9fd8fc8cf6f 100644
--- a/src/library/treeitem.h
+++ b/src/library/treeitem.h
@@ -1,13 +1,14 @@
 #pragma once
 
+#include <QIcon>
 #include <QList>
 #include <QString>
 #include <QVariant>
 
-#include "library/libraryfeature.h"
-
+#include "util/assert.h"
 #include "util/memory.h"
 
+class LibraryFeature;
 
 class TreeItem final {
     struct PrivateRootTag {};
diff --git a/src/library/treeitemmodel.h b/src/library/treeitemmodel.h
index 964d55ea955..793dc3e24ed 100644
--- a/src/library/treeitemmodel.h
+++ b/src/library/treeitemmodel.h
@@ -3,7 +3,6 @@
 #include <QAbstractItemModel>
 #include <QModelIndex>
 #include <QVariant>
-#include <QList>
 
 #include "util/memory.h"
 
diff --git a/src/test/cratestorage_test.cpp b/src/test/cratestorage_test.cpp
index 2fcac9a5e9e..093f0001ab1 100644
--- a/src/test/cratestorage_test.cpp
+++ b/src/test/cratestorage_test.cpp
@@ -1,5 +1,6 @@
 #include "library/trackset/crate/cratestorage.h"
 
+#include "library/trackset/crate/crate.h"
 #include "test/librarytest.h"
 
 class CrateStorageTest : public LibraryTest {
diff --git a/src/test/itunesxmlimportertest.cpp b/src/test/itunesxmlimportertest.cpp
index db998c0ce21..4ef851d4e58 100644
--- a/src/test/itunesxmlimportertest.cpp
+++ b/src/test/itunesxmlimportertest.cpp
@@ -11,6 +11,7 @@
 #include "library/itunes/itunesimporter.h"
 #include "library/itunes/itunespathmapping.h"
 #include "library/itunes/itunesxmlimporter.h"
+#include "library/treeitem.h"
 #include "test/mixxxtest.h"
 
 class ITunesXMLImporterTest : public MixxxTest {
diff --git a/src/test/playermanagertest.cpp b/src/test/playermanagertest.cpp
index 5a0f5f46a46..70497c575eb 100644
--- a/src/test/playermanagertest.cpp
+++ b/src/test/playermanagertest.cpp
@@ -7,6 +7,8 @@
 #include "engine/channels/enginedeck.h"
 #include "engine/enginebuffer.h"
 #include "engine/enginemixer.h"
+#include "library/library.h"
+#include "library/trackcollectionmanager.h"
 #include "mixer/basetrackplayer.h"
 #include "mixer/deck.h"
 #include "mixer/playerinfo.h"
diff --git a/src/test/searchqueryparsertest.cpp b/src/test/searchqueryparsertest.cpp
index 614c5097d39..be3fcea4c76 100644
--- a/src/test/searchqueryparsertest.cpp
+++ b/src/test/searchqueryparsertest.cpp
@@ -3,7 +3,9 @@
 #include <QDir>
 #include <QtDebug>
 
+#include "library/searchquery.h"
 #include "library/searchqueryparser.h"
+#include "library/trackset/crate/crate.h"
 #include "test/librarytest.h"
 #include "track/track.h"
 #include "util/assert.h"

From 7eba146963719e4611be75c1fa0e40c28b9964ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Mon, 30 Oct 2023 22:08:19 +0100
Subject: [PATCH 243/388] Improve library dao headers

---
 src/database/mixxxdb.h              |  4 +---
 src/database/schemamanager.h        |  5 ++---
 src/library/dao/analysisdao.cpp     |  5 ++---
 src/library/dao/analysisdao.h       |  4 ++--
 src/library/dao/autodjcratesdao.cpp |  3 ---
 src/library/dao/cuedao.cpp          |  3 ---
 src/library/dao/cuedao.h            |  2 --
 src/library/dao/libraryhashdao.cpp  |  8 ++++----
 src/library/dao/libraryhashdao.h    |  1 -
 src/library/dao/playlistdao.cpp     |  3 ---
 src/library/dao/playlistdao.h       |  2 +-
 src/library/dao/settingsdao.cpp     |  4 +++-
 src/library/dao/settingsdao.h       |  3 ++-
 src/library/dao/trackdao.cpp        |  6 ------
 src/library/dao/trackdao.h          |  4 ----
 src/library/dlganalysis.cpp         |  5 -----
 src/library/dlganalysis.h           |  3 +--
 src/library/dlgcoverartfullsize.cpp |  2 ++
 src/library/dlgcoverartfullsize.h   | 10 ++++++----
 src/widget/wcoverart.cpp            |  2 ++
 src/widget/wspinnybase.cpp          |  1 +
 21 files changed, 29 insertions(+), 51 deletions(-)

diff --git a/src/database/mixxxdb.h b/src/database/mixxxdb.h
index d02a7c22803..0e31fb61be8 100644
--- a/src/database/mixxxdb.h
+++ b/src/database/mixxxdb.h
@@ -1,11 +1,9 @@
 #pragma once
 
-#include <QSqlDatabase>
-
 #include "preferences/usersettings.h"
-
 #include "util/db/dbconnectionpool.h"
 
+class QSqlDatabase;
 
 class MixxxDb : public QObject {
     Q_OBJECT
diff --git a/src/database/schemamanager.h b/src/database/schemamanager.h
index b9b0ebe3ed3..2d335d57c7c 100644
--- a/src/database/schemamanager.h
+++ b/src/database/schemamanager.h
@@ -1,10 +1,9 @@
 #pragma once
 
-#include <QSqlDatabase>
-
-#include "preferences/usersettings.h"
 #include "library/dao/settingsdao.h"
 
+class QSqlDatabase;
+
 /// The SchemaManager reads the database schema from the schemaFile
 /// (res/schema.xml) and is responsible for checking compatibility as well as
 /// upgrading the database if necessary.
diff --git a/src/library/dao/analysisdao.cpp b/src/library/dao/analysisdao.cpp
index 2c5c42f62d1..30e9e1ed3da 100644
--- a/src/library/dao/analysisdao.cpp
+++ b/src/library/dao/analysisdao.cpp
@@ -1,9 +1,8 @@
+#include "library/dao/analysisdao.h"
+
 #include <QSqlQuery>
-#include <QSqlResult>
-#include <QSqlError>
 #include <QtDebug>
 
-#include "library/dao/analysisdao.h"
 #include "library/queryutil.h"
 #include "preferences/waveformsettings.h"
 #include "util/performancetimer.h"
diff --git a/src/library/dao/analysisdao.h b/src/library/dao/analysisdao.h
index 1519b30f226..27314b2b67f 100644
--- a/src/library/dao/analysisdao.h
+++ b/src/library/dao/analysisdao.h
@@ -1,14 +1,14 @@
 #pragma once
 
-#include <QObject>
 #include <QDir>
-#include <QSqlDatabase>
 
 #include "preferences/usersettings.h"
 #include "library/dao/dao.h"
 #include "track/trackid.h"
 #include "waveform/waveform.h"
 
+class QSqlDatabase;
+
 class AnalysisDao : public DAO {
   public:
     static const QString s_analysisTableName;
diff --git a/src/library/dao/autodjcratesdao.cpp b/src/library/dao/autodjcratesdao.cpp
index a03ec273d16..839b7971307 100644
--- a/src/library/dao/autodjcratesdao.cpp
+++ b/src/library/dao/autodjcratesdao.cpp
@@ -2,10 +2,7 @@
 
 #include <QRandomGenerator>
 #include <QtDebug>
-#include <QtSql>
 
-#include "library/dao/settingsdao.h"
-#include "library/dao/trackdao.h"
 #include "library/dao/trackschema.h"
 #include "library/queryutil.h"
 #include "library/trackcollection.h"
diff --git a/src/library/dao/cuedao.cpp b/src/library/dao/cuedao.cpp
index 9b0066fc9db..49ff2ee9291 100644
--- a/src/library/dao/cuedao.cpp
+++ b/src/library/dao/cuedao.cpp
@@ -2,16 +2,13 @@
 
 #include <QVariant>
 #include <QtDebug>
-#include <QtSql>
 
 #include "engine/engine.h"
 #include "library/queryutil.h"
-#include "track/track.h"
 #include "util/assert.h"
 #include "util/color/rgbcolor.h"
 #include "util/db/fwdsqlquery.h"
 #include "util/logger.h"
-#include "util/performancetimer.h"
 
 namespace {
 
diff --git a/src/library/dao/cuedao.h b/src/library/dao/cuedao.h
index 6920a25b973..20c6f104dc3 100644
--- a/src/library/dao/cuedao.h
+++ b/src/library/dao/cuedao.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <QSqlDatabase>
-
 #include "library/dao/dao.h"
 #include "track/cue.h"
 #include "track/trackid.h"
diff --git a/src/library/dao/libraryhashdao.cpp b/src/library/dao/libraryhashdao.cpp
index 4e0e1347e90..1b824f034f9 100644
--- a/src/library/dao/libraryhashdao.cpp
+++ b/src/library/dao/libraryhashdao.cpp
@@ -1,10 +1,10 @@
-#include <QtSql>
+#include "libraryhashdao.h"
+
 #include <QString>
-#include <QtDebug>
-#include <QVariant>
 #include <QThread>
+#include <QVariant>
+#include <QtDebug>
 
-#include "libraryhashdao.h"
 #include "library/queryutil.h"
 
 namespace {
diff --git a/src/library/dao/libraryhashdao.h b/src/library/dao/libraryhashdao.h
index 0f16cefa5b7..45a36431189 100644
--- a/src/library/dao/libraryhashdao.h
+++ b/src/library/dao/libraryhashdao.h
@@ -3,7 +3,6 @@
 #include <QObject>
 #include <QHash>
 #include <QString>
-#include <QSqlDatabase>
 
 #include "library/dao/dao.h"
 #include "util/cache.h"
diff --git a/src/library/dao/playlistdao.cpp b/src/library/dao/playlistdao.cpp
index 7758d148730..c9b9d24265f 100644
--- a/src/library/dao/playlistdao.cpp
+++ b/src/library/dao/playlistdao.cpp
@@ -2,13 +2,10 @@
 
 #include <QRandomGenerator>
 #include <QtDebug>
-#include <QtSql>
 
 #include "library/autodj/autodjprocessor.h"
 #include "library/queryutil.h"
-#include "library/trackcollection.h"
 #include "moc_playlistdao.cpp"
-#include "track/track.h"
 #include "util/db/dbconnection.h"
 #include "util/db/fwdsqlquery.h"
 #include "util/math.h"
diff --git a/src/library/dao/playlistdao.h b/src/library/dao/playlistdao.h
index e0b0c13bff2..58660626c27 100644
--- a/src/library/dao/playlistdao.h
+++ b/src/library/dao/playlistdao.h
@@ -2,7 +2,6 @@
 
 #include <QHash>
 #include <QObject>
-#include <QSqlDatabase>
 #include <QSet>
 
 #include "library/dao/dao.h"
@@ -27,6 +26,7 @@ const QString PLAYLISTTRACKSTABLE_DATETIMEADDED = QStringLiteral("pl_datetime_ad
 #define AUTODJ_TABLE "Auto DJ"
 
 class AutoDJProcessor;
+class QSqlDatabase;
 
 constexpr int kInvalidPlaylistId = -1;
 
diff --git a/src/library/dao/settingsdao.cpp b/src/library/dao/settingsdao.cpp
index 3eae7aba06c..09f6f99b77f 100644
--- a/src/library/dao/settingsdao.cpp
+++ b/src/library/dao/settingsdao.cpp
@@ -1,6 +1,8 @@
 #include "library/dao/settingsdao.h"
 
-#include <QtSql>
+#include <QSqlError>
+#include <QSqlQuery>
+#include <QSqlRecord>
 
 #include "util/assert.h"
 #include "util/logger.h"
diff --git a/src/library/dao/settingsdao.h b/src/library/dao/settingsdao.h
index ade5a92e989..63242acb973 100644
--- a/src/library/dao/settingsdao.h
+++ b/src/library/dao/settingsdao.h
@@ -2,7 +2,8 @@
 
 #include <QSqlDatabase>
 #include <QString>
-#include <QVariant>
+
+class QVariant;
 
 // All library-specific preferences go in the library settings table
 class SettingsDAO final {
diff --git a/src/library/dao/trackdao.cpp b/src/library/dao/trackdao.cpp
index e343ecfdd59..536a65040a5 100644
--- a/src/library/dao/trackdao.cpp
+++ b/src/library/dao/trackdao.cpp
@@ -2,11 +2,8 @@
 
 #include <QChar>
 #include <QDir>
-#include <QDirIterator>
 #include <QFileInfo>
-#include <QImage>
 #include <QtDebug>
-#include <QtSql>
 
 #ifdef __SQLITE3__
 #include <sqlite3.h>
@@ -18,10 +15,8 @@
 #include "library/dao/cuedao.h"
 #include "library/dao/libraryhashdao.h"
 #include "library/dao/playlistdao.h"
-#include "library/dao/trackschema.h"
 #include "library/library_prefs.h"
 #include "library/queryutil.h"
-#include "library/trackset/crate/cratestorage.h"
 #include "moc_trackdao.cpp"
 #include "sources/soundsourceproxy.h"
 #include "track/beats.h"
@@ -29,7 +24,6 @@
 #include "track/keyfactory.h"
 #include "track/keyutils.h"
 #include "track/track.h"
-#include "track/tracknumbers.h"
 #include "util/assert.h"
 #include "util/datetime.h"
 #include "util/db/fwdsqlquery.h"
diff --git a/src/library/dao/trackdao.h b/src/library/dao/trackdao.h
index 29f7e9bff14..df42ddb41c9 100644
--- a/src/library/dao/trackdao.h
+++ b/src/library/dao/trackdao.h
@@ -1,10 +1,8 @@
 #pragma once
 
-#include <QFileInfo>
 #include <QList>
 #include <QObject>
 #include <QSet>
-#include <QSqlDatabase>
 #include <QString>
 
 #include "library/dao/dao.h"
@@ -14,7 +12,6 @@
 #include "util/class.h"
 #include "util/memory.h"
 
-class FwdSqlQuery;
 class SqlTransaction;
 class PlaylistDAO;
 class AnalysisDao;
@@ -22,7 +19,6 @@ class CueDAO;
 class LibraryHashDAO;
 
 namespace mixxx {
-
 class FileInfo;
 class TrackRecord;
 
diff --git a/src/library/dlganalysis.cpp b/src/library/dlganalysis.cpp
index 079bfd02a6e..36bb12953b6 100644
--- a/src/library/dlganalysis.cpp
+++ b/src/library/dlganalysis.cpp
@@ -1,18 +1,13 @@
 #include "library/dlganalysis.h"
 
-#include <QSqlTableModel>
-
 #include "analyzer/analyzerprogress.h"
 #include "analyzer/analyzerscheduledtrack.h"
 #include "library/dao/trackschema.h"
 #include "library/library.h"
-#include "library/trackcollectionmanager.h"
 #include "moc_dlganalysis.cpp"
 #include "util/assert.h"
 #include "widget/wanalysislibrarytableview.h"
 #include "widget/wlibrary.h"
-#include "widget/wskincolor.h"
-#include "widget/wwidget.h"
 
 DlgAnalysis::DlgAnalysis(WLibrary* parent,
                        UserSettingsPointer pConfig,
diff --git a/src/library/dlganalysis.h b/src/library/dlganalysis.h
index 5fd5fdf9822..c4d90c56521 100644
--- a/src/library/dlganalysis.h
+++ b/src/library/dlganalysis.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <QButtonGroup>
-#include <QItemSelection>
 
 #include "analyzer/analyzerprogress.h"
 #include "analyzer/analyzerscheduledtrack.h"
@@ -10,10 +9,10 @@
 #include "library/ui_dlganalysis.h"
 #include "preferences/usersettings.h"
 
-class AnalysisLibraryTableModel;
 class WAnalysisLibraryTableView;
 class Library;
 class WLibrary;
+class QItemSelection;
 
 class DlgAnalysis : public QWidget, public Ui::DlgAnalysis, public virtual LibraryView {
     Q_OBJECT
diff --git a/src/library/dlgcoverartfullsize.cpp b/src/library/dlgcoverartfullsize.cpp
index 68945ced293..027a4ffa687 100644
--- a/src/library/dlgcoverartfullsize.cpp
+++ b/src/library/dlgcoverartfullsize.cpp
@@ -7,9 +7,11 @@
 
 #include "library/coverartcache.h"
 #include "library/coverartutils.h"
+#include "mixer/basetrackplayer.h"
 #include "moc_dlgcoverartfullsize.cpp"
 #include "track/track.h"
 #include "util/widgethelper.h"
+#include "widget/wcoverartmenu.h"
 
 DlgCoverArtFullSize::DlgCoverArtFullSize(
         QWidget* parent,
diff --git a/src/library/dlgcoverartfullsize.h b/src/library/dlgcoverartfullsize.h
index b10b1f33259..2842815fe6d 100644
--- a/src/library/dlgcoverartfullsize.h
+++ b/src/library/dlgcoverartfullsize.h
@@ -4,12 +4,14 @@
 #include <QPoint>
 #include <QTimer>
 
-#include "library/coverart.h"
 #include "library/ui_dlgcoverartfullsize.h"
-#include "mixer/basetrackplayer.h"
 #include "track/track_decl.h"
-#include "util/parented_ptr.h"
-#include "widget/wcoverartmenu.h"
+#include "util/cache.h"
+
+class BaseTrackPlayer;
+class WCoverArtMenu;
+class CoverInfo;
+class CoverInfoRelative;
 
 class DlgCoverArtFullSize
         : public QDialog,
diff --git a/src/widget/wcoverart.cpp b/src/widget/wcoverart.cpp
index 87f79fe0e75..1c72c05eccf 100644
--- a/src/widget/wcoverart.cpp
+++ b/src/widget/wcoverart.cpp
@@ -6,11 +6,13 @@
 #include "library/coverartcache.h"
 #include "library/coverartutils.h"
 #include "library/dlgcoverartfullsize.h"
+#include "mixer/basetrackplayer.h"
 #include "moc_wcoverart.cpp"
 #include "skin/legacy/skincontext.h"
 #include "track/track.h"
 #include "util/dnd.h"
 #include "util/math.h"
+#include "widget/wcoverartmenu.h"
 #include "widget/wskincolor.h"
 
 WCoverArt::WCoverArt(QWidget* parent,
diff --git a/src/widget/wspinnybase.cpp b/src/widget/wspinnybase.cpp
index 2f128497aed..8a7f4a4928f 100644
--- a/src/widget/wspinnybase.cpp
+++ b/src/widget/wspinnybase.cpp
@@ -7,6 +7,7 @@
 #include "library/coverartcache.h"
 #include "library/coverartutils.h"
 #include "library/dlgcoverartfullsize.h"
+#include "mixer/basetrackplayer.h"
 #include "moc_wspinnybase.cpp"
 #include "skin/legacy/skincontext.h"
 #include "track/track.h"

From 507a482600900d592dd1b6d18520898cb699e739 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Mon, 30 Oct 2023 23:43:37 +0100
Subject: [PATCH 244/388] Improve library browse headers

---
 src/library/browse/browsefeature.cpp    | 4 +---
 src/library/browse/browsefeature.h      | 6 ++----
 src/library/browse/browsetablemodel.cpp | 6 +-----
 src/library/browse/browsetablemodel.h   | 4 ++--
 src/library/browse/browsethread.cpp     | 2 --
 src/library/browse/browsethread.h       | 2 +-
 src/library/browse/foldertreemodel.cpp  | 6 +-----
 src/library/browse/foldertreemodel.h    | 5 -----
 8 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/src/library/browse/browsefeature.cpp b/src/library/browse/browsefeature.cpp
index ce82f714881..56ca30aa1a8 100644
--- a/src/library/browse/browsefeature.cpp
+++ b/src/library/browse/browsefeature.cpp
@@ -5,15 +5,13 @@
 #include <QMenu>
 #include <QPushButton>
 #include <QStringList>
-#include <QTreeView>
 
-#include "controllers/keyboard/keyboardeventfilter.h"
+#include "library/browse/foldertreemodel.h"
 #include "library/library.h"
 #include "library/trackcollection.h"
 #include "library/trackcollectionmanager.h"
 #include "library/treeitem.h"
 #include "moc_browsefeature.cpp"
-#include "track/track.h"
 #include "util/memory.h"
 #include "widget/wlibrary.h"
 #include "widget/wlibrarysidebar.h"
diff --git a/src/library/browse/browsefeature.h b/src/library/browse/browsefeature.h
index ded3b3b82fe..d7c0d5064ec 100644
--- a/src/library/browse/browsefeature.h
+++ b/src/library/browse/browsefeature.h
@@ -4,14 +4,10 @@
 #include <QSortFilterProxyModel>
 #include <QObject>
 #include <QVariant>
-#include <QIcon>
-#include <QModelIndex>
-#include <QPoint>
 #include <QString>
 
 #include "preferences/usersettings.h"
 #include "library/browse/browsetablemodel.h"
-#include "library/browse/foldertreemodel.h"
 #include "library/libraryfeature.h"
 #include "library/proxytrackmodel.h"
 
@@ -21,6 +17,8 @@
 class Library;
 class TrackCollection;
 class WLibrarySidebar;
+class QModelIndex;
+class FolderTreeModel;
 
 class BrowseFeature : public LibraryFeature {
     Q_OBJECT
diff --git a/src/library/browse/browsetablemodel.cpp b/src/library/browse/browsetablemodel.cpp
index 35a75ba6e47..9bda00364bb 100644
--- a/src/library/browse/browsetablemodel.cpp
+++ b/src/library/browse/browsetablemodel.cpp
@@ -1,14 +1,9 @@
 #include "library/browse/browsetablemodel.h"
 
 #include <QMessageBox>
-#include <QMetaType>
 #include <QStringList>
-#include <QTableView>
 #include <QUrl>
-#include <QtConcurrentRun>
-#include <QtSql>
 
-#include "control/controlobject.h"
 #include "library/browse/browsetablemodel.h"
 #include "library/browse/browsethread.h"
 #include "library/previewbuttondelegate.h"
@@ -17,6 +12,7 @@
 #include "mixer/playerinfo.h"
 #include "mixer/playermanager.h"
 #include "moc_browsetablemodel.cpp"
+#include "recording/recordingmanager.h"
 #include "track/track.h"
 #include "widget/wlibrarytableview.h"
 
diff --git a/src/library/browse/browsetablemodel.h b/src/library/browse/browsetablemodel.h
index 702c4345a26..fb4b8dbc7f8 100644
--- a/src/library/browse/browsetablemodel.h
+++ b/src/library/browse/browsetablemodel.h
@@ -1,10 +1,8 @@
 #pragma once
 
 #include <QStandardItemModel>
-#include <QMimeData>
 
 #include "library/trackmodel.h"
-#include "recording/recordingmanager.h"
 #include "library/browse/browsethread.h"
 
 //constants
@@ -32,6 +30,8 @@ constexpr int COLUMN_REPLAYGAIN = 20;
 constexpr int NUM_COLUMNS = 21;
 
 class TrackCollectionManager;
+class QMimeData;
+class RecordingManager;
 
 namespace mixxx {
 
diff --git a/src/library/browse/browsethread.cpp b/src/library/browse/browsethread.cpp
index 0801c25e054..f6a763b48c0 100644
--- a/src/library/browse/browsethread.cpp
+++ b/src/library/browse/browsethread.cpp
@@ -1,6 +1,5 @@
 #include "library/browse/browsethread.h"
 
-#include <QDateTime>
 #include <QDirIterator>
 #include <QStringList>
 #include <QtDebug>
@@ -8,7 +7,6 @@
 #include "library/browse/browsetablemodel.h"
 #include "moc_browsethread.cpp"
 #include "sources/soundsourceproxy.h"
-#include "track/track.h"
 #include "util/datetime.h"
 #include "util/trace.h"
 
diff --git a/src/library/browse/browsethread.h b/src/library/browse/browsethread.h
index 9b9d92566d1..c92ff9828cc 100644
--- a/src/library/browse/browsethread.h
+++ b/src/library/browse/browsethread.h
@@ -7,7 +7,6 @@
 #include <QList>
 #include <QMutex>
 #include <QSharedPointer>
-#include <QStandardItem>
 #include <QThread>
 #include <QWaitCondition>
 #include <QWeakPointer>
@@ -23,6 +22,7 @@
 // other than the GUI thread.
 class BrowseTableModel;
 class BrowseThread;
+class QStandardItem;
 
 typedef QSharedPointer<BrowseThread> BrowseThreadPointer;
 
diff --git a/src/library/browse/foldertreemodel.cpp b/src/library/browse/foldertreemodel.cpp
index 24299b35159..3f56a74c3be 100644
--- a/src/library/browse/foldertreemodel.cpp
+++ b/src/library/browse/foldertreemodel.cpp
@@ -3,14 +3,10 @@
 #include <Shellapi.h>
 #include <Shlobj.h>
 #else
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <dirent.h>
-#include <unistd.h>
-#include <errno.h>
 #endif
 
-#include <QFileInfo>
+#include <QFileInfoList>
 
 #include "library/browse/browsefeature.h"
 #include "library/browse/foldertreemodel.h"
diff --git a/src/library/browse/foldertreemodel.h b/src/library/browse/foldertreemodel.h
index 2bff73671a3..ee6cbea35d5 100644
--- a/src/library/browse/foldertreemodel.h
+++ b/src/library/browse/foldertreemodel.h
@@ -1,15 +1,10 @@
 #pragma once
 
-#include <QAbstractItemModel>
 #include <QModelIndex>
-#include <QVariant>
-#include <QList>
 #include <QHash>
 
 #include "library/treeitemmodel.h"
-#include "library/treeitem.h"
 
-class TreeItem;
 // This class represents a folder item within the Browse Feature
 // The class is derived from TreeItemModel to support lazy model
 // initialization.

From cefd54f3675caffcea20291002cba9f09c7699df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Tue, 31 Oct 2023 00:17:24 +0100
Subject: [PATCH 245/388] Improve recording headers

---
 src/library/recording/dlgrecording.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/library/recording/dlgrecording.cpp b/src/library/recording/dlgrecording.cpp
index f7cce739e1c..61661105134 100644
--- a/src/library/recording/dlgrecording.cpp
+++ b/src/library/recording/dlgrecording.cpp
@@ -3,6 +3,7 @@
 #include "controllers/keyboard/keyboardeventfilter.h"
 #include "library/library.h"
 #include "moc_dlgrecording.cpp"
+#include "recording/recordingmanager.h"
 #include "util/assert.h"
 #include "widget/wlibrary.h"
 #include "widget/wtracktableview.h"

From d7bafad865351c695f2e40b883989f00292feae7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sun, 5 Nov 2023 11:49:47 +0100
Subject: [PATCH 246/388] Improve banshee headers

---
 src/library/banshee/bansheefeature.cpp       | 4 +---
 src/library/banshee/bansheefeature.h         | 7 -------
 src/library/banshee/bansheeplaylistmodel.cpp | 4 +---
 src/library/banshee/bansheeplaylistmodel.h   | 9 ++-------
 4 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/library/banshee/bansheefeature.cpp b/src/library/banshee/bansheefeature.cpp
index 80d875379ab..71f01260192 100644
--- a/src/library/banshee/bansheefeature.cpp
+++ b/src/library/banshee/bansheefeature.cpp
@@ -6,10 +6,8 @@
 
 #include "library/banshee/bansheedbconnection.h"
 #include "library/banshee/bansheeplaylistmodel.h"
-#include "library/baseexternalplaylistmodel.h"
-#include "library/dao/settingsdao.h"
 #include "library/library.h"
-#include "library/trackcollectionmanager.h"
+#include "library/treeitem.h"
 #include "moc_bansheefeature.cpp"
 #include "track/track.h"
 
diff --git a/src/library/banshee/bansheefeature.h b/src/library/banshee/bansheefeature.h
index 57b6357b37f..6be40fdd1a1 100644
--- a/src/library/banshee/bansheefeature.h
+++ b/src/library/banshee/bansheefeature.h
@@ -1,18 +1,11 @@
 #pragma once
 
-#include <QStringListModel>
-#include <QtSql>
 #include <QFuture>
-#include <QtConcurrentRun>
 #include <QFutureWatcher>
 
 #include "library/baseexternallibraryfeature.h"
-#include "library/trackcollection.h"
-#include "library/treeitemmodel.h"
-#include "library/treeitem.h"
 #include "library/banshee/bansheedbconnection.h"
 
-
 class BansheePlaylistModel;
 
 class BansheeFeature : public BaseExternalLibraryFeature {
diff --git a/src/library/banshee/bansheeplaylistmodel.cpp b/src/library/banshee/bansheeplaylistmodel.cpp
index 8326d91fc16..30805b66bea 100644
--- a/src/library/banshee/bansheeplaylistmodel.cpp
+++ b/src/library/banshee/bansheeplaylistmodel.cpp
@@ -3,13 +3,11 @@
 #include <QtDebug>
 
 #include "library/banshee/bansheedbconnection.h"
-#include "library/previewbuttondelegate.h"
+#include "library/dao/playlistdao.h"
 #include "library/queryutil.h"
-#include "library/starrating.h"
 #include "library/trackcollectionmanager.h"
 #include "mixer/playermanager.h"
 #include "moc_bansheeplaylistmodel.cpp"
-#include "track/beats.h"
 #include "track/track.h"
 
 #define BANSHEE_TABLE "banshee"
diff --git a/src/library/banshee/bansheeplaylistmodel.h b/src/library/banshee/bansheeplaylistmodel.h
index 868a85cfb01..f137364a606 100644
--- a/src/library/banshee/bansheeplaylistmodel.h
+++ b/src/library/banshee/bansheeplaylistmodel.h
@@ -1,15 +1,10 @@
 #pragma once
 
-#include <QHash>
-#include <QtSql>
-
 #include "library/trackmodel.h"
-#include "library/trackcollection.h"
-#include "library/dao/trackdao.h"
-#include "library/banshee/bansheedbconnection.h"
-#include "library/stardelegate.h"
 #include "library/basesqltablemodel.h"
 
+class BansheeDbConnection;
+
 class BansheePlaylistModel final : public BaseSqlTableModel {
     Q_OBJECT
   public:

From fc00e51a52bf8dacaa9fc2156cce731f341449db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Tue, 31 Oct 2023 13:19:59 +0100
Subject: [PATCH 247/388] Improve headers of autodj classes

---
 src/library/autodj/autodjfeature.cpp   |  4 ----
 src/library/autodj/autodjfeature.h     | 11 ++++-------
 src/library/autodj/autodjprocessor.cpp |  3 +--
 src/library/autodj/autodjprocessor.h   |  6 +++---
 src/library/autodj/dlgautodj.cpp       |  6 ++++--
 src/library/autodj/dlgautodj.h         |  6 ++----
 src/test/autodjprocessor_test.cpp      |  1 +
 7 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/src/library/autodj/autodjfeature.cpp b/src/library/autodj/autodjfeature.cpp
index e793d9023be..d2fe03b9686 100644
--- a/src/library/autodj/autodjfeature.cpp
+++ b/src/library/autodj/autodjfeature.cpp
@@ -1,10 +1,8 @@
 #include "library/autodj/autodjfeature.h"
 
 #include <QMenu>
-#include <QMetaObject>
 #include <QtDebug>
 
-#include "controllers/keyboard/keyboardeventfilter.h"
 #include "library/autodj/autodjprocessor.h"
 #include "library/autodj/dlgautodj.h"
 #include "library/library.h"
@@ -13,11 +11,9 @@
 #include "library/trackcollectionmanager.h"
 #include "library/trackset/crate/cratestorage.h"
 #include "library/treeitem.h"
-#include "mixer/playermanager.h"
 #include "moc_autodjfeature.cpp"
 #include "sources/soundsourceproxy.h"
 #include "track/track.h"
-#include "util/dnd.h"
 #include "widget/wlibrary.h"
 #include "widget/wlibrarysidebar.h"
 
diff --git a/src/library/autodj/autodjfeature.h b/src/library/autodj/autodjfeature.h
index 35ee88e903d..09bd81127f1 100644
--- a/src/library/autodj/autodjfeature.h
+++ b/src/library/autodj/autodjfeature.h
@@ -1,19 +1,14 @@
 #pragma once
 
-#include <QAction>
 #include <QList>
-#include <QModelIndex>
 #include <QObject>
-#include <QPoint>
 #include <QPointer>
-#include <QStringListModel>
 #include <QUrl>
 #include <QVariant>
 
 #include "library/dao/autodjcratesdao.h"
 #include "library/libraryfeature.h"
 #include "library/trackset/crate/crate.h"
-#include "library/treeitemmodel.h"
 #include "preferences/usersettings.h"
 #include "util/parented_ptr.h"
 
@@ -21,9 +16,11 @@ class DlgAutoDJ;
 class Library;
 class PlayerManagerInterface;
 class TrackCollection;
-class TrackCollectionManager;
 class AutoDJProcessor;
 class WLibrarySidebar;
+class QAction;
+class QModelIndex;
+class QPoint;
 
 class AutoDJFeature : public LibraryFeature {
     Q_OBJECT
@@ -80,7 +77,7 @@ class AutoDJFeature : public LibraryFeature {
 
     // A context-menu item that allows crates to be removed from the
     // auto-DJ list.
-    QAction *m_pRemoveCrateFromAutoDj;
+    QAction* m_pRemoveCrateFromAutoDj;
 
     QPointer<WLibrarySidebar> m_pSidebarWidget;
 
diff --git a/src/library/autodj/autodjprocessor.cpp b/src/library/autodj/autodjprocessor.cpp
index 0128cda47d8..c44abea1ca2 100644
--- a/src/library/autodj/autodjprocessor.cpp
+++ b/src/library/autodj/autodjprocessor.cpp
@@ -3,8 +3,7 @@
 #include "control/controlproxy.h"
 #include "control/controlpushbutton.h"
 #include "engine/channels/enginedeck.h"
-#include "engine/engine.h"
-#include "library/trackcollection.h"
+#include "library/playlisttablemodel.h"
 #include "mixer/basetrackplayer.h"
 #include "mixer/playermanager.h"
 #include "moc_autodjprocessor.cpp"
diff --git a/src/library/autodj/autodjprocessor.h b/src/library/autodj/autodjprocessor.h
index cb73b1b399a..600cf7bfb70 100644
--- a/src/library/autodj/autodjprocessor.h
+++ b/src/library/autodj/autodjprocessor.h
@@ -1,13 +1,11 @@
 #pragma once
 
-#include <QModelIndexList>
 #include <QObject>
 #include <QString>
 
+#include "audio/frame.h"
 #include "control/controlproxy.h"
 #include "engine/channels/enginechannel.h"
-#include "engine/controls/cuecontrol.h"
-#include "library/playlisttablemodel.h"
 #include "preferences/usersettings.h"
 #include "track/track_decl.h"
 #include "util/class.h"
@@ -16,6 +14,8 @@ class ControlPushButton;
 class TrackCollectionManager;
 class PlayerManagerInterface;
 class BaseTrackPlayer;
+class PlaylistTableModel;
+typedef QList<QModelIndex> QModelIndexList;
 
 class DeckAttributes : public QObject {
     Q_OBJECT
diff --git a/src/library/autodj/dlgautodj.cpp b/src/library/autodj/dlgautodj.cpp
index 22b3467591c..d7fb4302a47 100644
--- a/src/library/autodj/dlgautodj.cpp
+++ b/src/library/autodj/dlgautodj.cpp
@@ -1,10 +1,12 @@
 #include "library/autodj/dlgautodj.h"
 
-#include <QApplication>
+#include <QKeyEvent>
+#include <QLineEdit>
 #include <QMessageBox>
 
+#include "controllers/keyboard/keyboardeventfilter.h"
+#include "library/library.h"
 #include "library/playlisttablemodel.h"
-#include "library/trackcollectionmanager.h"
 #include "moc_dlgautodj.cpp"
 #include "track/track.h"
 #include "util/assert.h"
diff --git a/src/library/autodj/dlgautodj.h b/src/library/autodj/dlgautodj.h
index dcd628a07d9..9a482339328 100644
--- a/src/library/autodj/dlgautodj.h
+++ b/src/library/autodj/dlgautodj.h
@@ -1,21 +1,19 @@
 #pragma once
 
-#include <QLineEdit>
 #include <QString>
 #include <QWidget>
 
-#include "controllers/keyboard/keyboardeventfilter.h"
 #include "library/autodj/autodjprocessor.h"
 #include "library/autodj/ui_dlgautodj.h"
-#include "library/library.h"
 #include "library/libraryview.h"
-#include "library/trackcollection.h"
 #include "preferences/usersettings.h"
 #include "track/track_decl.h"
 
 class PlaylistTableModel;
 class WLibrary;
 class WTrackTableView;
+class Library;
+class KeyboardEventFilter;
 
 class DlgAutoDJ : public QWidget, public Ui::DlgAutoDJ, public LibraryView {
     Q_OBJECT
diff --git a/src/test/autodjprocessor_test.cpp b/src/test/autodjprocessor_test.cpp
index ff4c02f8448..4a941ad50e6 100644
--- a/src/test/autodjprocessor_test.cpp
+++ b/src/test/autodjprocessor_test.cpp
@@ -10,6 +10,7 @@
 #include "control/controlpotmeter.h"
 #include "control/controlpushbutton.h"
 #include "engine/engine.h"
+#include "library/playlisttablemodel.h"
 #include "mixer/basetrackplayer.h"
 #include "mixer/playerinfo.h"
 #include "mixer/playermanager.h"

From 4df4ae3f68aec06632c75917a9b12a1b55005702 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Wed, 1 Nov 2023 07:46:15 +0100
Subject: [PATCH 248/388] Improve headers of engine/sync

---
 src/engine/sync/enginesync.cpp    | 1 -
 src/engine/sync/enginesync.h      | 1 -
 src/engine/sync/internalclock.cpp | 2 --
 src/engine/sync/synccontrol.cpp   | 3 +--
 src/engine/sync/synccontrol.h     | 5 ++---
 5 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/engine/sync/enginesync.cpp b/src/engine/sync/enginesync.cpp
index daa085ee7a9..b6b1a5fa688 100644
--- a/src/engine/sync/enginesync.cpp
+++ b/src/engine/sync/enginesync.cpp
@@ -1,7 +1,6 @@
 #include "engine/sync/enginesync.h"
 
 #include <QMetaType>
-#include <QStringList>
 
 #include "engine/channels/enginechannel.h"
 #include "engine/enginebuffer.h"
diff --git a/src/engine/sync/enginesync.h b/src/engine/sync/enginesync.h
index b5345847c2a..775132bb868 100644
--- a/src/engine/sync/enginesync.h
+++ b/src/engine/sync/enginesync.h
@@ -2,7 +2,6 @@
 
 #include <gtest/gtest_prod.h>
 
-#include "audio/types.h"
 #include "engine/sync/syncable.h"
 #include "preferences/usersettings.h"
 
diff --git a/src/engine/sync/internalclock.cpp b/src/engine/sync/internalclock.cpp
index 772d4830215..e5ba10d363c 100644
--- a/src/engine/sync/internalclock.cpp
+++ b/src/engine/sync/internalclock.cpp
@@ -5,9 +5,7 @@
 #include "control/controllinpotmeter.h"
 #include "control/controlobject.h"
 #include "control/controlpushbutton.h"
-#include "engine/sync/enginesync.h"
 #include "moc_internalclock.cpp"
-#include "preferences/usersettings.h"
 #include "util/logger.h"
 #include "util/math.h"
 
diff --git a/src/engine/sync/synccontrol.cpp b/src/engine/sync/synccontrol.cpp
index 990ec946fed..100125d6967 100644
--- a/src/engine/sync/synccontrol.cpp
+++ b/src/engine/sync/synccontrol.cpp
@@ -5,14 +5,13 @@
 #include "control/controlpushbutton.h"
 #include "engine/channels/enginechannel.h"
 #include "engine/controls/bpmcontrol.h"
-#include "engine/controls/ratecontrol.h"
 #include "engine/enginebuffer.h"
 #include "engine/enginemixer.h"
+#include "engine/sync/enginesync.h"
 #include "moc_synccontrol.cpp"
 #include "track/track.h"
 #include "util/assert.h"
 #include "util/logger.h"
-#include "util/math.h"
 
 const double SyncControl::kBpmUnity = 1.0;
 const double SyncControl::kBpmHalve = 0.5;
diff --git a/src/engine/sync/synccontrol.h b/src/engine/sync/synccontrol.h
index 3c966484158..912f82b51bb 100644
--- a/src/engine/sync/synccontrol.h
+++ b/src/engine/sync/synccontrol.h
@@ -1,18 +1,17 @@
 #pragma once
 
 #include <gtest/gtest_prod.h>
-
 #include <QScopedPointer>
 
 #include "engine/controls/enginecontrol.h"
-#include "engine/sync/enginesync.h"
 
-class EngineChannel;
 class BpmControl;
 class RateControl;
 class ControlObject;
 class ControlProxy;
 class ControlPushButton;
+class EngineChannel;
+class EngineSync;
 
 /// SyncControl is the Sync Lock object for playback decks.
 class SyncControl : public EngineControl, public Syncable {

From dc6474fb007b03ad1015ce51ed0794c206a84fd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Wed, 1 Nov 2023 20:59:50 +0100
Subject: [PATCH 249/388] Improve headers of engine/sidechain

---
 src/engine/sidechain/enginenetworkstream.cpp       | 3 ++-
 src/engine/sidechain/enginenetworkstream.h         | 5 +++--
 src/engine/sidechain/enginerecord.cpp              | 1 -
 src/engine/sidechain/enginerecord.h                | 1 -
 src/engine/sidechain/enginesidechain.cpp           | 1 -
 src/engine/sidechain/enginesidechain.h             | 3 ++-
 src/engine/sidechain/networkinputstreamworker.h    | 6 ++++--
 src/engine/sidechain/networkoutputstreamworker.cpp | 1 -
 src/engine/sidechain/networkoutputstreamworker.h   | 4 +++-
 9 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/engine/sidechain/enginenetworkstream.cpp b/src/engine/sidechain/enginenetworkstream.cpp
index d449314f8ed..06d465babfb 100644
--- a/src/engine/sidechain/enginenetworkstream.cpp
+++ b/src/engine/sidechain/enginenetworkstream.cpp
@@ -5,7 +5,6 @@
 #include "util/performancetimer.h"
 #else
 #include <sys/time.h>
-#include <unistd.h>
 #endif
 
 #ifdef __WINDOWS__
@@ -15,6 +14,8 @@ static PgGetSystemTimeFn s_pfpgGetSystemTimeFn = NULL;
 #endif
 
 #include "broadcast/defs_broadcast.h"
+#include "engine/sidechain/networkinputstreamworker.h"
+#include "util/fifo.h"
 #include "util/logger.h"
 #include "util/sample.h"
 
diff --git a/src/engine/sidechain/enginenetworkstream.h b/src/engine/sidechain/enginenetworkstream.h
index f09e53e9bc6..2501456bac7 100644
--- a/src/engine/sidechain/enginenetworkstream.h
+++ b/src/engine/sidechain/enginenetworkstream.h
@@ -1,11 +1,12 @@
 #pragma once
 
 #include <engine/sidechain/networkoutputstreamworker.h>
-#include <engine/sidechain/networkinputstreamworker.h>
+
 #include <QVector>
 
 #include "util/types.h"
-#include "util/fifo.h"
+
+class NetworkInputStreamWorker;
 
 class EngineNetworkStream {
   public:
diff --git a/src/engine/sidechain/enginerecord.cpp b/src/engine/sidechain/enginerecord.cpp
index 7858efee3aa..50e739b0656 100644
--- a/src/engine/sidechain/enginerecord.cpp
+++ b/src/engine/sidechain/enginerecord.cpp
@@ -1,6 +1,5 @@
 #include "engine/sidechain/enginerecord.h"
 
-#include "control/controlobject.h"
 #include "control/controlproxy.h"
 #include "encoder/encoder.h"
 #include "mixer/playerinfo.h"
diff --git a/src/engine/sidechain/enginerecord.h b/src/engine/sidechain/enginerecord.h
index eb9d45fed8a..662a7b25d6e 100644
--- a/src/engine/sidechain/enginerecord.h
+++ b/src/engine/sidechain/enginerecord.h
@@ -11,7 +11,6 @@
 #include "preferences/usersettings.h"
 #include "track/track_decl.h"
 
-class ConfigKey;
 class ControlProxy;
 
 class EngineRecord : public QObject, public EncoderCallback, public SideChainWorker {
diff --git a/src/engine/sidechain/enginesidechain.cpp b/src/engine/sidechain/enginesidechain.cpp
index 983ac207492..3644fce8ab1 100644
--- a/src/engine/sidechain/enginesidechain.cpp
+++ b/src/engine/sidechain/enginesidechain.cpp
@@ -16,7 +16,6 @@
 #include "util/counter.h"
 #include "util/event.h"
 #include "util/sample.h"
-#include "util/timer.h"
 #include "util/trace.h"
 
 #define SIDECHAIN_BUFFER_SIZE 65536
diff --git a/src/engine/sidechain/enginesidechain.h b/src/engine/sidechain/enginesidechain.h
index 5552580aebc..094a024d2fc 100644
--- a/src/engine/sidechain/enginesidechain.h
+++ b/src/engine/sidechain/enginesidechain.h
@@ -6,12 +6,13 @@
 #include <QList>
 
 #include "preferences/usersettings.h"
-#include "engine/sidechain/sidechainworker.h"
 #include "soundio/soundmanagerutil.h"
 #include "util/fifo.h"
 #include "util/mutex.h"
 #include "util/types.h"
 
+class SideChainWorker;
+
 class EngineSideChain : public QThread, public AudioDestination {
     Q_OBJECT
   public:
diff --git a/src/engine/sidechain/networkinputstreamworker.h b/src/engine/sidechain/networkinputstreamworker.h
index 115154fea26..6556afa0588 100644
--- a/src/engine/sidechain/networkinputstreamworker.h
+++ b/src/engine/sidechain/networkinputstreamworker.h
@@ -1,7 +1,9 @@
 #pragma once
 
-#include "util/fifo.h"
-#include "util/sample.h"
+#include "util/types.h"
+
+template<class DataType>
+class FIFO;
 
 class NetworkInputStreamWorker {
   public:
diff --git a/src/engine/sidechain/networkoutputstreamworker.cpp b/src/engine/sidechain/networkoutputstreamworker.cpp
index f53c6bb47bd..988ded84791 100644
--- a/src/engine/sidechain/networkoutputstreamworker.cpp
+++ b/src/engine/sidechain/networkoutputstreamworker.cpp
@@ -1,7 +1,6 @@
 #include <engine/sidechain/networkoutputstreamworker.h>
 #include "engine/sidechain/enginenetworkstream.h"
 #include "util/logger.h"
-#include "util/sample.h"
 
 
 namespace {
diff --git a/src/engine/sidechain/networkoutputstreamworker.h b/src/engine/sidechain/networkoutputstreamworker.h
index 813853050bb..c3f8441df00 100644
--- a/src/engine/sidechain/networkoutputstreamworker.h
+++ b/src/engine/sidechain/networkoutputstreamworker.h
@@ -3,7 +3,9 @@
 #include <QSharedPointer>
 
 #include "util/types.h"
-#include "util/fifo.h"
+
+template<class DataType>
+class FIFO;
 
 /*
  * States:

From 293a811b1db6ef1d3c7a9aa3ce5b48235d914dd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Wed, 1 Nov 2023 21:03:12 +0100
Subject: [PATCH 250/388] Improve headers of engine filters

---
 src/engine/filters/enginefilter.cpp          | 2 --
 src/engine/filters/enginefilter.h            | 4 +++-
 src/engine/filters/enginefilterbiquad1.cpp   | 2 --
 src/engine/filters/enginefiltermoogladder4.h | 7 -------
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/engine/filters/enginefilter.cpp b/src/engine/filters/enginefilter.cpp
index 8efc37506ea..9f1d82ff988 100644
--- a/src/engine/filters/enginefilter.cpp
+++ b/src/engine/filters/enginefilter.cpp
@@ -2,8 +2,6 @@
 
 #include "engine/filters/enginefilter.h"
 
-#include <QtDebug>
-
 #include "moc_enginefilter.cpp"
 
 EngineFilter::EngineFilter(char* conf, int predefinedType)
diff --git a/src/engine/filters/enginefilter.h b/src/engine/filters/enginefilter.h
index 0397d0ff4fe..27f59329943 100644
--- a/src/engine/filters/enginefilter.h
+++ b/src/engine/filters/enginefilter.h
@@ -1,8 +1,10 @@
 // Wrapper for FidLib Filter Library
 #pragma once
 
-#include <cstdio>
+// clang-format off
+#include <cstdio> // for FILE in fidlib.h
 #include <fidlib.h>
+// clang-format on
 
 #include "engine/engineobject.h"
 #include "util/types.h"
diff --git a/src/engine/filters/enginefilterbiquad1.cpp b/src/engine/filters/enginefilterbiquad1.cpp
index c0376bc9c6f..31ee4dde99d 100644
--- a/src/engine/filters/enginefilterbiquad1.cpp
+++ b/src/engine/filters/enginefilterbiquad1.cpp
@@ -1,7 +1,5 @@
 #include "engine/filters/enginefilterbiquad1.h"
 
-#include <stdio.h>
-
 #include "moc_enginefilterbiquad1.cpp"
 
 EngineFilterBiquad1LowShelving::EngineFilterBiquad1LowShelving(int sampleRate,
diff --git a/src/engine/filters/enginefiltermoogladder4.h b/src/engine/filters/enginefiltermoogladder4.h
index 39a46bb33c0..0b694fb84b2 100644
--- a/src/engine/filters/enginefiltermoogladder4.h
+++ b/src/engine/filters/enginefiltermoogladder4.h
@@ -10,15 +10,8 @@
 // Based on C Source from R. Lindner published at public domain
 // http://musicdsp.org/showArchiveComment.php?ArchiveID=196
 
-#include <memory.h>
-#include <stdio.h>
-
-#include <QDebug>
-
 #include "engine/engineobject.h"
-#include "util/math.h"
 #include "util/sample.h"
-#include "util/timer.h"
 
 namespace {
 

From 68906df8291c2256b3241a292bc14e0ab48dce23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Wed, 1 Nov 2023 21:10:40 +0100
Subject: [PATCH 251/388] Improve headers of effect classes

---
 src/effects/backends/effectsbackendmanager.h | 3 ++-
 src/effects/chains/outputeffectchain.cpp     | 1 +
 src/effects/chains/pergroupeffectchain.cpp   | 3 ++-
 src/effects/effectslot.cpp                   | 1 +
 src/engine/effects/engineeffect.cpp          | 2 ++
 src/engine/effects/engineeffect.h            | 5 -----
 src/engine/effects/engineeffectchain.h       | 2 --
 src/engine/effects/engineeffectsdelay.h      | 1 -
 src/engine/effects/engineeffectsmanager.h    | 5 +----
 src/preferences/dialog/dlgprefmixer.cpp      | 1 +
 src/test/playermanagertest.cpp               | 1 +
 11 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/effects/backends/effectsbackendmanager.h b/src/effects/backends/effectsbackendmanager.h
index 4a59acd19fa..895d6bad3d3 100644
--- a/src/effects/backends/effectsbackendmanager.h
+++ b/src/effects/backends/effectsbackendmanager.h
@@ -1,8 +1,9 @@
 #pragma once
 
-#include "effects/backends/effectsbackend.h"
+#include "effects/defs.h"
 
 class ControlObject;
+class EffectProcessor;
 
 /// EffectsBackendManager initializes EffectsBackends, maintains the list of
 /// available EffectManifests, and creates EffectProcessors from EffectManifests.
diff --git a/src/effects/chains/outputeffectchain.cpp b/src/effects/chains/outputeffectchain.cpp
index ffbe26dc52c..8db2f62a996 100644
--- a/src/effects/chains/outputeffectchain.cpp
+++ b/src/effects/chains/outputeffectchain.cpp
@@ -1,6 +1,7 @@
 #include "effects/chains/outputeffectchain.h"
 
 #include "effects/effectslot.h"
+#include "effects/effectsmanager.h"
 #include "moc_outputeffectchain.cpp"
 
 OutputEffectChain::OutputEffectChain(EffectsManager* pEffectsManager,
diff --git a/src/effects/chains/pergroupeffectchain.cpp b/src/effects/chains/pergroupeffectchain.cpp
index 0c6649843f6..c2954c25c43 100644
--- a/src/effects/chains/pergroupeffectchain.cpp
+++ b/src/effects/chains/pergroupeffectchain.cpp
@@ -1,8 +1,9 @@
 #include "effects/chains/pergroupeffectchain.h"
 
-#include "effects/effectsmanager.h"
 #include "moc_pergroupeffectchain.cpp"
 
+class EffectsManager;
+
 PerGroupEffectChain::PerGroupEffectChain(
         const ChannelHandleAndGroup& handleAndGroup,
         const QString& chainSlotGroup,
diff --git a/src/effects/effectslot.cpp b/src/effects/effectslot.cpp
index 36587971e52..9d0cfeb2426 100644
--- a/src/effects/effectslot.cpp
+++ b/src/effects/effectslot.cpp
@@ -8,6 +8,7 @@
 #include "control/controlpushbutton.h"
 #include "effects/defs.h"
 #include "effects/effectchain.h"
+#include "effects/effectsmanager.h"
 #include "effects/effectsmessenger.h"
 #include "effects/presets/effectpresetmanager.h"
 #include "effects/visibleeffectslist.h"
diff --git a/src/engine/effects/engineeffect.cpp b/src/engine/effects/engineeffect.cpp
index 760b3f12b4e..bc7c41c8de0 100644
--- a/src/engine/effects/engineeffect.cpp
+++ b/src/engine/effects/engineeffect.cpp
@@ -1,5 +1,7 @@
 #include "engine/effects/engineeffect.h"
 
+#include "effects/backends/effectsbackendmanager.h"
+#include "engine/effects/engineeffectparameter.h"
 #include "engine/engine.h"
 #include "util/defs.h"
 #include "util/sample.h"
diff --git a/src/engine/effects/engineeffect.h b/src/engine/effects/engineeffect.h
index 63a662905fc..d2c4c2fe3aa 100644
--- a/src/engine/effects/engineeffect.h
+++ b/src/engine/effects/engineeffect.h
@@ -1,18 +1,13 @@
 #pragma once
 
-#include <QList>
 #include <QMap>
 #include <QSet>
 #include <QString>
 #include <QVector>
-#include <QtDebug>
 
 #include "effects/backends/effectmanifest.h"
 #include "effects/backends/effectprocessor.h"
-#include "effects/effectsmanager.h"
 #include "engine/channelhandle.h"
-#include "engine/effects/engineeffectparameter.h"
-#include "engine/effects/groupfeaturestate.h"
 #include "engine/effects/message.h"
 #include "util/memory.h"
 #include "util/types.h"
diff --git a/src/engine/effects/engineeffectchain.h b/src/engine/effects/engineeffectchain.h
index 0673b70798b..ff96b86a885 100644
--- a/src/engine/effects/engineeffectchain.h
+++ b/src/engine/effects/engineeffectchain.h
@@ -5,10 +5,8 @@
 
 #include "engine/channelhandle.h"
 #include "engine/effects/engineeffectsdelay.h"
-#include "engine/effects/groupfeaturestate.h"
 #include "engine/effects/message.h"
 #include "util/class.h"
-#include "util/memory.h"
 #include "util/samplebuffer.h"
 #include "util/types.h"
 
diff --git a/src/engine/effects/engineeffectsdelay.h b/src/engine/effects/engineeffectsdelay.h
index cc714a848cc..5cdde538e7e 100644
--- a/src/engine/effects/engineeffectsdelay.h
+++ b/src/engine/effects/engineeffectsdelay.h
@@ -3,7 +3,6 @@
 #include "engine/engine.h"
 #include "engine/engineobject.h"
 #include "util/assert.h"
-#include "util/sample.h"
 #include "util/types.h"
 
 namespace {
diff --git a/src/engine/effects/engineeffectsmanager.h b/src/engine/effects/engineeffectsmanager.h
index 5085731bdf1..a9386f99918 100644
--- a/src/engine/effects/engineeffectsmanager.h
+++ b/src/engine/effects/engineeffectsmanager.h
@@ -1,16 +1,13 @@
 #pragma once
 
-#include <QScopedPointer>
-
 #include "engine/channelhandle.h"
-#include "engine/effects/groupfeaturestate.h"
 #include "engine/effects/message.h"
-#include "util/fifo.h"
 #include "util/samplebuffer.h"
 #include "util/types.h"
 
 class EngineEffectChain;
 class EngineEffect;
+class GroupFeatureState;
 
 /// EngineEffectsManager is the entry point for processing effects in the audio
 /// thread. It also passes EffectsRequests from EffectsMessenger down to the
diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index c3aa7f9a8bb..ef808763e90 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -12,6 +12,7 @@
 #include "effects/chains/equalizereffectchain.h"
 #include "effects/chains/quickeffectchain.h"
 #include "effects/effectslot.h"
+#include "effects/effectsmanager.h"
 #include "engine/enginexfader.h"
 #include "mixer/playermanager.h"
 #include "moc_dlgprefmixer.cpp"
diff --git a/src/test/playermanagertest.cpp b/src/test/playermanagertest.cpp
index 70497c575eb..394e63b7682 100644
--- a/src/test/playermanagertest.cpp
+++ b/src/test/playermanagertest.cpp
@@ -4,6 +4,7 @@
 
 #include "control/controlindicatortimer.h"
 #include "database/mixxxdb.h"
+#include "effects/effectsmanager.h"
 #include "engine/channels/enginedeck.h"
 #include "engine/enginebuffer.h"
 #include "engine/enginemixer.h"

From f2e436c5b381d790789b0063b5be3f96191c969f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Wed, 1 Nov 2023 21:13:51 +0100
Subject: [PATCH 252/388] Improve headers of engine classes

---
 src/engine/cachingreader/cachingreader.cpp       | 3 ---
 src/engine/cachingreader/cachingreaderchunk.cpp  | 1 -
 src/engine/cachingreader/cachingreaderworker.cpp | 3 +--
 src/engine/cachingreader/cachingreaderworker.h   | 7 +++----
 src/engine/channelmixer.cpp                      | 1 +
 src/engine/channelmixer.h                        | 1 -
 src/engine/channels/engineaux.cpp                | 2 --
 src/engine/channels/engineaux.h                  | 3 ---
 src/engine/channels/enginechannel.cpp            | 1 +
 src/engine/channels/enginechannel.h              | 5 +----
 src/engine/channels/enginedeck.cpp               | 1 -
 src/engine/channels/enginedeck.h                 | 7 -------
 src/engine/channels/enginemicrophone.cpp         | 2 --
 src/engine/channels/enginemicrophone.h           | 5 -----
 src/engine/controls/bpmcontrol.cpp               | 7 +------
 src/engine/controls/bpmcontrol.h                 | 3 ---
 src/engine/controls/cuecontrol.cpp               | 2 --
 src/engine/controls/cuecontrol.h                 | 2 +-
 src/engine/controls/enginecontrol.cpp            | 1 -
 src/engine/controls/enginecontrol.h              | 4 +---
 src/engine/controls/keycontrol.h                 | 1 -
 src/engine/controls/loopingcontrol.cpp           | 2 +-
 src/engine/controls/loopingcontrol.h             | 4 +---
 src/engine/controls/quantizecontrol.cpp          | 2 --
 src/engine/controls/quantizecontrol.h            | 2 --
 src/engine/controls/ratecontrol.h                | 1 -
 src/engine/enginebuffer.cpp                      | 6 ------
 src/engine/enginebuffer.h                        | 3 ---
 src/engine/enginedelay.h                         | 2 +-
 src/engine/enginemixer.cpp                       | 7 -------
 src/engine/enginemixer.h                         | 7 +------
 src/engine/engineobject.h                        | 3 ++-
 src/engine/enginepregain.cpp                     | 5 +----
 src/engine/enginepregain.h                       | 1 -
 src/engine/enginetalkoverducking.cpp             | 1 +
 src/engine/enginetalkoverducking.h               | 3 +--
 src/engine/enginevumeter.cpp                     | 2 --
 src/engine/enginevumeter.h                       | 2 --
 src/engine/engineworker.cpp                      | 1 +
 src/engine/engineworkerscheduler.cpp             | 2 --
 src/engine/engineworkerscheduler.h               | 4 +---
 src/engine/positionscratchcontroller.cpp         | 4 ++--
 src/engine/positionscratchcontroller.h           | 2 +-
 src/engine/readaheadmanager.cpp                  | 1 -
 src/engine/readaheadmanager.h                    | 2 --
 src/engine/sync/synccontrol.h                    | 2 ++
 src/soundio/sounddevicenetwork.h                 | 1 +
 47 files changed, 27 insertions(+), 107 deletions(-)

diff --git a/src/engine/cachingreader/cachingreader.cpp b/src/engine/cachingreader/cachingreader.cpp
index 7b23c19941e..de2c78229dc 100644
--- a/src/engine/cachingreader/cachingreader.cpp
+++ b/src/engine/cachingreader/cachingreader.cpp
@@ -1,11 +1,8 @@
 #include "engine/cachingreader/cachingreader.h"
 
-#include <QFileInfo>
 #include <QtDebug>
 
-#include "control/controlobject.h"
 #include "moc_cachingreader.cpp"
-#include "track/track.h"
 #include "util/assert.h"
 #include "util/compatibility/qatomic.h"
 #include "util/counter.h"
diff --git a/src/engine/cachingreader/cachingreaderchunk.cpp b/src/engine/cachingreader/cachingreaderchunk.cpp
index fed9aa52723..f24d70e43c3 100644
--- a/src/engine/cachingreader/cachingreaderchunk.cpp
+++ b/src/engine/cachingreader/cachingreaderchunk.cpp
@@ -4,7 +4,6 @@
 
 #include "sources/audiosourcestereoproxy.h"
 #include "engine/engine.h"
-#include "util/math.h"
 #include "util/sample.h"
 #include "util/logger.h"
 
diff --git a/src/engine/cachingreader/cachingreaderworker.cpp b/src/engine/cachingreader/cachingreaderworker.cpp
index 7ec3c16931f..872459c09ca 100644
--- a/src/engine/cachingreader/cachingreaderworker.cpp
+++ b/src/engine/cachingreader/cachingreaderworker.cpp
@@ -1,16 +1,15 @@
 #include "engine/cachingreader/cachingreaderworker.h"
 
 #include <QAtomicInt>
-#include <QFileInfo>
 #include <QtDebug>
 
 #include "analyzer/analyzersilence.h"
-#include "control/controlobject.h"
 #include "moc_cachingreaderworker.cpp"
 #include "sources/soundsourceproxy.h"
 #include "track/track.h"
 #include "util/compatibility/qmutex.h"
 #include "util/event.h"
+#include "util/fifo.h"
 #include "util/logger.h"
 #include "util/span.h"
 
diff --git a/src/engine/cachingreader/cachingreaderworker.h b/src/engine/cachingreader/cachingreaderworker.h
index 7115658ebb7..ebc200669ba 100644
--- a/src/engine/cachingreader/cachingreaderworker.h
+++ b/src/engine/cachingreader/cachingreaderworker.h
@@ -1,17 +1,16 @@
 #pragma once
 
 #include <QMutex>
-#include <QSemaphore>
 #include <QString>
-#include <QThread>
-#include <QtDebug>
 
 #include "audio/frame.h"
 #include "engine/cachingreader/cachingreaderchunk.h"
 #include "engine/engineworker.h"
 #include "sources/audiosource.h"
 #include "track/track_decl.h"
-#include "util/fifo.h"
+
+template<class DataType>
+class FIFO;
 
 // POD with trivial ctor/dtor/copy for passing through FIFO
 typedef struct CachingReaderChunkReadRequest {
diff --git a/src/engine/channelmixer.cpp b/src/engine/channelmixer.cpp
index b360380d8d1..fa077d14512 100644
--- a/src/engine/channelmixer.cpp
+++ b/src/engine/channelmixer.cpp
@@ -1,5 +1,6 @@
 #include "engine/channelmixer.h"
 
+#include "engine/effects/engineeffectsmanager.h"
 #include "util/sample.h"
 #include "util/timer.h"
 
diff --git a/src/engine/channelmixer.h b/src/engine/channelmixer.h
index 1f019af0d9d..a7b143bb96d 100644
--- a/src/engine/channelmixer.h
+++ b/src/engine/channelmixer.h
@@ -2,7 +2,6 @@
 
 #include <QVarLengthArray>
 
-#include "effects/engineeffectsmanager.h"
 #include "engine/enginemixer.h"
 #include "util/types.h"
 
diff --git a/src/engine/channels/engineaux.cpp b/src/engine/channels/engineaux.cpp
index 63ebe3cd05f..9124bd0670f 100644
--- a/src/engine/channels/engineaux.cpp
+++ b/src/engine/channels/engineaux.cpp
@@ -2,12 +2,10 @@
 
 #include <QtDebug>
 
-#include "control/control.h"
 #include "control/controlaudiotaperpot.h"
 #include "effects/effectsmanager.h"
 #include "engine/effects/engineeffectsmanager.h"
 #include "moc_engineaux.cpp"
-#include "preferences/usersettings.h"
 #include "util/sample.h"
 
 EngineAux::EngineAux(const ChannelHandleAndGroup& handleGroup, EffectsManager* pEffectsManager)
diff --git a/src/engine/channels/engineaux.h b/src/engine/channels/engineaux.h
index af75783f3de..48a8fd1f228 100644
--- a/src/engine/channels/engineaux.h
+++ b/src/engine/channels/engineaux.h
@@ -2,10 +2,7 @@
 
 #include <QScopedPointer>
 
-#include "control/controlproxy.h"
-#include "control/controlpushbutton.h"
 #include "engine/channels/enginechannel.h"
-#include "util/circularbuffer.h"
 #include "soundio/soundmanagerutil.h"
 
 class ControlAudioTaperPot;
diff --git a/src/engine/channels/enginechannel.cpp b/src/engine/channels/enginechannel.cpp
index 75ffcbb24c2..59c80d45d3c 100644
--- a/src/engine/channels/enginechannel.cpp
+++ b/src/engine/channels/enginechannel.cpp
@@ -2,6 +2,7 @@
 
 #include "control/controlobject.h"
 #include "control/controlpushbutton.h"
+#include "effects/effectsmanager.h"
 #include "moc_enginechannel.cpp"
 
 EngineChannel::EngineChannel(const ChannelHandleAndGroup& handleGroup,
diff --git a/src/engine/channels/enginechannel.h b/src/engine/channels/enginechannel.h
index c48bb722a83..fa7405e812e 100644
--- a/src/engine/channels/enginechannel.h
+++ b/src/engine/channels/enginechannel.h
@@ -1,15 +1,12 @@
 #pragma once
 
 #include "control/pollingcontrolproxy.h"
-#include "effects/effectsmanager.h"
 #include "engine/channelhandle.h"
 #include "engine/engineobject.h"
 #include "engine/enginevumeter.h"
-#include "preferences/usersettings.h"
 
-class ControlObject;
+class EffectsManager;
 class EngineBuffer;
-class EngineFilterBlock;
 class ControlPushButton;
 
 class EngineChannel : public EngineObject {
diff --git a/src/engine/channels/enginedeck.cpp b/src/engine/channels/enginedeck.cpp
index 1c3aea2f057..0c42fdd6ad2 100644
--- a/src/engine/channels/enginedeck.cpp
+++ b/src/engine/channels/enginedeck.cpp
@@ -8,7 +8,6 @@
 #include "engine/enginevumeter.h"
 #include "moc_enginedeck.cpp"
 #include "util/sample.h"
-#include "waveform/waveformwidgetfactory.h"
 
 EngineDeck::EngineDeck(
         const ChannelHandleAndGroup& handleGroup,
diff --git a/src/engine/channels/enginedeck.h b/src/engine/channels/enginedeck.h
index d05c78ed153..672b011637e 100644
--- a/src/engine/channels/enginedeck.h
+++ b/src/engine/channels/enginedeck.h
@@ -3,19 +3,12 @@
 #include <QScopedPointer>
 
 #include "preferences/usersettings.h"
-#include "control/controlpushbutton.h"
-#include "engine/engineobject.h"
 #include "engine/channels/enginechannel.h"
-#include "util/circularbuffer.h"
-
 #include "soundio/soundmanagerutil.h"
 
-class EngineBuffer;
 class EnginePregain;
 class EngineBuffer;
 class EngineMixer;
-class EngineVuMeter;
-class EngineEffectsManager;
 class ControlPushButton;
 
 class EngineDeck : public EngineChannel, public AudioDestination {
diff --git a/src/engine/channels/enginemicrophone.cpp b/src/engine/channels/enginemicrophone.cpp
index 35ced50db4d..7141a60badd 100644
--- a/src/engine/channels/enginemicrophone.cpp
+++ b/src/engine/channels/enginemicrophone.cpp
@@ -2,12 +2,10 @@
 
 #include <QtDebug>
 
-#include "control/control.h"
 #include "control/controlaudiotaperpot.h"
 #include "effects/effectsmanager.h"
 #include "engine/effects/engineeffectsmanager.h"
 #include "moc_enginemicrophone.cpp"
-#include "preferences/usersettings.h"
 #include "util/sample.h"
 
 EngineMicrophone::EngineMicrophone(const ChannelHandleAndGroup& handleGroup,
diff --git a/src/engine/channels/enginemicrophone.h b/src/engine/channels/enginemicrophone.h
index 754d6a34f60..256f9602608 100644
--- a/src/engine/channels/enginemicrophone.h
+++ b/src/engine/channels/enginemicrophone.h
@@ -2,14 +2,9 @@
 
 #include <QScopedPointer>
 
-#include "control/controlpushbutton.h"
 #include "engine/channels/enginechannel.h"
-#include "engine/enginevumeter.h"
-#include "util/circularbuffer.h"
-
 #include "soundio/soundmanagerutil.h"
 
-class EngineEffectsManager;
 class ControlAudioTaperPot;
 
 // EngineMicrophone is an EngineChannel that implements a mixing source whose
diff --git a/src/engine/controls/bpmcontrol.cpp b/src/engine/controls/bpmcontrol.cpp
index 934be4907e5..bf9dccc043a 100644
--- a/src/engine/controls/bpmcontrol.cpp
+++ b/src/engine/controls/bpmcontrol.cpp
@@ -1,22 +1,17 @@
 #include "engine/controls/bpmcontrol.h"
 
-#include <QStringList>
-
 #include "control/controllinpotmeter.h"
 #include "control/controlobject.h"
 #include "control/controlproxy.h"
 #include "control/controlpushbutton.h"
-#include "engine/channels/enginechannel.h"
+#include "engine/effects/groupfeaturestate.h"
 #include "engine/enginebuffer.h"
-#include "engine/enginemixer.h"
 #include "moc_bpmcontrol.cpp"
 #include "track/beatutils.h"
 #include "track/track.h"
-#include "util/assert.h"
 #include "util/duration.h"
 #include "util/logger.h"
 #include "util/math.h"
-#include "waveform/visualplayposition.h"
 
 namespace {
 const mixxx::Logger kLogger("BpmControl");
diff --git a/src/engine/controls/bpmcontrol.h b/src/engine/controls/bpmcontrol.h
index 2c7f60e2794..7f6d5384c6b 100644
--- a/src/engine/controls/bpmcontrol.h
+++ b/src/engine/controls/bpmcontrol.h
@@ -9,11 +9,8 @@
 #include "track/beats.h"
 #include "util/tapfilter.h"
 
-class ControlObject;
 class ControlLinPotmeter;
 class ControlPushButton;
-class EngineBuffer;
-class SyncControl;
 
 /// BpmControl is an EngineControl that manages the bpm and beat distance of
 /// tracks.  It understands the tempo of the underlying track and the musical
diff --git a/src/engine/controls/cuecontrol.cpp b/src/engine/controls/cuecontrol.cpp
index 176dbb981a9..cf46758c6cd 100644
--- a/src/engine/controls/cuecontrol.cpp
+++ b/src/engine/controls/cuecontrol.cpp
@@ -7,9 +7,7 @@
 #include "moc_cuecontrol.cpp"
 #include "preferences/colorpalettesettings.h"
 #include "track/track.h"
-#include "util/color/color.h"
 #include "util/color/predefinedcolorpalettes.h"
-#include "util/sample.h"
 #include "vinylcontrol/defs_vinylcontrol.h"
 
 namespace {
diff --git a/src/engine/controls/cuecontrol.h b/src/engine/controls/cuecontrol.h
index 2a4326a1822..5972ba2935a 100644
--- a/src/engine/controls/cuecontrol.h
+++ b/src/engine/controls/cuecontrol.h
@@ -6,7 +6,6 @@
 #include <QAtomicPointer>
 #include <QList>
 
-#include "control/controlproxy.h"
 #include "engine/controls/enginecontrol.h"
 #include "preferences/colorpalettesettings.h"
 #include "preferences/usersettings.h"
@@ -20,6 +19,7 @@
 class ControlObject;
 class ControlPushButton;
 class ControlIndicator;
+class ControlProxy;
 
 enum class CueMode {
     Mixxx,
diff --git a/src/engine/controls/enginecontrol.cpp b/src/engine/controls/enginecontrol.cpp
index 1a46c590fd6..1cae66d267e 100644
--- a/src/engine/controls/enginecontrol.cpp
+++ b/src/engine/controls/enginecontrol.cpp
@@ -3,7 +3,6 @@
 #include "engine/enginebuffer.h"
 #include "engine/enginemixer.h"
 #include "engine/sync/enginesync.h"
-#include "mixer/playermanager.h"
 #include "moc_enginecontrol.cpp"
 
 EngineControl::EngineControl(const QString& group,
diff --git a/src/engine/controls/enginecontrol.h b/src/engine/controls/enginecontrol.h
index cf817e74cfe..517a29e6285 100644
--- a/src/engine/controls/enginecontrol.h
+++ b/src/engine/controls/enginecontrol.h
@@ -2,21 +2,19 @@
 
 #include <gtest/gtest_prod.h>
 
-#include <QList>
 #include <QObject>
 #include <gsl/pointers>
 
 #include "audio/frame.h"
 #include "control/controlvalue.h"
 #include "engine/cachingreader/cachingreader.h"
-#include "engine/effects/groupfeaturestate.h"
-#include "engine/sync/syncable.h"
 #include "preferences/usersettings.h"
 #include "track/beats.h"
 #include "track/track_decl.h"
 
 class EngineMixer;
 class EngineBuffer;
+struct GroupFeatureState;
 
 constexpr int kNoTrigger = -1;
 static_assert(
diff --git a/src/engine/controls/keycontrol.h b/src/engine/controls/keycontrol.h
index 513d195be72..6f949874ed4 100644
--- a/src/engine/controls/keycontrol.h
+++ b/src/engine/controls/keycontrol.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "engine/controls/enginecontrol.h"
-#include "control/controlvalue.h"
 #include "util/parented_ptr.h"
 
 class ControlObject;
diff --git a/src/engine/controls/loopingcontrol.cpp b/src/engine/controls/loopingcontrol.cpp
index aaa7f2c26af..0526d21e5b0 100644
--- a/src/engine/controls/loopingcontrol.cpp
+++ b/src/engine/controls/loopingcontrol.cpp
@@ -6,13 +6,13 @@
 #include "control/controlpushbutton.h"
 #include "engine/controls/bpmcontrol.h"
 #include "engine/controls/enginecontrol.h"
+#include "engine/controls/ratecontrol.h"
 #include "engine/enginebuffer.h"
 #include "moc_loopingcontrol.cpp"
 #include "preferences/usersettings.h"
 #include "track/track.h"
 #include "util/compatibility/qatomic.h"
 #include "util/math.h"
-#include "util/sample.h"
 
 namespace {
 constexpr mixxx::audio::FrameDiff_t kMinimumAudibleLoopSizeFrames = 150;
diff --git a/src/engine/controls/loopingcontrol.h b/src/engine/controls/loopingcontrol.h
index 58a4aad3163..f5161275e63 100644
--- a/src/engine/controls/loopingcontrol.h
+++ b/src/engine/controls/loopingcontrol.h
@@ -5,15 +5,13 @@
 
 #include "control/controlvalue.h"
 #include "engine/controls/enginecontrol.h"
-#include "engine/controls/ratecontrol.h"
 #include "preferences/usersettings.h"
 #include "track/beats.h"
-#include "track/cue.h"
 #include "track/track_decl.h"
 
 class ControlPushButton;
 class ControlObject;
-
+class RateControl;
 class LoopMoveControl;
 class BeatJumpControl;
 class BeatLoopingControl;
diff --git a/src/engine/controls/quantizecontrol.cpp b/src/engine/controls/quantizecontrol.cpp
index f36f6159efb..a8f9b40db2f 100644
--- a/src/engine/controls/quantizecontrol.cpp
+++ b/src/engine/controls/quantizecontrol.cpp
@@ -1,7 +1,5 @@
 #include "engine/controls/quantizecontrol.h"
 
-#include <QtDebug>
-
 #include "control/controlobject.h"
 #include "control/controlpushbutton.h"
 #include "engine/controls/enginecontrol.h"
diff --git a/src/engine/controls/quantizecontrol.h b/src/engine/controls/quantizecontrol.h
index 2df6e52cce7..6082815d4b8 100644
--- a/src/engine/controls/quantizecontrol.h
+++ b/src/engine/controls/quantizecontrol.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <QObject>
-
 #include "engine/controls/enginecontrol.h"
 #include "preferences/usersettings.h"
 #include "track/beats.h"
diff --git a/src/engine/controls/ratecontrol.h b/src/engine/controls/ratecontrol.h
index e308c88a03a..f3c553e916b 100644
--- a/src/engine/controls/ratecontrol.h
+++ b/src/engine/controls/ratecontrol.h
@@ -13,7 +13,6 @@ class ControlObject;
 class ControlPotmeter;
 class ControlPushButton;
 class ControlProxy;
-class EngineChannel;
 class PositionScratchController;
 
 // RateControl is an EngineControl that is in charge of managing the rate of
diff --git a/src/engine/enginebuffer.cpp b/src/engine/enginebuffer.cpp
index b60a519926f..d75fb9e38ee 100644
--- a/src/engine/enginebuffer.cpp
+++ b/src/engine/enginebuffer.cpp
@@ -2,7 +2,6 @@
 
 #include <QtDebug>
 
-#include "control/controlindicator.h"
 #include "control/controllinpotmeter.h"
 #include "control/controlpotmeter.h"
 #include "control/controlproxy.h"
@@ -21,13 +20,11 @@
 #include "engine/controls/quantizecontrol.h"
 #include "engine/controls/ratecontrol.h"
 #include "engine/enginemixer.h"
-#include "engine/engineworkerscheduler.h"
 #include "engine/readaheadmanager.h"
 #include "engine/sync/enginesync.h"
 #include "engine/sync/synccontrol.h"
 #include "moc_enginebuffer.cpp"
 #include "preferences/usersettings.h"
-#include "track/keyutils.h"
 #include "track/track.h"
 #include "util/assert.h"
 #include "util/compatibility/qatomic.h"
@@ -36,9 +33,6 @@
 #include "util/sample.h"
 #include "util/timer.h"
 #include "waveform/visualplayposition.h"
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-#include "waveform/waveformwidgetfactory.h"
-#endif
 
 #ifdef __VINYLCONTROL__
 #include "engine/controls/vinylcontrolcontrol.h"
diff --git a/src/engine/enginebuffer.h b/src/engine/enginebuffer.h
index bc76f15fabf..b0de905ebbc 100644
--- a/src/engine/enginebuffer.h
+++ b/src/engine/enginebuffer.h
@@ -4,7 +4,6 @@
 
 #include <QAtomicInt>
 #include <QMutex>
-#include <cfloat>
 #include <initializer_list>
 
 #include "audio/frame.h"
@@ -17,7 +16,6 @@
 #include "preferences/usersettings.h"
 #include "track/bpm.h"
 #include "track/track_decl.h"
-#include "util/rotary.h"
 #include "util/types.h"
 
 //for the writer
@@ -44,7 +42,6 @@ class ControlPotmeter;
 class EngineBufferScale;
 class EngineBufferScaleLinear;
 class EngineBufferScaleST;
-class EngineBufferScaleRubberBand;
 class EngineSync;
 class EngineWorkerScheduler;
 class VisualPlayPosition;
diff --git a/src/engine/enginedelay.h b/src/engine/enginedelay.h
index f57766f6bd8..9430d00fc44 100644
--- a/src/engine/enginedelay.h
+++ b/src/engine/enginedelay.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "engine/engineobject.h"
-#include "preferences/usersettings.h"
 
+class ConfigKey;
 class ControlPotmeter;
 class ControlProxy;
 
diff --git a/src/engine/enginemixer.cpp b/src/engine/enginemixer.cpp
index 118caeb7c8e..a97c672a370 100644
--- a/src/engine/enginemixer.cpp
+++ b/src/engine/enginemixer.cpp
@@ -1,16 +1,11 @@
 #include "engine/enginemixer.h"
 
-#include <QList>
-#include <QPair>
-#include <QtDebug>
-
 #include "control/controlaudiotaperpot.h"
 #include "control/controlpotmeter.h"
 #include "control/controlpushbutton.h"
 #include "effects/effectsmanager.h"
 #include "engine/channelmixer.h"
 #include "engine/channels/enginechannel.h"
-#include "engine/channels/enginedeck.h"
 #include "engine/effects/engineeffectsmanager.h"
 #include "engine/enginebuffer.h"
 #include "engine/enginedelay.h"
@@ -25,8 +20,6 @@
 #include "preferences/usersettings.h"
 #include "util/defs.h"
 #include "util/sample.h"
-#include "util/timer.h"
-#include "util/trace.h"
 
 namespace {
 const QString kAppGroup = QStringLiteral("[App]");
diff --git a/src/engine/enginemixer.h b/src/engine/enginemixer.h
index 23d7c95bced..fa18e8aa0a5 100644
--- a/src/engine/enginemixer.h
+++ b/src/engine/enginemixer.h
@@ -9,6 +9,7 @@
 #include "control/controlpushbutton.h"
 #include "engine/channelhandle.h"
 #include "engine/channels/enginechannel.h"
+#include "engine/effects/groupfeaturestate.h"
 #include "engine/engineobject.h"
 #include "preferences/usersettings.h"
 #include "recording/recordingmanager.h"
@@ -16,18 +17,12 @@
 #include "soundio/soundmanagerutil.h"
 
 class EngineWorkerScheduler;
-class EngineBuffer;
-class EngineChannel;
-class EngineDeck;
-class EngineFlanger;
 class EngineVuMeter;
 class ControlPotmeter;
 class ControlPushButton;
 class EngineSideChain;
 class EffectsManager;
 class EngineEffectsManager;
-class SyncWorker;
-class GuiTick;
 class EngineSync;
 class EngineTalkoverDucking;
 class EngineDelay;
diff --git a/src/engine/engineobject.h b/src/engine/engineobject.h
index 3c5c4c443b5..edbbccaee75 100644
--- a/src/engine/engineobject.h
+++ b/src/engine/engineobject.h
@@ -3,7 +3,8 @@
 #include <QObject>
 
 #include "util/types.h"
-#include "engine/effects/groupfeaturestate.h"
+
+struct GroupFeatureState;
 
 class EngineObject : public QObject {
     Q_OBJECT
diff --git a/src/engine/enginepregain.cpp b/src/engine/enginepregain.cpp
index f9da9e207a3..c745771c54a 100644
--- a/src/engine/enginepregain.cpp
+++ b/src/engine/enginepregain.cpp
@@ -1,13 +1,10 @@
 #include "engine/enginepregain.h"
 
-#include <QtDebug>
-
 #include "control/controlaudiotaperpot.h"
 #include "control/controlobject.h"
 #include "control/controlpotmeter.h"
-#include "control/controlpushbutton.h"
+#include "engine/effects/groupfeaturestate.h"
 #include "moc_enginepregain.cpp"
-#include "preferences/usersettings.h"
 #include "util/math.h"
 #include "util/sample.h"
 
diff --git a/src/engine/enginepregain.h b/src/engine/enginepregain.h
index eb3dd3f6f9f..4e2de510039 100644
--- a/src/engine/enginepregain.h
+++ b/src/engine/enginepregain.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "engine/engineobject.h"
-#include "control/controlobject.h"
 #include "util/performancetimer.h"
 
 class ControlAudioTaperPot;
diff --git a/src/engine/enginetalkoverducking.cpp b/src/engine/enginetalkoverducking.cpp
index 1531b5a569f..75253d9f72a 100644
--- a/src/engine/enginetalkoverducking.cpp
+++ b/src/engine/enginetalkoverducking.cpp
@@ -1,5 +1,6 @@
 #include "engine/enginetalkoverducking.h"
 
+#include "control/controllinpotmeter.h"
 #include "control/controlproxy.h"
 #include "moc_enginetalkoverducking.cpp"
 
diff --git a/src/engine/enginetalkoverducking.h b/src/engine/enginetalkoverducking.h
index f7df4e3b1fd..da4a9751bf9 100644
--- a/src/engine/enginetalkoverducking.h
+++ b/src/engine/enginetalkoverducking.h
@@ -1,11 +1,10 @@
 #pragma once
 
 #include "engine/enginesidechaincompressor.h"
-#include "control/controlpotmeter.h"
 #include "control/controlpushbutton.h"
 
-class ConfigValue;
 class ControlProxy;
+class ControlPotmeter;
 
 class EngineTalkoverDucking : public QObject, public EngineSideChainCompressor {
   Q_OBJECT
diff --git a/src/engine/enginevumeter.cpp b/src/engine/enginevumeter.cpp
index 4ee238c46c6..c5c57b8179b 100644
--- a/src/engine/enginevumeter.cpp
+++ b/src/engine/enginevumeter.cpp
@@ -1,7 +1,5 @@
 #include "engine/enginevumeter.h"
 
-#include "control/controlpotmeter.h"
-#include "control/controlproxy.h"
 #include "moc_enginevumeter.cpp"
 #include "util/sample.h"
 
diff --git a/src/engine/enginevumeter.h b/src/engine/enginevumeter.h
index a8e35123892..3bcf7c7db3c 100644
--- a/src/engine/enginevumeter.h
+++ b/src/engine/enginevumeter.h
@@ -4,8 +4,6 @@
 #include "control/pollingcontrolproxy.h"
 #include "engine/engineobject.h"
 
-class ControlPotmeter;
-
 class EngineVuMeter : public EngineObject {
     Q_OBJECT
   public:
diff --git a/src/engine/engineworker.cpp b/src/engine/engineworker.cpp
index 228a574ebb1..37adb0958a9 100644
--- a/src/engine/engineworker.cpp
+++ b/src/engine/engineworker.cpp
@@ -2,6 +2,7 @@
 
 #include "engine/engineworkerscheduler.h"
 #include "moc_engineworker.cpp"
+#include "util/assert.h"
 
 EngineWorker::EngineWorker()
     : m_pScheduler(nullptr) {
diff --git a/src/engine/engineworkerscheduler.cpp b/src/engine/engineworkerscheduler.cpp
index 650ccbcb3cc..bd898dbdab5 100644
--- a/src/engine/engineworkerscheduler.cpp
+++ b/src/engine/engineworkerscheduler.cpp
@@ -1,7 +1,5 @@
 #include "engine/engineworkerscheduler.h"
 
-#include <QtDebug>
-
 #include "engine/engineworker.h"
 #include "moc_engineworkerscheduler.cpp"
 #include "util/compatibility/qmutex.h"
diff --git a/src/engine/engineworkerscheduler.h b/src/engine/engineworkerscheduler.h
index a7ecb90094e..1b2fa5ff798 100644
--- a/src/engine/engineworkerscheduler.h
+++ b/src/engine/engineworkerscheduler.h
@@ -1,11 +1,9 @@
 #pragma once
 
 #include <QMutex>
-#include <QThreadPool>
+#include <QThread>
 #include <QWaitCondition>
 
-#include "util/fifo.h"
-
 // The max engine workers that can be expected to run within a callback
 // (e.g. the max that we will schedule). Must be a power of 2.
 #define MAX_ENGINE_WORKERS 32
diff --git a/src/engine/positionscratchcontroller.cpp b/src/engine/positionscratchcontroller.cpp
index e83213ec83c..32353601f50 100644
--- a/src/engine/positionscratchcontroller.cpp
+++ b/src/engine/positionscratchcontroller.cpp
@@ -1,9 +1,9 @@
 #include "engine/positionscratchcontroller.h"
 
-#include <QtDebug>
-
+#include "control/controlobject.h"
 #include "engine/bufferscalers/enginebufferscale.h" // for MIN_SEEK_SPEED
 #include "moc_positionscratchcontroller.cpp"
+#include "preferences/configobject.h" // for ConfigKey
 #include "util/math.h"
 
 class VelocityController {
diff --git a/src/engine/positionscratchcontroller.h b/src/engine/positionscratchcontroller.h
index dc47e5972a2..fe4d5034d20 100644
--- a/src/engine/positionscratchcontroller.h
+++ b/src/engine/positionscratchcontroller.h
@@ -4,8 +4,8 @@
 #include <QString>
 
 #include "audio/frame.h"
-#include "control/controlobject.h"
 
+class ControlObject;
 class VelocityController;
 class RateIIFilter;
 
diff --git a/src/engine/readaheadmanager.cpp b/src/engine/readaheadmanager.cpp
index 69ee41c506f..6af6981f566 100644
--- a/src/engine/readaheadmanager.cpp
+++ b/src/engine/readaheadmanager.cpp
@@ -4,7 +4,6 @@
 #include "engine/controls/loopingcontrol.h"
 #include "engine/controls/ratecontrol.h"
 #include "util/defs.h"
-#include "util/math.h"
 #include "util/sample.h"
 
 ReadAheadManager::ReadAheadManager()
diff --git a/src/engine/readaheadmanager.h b/src/engine/readaheadmanager.h
index 9bc9e796bdb..ae71a5f6b1c 100644
--- a/src/engine/readaheadmanager.h
+++ b/src/engine/readaheadmanager.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <QList>
-#include <QPair>
 #include <gsl/pointers>
 #include <list>
 
diff --git a/src/engine/sync/synccontrol.h b/src/engine/sync/synccontrol.h
index 912f82b51bb..f741bef845a 100644
--- a/src/engine/sync/synccontrol.h
+++ b/src/engine/sync/synccontrol.h
@@ -1,9 +1,11 @@
 #pragma once
 
 #include <gtest/gtest_prod.h>
+
 #include <QScopedPointer>
 
 #include "engine/controls/enginecontrol.h"
+#include "engine/sync/syncable.h"
 
 class BpmControl;
 class RateControl;
diff --git a/src/soundio/sounddevicenetwork.h b/src/soundio/sounddevicenetwork.h
index 03af40b2ee6..97ea71d5338 100644
--- a/src/soundio/sounddevicenetwork.h
+++ b/src/soundio/sounddevicenetwork.h
@@ -11,6 +11,7 @@
 #include "control/pollingcontrolproxy.h"
 #include "engine/sidechain/networkoutputstreamworker.h"
 #include "soundio/sounddevice.h"
+#include "util/fifo.h"
 #include "util/memory.h"
 #include "util/performancetimer.h"
 

From 6f14df89d65f713569d5f5d892d032e2428acc38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Wed, 1 Nov 2023 23:06:49 +0100
Subject: [PATCH 253/388] Improve headers of encoder classes

---
 src/encoder/encoder.h               | 10 ++++++++--
 src/encoder/encoderfdkaac.cpp       |  1 +
 src/encoder/encoderfdkaac.h         |  5 ++++-
 src/encoder/encoderfdkaacsettings.h |  4 ++--
 src/encoder/encoderflacsettings.cpp |  1 -
 src/encoder/encoderflacsettings.h   |  2 +-
 src/encoder/encodermp3.cpp          | 11 +++++++----
 src/encoder/encodermp3settings.h    |  2 +-
 src/encoder/encoderopus.cpp         |  1 +
 src/encoder/encodersndfileflac.cpp  |  3 +--
 src/encoder/encodersndfileflac.h    |  2 --
 src/encoder/encodervorbis.cpp       |  8 ++++++--
 src/encoder/encodervorbis.h         |  3 +--
 src/encoder/encodervorbissettings.h |  2 +-
 src/encoder/encoderwave.cpp         |  8 ++++----
 src/encoder/encoderwave.h           |  1 -
 src/encoder/encoderwavesettings.h   |  5 +++--
 17 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/src/encoder/encoder.h b/src/encoder/encoder.h
index f1c174438d0..2f107f3dfc1 100644
--- a/src/encoder/encoder.h
+++ b/src/encoder/encoder.h
@@ -1,13 +1,19 @@
 #pragma once
 
-#include "audio/types.h"
-#include "encoder/encodercallback.h"
 #include "encoder/encoderrecordingsettings.h"
 #include "encoder/encodersettings.h"
 #include "preferences/usersettings.h"
 #include "util/memory.h"
 #include "util/types.h"
 
+class EncoderCallback;
+
+namespace mixxx {
+namespace audio {
+class SampleRate;
+} // namespace audio
+} // namespace mixxx
+
 class Encoder {
   public:
         class Format {
diff --git a/src/encoder/encoderfdkaac.cpp b/src/encoder/encoderfdkaac.cpp
index 984af6df64d..f6edec63ba4 100644
--- a/src/encoder/encoderfdkaac.cpp
+++ b/src/encoder/encoderfdkaac.cpp
@@ -8,6 +8,7 @@
 #include <QString>
 #include <QStringList>
 
+#include "encoder/encodercallback.h"
 #include "engine/sidechain/enginesidechain.h"
 #include "recording/defs_recording.h"
 #include "util/logger.h"
diff --git a/src/encoder/encoderfdkaac.h b/src/encoder/encoderfdkaac.h
index 684f94ebbfe..d796f7aed3f 100644
--- a/src/encoder/encoderfdkaac.h
+++ b/src/encoder/encoderfdkaac.h
@@ -5,8 +5,11 @@
 #include <memory>
 #include <vector>
 
+#include "audio/types.h"
 #include "encoder/encoder.h"
-#include "util/fifo.h"
+
+template<class DataType>
+class FIFO;
 
 class EncoderFdkAac : public Encoder {
   public:
diff --git a/src/encoder/encoderfdkaacsettings.h b/src/encoder/encoderfdkaacsettings.h
index 3652b9ed61e..ccafd1b86f9 100644
--- a/src/encoder/encoderfdkaacsettings.h
+++ b/src/encoder/encoderfdkaacsettings.h
@@ -2,8 +2,8 @@
 
 #include <QList>
 
-#include "encoder/encoder.h"
-#include "encoder/encodersettings.h"
+#include "encoder/encoderrecordingsettings.h"
+#include "preferences/usersettings.h"
 
 class EncoderFdkAacSettings : public EncoderRecordingSettings {
   public:
diff --git a/src/encoder/encoderflacsettings.cpp b/src/encoder/encoderflacsettings.cpp
index 936c5629e55..2664e45fd52 100644
--- a/src/encoder/encoderflacsettings.cpp
+++ b/src/encoder/encoderflacsettings.cpp
@@ -1,6 +1,5 @@
 #include "encoder/encoderflacsettings.h"
 #include "recording/defs_recording.h"
-#include <sndfile.h>
 
 const int EncoderFlacSettings::DEFAULT_QUALITY_VALUE = 5;
 const QString EncoderFlacSettings::BITS_GROUP = "FLAC_BITS";
diff --git a/src/encoder/encoderflacsettings.h b/src/encoder/encoderflacsettings.h
index de5da145aff..354366e5857 100644
--- a/src/encoder/encoderflacsettings.h
+++ b/src/encoder/encoderflacsettings.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "encoder/encoderrecordingsettings.h"
-#include "encoder/encoder.h"
+#include "preferences/usersettings.h"
 #include "recording/defs_recording.h"
 
 /// Storage of settings for FLAC encoder
diff --git a/src/encoder/encodermp3.cpp b/src/encoder/encodermp3.cpp
index c79376945e4..9868ce6d84c 100644
--- a/src/encoder/encodermp3.cpp
+++ b/src/encoder/encodermp3.cpp
@@ -1,10 +1,13 @@
-#include <QtDebug>
-#include <QObject>
+#include "encoder/encodermp3.h"
+
 #include <limits.h>
 
-#include "encoder/encodermp3.h"
-#include "encoder/encodermp3settings.h"
+#include <QObject>
+#include <QtDebug>
+
+#include "audio/types.h"
 #include "encoder/encodercallback.h"
+#include "encoder/encodermp3settings.h"
 
 // Automatic thresholds for switching the encoder to mono
 // They have been chosen by testing and to keep the same number
diff --git a/src/encoder/encodermp3settings.h b/src/encoder/encodermp3settings.h
index bc057c69c8a..7137b6e655e 100644
--- a/src/encoder/encodermp3settings.h
+++ b/src/encoder/encodermp3settings.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "encoder/encoderrecordingsettings.h"
-#include "encoder/encoder.h"
+#include "preferences/usersettings.h"
 #include "recording/defs_recording.h"
 
 // Storage of settings for MP3 encoder
diff --git a/src/encoder/encoderopus.cpp b/src/encoder/encoderopus.cpp
index ecd39e2b78d..ff7975dd4a9 100644
--- a/src/encoder/encoderopus.cpp
+++ b/src/encoder/encoderopus.cpp
@@ -5,6 +5,7 @@
 #include <QRandomGenerator>
 #include <QtGlobal>
 
+#include "encoder/encodercallback.h"
 #include "encoder/encoderopussettings.h"
 #include "engine/sidechain/enginesidechain.h"
 #include "util/logger.h"
diff --git a/src/encoder/encodersndfileflac.cpp b/src/encoder/encodersndfileflac.cpp
index 7df3a1cf7e8..7fb40d8e88f 100644
--- a/src/encoder/encodersndfileflac.cpp
+++ b/src/encoder/encodersndfileflac.cpp
@@ -2,8 +2,7 @@
 
 #include <QtDebug>
 
-#include "encoder/encodercallback.h"
-#include "util/sample.h"
+#include "encoder/encoderflacsettings.h"
 
 namespace {
 constexpr SINT kEncBufferSize = 8192; // used inside libsndfile for flac
diff --git a/src/encoder/encodersndfileflac.h b/src/encoder/encodersndfileflac.h
index 68dfd3f9046..40270f29d5a 100644
--- a/src/encoder/encodersndfileflac.h
+++ b/src/encoder/encodersndfileflac.h
@@ -1,13 +1,11 @@
 #pragma once
 
-#include "encoder/encoderflacsettings.h"
 #ifdef Q_OS_WIN
 //Enable unicode in libsndfile on Windows
 //(sf_open uses UTF-8 otherwise)
 #include <windows.h>
 #define ENABLE_SNDFILE_WINDOWS_PROTOTYPES 1
 #endif
-#include <sndfile.h>
 
 #include "util/types.h"
 #include "encoder/encoderwave.h"
diff --git a/src/encoder/encodervorbis.cpp b/src/encoder/encodervorbis.cpp
index a60678b39bd..96a2b6bd5e9 100644
--- a/src/encoder/encodervorbis.cpp
+++ b/src/encoder/encodervorbis.cpp
@@ -1,8 +1,12 @@
+#include "encoder/encodervorbis.h"
+
 #include <stdlib.h> // needed for random num gen
-#include <time.h> // needed for random num gen
+#include <time.h>   // needed for random num gen
+#include <vorbis/vorbisenc.h>
+
 #include <QtDebug>
 
-#include "encoder/encodervorbis.h"
+#include "audio/types.h"
 #include "encoder/encodercallback.h"
 
 // Automatic thresholds for switching the encoder to mono
diff --git a/src/encoder/encodervorbis.h b/src/encoder/encodervorbis.h
index 31a54aa66a1..b28779181a4 100644
--- a/src/encoder/encodervorbis.h
+++ b/src/encoder/encodervorbis.h
@@ -1,7 +1,6 @@
 #pragma once
 
-// this also includes vorbis/codec.h
-#include <vorbis/vorbisenc.h>
+#include <vorbis/codec.h>
 
 #include <QFile>
 
diff --git a/src/encoder/encodervorbissettings.h b/src/encoder/encodervorbissettings.h
index a05597d3f53..ffd534866bb 100644
--- a/src/encoder/encodervorbissettings.h
+++ b/src/encoder/encodervorbissettings.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "encoder/encoderrecordingsettings.h"
-#include "encoder/encoder.h"
+#include "preferences/usersettings.h"
 #include "recording/defs_recording.h"
 
 /// Storage of settings for Vorbis encoder
diff --git a/src/encoder/encoderwave.cpp b/src/encoder/encoderwave.cpp
index 3bdec355d42..91e90874cb3 100644
--- a/src/encoder/encoderwave.cpp
+++ b/src/encoder/encoderwave.cpp
@@ -1,12 +1,12 @@
-#include <QtDebug>
-
 #include "encoder/encoderwave.h"
 
+#include <QtDebug>
+
+#include "audio/types.h"
 #include "encoder/encodercallback.h"
-#include "errordialoghandler.h"
+#include "encoder/encoderwavesettings.h"
 #include "recording/defs_recording.h"
 
-
 // The virtual file context must return the length of the virtual file in bytes.
 static sf_count_t  sf_f_get_filelen (void *user_data)
 {
diff --git a/src/encoder/encoderwave.h b/src/encoder/encoderwave.h
index 54d67184998..0811bf1287b 100644
--- a/src/encoder/encoderwave.h
+++ b/src/encoder/encoderwave.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "encoder/encoderwavesettings.h"
 #ifdef Q_OS_WIN
 // Enable unicode in libsndfile on Windows
 // (sf_open uses UTF-8 otherwise)
diff --git a/src/encoder/encoderwavesettings.h b/src/encoder/encoderwavesettings.h
index 6818591949e..3bb3ba44b54 100644
--- a/src/encoder/encoderwavesettings.h
+++ b/src/encoder/encoderwavesettings.h
@@ -1,9 +1,10 @@
 #pragma once
 
-#include "encoder/encoderrecordingsettings.h"
-#include "encoder/encoder.h"
 #include <QList>
 
+#include "encoder/encoderrecordingsettings.h"
+#include "preferences/usersettings.h"
+
 /// Storage of settings for WAVE/AIFF encoder
 class EncoderWaveSettings : public EncoderRecordingSettings {
   public:

From 98fe2a8a935c90333cd749b8a077eebe35fd0214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Wed, 1 Nov 2023 23:08:21 +0100
Subject: [PATCH 254/388] Improve headers of enginebufferscaler classes

---
 src/engine/bufferscalers/enginebufferscale.cpp           | 1 -
 src/engine/bufferscalers/enginebufferscalelinear.cpp     | 2 +-
 src/engine/bufferscalers/enginebufferscalelinear.h       | 6 +++---
 src/engine/bufferscalers/enginebufferscalerubberband.cpp | 1 -
 src/engine/bufferscalers/enginebufferscalest.cpp         | 3 ---
 src/engine/cachingreader/cachingreader.cpp               | 1 -
 src/engine/cachingreader/cachingreader.h                 | 1 -
 7 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/engine/bufferscalers/enginebufferscale.cpp b/src/engine/bufferscalers/enginebufferscale.cpp
index 71ba23eed3b..ee9ef873ab4 100644
--- a/src/engine/bufferscalers/enginebufferscale.cpp
+++ b/src/engine/bufferscalers/enginebufferscale.cpp
@@ -2,7 +2,6 @@
 
 #include "engine/engine.h"
 #include "moc_enginebufferscale.cpp"
-#include "util/defs.h"
 
 EngineBufferScale::EngineBufferScale()
         : m_outputSignal(
diff --git a/src/engine/bufferscalers/enginebufferscalelinear.cpp b/src/engine/bufferscalers/enginebufferscalelinear.cpp
index 33fda453e01..1b28123d44f 100644
--- a/src/engine/bufferscalers/enginebufferscalelinear.cpp
+++ b/src/engine/bufferscalers/enginebufferscalelinear.cpp
@@ -2,8 +2,8 @@
 
 #include <QtDebug>
 
+#include "engine/readaheadmanager.h"
 #include "moc_enginebufferscalelinear.cpp"
-#include "track/keyutils.h"
 #include "util/assert.h"
 #include "util/math.h"
 #include "util/sample.h"
diff --git a/src/engine/bufferscalers/enginebufferscalelinear.h b/src/engine/bufferscalers/enginebufferscalelinear.h
index 5c7882ee1c0..d4ea8f67307 100644
--- a/src/engine/bufferscalers/enginebufferscalelinear.h
+++ b/src/engine/bufferscalers/enginebufferscalelinear.h
@@ -1,17 +1,17 @@
 #pragma once
 
 #include "engine/bufferscalers/enginebufferscale.h"
-#include "engine/readaheadmanager.h"
+
+class ReadAheadManager;
 
 /** Number of samples to read ahead */
 constexpr int kiLinearScaleReadAheadLength = 10240;
 
-
 class EngineBufferScaleLinear : public EngineBufferScale  {
     Q_OBJECT
   public:
     explicit EngineBufferScaleLinear(
-            ReadAheadManager *pReadAheadManager);
+            ReadAheadManager* pReadAheadManager);
     ~EngineBufferScaleLinear() override;
 
     double scaleBuffer(
diff --git a/src/engine/bufferscalers/enginebufferscalerubberband.cpp b/src/engine/bufferscalers/enginebufferscalerubberband.cpp
index 8988782f8e8..98e2cb02a83 100644
--- a/src/engine/bufferscalers/enginebufferscalerubberband.cpp
+++ b/src/engine/bufferscalers/enginebufferscalerubberband.cpp
@@ -2,7 +2,6 @@
 
 #include <QtDebug>
 
-#include "control/controlobject.h"
 #include "engine/readaheadmanager.h"
 #include "moc_enginebufferscalerubberband.cpp"
 #include "util/counter.h"
diff --git a/src/engine/bufferscalers/enginebufferscalest.cpp b/src/engine/bufferscalers/enginebufferscalest.cpp
index 2d4c4fb9a13..1d46edbf173 100644
--- a/src/engine/bufferscalers/enginebufferscalest.cpp
+++ b/src/engine/bufferscalers/enginebufferscalest.cpp
@@ -5,10 +5,7 @@
 // Fixes redefinition warnings from SoundTouch.
 #include <soundtouch/SoundTouch.h>
 
-#include "control/controlobject.h"
-#include "engine/engineobject.h"
 #include "engine/readaheadmanager.h"
-#include "track/keyutils.h"
 #include "util/math.h"
 #include "util/sample.h"
 
diff --git a/src/engine/cachingreader/cachingreader.cpp b/src/engine/cachingreader/cachingreader.cpp
index de2c78229dc..45a83cf525a 100644
--- a/src/engine/cachingreader/cachingreader.cpp
+++ b/src/engine/cachingreader/cachingreader.cpp
@@ -7,7 +7,6 @@
 #include "util/compatibility/qatomic.h"
 #include "util/counter.h"
 #include "util/logger.h"
-#include "util/math.h"
 #include "util/sample.h"
 
 namespace {
diff --git a/src/engine/cachingreader/cachingreader.h b/src/engine/cachingreader/cachingreader.h
index cb7fe2b5e7b..c8aa8d8e8de 100644
--- a/src/engine/cachingreader/cachingreader.h
+++ b/src/engine/cachingreader/cachingreader.h
@@ -8,7 +8,6 @@
 #include <list>
 
 #include "engine/cachingreader/cachingreaderworker.h"
-#include "engine/engineworker.h"
 #include "preferences/usersettings.h"
 #include "track/track_decl.h"
 #include "util/fifo.h"

From 87c1328224294f54657e781f9ea4f1ca0de8516e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Thu, 2 Nov 2023 07:46:19 +0100
Subject: [PATCH 255/388] Improve effects preset includes

---
 src/effects/presets/effectchainpreset.cpp        | 2 ++
 src/effects/presets/effectchainpreset.h          | 1 -
 src/effects/presets/effectchainpresetmanager.cpp | 2 +-
 src/effects/presets/effectchainpresetmanager.h   | 3 ---
 src/effects/presets/effectpreset.h               | 1 -
 src/effects/presets/effectpresetmanager.cpp      | 1 +
 src/effects/presets/effectpresetmanager.h        | 2 +-
 src/preferences/dialog/dlgprefeffects.cpp        | 4 ++++
 src/widget/weffectchainpresetbutton.h            | 1 +
 9 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/effects/presets/effectchainpreset.cpp b/src/effects/presets/effectchainpreset.cpp
index 0df63a6342f..35b6d5ab5e1 100644
--- a/src/effects/presets/effectchainpreset.cpp
+++ b/src/effects/presets/effectchainpreset.cpp
@@ -1,6 +1,8 @@
 #include "effects/presets/effectchainpreset.h"
 
+#include "effects/backends/effectmanifest.h"
 #include "effects/effectchain.h"
+#include "effects/presets/effectpreset.h"
 #include "effects/presets/effectxmlelements.h"
 #include "util/xml.h"
 
diff --git a/src/effects/presets/effectchainpreset.h b/src/effects/presets/effectchainpreset.h
index 890e380923c..fc0dd321515 100644
--- a/src/effects/presets/effectchainpreset.h
+++ b/src/effects/presets/effectchainpreset.h
@@ -3,7 +3,6 @@
 
 #include "effects/defs.h"
 #include "effects/effectchainmixmode.h"
-#include "effects/presets/effectpreset.h"
 
 class EffectChain;
 
diff --git a/src/effects/presets/effectchainpresetmanager.cpp b/src/effects/presets/effectchainpresetmanager.cpp
index a9965ff8e56..5232c884003 100644
--- a/src/effects/presets/effectchainpresetmanager.cpp
+++ b/src/effects/presets/effectchainpresetmanager.cpp
@@ -7,7 +7,7 @@
 
 #include "effects/backends/builtin/filtereffect.h"
 #include "effects/effectchain.h"
-#include "effects/effectsmanager.h"
+#include "effects/presets/effectpreset.h"
 #include "effects/presets/effectxmlelements.h"
 #include "moc_effectchainpresetmanager.cpp"
 #include "util/filename.h"
diff --git a/src/effects/presets/effectchainpresetmanager.h b/src/effects/presets/effectchainpresetmanager.h
index 8bd326b9661..1ad9f76e62b 100644
--- a/src/effects/presets/effectchainpresetmanager.h
+++ b/src/effects/presets/effectchainpresetmanager.h
@@ -4,11 +4,8 @@
 #include <QList>
 
 #include "effects/backends/effectsbackendmanager.h"
-#include "effects/presets/effectchainpreset.h"
 #include "preferences/usersettings.h"
 
-class EffectsManager;
-
 struct EffectsXmlData {
     QHash<QString, EffectChainPresetPointer> quickEffectChainPresets;
     QList<EffectChainPresetPointer> standardEffectChainPresets;
diff --git a/src/effects/presets/effectpreset.h b/src/effects/presets/effectpreset.h
index 4df5b7b5575..01b9f6f3716 100644
--- a/src/effects/presets/effectpreset.h
+++ b/src/effects/presets/effectpreset.h
@@ -1,7 +1,6 @@
 #pragma once
 #include <QDomElement>
 
-#include "effects/backends/effectmanifest.h"
 #include "effects/defs.h"
 #include "effects/presets/effectparameterpreset.h"
 
diff --git a/src/effects/presets/effectpresetmanager.cpp b/src/effects/presets/effectpresetmanager.cpp
index 3633415660a..2f78b622faa 100644
--- a/src/effects/presets/effectpresetmanager.cpp
+++ b/src/effects/presets/effectpresetmanager.cpp
@@ -3,6 +3,7 @@
 #include <QDir>
 
 #include "effects/backends/effectsbackendmanager.h"
+#include "effects/presets/effectpreset.h"
 #include "effects/presets/effectxmlelements.h"
 #include "util/filename.h"
 
diff --git a/src/effects/presets/effectpresetmanager.h b/src/effects/presets/effectpresetmanager.h
index 9c5fd236407..7c3b43bbc7e 100644
--- a/src/effects/presets/effectpresetmanager.h
+++ b/src/effects/presets/effectpresetmanager.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "effects/presets/effectpreset.h"
+#include "effects/backends/effectsbackendmanager.h"
 #include "preferences/usersettings.h"
 
 /// EffectPresetManager loads and saves default EffectPresets for each type of
diff --git a/src/preferences/dialog/dlgprefeffects.cpp b/src/preferences/dialog/dlgprefeffects.cpp
index e62d7fdad04..5daaca2b51e 100644
--- a/src/preferences/dialog/dlgprefeffects.cpp
+++ b/src/preferences/dialog/dlgprefeffects.cpp
@@ -5,11 +5,15 @@
 #include "effects/backends/effectmanifest.h"
 #include "effects/backends/effectsbackend.h"
 #include "effects/effectsmanager.h"
+#include "effects/presets/effectchainpreset.h"
+#include "effects/presets/effectpreset.h"
 #include "effects/visibleeffectslist.h"
 #include "moc_dlgprefeffects.cpp"
 #include "preferences/effectchainpresetlistmodel.h"
 #include "preferences/effectmanifesttablemodel.h"
 
+class EffectsManager;
+
 DlgPrefEffects::DlgPrefEffects(QWidget* pParent,
         UserSettingsPointer pConfig,
         std::shared_ptr<EffectsManager> pEffectsManager)
diff --git a/src/widget/weffectchainpresetbutton.h b/src/widget/weffectchainpresetbutton.h
index 62d16b86a2d..812b9f69239 100644
--- a/src/widget/weffectchainpresetbutton.h
+++ b/src/widget/weffectchainpresetbutton.h
@@ -9,6 +9,7 @@
 
 class QDomNode;
 class SkinContext;
+class EffectsManager;
 
 class WEffectChainPresetButton : public QPushButton, public WBaseWidget {
     Q_OBJECT

From 369a9f455da55d66c9186065f4c1924a01f08d8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Thu, 2 Nov 2023 08:00:08 +0100
Subject: [PATCH 256/388] Improve headers of buildin effects

---
 src/effects/backends/builtin/autopaneffect.cpp         |  6 ++----
 src/effects/backends/builtin/autopaneffect.h           |  4 ----
 src/effects/backends/builtin/balanceeffect.cpp         |  2 ++
 src/effects/backends/builtin/balanceeffect.h           |  2 --
 src/effects/backends/builtin/bessel4lvmixeqeffect.cpp  |  3 ++-
 src/effects/backends/builtin/bessel4lvmixeqeffect.h    |  4 ----
 src/effects/backends/builtin/bessel8lvmixeqeffect.cpp  |  3 ++-
 src/effects/backends/builtin/bessel8lvmixeqeffect.h    |  5 -----
 .../backends/builtin/biquadfullkilleqeffect.cpp        |  2 ++
 src/effects/backends/builtin/biquadfullkilleqeffect.h  |  6 ------
 src/effects/backends/builtin/bitcrushereffect.cpp      |  2 ++
 src/effects/backends/builtin/bitcrushereffect.h        |  2 --
 src/effects/backends/builtin/builtinbackend.cpp        |  2 --
 src/effects/backends/builtin/distortioneffect.cpp      |  3 +++
 src/effects/backends/builtin/distortioneffect.h        |  3 ---
 src/effects/backends/builtin/echoeffect.cpp            |  4 ++--
 src/effects/backends/builtin/echoeffect.h              |  4 ----
 src/effects/backends/builtin/filtereffect.cpp          |  3 +++
 src/effects/backends/builtin/filtereffect.h            |  8 +++-----
 src/effects/backends/builtin/flangereffect.cpp         |  4 ++--
 src/effects/backends/builtin/flangereffect.h           |  3 ---
 src/effects/backends/builtin/graphiceqeffect.cpp       |  4 +++-
 src/effects/backends/builtin/graphiceqeffect.h         | 10 ++++------
 .../backends/builtin/linkwitzriley8eqeffect.cpp        |  5 ++++-
 src/effects/backends/builtin/linkwitzriley8eqeffect.h  |  8 +++-----
 src/effects/backends/builtin/loudnesscontoureffect.cpp |  3 +++
 src/effects/backends/builtin/loudnesscontoureffect.h   | 10 +++-------
 src/effects/backends/builtin/metronomeeffect.cpp       |  5 ++---
 src/effects/backends/builtin/metronomeeffect.h         |  5 -----
 .../backends/builtin/moogladder4filtereffect.cpp       |  4 +++-
 src/effects/backends/builtin/moogladder4filtereffect.h |  8 +++-----
 src/effects/backends/builtin/parametriceqeffect.cpp    |  3 ++-
 src/effects/backends/builtin/parametriceqeffect.h      |  5 -----
 src/effects/backends/builtin/phasereffect.cpp          |  3 ++-
 src/effects/backends/builtin/phasereffect.h            |  3 ---
 src/effects/backends/builtin/pitchshifteffect.cpp      |  4 ++++
 src/effects/backends/builtin/pitchshifteffect.h        |  7 -------
 src/effects/backends/builtin/reverbeffect.cpp          |  4 ++--
 src/effects/backends/builtin/reverbeffect.h            |  4 ----
 .../backends/builtin/threebandbiquadeqeffect.cpp       |  1 +
 src/effects/backends/builtin/threebandbiquadeqeffect.h |  5 -----
 src/effects/backends/builtin/tremoloeffect.h           |  5 ++---
 src/effects/backends/builtin/whitenoiseeffect.cpp      |  2 ++
 src/effects/backends/builtin/whitenoiseeffect.h        |  6 ------
 src/effects/presets/effectchainpresetmanager.cpp       |  1 +
 45 files changed, 69 insertions(+), 121 deletions(-)

diff --git a/src/effects/backends/builtin/autopaneffect.cpp b/src/effects/backends/builtin/autopaneffect.cpp
index 80c6fed20ce..7e9d9aa5543 100644
--- a/src/effects/backends/builtin/autopaneffect.cpp
+++ b/src/effects/backends/builtin/autopaneffect.cpp
@@ -1,10 +1,8 @@
 #include "effects/backends/builtin/autopaneffect.h"
 
-#include <QtDebug>
-
-#include "util/experiment.h"
+#include "effects/backends/effectmanifest.h"
+#include "engine/effects/engineeffectparameter.h"
 #include "util/math.h"
-#include "util/sample.h"
 
 constexpr float kPositionRampingThreshold = 0.002f;
 
diff --git a/src/effects/backends/builtin/autopaneffect.h b/src/effects/backends/builtin/autopaneffect.h
index dc969f89a13..50dd2f7d228 100644
--- a/src/effects/backends/builtin/autopaneffect.h
+++ b/src/effects/backends/builtin/autopaneffect.h
@@ -3,12 +3,8 @@
 #include <QMap>
 
 #include "effects/backends/effectprocessor.h"
-#include "engine/effects/engineeffect.h"
-#include "engine/effects/engineeffectparameter.h"
 #include "engine/filters/enginefilterpansingle.h"
 #include "util/class.h"
-#include "util/defs.h"
-#include "util/sample.h"
 #include "util/types.h"
 
 // This class provides a float value that cannot be increased or decreased
diff --git a/src/effects/backends/builtin/balanceeffect.cpp b/src/effects/backends/builtin/balanceeffect.cpp
index cef476d58de..ed44a17925b 100644
--- a/src/effects/backends/builtin/balanceeffect.cpp
+++ b/src/effects/backends/builtin/balanceeffect.cpp
@@ -1,5 +1,7 @@
 #include "balanceeffect.h"
 
+#include "effects/backends/effectmanifest.h"
+#include "engine/effects/engineeffectparameter.h"
 #include "util/defs.h"
 
 namespace {
diff --git a/src/effects/backends/builtin/balanceeffect.h b/src/effects/backends/builtin/balanceeffect.h
index 92c4a6014ae..0cbf518c358 100644
--- a/src/effects/backends/builtin/balanceeffect.h
+++ b/src/effects/backends/builtin/balanceeffect.h
@@ -1,8 +1,6 @@
 #pragma once
 
 #include "effects/backends/effectprocessor.h"
-#include "engine/effects/engineeffect.h"
-#include "engine/effects/engineeffectparameter.h"
 #include "engine/filters/enginefilterlinkwitzriley4.h"
 #include "util/memory.h"
 #include "util/samplebuffer.h"
diff --git a/src/effects/backends/builtin/bessel4lvmixeqeffect.cpp b/src/effects/backends/builtin/bessel4lvmixeqeffect.cpp
index a8d73c6a18f..79edd9a83c5 100644
--- a/src/effects/backends/builtin/bessel4lvmixeqeffect.cpp
+++ b/src/effects/backends/builtin/bessel4lvmixeqeffect.cpp
@@ -1,8 +1,9 @@
 #include "effects/backends/builtin/bessel4lvmixeqeffect.h"
 
 #include "effects/backends/builtin/equalizer_util.h"
+#include "effects/backends/effectmanifest.h"
 #include "effects/defs.h"
-#include "util/math.h"
+#include "engine/effects/engineeffectparameter.h"
 
 // static
 QString Bessel4LVMixEQEffect::getId() {
diff --git a/src/effects/backends/builtin/bessel4lvmixeqeffect.h b/src/effects/backends/builtin/bessel4lvmixeqeffect.h
index ca94b113171..eaa6c784004 100644
--- a/src/effects/backends/builtin/bessel4lvmixeqeffect.h
+++ b/src/effects/backends/builtin/bessel4lvmixeqeffect.h
@@ -4,12 +4,8 @@
 #include "control/pollingcontrolproxy.h"
 #include "effects/backends/builtin/lvmixeqbase.h"
 #include "effects/backends/effectprocessor.h"
-#include "engine/effects/engineeffect.h"
-#include "engine/effects/engineeffectparameter.h"
 #include "engine/filters/enginefilterbessel4.h"
-#include "engine/filters/enginefilterdelay.h"
 #include "util/class.h"
-#include "util/defs.h"
 #include "util/types.h"
 
 class Bessel4LVMixEQEffectGroupState : public LVMixEQEffectGroupState<EngineFilterBessel4Low> {
diff --git a/src/effects/backends/builtin/bessel8lvmixeqeffect.cpp b/src/effects/backends/builtin/bessel8lvmixeqeffect.cpp
index 1a867a8b3b8..5076d2de940 100644
--- a/src/effects/backends/builtin/bessel8lvmixeqeffect.cpp
+++ b/src/effects/backends/builtin/bessel8lvmixeqeffect.cpp
@@ -1,8 +1,9 @@
 #include "effects/backends/builtin/bessel8lvmixeqeffect.h"
 
 #include "effects/backends/builtin/equalizer_util.h"
+#include "effects/backends/effectmanifest.h"
 #include "effects/defs.h"
-#include "util/math.h"
+#include "engine/effects/engineeffectparameter.h"
 
 // static
 QString Bessel8LVMixEQEffect::getId() {
diff --git a/src/effects/backends/builtin/bessel8lvmixeqeffect.h b/src/effects/backends/builtin/bessel8lvmixeqeffect.h
index 83524f9ced1..73b89c7aac4 100644
--- a/src/effects/backends/builtin/bessel8lvmixeqeffect.h
+++ b/src/effects/backends/builtin/bessel8lvmixeqeffect.h
@@ -5,13 +5,8 @@
 #include "control/pollingcontrolproxy.h"
 #include "effects/backends/builtin/lvmixeqbase.h"
 #include "effects/backends/effectprocessor.h"
-#include "engine/effects/engineeffect.h"
-#include "engine/effects/engineeffectparameter.h"
 #include "engine/filters/enginefilterbessel8.h"
-#include "engine/filters/enginefilterdelay.h"
 #include "util/class.h"
-#include "util/defs.h"
-#include "util/sample.h"
 #include "util/types.h"
 
 class Bessel8LVMixEQEffectGroupState : public LVMixEQEffectGroupState<EngineFilterBessel8Low> {
diff --git a/src/effects/backends/builtin/biquadfullkilleqeffect.cpp b/src/effects/backends/builtin/biquadfullkilleqeffect.cpp
index 463a3d36ce5..fc3cfc67760 100644
--- a/src/effects/backends/builtin/biquadfullkilleqeffect.cpp
+++ b/src/effects/backends/builtin/biquadfullkilleqeffect.cpp
@@ -1,7 +1,9 @@
 #include "effects/backends/builtin/biquadfullkilleqeffect.h"
 
 #include "effects/backends/builtin/equalizer_util.h"
+#include "effects/backends/effectmanifest.h"
 #include "effects/defs.h"
+#include "engine/effects/engineeffectparameter.h"
 #include "util/math.h"
 
 namespace {
diff --git a/src/effects/backends/builtin/biquadfullkilleqeffect.h b/src/effects/backends/builtin/biquadfullkilleqeffect.h
index 2f3ab30bc72..e7aacaa6d5b 100644
--- a/src/effects/backends/builtin/biquadfullkilleqeffect.h
+++ b/src/effects/backends/builtin/biquadfullkilleqeffect.h
@@ -3,15 +3,9 @@
 #include "control/pollingcontrolproxy.h"
 #include "effects/backends/builtin/lvmixeqbase.h"
 #include "effects/backends/effectprocessor.h"
-#include "engine/effects/engineeffect.h"
-#include "engine/effects/engineeffectparameter.h"
 #include "engine/filters/enginefilterbessel4.h"
 #include "engine/filters/enginefilterbiquad1.h"
-#include "engine/filters/enginefilterdelay.h"
-#include "util/class.h"
-#include "util/defs.h"
 #include "util/memory.h"
-#include "util/sample.h"
 #include "util/samplebuffer.h"
 #include "util/types.h"
 
diff --git a/src/effects/backends/builtin/bitcrushereffect.cpp b/src/effects/backends/builtin/bitcrushereffect.cpp
index 3d1dc3b3e7f..08eeece6d34 100644
--- a/src/effects/backends/builtin/bitcrushereffect.cpp
+++ b/src/effects/backends/builtin/bitcrushereffect.cpp
@@ -1,5 +1,7 @@
 #include "effects/backends/builtin/bitcrushereffect.h"
 
+#include "effects/backends/effectmanifest.h"
+#include "engine/effects/engineeffectparameter.h"
 #include "util/sample.h"
 
 // static
diff --git a/src/effects/backends/builtin/bitcrushereffect.h b/src/effects/backends/builtin/bitcrushereffect.h
index e8b399505b7..696ea9b9b5e 100644
--- a/src/effects/backends/builtin/bitcrushereffect.h
+++ b/src/effects/backends/builtin/bitcrushereffect.h
@@ -3,8 +3,6 @@
 #include <QMap>
 
 #include "effects/backends/effectprocessor.h"
-#include "engine/effects/engineeffect.h"
-#include "engine/effects/engineeffectparameter.h"
 #include "util/class.h"
 #include "util/types.h"
 
diff --git a/src/effects/backends/builtin/builtinbackend.cpp b/src/effects/backends/builtin/builtinbackend.cpp
index e4e879e7b69..7e21138234d 100644
--- a/src/effects/backends/builtin/builtinbackend.cpp
+++ b/src/effects/backends/builtin/builtinbackend.cpp
@@ -1,8 +1,6 @@
 
 #include "effects/backends/builtin/builtinbackend.h"
 
-#include <QtDebug>
-
 #include "effects/backends/builtin/balanceeffect.h"
 #include "effects/backends/builtin/bessel4lvmixeqeffect.h"
 #include "effects/backends/builtin/bessel8lvmixeqeffect.h"
diff --git a/src/effects/backends/builtin/distortioneffect.cpp b/src/effects/backends/builtin/distortioneffect.cpp
index 2e7f45dce4d..ff196bd4bd2 100644
--- a/src/effects/backends/builtin/distortioneffect.cpp
+++ b/src/effects/backends/builtin/distortioneffect.cpp
@@ -1,5 +1,8 @@
 #include "effects/backends/builtin/distortioneffect.h"
 
+#include "effects/backends/effectmanifest.h"
+#include "engine/effects/engineeffectparameter.h"
+
 namespace {
 inline CSAMPLE tanh_approx(CSAMPLE input) {
     return input / (1 + input * input / (3 + input * input / 5));
diff --git a/src/effects/backends/builtin/distortioneffect.h b/src/effects/backends/builtin/distortioneffect.h
index 48b0dd50ebd..70dd90cae16 100644
--- a/src/effects/backends/builtin/distortioneffect.h
+++ b/src/effects/backends/builtin/distortioneffect.h
@@ -1,10 +1,7 @@
 #pragma once
 
 #include "effects/backends/effectprocessor.h"
-#include "engine/effects/engineeffect.h"
-#include "engine/effects/engineeffectparameter.h"
 #include "util/class.h"
-#include "util/defs.h"
 #include "util/sample.h"
 #include "util/types.h"
 
diff --git a/src/effects/backends/builtin/echoeffect.cpp b/src/effects/backends/builtin/echoeffect.cpp
index d926359fb1e..4b132bcfb38 100644
--- a/src/effects/backends/builtin/echoeffect.cpp
+++ b/src/effects/backends/builtin/echoeffect.cpp
@@ -1,7 +1,7 @@
 #include "effects/backends/builtin/echoeffect.h"
 
-#include <QtDebug>
-
+#include "effects/backends/effectmanifest.h"
+#include "engine/effects/engineeffectparameter.h"
 #include "util/math.h"
 #include "util/rampingvalue.h"
 #include "util/sample.h"
diff --git a/src/effects/backends/builtin/echoeffect.h b/src/effects/backends/builtin/echoeffect.h
index 3ac9a24f5b3..3c9690ffbda 100644
--- a/src/effects/backends/builtin/echoeffect.h
+++ b/src/effects/backends/builtin/echoeffect.h
@@ -3,12 +3,8 @@
 #include <QMap>
 
 #include "effects/backends/effectprocessor.h"
-#include "engine/effects/engineeffect.h"
-#include "engine/effects/engineeffectparameter.h"
 #include "engine/engine.h"
 #include "util/class.h"
-#include "util/defs.h"
-#include "util/sample.h"
 #include "util/samplebuffer.h"
 
 class EchoGroupState : public EffectState {
diff --git a/src/effects/backends/builtin/filtereffect.cpp b/src/effects/backends/builtin/filtereffect.cpp
index bd64958c0d1..e48b588a8c7 100644
--- a/src/effects/backends/builtin/filtereffect.cpp
+++ b/src/effects/backends/builtin/filtereffect.cpp
@@ -1,5 +1,8 @@
 #include "effects/backends/builtin/filtereffect.h"
 
+#include "effects/backends/effectmanifest.h"
+#include "engine/effects/engineeffectparameter.h"
+#include "engine/filters/enginefilterbiquad1.h"
 #include "util/math.h"
 
 namespace {
diff --git a/src/effects/backends/builtin/filtereffect.h b/src/effects/backends/builtin/filtereffect.h
index 6ea4eda8c43..e1c55909d05 100644
--- a/src/effects/backends/builtin/filtereffect.h
+++ b/src/effects/backends/builtin/filtereffect.h
@@ -1,15 +1,13 @@
 #pragma once
 
 #include "effects/backends/effectprocessor.h"
-#include "engine/effects/engineeffect.h"
-#include "engine/effects/engineeffectparameter.h"
-#include "engine/filters/enginefilterbiquad1.h"
 #include "util/class.h"
-#include "util/defs.h"
-#include "util/sample.h"
 #include "util/samplebuffer.h"
 #include "util/types.h"
 
+class EngineFilterBiquad1Low;
+class EngineFilterBiquad1High;
+
 struct FilterGroupState : public EffectState {
     FilterGroupState(const mixxx::EngineParameters& engineParameters);
     ~FilterGroupState() override;
diff --git a/src/effects/backends/builtin/flangereffect.cpp b/src/effects/backends/builtin/flangereffect.cpp
index afbf9412f9b..542c5e8d706 100644
--- a/src/effects/backends/builtin/flangereffect.cpp
+++ b/src/effects/backends/builtin/flangereffect.cpp
@@ -1,7 +1,7 @@
 #include "effects/backends/builtin/flangereffect.h"
 
-#include <QtDebug>
-
+#include "effects/backends/effectmanifest.h"
+#include "engine/effects/engineeffectparameter.h"
 #include "util/math.h"
 
 namespace {
diff --git a/src/effects/backends/builtin/flangereffect.h b/src/effects/backends/builtin/flangereffect.h
index ad00bb158bd..ceedbbb0de4 100644
--- a/src/effects/backends/builtin/flangereffect.h
+++ b/src/effects/backends/builtin/flangereffect.h
@@ -3,10 +3,7 @@
 #include <QMap>
 
 #include "effects/backends/effectprocessor.h"
-#include "engine/effects/engineeffect.h"
-#include "engine/effects/engineeffectparameter.h"
 #include "util/class.h"
-#include "util/defs.h"
 #include "util/rampingvalue.h"
 #include "util/sample.h"
 #include "util/types.h"
diff --git a/src/effects/backends/builtin/graphiceqeffect.cpp b/src/effects/backends/builtin/graphiceqeffect.cpp
index a6cbf8b945d..37ea676528e 100644
--- a/src/effects/backends/builtin/graphiceqeffect.cpp
+++ b/src/effects/backends/builtin/graphiceqeffect.cpp
@@ -1,6 +1,8 @@
 #include "effects/backends/builtin/graphiceqeffect.h"
 
-#include "util/math.h"
+#include "effects/backends/effectmanifest.h"
+#include "engine/effects/engineeffectparameter.h"
+#include "engine/filters/enginefilterbiquad1.h"
 
 #define Q 1.2247449
 
diff --git a/src/effects/backends/builtin/graphiceqeffect.h b/src/effects/backends/builtin/graphiceqeffect.h
index c088adcfda1..95a0185e5f8 100644
--- a/src/effects/backends/builtin/graphiceqeffect.h
+++ b/src/effects/backends/builtin/graphiceqeffect.h
@@ -2,16 +2,14 @@
 
 #include <QMap>
 
-#include "control/controlproxy.h"
 #include "effects/backends/effectprocessor.h"
-#include "engine/effects/engineeffect.h"
-#include "engine/effects/engineeffectparameter.h"
-#include "engine/filters/enginefilterbiquad1.h"
 #include "util/class.h"
-#include "util/defs.h"
-#include "util/sample.h"
 #include "util/types.h"
 
+class EngineFilterBiquad1LowShelving;
+class EngineFilterBiquad1Peaking;
+class EngineFilterBiquad1HighShelving;
+
 class GraphicEQEffectGroupState : public EffectState {
   public:
     GraphicEQEffectGroupState(const mixxx::EngineParameters& engineParameters);
diff --git a/src/effects/backends/builtin/linkwitzriley8eqeffect.cpp b/src/effects/backends/builtin/linkwitzriley8eqeffect.cpp
index 687ddd2cb9a..c680afb6508 100644
--- a/src/effects/backends/builtin/linkwitzriley8eqeffect.cpp
+++ b/src/effects/backends/builtin/linkwitzriley8eqeffect.cpp
@@ -1,8 +1,11 @@
 #include "effects/backends/builtin/linkwitzriley8eqeffect.h"
 
 #include "effects/backends/builtin/equalizer_util.h"
+#include "effects/backends/effectmanifest.h"
 #include "effects/defs.h"
-#include "util/math.h"
+#include "engine/effects/engineeffectparameter.h"
+#include "engine/filters/enginefilterlinkwitzriley8.h"
+#include "util/defs.h"
 
 static constexpr unsigned int kStartupSamplerate = 44100;
 static constexpr unsigned int kStartupLoFreq = 246;
diff --git a/src/effects/backends/builtin/linkwitzriley8eqeffect.h b/src/effects/backends/builtin/linkwitzriley8eqeffect.h
index e1cddb1a42a..4bb7d37aa15 100644
--- a/src/effects/backends/builtin/linkwitzriley8eqeffect.h
+++ b/src/effects/backends/builtin/linkwitzriley8eqeffect.h
@@ -4,14 +4,12 @@
 
 #include "control/pollingcontrolproxy.h"
 #include "effects/backends/effectprocessor.h"
-#include "engine/effects/engineeffect.h"
-#include "engine/effects/engineeffectparameter.h"
-#include "engine/filters/enginefilterlinkwitzriley8.h"
 #include "util/class.h"
-#include "util/defs.h"
-#include "util/sample.h"
 #include "util/types.h"
 
+class EngineFilterLinkwitzRiley8High;
+class EngineFilterLinkwitzRiley8Low;
+
 class LinkwitzRiley8EQEffectGroupState : public EffectState {
   public:
     LinkwitzRiley8EQEffectGroupState(const mixxx::EngineParameters& engineParameters);
diff --git a/src/effects/backends/builtin/loudnesscontoureffect.cpp b/src/effects/backends/builtin/loudnesscontoureffect.cpp
index fa1dec50ba3..b2f49f50303 100644
--- a/src/effects/backends/builtin/loudnesscontoureffect.cpp
+++ b/src/effects/backends/builtin/loudnesscontoureffect.cpp
@@ -1,5 +1,8 @@
 #include "effects/backends/builtin/loudnesscontoureffect.h"
 
+#include "effects/backends/effectmanifest.h"
+#include "engine/effects/engineeffectparameter.h"
+#include "engine/filters/enginefilterbiquad1.h"
 #include "util/math.h"
 
 namespace {
diff --git a/src/effects/backends/builtin/loudnesscontoureffect.h b/src/effects/backends/builtin/loudnesscontoureffect.h
index f28a74a4c95..54043d00e54 100644
--- a/src/effects/backends/builtin/loudnesscontoureffect.h
+++ b/src/effects/backends/builtin/loudnesscontoureffect.h
@@ -1,16 +1,12 @@
 #pragma once
 
-#include "control/controlproxy.h"
 #include "effects/backends/effectprocessor.h"
-#include "engine/effects/engineeffect.h"
-#include "engine/effects/engineeffectparameter.h"
-#include "engine/filters/enginefilterbiquad1.h"
-#include "util/class.h"
-#include "util/defs.h"
 #include "util/memory.h"
-#include "util/sample.h"
 #include "util/types.h"
 
+class EngineFilterBiquad1HighShelving;
+class EngineFilterBiquad1Peaking;
+
 class LoudnessContourEffectGroupState final : public EffectState {
   public:
     LoudnessContourEffectGroupState(const mixxx::EngineParameters& engineParameters);
diff --git a/src/effects/backends/builtin/metronomeeffect.cpp b/src/effects/backends/builtin/metronomeeffect.cpp
index 1338c634fea..e7b7638b9e7 100644
--- a/src/effects/backends/builtin/metronomeeffect.cpp
+++ b/src/effects/backends/builtin/metronomeeffect.cpp
@@ -1,9 +1,8 @@
 #include "metronomeeffect.h"
 
-#include <QtDebug>
-
+#include "effects/backends/effectmanifest.h"
+#include "engine/effects/engineeffectparameter.h"
 #include "metronomeclick.h"
-#include "util/experiment.h"
 #include "util/math.h"
 #include "util/sample.h"
 
diff --git a/src/effects/backends/builtin/metronomeeffect.h b/src/effects/backends/builtin/metronomeeffect.h
index aa7e48cfd76..e3c81c7bfff 100644
--- a/src/effects/backends/builtin/metronomeeffect.h
+++ b/src/effects/backends/builtin/metronomeeffect.h
@@ -3,12 +3,7 @@
 #include <QMap>
 
 #include "effects/backends/effectprocessor.h"
-#include "engine/effects/engineeffect.h"
-#include "engine/effects/engineeffectparameter.h"
-#include "engine/filters/enginefilterpansingle.h"
 #include "util/class.h"
-#include "util/defs.h"
-#include "util/sample.h"
 #include "util/types.h"
 
 class MetronomeGroupState final : public EffectState {
diff --git a/src/effects/backends/builtin/moogladder4filtereffect.cpp b/src/effects/backends/builtin/moogladder4filtereffect.cpp
index 86912a530c4..aa4252fc73a 100644
--- a/src/effects/backends/builtin/moogladder4filtereffect.cpp
+++ b/src/effects/backends/builtin/moogladder4filtereffect.cpp
@@ -1,6 +1,8 @@
 #include "effects/backends/builtin/moogladder4filtereffect.h"
 
-#include "util/math.h"
+#include "effects/backends/effectmanifest.h"
+#include "engine/effects/engineeffectparameter.h"
+#include "engine/filters/enginefiltermoogladder4.h"
 
 static constexpr double kMinCorner = 0.0003; // 13 Hz @ 44100
 static constexpr double kMaxCorner = 0.5;    // 22050 Hz @ 44100
diff --git a/src/effects/backends/builtin/moogladder4filtereffect.h b/src/effects/backends/builtin/moogladder4filtereffect.h
index 0177e8e2dfc..24993a8bb40 100644
--- a/src/effects/backends/builtin/moogladder4filtereffect.h
+++ b/src/effects/backends/builtin/moogladder4filtereffect.h
@@ -1,13 +1,11 @@
 #pragma once
 #include "effects/backends/effectprocessor.h"
-#include "engine/effects/engineeffect.h"
-#include "engine/effects/engineeffectparameter.h"
-#include "engine/filters/enginefiltermoogladder4.h"
 #include "util/class.h"
-#include "util/defs.h"
-#include "util/sample.h"
 #include "util/types.h"
 
+class EngineFilterMoogLadder4Low;
+class EngineFilterMoogLadder4High;
+
 class MoogLadder4FilterGroupState : public EffectState {
   public:
     MoogLadder4FilterGroupState(const mixxx::EngineParameters& engineParameters);
diff --git a/src/effects/backends/builtin/parametriceqeffect.cpp b/src/effects/backends/builtin/parametriceqeffect.cpp
index 4e29c5807e6..d109a6bf266 100644
--- a/src/effects/backends/builtin/parametriceqeffect.cpp
+++ b/src/effects/backends/builtin/parametriceqeffect.cpp
@@ -1,6 +1,7 @@
 #include "effects/backends/builtin/parametriceqeffect.h"
 
-#include "util/math.h"
+#include "effects/backends/effectmanifest.h"
+#include "engine/effects/engineeffectparameter.h"
 
 namespace {
 constexpr int kBandCount = 2;
diff --git a/src/effects/backends/builtin/parametriceqeffect.h b/src/effects/backends/builtin/parametriceqeffect.h
index 7183d6e0e2e..ebff8032f8b 100644
--- a/src/effects/backends/builtin/parametriceqeffect.h
+++ b/src/effects/backends/builtin/parametriceqeffect.h
@@ -4,15 +4,10 @@
 #include <vector>
 
 #include "audio/types.h"
-#include "control/controlproxy.h"
 #include "effects/backends/effectprocessor.h"
-#include "engine/effects/engineeffect.h"
-#include "engine/effects/engineeffectparameter.h"
 #include "engine/filters/enginefilterbiquad1.h"
 #include "util/class.h"
-#include "util/defs.h"
 #include "util/memory.h"
-#include "util/sample.h"
 #include "util/types.h"
 
 // The ParametricEQEffect models the mid bands from a SSL Black EQ (242)
diff --git a/src/effects/backends/builtin/phasereffect.cpp b/src/effects/backends/builtin/phasereffect.cpp
index 6dc6b62f460..dd92f19ceb4 100644
--- a/src/effects/backends/builtin/phasereffect.cpp
+++ b/src/effects/backends/builtin/phasereffect.cpp
@@ -1,6 +1,7 @@
 #include "effects/backends/builtin/phasereffect.h"
 
-#include <QDebug>
+#include "effects/backends/effectmanifest.h"
+#include "engine/effects/engineeffectparameter.h"
 
 namespace {
 constexpr unsigned int updateCoef = 32;
diff --git a/src/effects/backends/builtin/phasereffect.h b/src/effects/backends/builtin/phasereffect.h
index 0f5b6675544..9180ce2f7cf 100644
--- a/src/effects/backends/builtin/phasereffect.h
+++ b/src/effects/backends/builtin/phasereffect.h
@@ -1,10 +1,7 @@
 #pragma once
 
 #include "effects/backends/effectprocessor.h"
-#include "engine/effects/engineeffect.h"
-#include "engine/effects/engineeffectparameter.h"
 #include "util/class.h"
-#include "util/defs.h"
 #include "util/sample.h"
 #include "util/types.h"
 
diff --git a/src/effects/backends/builtin/pitchshifteffect.cpp b/src/effects/backends/builtin/pitchshifteffect.cpp
index 9dec56251b4..4dee0ed04e6 100644
--- a/src/effects/backends/builtin/pitchshifteffect.cpp
+++ b/src/effects/backends/builtin/pitchshifteffect.cpp
@@ -1,7 +1,11 @@
 #include "effects/backends/builtin/pitchshifteffect.h"
 
+#include <rubberband/RubberBandStretcher.h>
+
 #include <QString>
 
+#include "effects/backends/effectmanifest.h"
+#include "engine/effects/engineeffectparameter.h"
 #include "util/sample.h"
 
 namespace {
diff --git a/src/effects/backends/builtin/pitchshifteffect.h b/src/effects/backends/builtin/pitchshifteffect.h
index 9708bd4f4d3..3eb62efa7cd 100644
--- a/src/effects/backends/builtin/pitchshifteffect.h
+++ b/src/effects/backends/builtin/pitchshifteffect.h
@@ -1,16 +1,9 @@
 #pragma once
 
-#include <rubberband/RubberBandStretcher.h>
-
 #include <QMap>
 
 #include "effects/backends/effectprocessor.h"
-#include "engine/effects/engineeffect.h"
-#include "engine/effects/engineeffectparameter.h"
 #include "util/class.h"
-#include "util/defs.h"
-#include "util/math.h"
-#include "util/sample.h"
 #include "util/types.h"
 
 namespace RubberBand {
diff --git a/src/effects/backends/builtin/reverbeffect.cpp b/src/effects/backends/builtin/reverbeffect.cpp
index fd6b0fd8f9d..7f64bff6e05 100644
--- a/src/effects/backends/builtin/reverbeffect.cpp
+++ b/src/effects/backends/builtin/reverbeffect.cpp
@@ -1,7 +1,7 @@
 #include "effects/backends/builtin/reverbeffect.h"
 
-#include <QtDebug>
-
+#include "effects/backends/effectmanifest.h"
+#include "engine/effects/engineeffectparameter.h"
 #include "util/sample.h"
 
 // static
diff --git a/src/effects/backends/builtin/reverbeffect.h b/src/effects/backends/builtin/reverbeffect.h
index b8d8164e0fc..a2589d45e00 100644
--- a/src/effects/backends/builtin/reverbeffect.h
+++ b/src/effects/backends/builtin/reverbeffect.h
@@ -8,11 +8,7 @@
 #include <QMap>
 
 #include "effects/backends/effectprocessor.h"
-#include "engine/effects/engineeffect.h"
-#include "engine/effects/engineeffectparameter.h"
 #include "util/class.h"
-#include "util/defs.h"
-#include "util/sample.h"
 #include "util/types.h"
 
 class ReverbGroupState : public EffectState {
diff --git a/src/effects/backends/builtin/threebandbiquadeqeffect.cpp b/src/effects/backends/builtin/threebandbiquadeqeffect.cpp
index f362795e51b..bc1c5161522 100644
--- a/src/effects/backends/builtin/threebandbiquadeqeffect.cpp
+++ b/src/effects/backends/builtin/threebandbiquadeqeffect.cpp
@@ -2,6 +2,7 @@
 
 #include "effects/backends/builtin/equalizer_util.h"
 #include "effects/defs.h"
+#include "engine/effects/engineeffectparameter.h"
 #include "util/math.h"
 
 namespace {
diff --git a/src/effects/backends/builtin/threebandbiquadeqeffect.h b/src/effects/backends/builtin/threebandbiquadeqeffect.h
index 6d6bad756d3..9dab205d018 100644
--- a/src/effects/backends/builtin/threebandbiquadeqeffect.h
+++ b/src/effects/backends/builtin/threebandbiquadeqeffect.h
@@ -2,13 +2,8 @@
 
 #include "control/pollingcontrolproxy.h"
 #include "effects/backends/effectprocessor.h"
-#include "engine/effects/engineeffect.h"
-#include "engine/effects/engineeffectparameter.h"
 #include "engine/filters/enginefilterbiquad1.h"
-#include "util/class.h"
-#include "util/defs.h"
 #include "util/memory.h"
-#include "util/sample.h"
 #include "util/samplebuffer.h"
 #include "util/types.h"
 
diff --git a/src/effects/backends/builtin/tremoloeffect.h b/src/effects/backends/builtin/tremoloeffect.h
index b4e4f81b5e2..f653f81eb81 100644
--- a/src/effects/backends/builtin/tremoloeffect.h
+++ b/src/effects/backends/builtin/tremoloeffect.h
@@ -1,10 +1,9 @@
 #pragma once
+
+#include "effects/backends/effectmanifest.h"
 #include "effects/backends/effectprocessor.h"
-#include "engine/effects/engineeffect.h"
 #include "engine/effects/engineeffectparameter.h"
 #include "util/class.h"
-#include "util/defs.h"
-#include "util/sample.h"
 #include "util/types.h"
 
 class TremoloState : public EffectState {
diff --git a/src/effects/backends/builtin/whitenoiseeffect.cpp b/src/effects/backends/builtin/whitenoiseeffect.cpp
index 8e899b43ba6..762f41901ee 100644
--- a/src/effects/backends/builtin/whitenoiseeffect.cpp
+++ b/src/effects/backends/builtin/whitenoiseeffect.cpp
@@ -1,5 +1,7 @@
 #include "effects/backends/builtin/whitenoiseeffect.h"
 
+#include "effects/backends/effectmanifest.h"
+#include "engine/effects/engineeffectparameter.h"
 #include "util/rampingvalue.h"
 
 namespace {
diff --git a/src/effects/backends/builtin/whitenoiseeffect.h b/src/effects/backends/builtin/whitenoiseeffect.h
index fb87f10a602..28757aabc8c 100644
--- a/src/effects/backends/builtin/whitenoiseeffect.h
+++ b/src/effects/backends/builtin/whitenoiseeffect.h
@@ -3,13 +3,7 @@
 #include <random>
 
 #include "effects/backends/effectprocessor.h"
-#include "engine/effects/engineeffect.h"
-#include "engine/effects/engineeffectparameter.h"
-#include "engine/filters/enginefilterpansingle.h"
 #include "util/class.h"
-#include "util/defs.h"
-#include "util/sample.h"
-#include "util/samplebuffer.h"
 #include "util/types.h"
 
 class WhiteNoiseGroupState final : public EffectState {
diff --git a/src/effects/presets/effectchainpresetmanager.cpp b/src/effects/presets/effectchainpresetmanager.cpp
index 5232c884003..e1e2eb84d1d 100644
--- a/src/effects/presets/effectchainpresetmanager.cpp
+++ b/src/effects/presets/effectchainpresetmanager.cpp
@@ -6,6 +6,7 @@
 #include <QMessageBox>
 
 #include "effects/backends/builtin/filtereffect.h"
+#include "effects/backends/effectmanifest.h"
 #include "effects/effectchain.h"
 #include "effects/presets/effectpreset.h"
 #include "effects/presets/effectxmlelements.h"

From b1af109c20efa0ecfa35f87713aab597ebfcb4b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Thu, 2 Nov 2023 12:15:24 +0100
Subject: [PATCH 257/388] Improve headers of effect classes

---
 src/controllers/controlpickermenu.cpp            |  3 +++
 src/effects/backends/effectmanifest.h            |  1 -
 src/effects/backends/effectsbackend.h            |  1 -
 src/effects/chains/equalizereffectchain.cpp      |  1 +
 src/effects/chains/pergroupeffectchain.cpp       |  1 +
 src/effects/chains/quickeffectchain.cpp          |  2 ++
 src/effects/effectbuttonparameterslot.cpp        |  7 +------
 src/effects/effectbuttonparameterslot.h          |  3 ---
 src/effects/effectchain.cpp                      |  6 +-----
 src/effects/effectchain.h                        |  8 +-------
 src/effects/effectknobparameterslot.cpp          |  4 ----
 src/effects/effectknobparameterslot.h            |  3 ---
 src/effects/effectparameter.cpp                  |  2 +-
 src/effects/effectparameter.h                    |  5 -----
 src/effects/effectparameterslotbase.cpp          |  4 ----
 src/effects/effectparameterslotbase.h            |  4 +---
 src/effects/effectslot.cpp                       |  9 ++++++---
 src/effects/effectslot.h                         | 14 ++++----------
 src/effects/effectsmanager.cpp                   |  3 +--
 src/effects/presets/effectchainpresetmanager.cpp |  1 +
 src/effects/visibleeffectslist.cpp               |  2 ++
 src/effects/visibleeffectslist.h                 |  2 +-
 src/engine/effects/engineeffectsmanager.h        |  2 +-
 src/preferences/dialog/dlgprefmixer.cpp          |  2 ++
 src/widget/weffectchainpresetbutton.cpp          |  4 ++++
 src/widget/weffectchainpresetselector.cpp        |  2 ++
 src/widget/weffectparameterknob.cpp              |  1 +
 src/widget/weffectparameterknobcomposed.cpp      |  2 ++
 src/widget/weffectparameternamebase.cpp          |  3 +++
 src/widget/weffectpushbutton.cpp                 |  2 ++
 30 files changed, 44 insertions(+), 60 deletions(-)

diff --git a/src/controllers/controlpickermenu.cpp b/src/controllers/controlpickermenu.cpp
index 1a63f9f2849..4abbfbee4ef 100644
--- a/src/controllers/controlpickermenu.cpp
+++ b/src/controllers/controlpickermenu.cpp
@@ -1,8 +1,11 @@
 #include "controllers/controlpickermenu.h"
 
+#include "control/controlobject.h"
 #include "effects/chains/equalizereffectchain.h"
 #include "effects/chains/standardeffectchain.h"
 #include "effects/defs.h"
+#include "effects/effectbuttonparameterslot.h"
+#include "effects/effectknobparameterslot.h"
 #include "effects/effectslot.h"
 #include "engine/controls/cuecontrol.h"
 #include "engine/controls/loopingcontrol.h"
diff --git a/src/effects/backends/effectmanifest.h b/src/effects/backends/effectmanifest.h
index 3bf6dbae3a5..45ecd27a59f 100644
--- a/src/effects/backends/effectmanifest.h
+++ b/src/effects/backends/effectmanifest.h
@@ -3,7 +3,6 @@
 #include <QList>
 #include <QSharedPointer>
 #include <QString>
-#include <QtDebug>
 
 #include "effects/backends/effectmanifestparameter.h"
 #include "effects/backends/effectsbackend.h"
diff --git a/src/effects/backends/effectsbackend.h b/src/effects/backends/effectsbackend.h
index 4d531a90090..b2b5b84a161 100644
--- a/src/effects/backends/effectsbackend.h
+++ b/src/effects/backends/effectsbackend.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <QList>
-#include <QObject>
 #include <QSet>
 #include <QString>
 
diff --git a/src/effects/chains/equalizereffectchain.cpp b/src/effects/chains/equalizereffectchain.cpp
index 03b8e498318..ccf341c6b6c 100644
--- a/src/effects/chains/equalizereffectchain.cpp
+++ b/src/effects/chains/equalizereffectchain.cpp
@@ -1,5 +1,6 @@
 #include "effects/chains/equalizereffectchain.h"
 
+#include "control/controlobject.h"
 #include "effects/effectslot.h"
 #include "moc_equalizereffectchain.cpp"
 
diff --git a/src/effects/chains/pergroupeffectchain.cpp b/src/effects/chains/pergroupeffectchain.cpp
index c2954c25c43..8c5eb8262c3 100644
--- a/src/effects/chains/pergroupeffectchain.cpp
+++ b/src/effects/chains/pergroupeffectchain.cpp
@@ -1,5 +1,6 @@
 #include "effects/chains/pergroupeffectchain.h"
 
+#include "control/controlobject.h"
 #include "moc_pergroupeffectchain.cpp"
 
 class EffectsManager;
diff --git a/src/effects/chains/quickeffectchain.cpp b/src/effects/chains/quickeffectchain.cpp
index 587300cedea..8ecd6426103 100644
--- a/src/effects/chains/quickeffectchain.cpp
+++ b/src/effects/chains/quickeffectchain.cpp
@@ -1,6 +1,8 @@
 #include "effects/chains/quickeffectchain.h"
 
+#include "control/controlobject.h"
 #include "effects/effectslot.h"
+#include "effects/presets/effectchainpreset.h"
 #include "effects/presets/effectchainpresetmanager.h"
 #include "moc_quickeffectchain.cpp"
 
diff --git a/src/effects/effectbuttonparameterslot.cpp b/src/effects/effectbuttonparameterslot.cpp
index b10cd0b507c..cd700a536b4 100644
--- a/src/effects/effectbuttonparameterslot.cpp
+++ b/src/effects/effectbuttonparameterslot.cpp
@@ -1,14 +1,9 @@
 #include "effects/effectbuttonparameterslot.h"
 
-#include <QtDebug>
-
-#include "control/controleffectknob.h"
 #include "control/controlobject.h"
 #include "control/controlpushbutton.h"
-#include "effects/effectslot.h"
+#include "effects/effectparameter.h"
 #include "moc_effectbuttonparameterslot.cpp"
-#include "util/math.h"
-#include "util/xml.h"
 
 EffectButtonParameterSlot::EffectButtonParameterSlot(const QString& group,
         const unsigned int iParameterSlotNumber)
diff --git a/src/effects/effectbuttonparameterslot.h b/src/effects/effectbuttonparameterslot.h
index eed7d658da2..c984b8e2da1 100644
--- a/src/effects/effectbuttonparameterslot.h
+++ b/src/effects/effectbuttonparameterslot.h
@@ -2,13 +2,10 @@
 
 #include <QObject>
 #include <QString>
-#include <QVariant>
 
-#include "control/controlobject.h"
 #include "effects/effectparameterslotbase.h"
 #include "util/class.h"
 
-class ControlObject;
 class ControlPushButton;
 
 /// Refer to EffectParameterSlotBase for documentation
diff --git a/src/effects/effectchain.cpp b/src/effects/effectchain.cpp
index 53c37a3ce4b..42c380e89ea 100644
--- a/src/effects/effectchain.cpp
+++ b/src/effects/effectchain.cpp
@@ -6,15 +6,11 @@
 #include "effects/effectslot.h"
 #include "effects/effectsmanager.h"
 #include "effects/effectsmessenger.h"
+#include "effects/presets/effectchainpreset.h"
 #include "effects/presets/effectchainpresetmanager.h"
 #include "engine/effects/engineeffectchain.h"
-#include "engine/engine.h"
-#include "mixer/playermanager.h"
 #include "moc_effectchain.cpp"
-#include "util/defs.h"
-#include "util/math.h"
 #include "util/sample.h"
-#include "util/xml.h"
 
 EffectChain::EffectChain(const QString& group,
         EffectsManager* pEffectsManager,
diff --git a/src/effects/effectchain.h b/src/effects/effectchain.h
index cf49b53b6d9..f0aadc4ab24 100644
--- a/src/effects/effectchain.h
+++ b/src/effects/effectchain.h
@@ -1,24 +1,18 @@
 #pragma once
 
-#include <QDomDocument>
 #include <QList>
-#include <QMap>
 #include <QObject>
-#include <QSignalMapper>
 
-#include "control/controlobject.h"
 #include "effects/defs.h"
 #include "effects/effectchainmixmode.h"
-#include "effects/presets/effectchainpreset.h"
 #include "engine/channelhandle.h"
 #include "util/class.h"
 #include "util/memory.h"
 
+class ControlObject;
 class ControlPushButton;
 class ControlEncoder;
-class EffectChain;
 class EffectsManager;
-class EffectProcessor;
 class EngineEffectChain;
 
 /// EffectChain is the main thread representation of an effect chain.
diff --git a/src/effects/effectknobparameterslot.cpp b/src/effects/effectknobparameterslot.cpp
index 8b683297377..4f3fb704d6e 100644
--- a/src/effects/effectknobparameterslot.cpp
+++ b/src/effects/effectknobparameterslot.cpp
@@ -1,15 +1,11 @@
 #include "effects/effectknobparameterslot.h"
 
-#include <QtDebug>
-
 #include "control/controleffectknob.h"
 #include "control/controlobject.h"
 #include "control/controlpushbutton.h"
 #include "controllers/softtakeover.h"
 #include "effects/effectparameter.h"
-#include "effects/effectslot.h"
 #include "moc_effectknobparameterslot.cpp"
-#include "util/xml.h"
 
 EffectKnobParameterSlot::EffectKnobParameterSlot(
         const QString& group, const unsigned int iParameterSlotNumber)
diff --git a/src/effects/effectknobparameterslot.h b/src/effects/effectknobparameterslot.h
index d0038afa0ea..d5930ecb31f 100644
--- a/src/effects/effectknobparameterslot.h
+++ b/src/effects/effectknobparameterslot.h
@@ -4,15 +4,12 @@
 #include <QString>
 #include <QVariant>
 
-#include "control/controlobject.h"
 #include "effects/effectparameterslotbase.h"
 #include "util/class.h"
 
-class ControlObject;
 class ControlPushButton;
 class ControlEffectKnob;
 class SoftTakeover;
-class EffectSlot;
 
 /// Refer to EffectParameterSlotBase for documentation
 class EffectKnobParameterSlot : public EffectParameterSlotBase {
diff --git a/src/effects/effectparameter.cpp b/src/effects/effectparameter.cpp
index 71187e71ac9..0ee6bbf4e4c 100644
--- a/src/effects/effectparameter.cpp
+++ b/src/effects/effectparameter.cpp
@@ -3,7 +3,7 @@
 #include <QtDebug>
 
 #include "effects/effectsmessenger.h"
-#include "util/assert.h"
+#include "effects/presets/effectparameterpreset.h"
 
 EffectParameter::EffectParameter(EngineEffect* pEngineEffect,
         EffectsMessengerPointer pEffectsMessenger,
diff --git a/src/effects/effectparameter.h b/src/effects/effectparameter.h
index 62166524210..b2d62eee0a5 100644
--- a/src/effects/effectparameter.h
+++ b/src/effects/effectparameter.h
@@ -1,13 +1,8 @@
 #pragma once
 
-#include <QObject>
-
 #include "effects/backends/effectmanifestparameter.h"
-#include "effects/effectslot.h"
 #include "util/class.h"
 
-class Effect;
-class EffectsManager;
 class EngineEffect;
 class EffectParameterPreset;
 
diff --git a/src/effects/effectparameterslotbase.cpp b/src/effects/effectparameterslotbase.cpp
index 4d1e70fd685..6cd170fdfb0 100644
--- a/src/effects/effectparameterslotbase.cpp
+++ b/src/effects/effectparameterslotbase.cpp
@@ -1,10 +1,6 @@
 #include "effects/effectparameterslotbase.h"
 
-#include <QtDebug>
-
-#include "control/controleffectknob.h"
 #include "control/controlobject.h"
-#include "control/controlpushbutton.h"
 #include "effects/effectparameter.h"
 #include "moc_effectparameterslotbase.cpp"
 
diff --git a/src/effects/effectparameterslotbase.h b/src/effects/effectparameterslotbase.h
index 6aee70783b1..b621db1aa9d 100644
--- a/src/effects/effectparameterslotbase.h
+++ b/src/effects/effectparameterslotbase.h
@@ -2,10 +2,8 @@
 
 #include <QObject>
 #include <QString>
-#include <QVariant>
 
-#include "control/controlobject.h"
-#include "effects/backends/effectmanifest.h"
+#include "effects/backends/effectmanifestparameter.h"
 #include "util/class.h"
 
 class ControlObject;
diff --git a/src/effects/effectslot.cpp b/src/effects/effectslot.cpp
index 9d0cfeb2426..c0ef89c6ab8 100644
--- a/src/effects/effectslot.cpp
+++ b/src/effects/effectslot.cpp
@@ -2,18 +2,21 @@
 
 #include <QDebug>
 
-#include "audio/types.h"
 #include "control/controlencoder.h"
-#include "control/controlproxy.h"
 #include "control/controlpushbutton.h"
+#include "effects/backends/effectmanifest.h"
 #include "effects/defs.h"
+#include "effects/effectbuttonparameterslot.h"
 #include "effects/effectchain.h"
+#include "effects/effectknobparameterslot.h"
+#include "effects/effectparameter.h"
 #include "effects/effectsmanager.h"
 #include "effects/effectsmessenger.h"
+#include "effects/presets/effectpreset.h"
 #include "effects/presets/effectpresetmanager.h"
 #include "effects/visibleeffectslist.h"
+#include "engine/effects/engineeffect.h"
 #include "moc_effectslot.cpp"
-#include "util/defs.h"
 #include "util/math.h"
 
 // The maximum number of effect parameters we're going to support.
diff --git a/src/effects/effectslot.h b/src/effects/effectslot.h
index ce2f3175eab..cb9b86d7fb4 100644
--- a/src/effects/effectslot.h
+++ b/src/effects/effectslot.h
@@ -4,19 +4,10 @@
 #include <QSharedPointer>
 #include <QString>
 
-#include "control/controlencoder.h"
-#include "control/controlobject.h"
-#include "control/controlpotmeter.h"
-#include "control/controlpushbutton.h"
 #include "controllers/softtakeover.h"
 #include "effects/backends/effectmanifest.h"
-#include "effects/effectbuttonparameterslot.h"
-#include "effects/effectknobparameterslot.h"
-#include "effects/effectparameter.h"
-#include "effects/presets/effectpreset.h"
 #include "engine/channelhandle.h"
-#include "engine/effects/engineeffect.h"
-#include "engine/engine.h"
+#include "preferences/usersettings.h"
 #include "util/class.h"
 
 class EffectProcessor;
@@ -28,6 +19,9 @@ class EngineEffectChain;
 class ControlProxy;
 class EffectParameter;
 class EffectKnobParameterSlot;
+class ControlPotmeter;
+class ControlPushButton;
+class ControlEncoder;
 
 typedef QMap<EffectParameterType, QList<EffectParameterPointer>> ParameterMap;
 
diff --git a/src/effects/effectsmanager.cpp b/src/effects/effectsmanager.cpp
index 76edf192aff..aa89c22100e 100644
--- a/src/effects/effectsmanager.cpp
+++ b/src/effects/effectsmanager.cpp
@@ -3,13 +3,12 @@
 #include <QDir>
 #include <QMetaType>
 
-#include "control/controlpotmeter.h"
 #include "effects/chains/equalizereffectchain.h"
 #include "effects/chains/outputeffectchain.h"
 #include "effects/chains/quickeffectchain.h"
 #include "effects/chains/standardeffectchain.h"
-#include "effects/effectslot.h"
 #include "effects/effectsmessenger.h"
+#include "effects/presets/effectchainpreset.h"
 #include "effects/presets/effectpresetmanager.h"
 #include "effects/presets/effectxmlelements.h"
 #include "effects/visibleeffectslist.h"
diff --git a/src/effects/presets/effectchainpresetmanager.cpp b/src/effects/presets/effectchainpresetmanager.cpp
index e1e2eb84d1d..78523c111d2 100644
--- a/src/effects/presets/effectchainpresetmanager.cpp
+++ b/src/effects/presets/effectchainpresetmanager.cpp
@@ -8,6 +8,7 @@
 #include "effects/backends/builtin/filtereffect.h"
 #include "effects/backends/effectmanifest.h"
 #include "effects/effectchain.h"
+#include "effects/presets/effectchainpreset.h"
 #include "effects/presets/effectpreset.h"
 #include "effects/presets/effectxmlelements.h"
 #include "moc_effectchainpresetmanager.cpp"
diff --git a/src/effects/visibleeffectslist.cpp b/src/effects/visibleeffectslist.cpp
index 093924feb94..1c2ffdd39a9 100644
--- a/src/effects/visibleeffectslist.cpp
+++ b/src/effects/visibleeffectslist.cpp
@@ -2,6 +2,8 @@
 
 #include <QDomDocument>
 
+#include "effects/backends/effectmanifest.h"
+#include "effects/backends/effectsbackend.h"
 #include "effects/backends/effectsbackendmanager.h"
 #include "effects/presets/effectxmlelements.h"
 #include "moc_visibleeffectslist.cpp"
diff --git a/src/effects/visibleeffectslist.h b/src/effects/visibleeffectslist.h
index c5f784b7822..58b898078b7 100644
--- a/src/effects/visibleeffectslist.h
+++ b/src/effects/visibleeffectslist.h
@@ -2,7 +2,7 @@
 
 #include <QList>
 
-#include "effects/backends/effectmanifest.h"
+#include "effects/defs.h"
 
 QT_FORWARD_DECLARE_CLASS(QDomDocument);
 
diff --git a/src/engine/effects/engineeffectsmanager.h b/src/engine/effects/engineeffectsmanager.h
index a9386f99918..53f9d9bc921 100644
--- a/src/engine/effects/engineeffectsmanager.h
+++ b/src/engine/effects/engineeffectsmanager.h
@@ -7,7 +7,7 @@
 
 class EngineEffectChain;
 class EngineEffect;
-class GroupFeatureState;
+struct GroupFeatureState;
 
 /// EngineEffectsManager is the entry point for processing effects in the audio
 /// thread. It also passes EffectsRequests from EffectsMessenger down to the
diff --git a/src/preferences/dialog/dlgprefmixer.cpp b/src/preferences/dialog/dlgprefmixer.cpp
index ef808763e90..dea3fbeb512 100644
--- a/src/preferences/dialog/dlgprefmixer.cpp
+++ b/src/preferences/dialog/dlgprefmixer.cpp
@@ -11,8 +11,10 @@
 #include "effects/backends/builtin/filtereffect.h"
 #include "effects/chains/equalizereffectchain.h"
 #include "effects/chains/quickeffectchain.h"
+#include "effects/effectparameterslotbase.h"
 #include "effects/effectslot.h"
 #include "effects/effectsmanager.h"
+#include "effects/presets/effectchainpreset.h"
 #include "engine/enginexfader.h"
 #include "mixer/playermanager.h"
 #include "moc_dlgprefmixer.cpp"
diff --git a/src/widget/weffectchainpresetbutton.cpp b/src/widget/weffectchainpresetbutton.cpp
index 3941259464a..559d817e54d 100644
--- a/src/widget/weffectchainpresetbutton.cpp
+++ b/src/widget/weffectchainpresetbutton.cpp
@@ -3,6 +3,10 @@
 #include <QCheckBox>
 #include <QWidgetAction>
 
+#include "effects/effectparameter.h"
+#include "effects/effectparameterslotbase.h"
+#include "effects/presets/effectchainpreset.h"
+#include "effects/presets/effectpreset.h"
 #include "effects/presets/effectpresetmanager.h"
 #include "moc_weffectchainpresetbutton.cpp"
 #include "util/parented_ptr.h"
diff --git a/src/widget/weffectchainpresetselector.cpp b/src/widget/weffectchainpresetselector.cpp
index 90f4d1b9a47..0c633814c3a 100644
--- a/src/widget/weffectchainpresetselector.cpp
+++ b/src/widget/weffectchainpresetselector.cpp
@@ -6,6 +6,8 @@
 
 #include "effects/chains/quickeffectchain.h"
 #include "effects/effectsmanager.h"
+#include "effects/presets/effectchainpreset.h"
+#include "effects/presets/effectpreset.h"
 #include "moc_weffectchainpresetselector.cpp"
 #include "widget/effectwidgetutils.h"
 
diff --git a/src/widget/weffectparameterknob.cpp b/src/widget/weffectparameterknob.cpp
index d77b9b491ae..d08949fec94 100644
--- a/src/widget/weffectparameterknob.cpp
+++ b/src/widget/weffectparameterknob.cpp
@@ -1,5 +1,6 @@
 #include "widget/weffectparameterknob.h"
 
+#include "effects/effectparameterslotbase.h"
 #include "moc_weffectparameterknob.cpp"
 #include "widget/effectwidgetutils.h"
 
diff --git a/src/widget/weffectparameterknobcomposed.cpp b/src/widget/weffectparameterknobcomposed.cpp
index aba1e6a9c35..9b253ad8fb9 100644
--- a/src/widget/weffectparameterknobcomposed.cpp
+++ b/src/widget/weffectparameterknobcomposed.cpp
@@ -1,5 +1,7 @@
 #include "widget/weffectparameterknobcomposed.h"
 
+#include "effects/effectparameterslotbase.h"
+#include "effects/presets/effectchainpreset.h"
 #include "moc_weffectparameterknobcomposed.cpp"
 #include "widget/effectwidgetutils.h"
 
diff --git a/src/widget/weffectparameternamebase.cpp b/src/widget/weffectparameternamebase.cpp
index 5110408567c..265689ad22b 100644
--- a/src/widget/weffectparameternamebase.cpp
+++ b/src/widget/weffectparameternamebase.cpp
@@ -5,8 +5,11 @@
 #include <QDropEvent>
 #include <QMimeData>
 
+#include "effects/effectknobparameterslot.h"
+#include "effects/effectparameterslotbase.h"
 #include "effects/effectslot.h"
 #include "moc_weffectparameternamebase.cpp"
+#include "util/math.h"
 
 namespace {
 const QString kMimeTextDelimiter = QStringLiteral("\n");
diff --git a/src/widget/weffectpushbutton.cpp b/src/widget/weffectpushbutton.cpp
index 904af10491a..24714d9ae65 100644
--- a/src/widget/weffectpushbutton.cpp
+++ b/src/widget/weffectpushbutton.cpp
@@ -4,6 +4,8 @@
 #include <QMenu>
 #include <QMouseEvent>
 
+#include "effects/effectparameterslotbase.h"
+#include "effects/presets/effectchainpreset.h"
 #include "moc_weffectpushbutton.cpp"
 #include "widget/effectwidgetutils.h"
 

From 7a5b0be78e9e4069695dc2dcff78654e17a9a796 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Fri, 3 Nov 2023 00:41:37 +0100
Subject: [PATCH 258/388] Improve headers of controller classes

---
 .../keyboard/keyboardeventfilter.cpp          |  1 -
 .../keyboard/keyboardeventfilter.h            |  4 ++--
 .../midi/legacymidicontrollermapping.cpp      |  1 -
 src/controllers/midi/midicontroller.cpp       |  2 +-
 src/controllers/midi/midicontroller.h         |  4 +---
 src/controllers/midi/midienumerator.h         | 21 ++++++-------------
 src/controllers/midi/midioutputhandler.cpp    |  1 -
 src/controllers/scripting/colormapper.cpp     |  1 -
 src/controllers/scripting/colormapper.h       |  3 +--
 .../scripting/colormapperjsproxy.h            |  2 +-
 src/mixxxmainwindow.cpp                       |  1 +
 11 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/src/controllers/keyboard/keyboardeventfilter.cpp b/src/controllers/keyboard/keyboardeventfilter.cpp
index 19dc4e947f7..c69b872414e 100644
--- a/src/controllers/keyboard/keyboardeventfilter.cpp
+++ b/src/controllers/keyboard/keyboardeventfilter.cpp
@@ -2,7 +2,6 @@
 
 #include <QEvent>
 #include <QKeyEvent>
-#include <QList>
 #include <QtDebug>
 
 #include "control/controlobject.h"
diff --git a/src/controllers/keyboard/keyboardeventfilter.h b/src/controllers/keyboard/keyboardeventfilter.h
index b557a4a8c54..5f49fd34dcd 100644
--- a/src/controllers/keyboard/keyboardeventfilter.h
+++ b/src/controllers/keyboard/keyboardeventfilter.h
@@ -1,13 +1,13 @@
 #pragma once
 
 #include <QObject>
-#include <QEvent>
-#include <QKeyEvent>
 #include <QMultiHash>
 
 #include "preferences/configobject.h"
 
 class ControlObject;
+class QEvent;
+class QKeyEvent;
 
 // This class provides handling of keyboard events.
 class KeyboardEventFilter : public QObject {
diff --git a/src/controllers/midi/legacymidicontrollermapping.cpp b/src/controllers/midi/legacymidicontrollermapping.cpp
index 0b5485e669c..fd7cf55c1c9 100644
--- a/src/controllers/midi/legacymidicontrollermapping.cpp
+++ b/src/controllers/midi/legacymidicontrollermapping.cpp
@@ -1,6 +1,5 @@
 #include "controllers/midi/legacymidicontrollermapping.h"
 
-#include "controllers/defs_controllers.h"
 #include "controllers/midi/legacymidicontrollermappingfilehandler.h"
 
 bool LegacyMidiControllerMapping::saveMapping(const QString& fileName) const {
diff --git a/src/controllers/midi/midicontroller.cpp b/src/controllers/midi/midicontroller.cpp
index 2f3c91e7818..04cc3035cd4 100644
--- a/src/controllers/midi/midicontroller.cpp
+++ b/src/controllers/midi/midicontroller.cpp
@@ -2,13 +2,13 @@
 
 #include "control/controlobject.h"
 #include "controllers/defs_controllers.h"
+#include "controllers/midi/midioutputhandler.h"
 #include "controllers/midi/midiutils.h"
 #include "defs_urls.h"
 #include "errordialoghandler.h"
 #include "mixer/playermanager.h"
 #include "moc_midicontroller.cpp"
 #include "util/math.h"
-#include "util/screensaver.h"
 
 MidiController::MidiController(const QString& deviceName)
         : Controller(deviceName) {
diff --git a/src/controllers/midi/midicontroller.h b/src/controllers/midi/midicontroller.h
index 97469c61404..9af7887515a 100644
--- a/src/controllers/midi/midicontroller.h
+++ b/src/controllers/midi/midicontroller.h
@@ -1,13 +1,11 @@
 #pragma once
 
 #include "controllers/controller.h"
-#include "controllers/midi/legacymidicontrollermapping.h"
 #include "controllers/midi/legacymidicontrollermappingfilehandler.h"
 #include "controllers/midi/midimessage.h"
-#include "controllers/midi/midioutputhandler.h"
 #include "controllers/softtakeover.h"
 
-class DlgControllerLearning;
+class MidiOutputHandler;
 
 /// MIDI Controller base class
 ///
diff --git a/src/controllers/midi/midienumerator.h b/src/controllers/midi/midienumerator.h
index 5e4079249e3..9736023fa88 100644
--- a/src/controllers/midi/midienumerator.h
+++ b/src/controllers/midi/midienumerator.h
@@ -1,19 +1,12 @@
-/**
-* @file midienumerator.h
-* @author Sean Pappalardo spappalardo@mixxx.org
-* @date Tue 7 Feb 2012
-* @brief Base class handling discovery and enumeration of DJ controllers that use the MIDI protocol.
-*
-* This class handles discovery and enumeration of MIDI DJ controllers and
-*   must be inherited by a class that implements it on some API.
-*/
-
-#ifndef MIDIENUMERATOR_H
-#define MIDIENUMERATOR_H
+#pragma once
 
 #include "controllers/controllerenumerator.h"
-#include "controllers/midi/midicontroller.h"
 
+/// @brief Base class handling discovery and enumeration of DJ controllers that
+/// use the MIDI protocol.
+///
+/// This class handles discovery and enumeration of MIDI DJ controllers and
+///   must be inherited by a class that implements it on some API.
 class MidiEnumerator : public ControllerEnumerator {
     Q_OBJECT
   public:
@@ -22,5 +15,3 @@ class MidiEnumerator : public ControllerEnumerator {
 
     virtual QList<Controller*> queryDevices() = 0;
 };
-
-#endif
diff --git a/src/controllers/midi/midioutputhandler.cpp b/src/controllers/midi/midioutputhandler.cpp
index f104a8c4b42..2dfad758b4c 100644
--- a/src/controllers/midi/midioutputhandler.cpp
+++ b/src/controllers/midi/midioutputhandler.cpp
@@ -2,7 +2,6 @@
 
 #include <QtDebug>
 
-#include "control/controlobject.h"
 #include "controllers/midi/midicontroller.h"
 #include "moc_midioutputhandler.cpp"
 
diff --git a/src/controllers/scripting/colormapper.cpp b/src/controllers/scripting/colormapper.cpp
index dec6154c68b..6564c6ed681 100644
--- a/src/controllers/scripting/colormapper.cpp
+++ b/src/controllers/scripting/colormapper.cpp
@@ -2,7 +2,6 @@
 
 #include <QVariant>
 #include <cmath>
-#include <cstdint>
 
 #include "util/logger.h"
 
diff --git a/src/controllers/scripting/colormapper.h b/src/controllers/scripting/colormapper.h
index f6caadc3d25..2a5ac5698b9 100644
--- a/src/controllers/scripting/colormapper.h
+++ b/src/controllers/scripting/colormapper.h
@@ -1,8 +1,7 @@
 #pragma once
 
-#include <QColor>
-#include <QJSValue>
 #include <QMap>
+#include <QRgb>
 
 #include "util/assert.h"
 
diff --git a/src/controllers/scripting/colormapperjsproxy.h b/src/controllers/scripting/colormapperjsproxy.h
index 3b742c463ab..4988b0f4a67 100644
--- a/src/controllers/scripting/colormapperjsproxy.h
+++ b/src/controllers/scripting/colormapperjsproxy.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <QJSValue>
+
 #include <QObject>
 #include <memory>
 
diff --git a/src/mixxxmainwindow.cpp b/src/mixxxmainwindow.cpp
index b0d25442978..b75acd737a8 100644
--- a/src/mixxxmainwindow.cpp
+++ b/src/mixxxmainwindow.cpp
@@ -1,5 +1,6 @@
 #include "mixxxmainwindow.h"
 
+#include <QCloseEvent>
 #include <QDebug>
 #include <QDesktopServices>
 #include <QFileDialog>

From 0c5e8a0f663c51f31dd9e0cc822503b866f9f3ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Fri, 3 Nov 2023 00:43:36 +0100
Subject: [PATCH 259/388] Improve headers of dialog classes

---
 src/dialog/dlgabout.cpp           | 1 +
 src/dialog/dlgabout.h             | 3 +--
 src/dialog/dlgdevelopertools.cpp  | 2 +-
 src/dialog/dlgdevelopertools.h    | 2 --
 src/dialog/dlgkeywheel.h          | 1 -
 src/dialog/dlgreplacecuecolor.cpp | 2 --
 6 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/dialog/dlgabout.cpp b/src/dialog/dlgabout.cpp
index 5d37773079c..6cb62610180 100644
--- a/src/dialog/dlgabout.cpp
+++ b/src/dialog/dlgabout.cpp
@@ -1,5 +1,6 @@
 #include "dialog/dlgabout.h"
 
+#include <QDebug>
 #include <QDesktopServices>
 #include <QFile>
 #include <QLocale>
diff --git a/src/dialog/dlgabout.h b/src/dialog/dlgabout.h
index f90a31e2692..b423b194eae 100644
--- a/src/dialog/dlgabout.h
+++ b/src/dialog/dlgabout.h
@@ -1,9 +1,8 @@
 #pragma once
 
-#include <QWidget>
+#include <QDialog>
 
 #include "dialog/ui_dlgaboutdlg.h"
-#include "preferences/usersettings.h"
 
 class DlgAbout : public QDialog, public Ui::DlgAboutDlg {
     Q_OBJECT
diff --git a/src/dialog/dlgdevelopertools.cpp b/src/dialog/dlgdevelopertools.cpp
index 72b8f41abac..4e9af0206cd 100644
--- a/src/dialog/dlgdevelopertools.cpp
+++ b/src/dialog/dlgdevelopertools.cpp
@@ -1,10 +1,10 @@
 #include "dialog/dlgdevelopertools.h"
 
 #include <QDateTime>
+#include <QDir>
 
 #include "control/control.h"
 #include "moc_dlgdevelopertools.cpp"
-#include "util/cmdlineargs.h"
 #include "util/logging.h"
 #include "util/statsmanager.h"
 
diff --git a/src/dialog/dlgdevelopertools.h b/src/dialog/dlgdevelopertools.h
index 2e36d135c57..a9f7c20f828 100644
--- a/src/dialog/dlgdevelopertools.h
+++ b/src/dialog/dlgdevelopertools.h
@@ -3,9 +3,7 @@
 #include <QDialog>
 #include <QFile>
 #include <QSortFilterProxyModel>
-#include <QTimerEvent>
 
-#include "control/controlobject.h"
 #include "control/controlsortfiltermodel.h"
 #include "dialog/ui_dlgdevelopertoolsdlg.h"
 #include "preferences/usersettings.h"
diff --git a/src/dialog/dlgkeywheel.h b/src/dialog/dlgkeywheel.h
index 61652213ef2..d1c45df15e1 100644
--- a/src/dialog/dlgkeywheel.h
+++ b/src/dialog/dlgkeywheel.h
@@ -3,7 +3,6 @@
 
 #include <QDialog>
 #include <QDomDocument>
-#include <QEvent>
 #include <QSvgWidget>
 
 #include "dialog/ui_dlgkeywheel.h"
diff --git a/src/dialog/dlgreplacecuecolor.cpp b/src/dialog/dlgreplacecuecolor.cpp
index 69e1f08ed84..a59a91baff8 100644
--- a/src/dialog/dlgreplacecuecolor.cpp
+++ b/src/dialog/dlgreplacecuecolor.cpp
@@ -6,8 +6,6 @@
 #include <QMessageBox>
 #include <QResizeEvent>
 #include <QStyleFactory>
-#include <QtConcurrent>
-#include <QStyleFactory>
 
 #include "engine/controls/cuecontrol.h"
 #include "library/dao/cuedao.h"

From 696ab3d584783840020a9d01082ef333fb197b4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Fri, 3 Nov 2023 08:08:25 +0100
Subject: [PATCH 260/388] Improve header of controller classes

---
 src/controllers/bulk/bulkenumerator.h                |  1 +
 src/controllers/controller.cpp                       |  7 +++----
 src/controllers/controller.h                         |  6 +-----
 src/controllers/controllerenumerator.h               |  5 ++++-
 src/controllers/controllerinputmappingtablemodel.cpp |  3 +++
 src/controllers/controllerinputmappingtablemodel.h   |  5 +++--
 src/controllers/controllerlearningeventfilter.h      |  3 ++-
 src/controllers/controllermanager.cpp                |  4 +++-
 src/controllers/controllermanager.h                  |  9 +++++----
 src/controllers/controllermappinginfo.cpp            |  1 -
 src/controllers/controllermappinginfo.h              |  1 -
 src/controllers/controllermappingtablemodel.cpp      |  1 +
 src/controllers/controllermappingtablemodel.h        | 11 ++++++-----
 .../controlleroutputmappingtablemodel.cpp            |  1 +
 src/controllers/controlleroutputmappingtablemodel.h  |  6 +++---
 src/controllers/controlpickermenu.cpp                |  1 -
 src/controllers/controlpickermenu.h                  |  2 +-
 src/controllers/delegates/controldelegate.cpp        |  2 +-
 src/controllers/delegates/controldelegate.h          |  2 +-
 src/controllers/delegates/midibytedelegate.cpp       |  1 -
 src/controllers/delegates/midichanneldelegate.cpp    |  2 --
 src/controllers/delegates/midioptionsdelegate.cpp    |  2 --
 src/controllers/delegates/midioptionsdelegate.h      |  3 ---
 src/controllers/dlgcontrollerlearning.cpp            |  1 +
 src/controllers/dlgcontrollerlearning.h              | 10 ++--------
 src/controllers/dlgprefcontroller.cpp                | 10 ++++++----
 src/controllers/dlgprefcontroller.h                  | 12 +++++++-----
 src/controllers/dlgprefcontrollers.cpp               |  1 +
 src/controllers/dlgprefcontrollers.h                 |  2 +-
 .../legacycontrollermappingfilehandler.cpp           |  2 +-
 src/controllers/legacycontrollermappingfilehandler.h |  9 +++++++--
 src/controllers/midi/midicontroller.cpp              |  3 +++
 .../scripting/controllerscriptenginebase.cpp         |  4 ++--
 .../scripting/controllerscriptenginebase.h           |  6 +-----
 .../scripting/controllerscriptmoduleengine.cpp       |  2 ++
 .../scripting/controllerscriptmoduleengine.h         |  3 +++
 src/test/controller_mapping_validation_test.cpp      |  1 +
 37 files changed, 77 insertions(+), 68 deletions(-)

diff --git a/src/controllers/bulk/bulkenumerator.h b/src/controllers/bulk/bulkenumerator.h
index 05c55275c09..de679271b2b 100644
--- a/src/controllers/bulk/bulkenumerator.h
+++ b/src/controllers/bulk/bulkenumerator.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "controllers/controllerenumerator.h"
+#include "preferences/usersettings.h"
 
 struct libusb_context;
 
diff --git a/src/controllers/controller.cpp b/src/controllers/controller.cpp
index db07cea1aab..4e1780eb3ec 100644
--- a/src/controllers/controller.cpp
+++ b/src/controllers/controller.cpp
@@ -1,14 +1,13 @@
 #include "controllers/controller.h"
 
-#include <QApplication>
-#include <QJSValue>
-#include <QRegularExpression>
+#include <QJSEngine>
 #include <algorithm>
 
-#include "controllers/defs_controllers.h"
+#include "controllers/scripting/legacy/controllerscriptenginelegacy.h"
 #include "moc_controller.cpp"
 #include "util/screensaver.h"
 
+
 namespace {
 QString loggingCategoryPrefix(const QString& deviceName) {
     return QStringLiteral("controller.") +
diff --git a/src/controllers/controller.h b/src/controllers/controller.h
index 8838450119d..cd6e0fa5990 100644
--- a/src/controllers/controller.h
+++ b/src/controllers/controller.h
@@ -1,17 +1,13 @@
 #pragma once
 
 #include <QElapsedTimer>
-#include <QLoggingCategory>
-#include <QTimerEvent>
 
 #include "controllers/controllermappinginfo.h"
-#include "controllers/legacycontrollermapping.h"
-#include "controllers/legacycontrollermappingfilehandler.h"
-#include "controllers/scripting/legacy/controllerscriptenginelegacy.h"
 #include "util/duration.h"
 #include "util/runtimeloggingcategory.h"
 
 class ControllerJSProxy;
+class ControllerScriptEngineLegacy;
 
 /// This is a base class representing a physical (or software) controller.  It
 /// must be inherited by a class that implements it on some API. Note that the
diff --git a/src/controllers/controllerenumerator.h b/src/controllers/controllerenumerator.h
index dc08154de92..e1b9e5f0fc1 100644
--- a/src/controllers/controllerenumerator.h
+++ b/src/controllers/controllerenumerator.h
@@ -1,6 +1,9 @@
 #pragma once
 
-#include "controllers/controller.h"
+#include <QList>
+#include <QObject>
+
+class Controller;
 
 /// Base class handling discovery and enumeration of DJ controllers.
 ///
diff --git a/src/controllers/controllerinputmappingtablemodel.cpp b/src/controllers/controllerinputmappingtablemodel.cpp
index 0fd0749cfff..f85a7b9e0bb 100644
--- a/src/controllers/controllerinputmappingtablemodel.cpp
+++ b/src/controllers/controllerinputmappingtablemodel.cpp
@@ -1,10 +1,13 @@
 #include "controllers/controllerinputmappingtablemodel.h"
 
+#include <QTableView>
+
 #include "controllers/delegates/controldelegate.h"
 #include "controllers/delegates/midibytedelegate.h"
 #include "controllers/delegates/midichanneldelegate.h"
 #include "controllers/delegates/midiopcodedelegate.h"
 #include "controllers/delegates/midioptionsdelegate.h"
+#include "controllers/midi/legacymidicontrollermapping.h"
 #include "controllers/midi/midimessage.h"
 #include "controllers/midi/midiutils.h"
 #include "moc_controllerinputmappingtablemodel.cpp"
diff --git a/src/controllers/controllerinputmappingtablemodel.h b/src/controllers/controllerinputmappingtablemodel.h
index 55a27ed8ac1..43cd14a996c 100644
--- a/src/controllers/controllerinputmappingtablemodel.h
+++ b/src/controllers/controllerinputmappingtablemodel.h
@@ -1,13 +1,14 @@
 #pragma once
 
-#include <QAbstractItemDelegate>
 #include <QAbstractTableModel>
 #include <QModelIndex>
-#include <QTableView>
 
 #include "controllers/controllermappingtablemodel.h"
 #include "controllers/midi/midimessage.h"
 
+class QAbstractItemDelegate;
+class QTableView;
+
 /// Table Model for the "Inputs" table view in the preferences dialog.
 ///
 /// This allows editing the input mappings for a MIDI mapping.
diff --git a/src/controllers/controllerlearningeventfilter.h b/src/controllers/controllerlearningeventfilter.h
index dc22e36a53a..a83ad081afa 100644
--- a/src/controllers/controllerlearningeventfilter.h
+++ b/src/controllers/controllerlearningeventfilter.h
@@ -1,11 +1,12 @@
 #pragma once
 
 #include <QObject>
-#include <QEvent>
 
 #include "control/controlobject.h"
 #include "widget/controlwidgetconnection.h"
 
+class QEvent;
+
 struct ControlInfo {
     ControlInfo()
             : clickControl(NULL),
diff --git a/src/controllers/controllermanager.cpp b/src/controllers/controllermanager.cpp
index 89f2c00c0be..971c9dc634b 100644
--- a/src/controllers/controllermanager.cpp
+++ b/src/controllers/controllermanager.cpp
@@ -3,14 +3,16 @@
 #include <QSet>
 #include <QThread>
 
+#include "controllers/controller.h"
 #include "controllers/controllerlearningeventfilter.h"
+#include "controllers/controllermappinginfoenumerator.h"
 #include "controllers/defs_controllers.h"
 #include "controllers/midi/portmidienumerator.h"
 #include "moc_controllermanager.cpp"
 #include "util/cmdlineargs.h"
 #include "util/compatibility/qmutex.h"
+#include "util/duration.h"
 #include "util/time.h"
-#include "util/trace.h"
 #ifdef __HSS1394__
 #include "controllers/midi/hss1394enumerator.h"
 #endif
diff --git a/src/controllers/controllermanager.h b/src/controllers/controllermanager.h
index 4460e0cf816..a41b015c020 100644
--- a/src/controllers/controllermanager.h
+++ b/src/controllers/controllermanager.h
@@ -3,16 +3,17 @@
 #include <QMutex>
 #include <QSharedPointer>
 #include <QTimer>
+#include <memory>
 
-#include "controllers/controllerenumerator.h"
-#include "controllers/controllermappinginfo.h"
-#include "controllers/controllermappinginfoenumerator.h"
-#include "controllers/legacycontrollermapping.h"
 #include "preferences/usersettings.h"
+#include "util/duration.h"
 
 // Forward declaration(s)
 class Controller;
 class ControllerLearningEventFilter;
+class MappingInfoEnumerator;
+class LegacyControllerMapping;
+class ControllerEnumerator;
 
 /// Function to sort controllers by name
 bool controllerCompare(Controller *a, Controller *b);
diff --git a/src/controllers/controllermappinginfo.cpp b/src/controllers/controllermappinginfo.cpp
index a238459095b..5db85cf70f3 100644
--- a/src/controllers/controllermappinginfo.cpp
+++ b/src/controllers/controllermappinginfo.cpp
@@ -1,6 +1,5 @@
 #include "controllers/controllermappinginfo.h"
 
-#include "controllers/defs_controllers.h"
 #include "util/xml.h"
 
 MappingInfo::MappingInfo()
diff --git a/src/controllers/controllermappinginfo.h b/src/controllers/controllermappinginfo.h
index 2e80d67a67b..35f910d89f9 100644
--- a/src/controllers/controllermappinginfo.h
+++ b/src/controllers/controllermappinginfo.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <QDomElement>
-#include <QFileInfo>
 #include <QList>
 #include <QMap>
 #include <QString>
diff --git a/src/controllers/controllermappingtablemodel.cpp b/src/controllers/controllermappingtablemodel.cpp
index 47502af5db5..b81ed85a977 100644
--- a/src/controllers/controllermappingtablemodel.cpp
+++ b/src/controllers/controllermappingtablemodel.cpp
@@ -1,5 +1,6 @@
 #include "controllers/controllermappingtablemodel.h"
 
+#include "controllers/midi/legacymidicontrollermapping.h"
 #include "library/searchqueryparser.h"
 #include "moc_controllermappingtablemodel.cpp"
 
diff --git a/src/controllers/controllermappingtablemodel.h b/src/controllers/controllermappingtablemodel.h
index 66f4bdc9e06..61e2ada51ae 100644
--- a/src/controllers/controllermappingtablemodel.h
+++ b/src/controllers/controllermappingtablemodel.h
@@ -2,17 +2,18 @@
 
 #include <QAbstractTableModel>
 #include <QHash>
-#include <QModelIndex>
 #include <QSortFilterProxyModel>
 #include <QStyledItemDelegate>
 #include <QTableView>
 #include <QVariant>
 #include <QVector>
+#include <memory>
 
-#include "controllers/controlpickermenu.h"
-#include "controllers/hid/legacyhidcontrollermapping.h"
-#include "controllers/legacycontrollermapping.h"
-#include "controllers/midi/legacymidicontrollermapping.h"
+#include "util/assert.h"
+
+class ControlPickerMenu;
+class LegacyControllerMapping;
+class LegacyMidiControllerMapping;
 
 class ControllerMappingTableModel : public QAbstractTableModel {
     Q_OBJECT
diff --git a/src/controllers/controlleroutputmappingtablemodel.cpp b/src/controllers/controlleroutputmappingtablemodel.cpp
index 1aee340fa5a..16b7c5f6158 100644
--- a/src/controllers/controlleroutputmappingtablemodel.cpp
+++ b/src/controllers/controlleroutputmappingtablemodel.cpp
@@ -4,6 +4,7 @@
 #include "controllers/delegates/midibytedelegate.h"
 #include "controllers/delegates/midichanneldelegate.h"
 #include "controllers/delegates/midiopcodedelegate.h"
+#include "controllers/midi/legacymidicontrollermapping.h"
 #include "controllers/midi/midimessage.h"
 #include "controllers/midi/midiutils.h"
 #include "moc_controlleroutputmappingtablemodel.cpp"
diff --git a/src/controllers/controlleroutputmappingtablemodel.h b/src/controllers/controlleroutputmappingtablemodel.h
index f1ea762df8d..c2764c7ec05 100644
--- a/src/controllers/controlleroutputmappingtablemodel.h
+++ b/src/controllers/controlleroutputmappingtablemodel.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include <QAbstractItemDelegate>
-#include <QAbstractTableModel>
 #include <QModelIndex>
-#include <QTableView>
 
 #include "controllers/controllermappingtablemodel.h"
 #include "controllers/midi/midimessage.h"
 
+class QTableView;
+class QAbstractItemDelegate;
+
 /// Table Model for the "Outputs" table view in the preferences dialog.
 ///
 /// This allows editing the output mappings for a MIDI mapping.
diff --git a/src/controllers/controlpickermenu.cpp b/src/controllers/controlpickermenu.cpp
index 4abbfbee4ef..33a8dc15763 100644
--- a/src/controllers/controlpickermenu.cpp
+++ b/src/controllers/controlpickermenu.cpp
@@ -6,7 +6,6 @@
 #include "effects/defs.h"
 #include "effects/effectbuttonparameterslot.h"
 #include "effects/effectknobparameterslot.h"
-#include "effects/effectslot.h"
 #include "engine/controls/cuecontrol.h"
 #include "engine/controls/loopingcontrol.h"
 #include "mixer/playermanager.h"
diff --git a/src/controllers/controlpickermenu.h b/src/controllers/controlpickermenu.h
index a1ba6cc2220..a61c0d0a5fc 100644
--- a/src/controllers/controlpickermenu.h
+++ b/src/controllers/controlpickermenu.h
@@ -3,7 +3,7 @@
 #include <QMenu>
 #include <QObject>
 
-#include "preferences/usersettings.h"
+class ConfigKey;
 
 class ControlPickerMenu : public QMenu {
     Q_OBJECT
diff --git a/src/controllers/delegates/controldelegate.cpp b/src/controllers/delegates/controldelegate.cpp
index ab7b38597bd..b6a42e21b17 100644
--- a/src/controllers/delegates/controldelegate.cpp
+++ b/src/controllers/delegates/controldelegate.cpp
@@ -3,8 +3,8 @@
 #include <QLineEdit>
 #include <QRegExp>
 #include <QStringList>
-#include <QtDebug>
 
+#include "controllers/controlpickermenu.h"
 #include "controllers/midi/midimessage.h"
 #include "moc_controldelegate.cpp"
 
diff --git a/src/controllers/delegates/controldelegate.h b/src/controllers/delegates/controldelegate.h
index 450e406087e..81ba29a03e0 100644
--- a/src/controllers/delegates/controldelegate.h
+++ b/src/controllers/delegates/controldelegate.h
@@ -2,7 +2,7 @@
 
 #include <QStyledItemDelegate>
 
-#include "controllers/controlpickermenu.h"
+class ControlPickerMenu;
 
 class ControlDelegate : public QStyledItemDelegate {
     Q_OBJECT
diff --git a/src/controllers/delegates/midibytedelegate.cpp b/src/controllers/delegates/midibytedelegate.cpp
index 0ee71a8fb71..d9c12ada542 100644
--- a/src/controllers/delegates/midibytedelegate.cpp
+++ b/src/controllers/delegates/midibytedelegate.cpp
@@ -1,6 +1,5 @@
 #include "controllers/delegates/midibytedelegate.h"
 
-#include "controllers/midi/midimessage.h"
 #include "controllers/midi/midiutils.h"
 #include "moc_midibytedelegate.cpp"
 #include "widget/hexspinbox.h"
diff --git a/src/controllers/delegates/midichanneldelegate.cpp b/src/controllers/delegates/midichanneldelegate.cpp
index cd73af1971b..26493a8ec6a 100644
--- a/src/controllers/delegates/midichanneldelegate.cpp
+++ b/src/controllers/delegates/midichanneldelegate.cpp
@@ -2,8 +2,6 @@
 
 #include <QSpinBox>
 
-#include "controllers/midi/midimessage.h"
-#include "controllers/midi/midiutils.h"
 #include "moc_midichanneldelegate.cpp"
 
 MidiChannelDelegate::MidiChannelDelegate(QObject* pParent)
diff --git a/src/controllers/delegates/midioptionsdelegate.cpp b/src/controllers/delegates/midioptionsdelegate.cpp
index dc870d519ca..deab2ea10c0 100644
--- a/src/controllers/delegates/midioptionsdelegate.cpp
+++ b/src/controllers/delegates/midioptionsdelegate.cpp
@@ -1,8 +1,6 @@
 #include "controllers/delegates/midioptionsdelegate.h"
 
 #include <QComboBox>
-#include <QTableView>
-#include <QtDebug>
 
 #include "controllers/midi/midimessage.h"
 #include "controllers/midi/midiutils.h"
diff --git a/src/controllers/delegates/midioptionsdelegate.h b/src/controllers/delegates/midioptionsdelegate.h
index 636de75003b..f690df38f95 100644
--- a/src/controllers/delegates/midioptionsdelegate.h
+++ b/src/controllers/delegates/midioptionsdelegate.h
@@ -1,9 +1,6 @@
 #pragma once
 
 #include <QStyledItemDelegate>
-#include <QTableView>
-
-#include "controllers/midi/midimessage.h"
 
 class MidiOptionsDelegate : public QStyledItemDelegate {
     Q_OBJECT
diff --git a/src/controllers/dlgcontrollerlearning.cpp b/src/controllers/dlgcontrollerlearning.cpp
index 9711006a19c..a5b7a2d06a9 100644
--- a/src/controllers/dlgcontrollerlearning.cpp
+++ b/src/controllers/dlgcontrollerlearning.cpp
@@ -4,6 +4,7 @@
 
 #include "control/controlobject.h"
 #include "controllers/learningutils.h"
+#include "controllers/midi/midicontroller.h"
 #include "controllers/midi/midiutils.h"
 #include "moc_dlgcontrollerlearning.cpp"
 #include "util/versionstore.h"
diff --git a/src/controllers/dlgcontrollerlearning.h b/src/controllers/dlgcontrollerlearning.h
index d530a783b24..a6e9824ae3b 100644
--- a/src/controllers/dlgcontrollerlearning.h
+++ b/src/controllers/dlgcontrollerlearning.h
@@ -7,16 +7,10 @@
 
 #include "controllers/ui_dlgcontrollerlearning.h"
 #include "controllers/controlpickermenu.h"
-#include "controllers/midi/midicontroller.h"
-#ifdef __HID__
-#include "controllers/hid/hidcontroller.h"
-#endif
-#include "controllers/bulk/bulkcontroller.h"
 #include "controllers/midi/midimessage.h"
-#include "controllers/controller.h"
-#include "preferences/usersettings.h"
 
-class LegacyControllerMapping;
+class Controller;
+class ControlObject;
 
 //#define CONTROLLERLESSTESTING
 
diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
index fc739b7d7ea..8d031b04066 100644
--- a/src/controllers/dlgprefcontroller.cpp
+++ b/src/controllers/dlgprefcontroller.cpp
@@ -6,20 +6,22 @@
 #include <QFileInfo>
 #include <QInputDialog>
 #include <QKeyEvent>
-#include <QStandardPaths>
-#include <QTableWidget>
-#include <QTableWidgetItem>
 
 #include "controllers/controller.h"
+#include "controllers/controllerinputmappingtablemodel.h"
 #include "controllers/controllerlearningeventfilter.h"
 #include "controllers/controllermanager.h"
+#include "controllers/controllermappinginfoenumerator.h"
+#include "controllers/controlleroutputmappingtablemodel.h"
+#include "controllers/controlpickermenu.h"
 #include "controllers/defs_controllers.h"
+#include "controllers/dlgcontrollerlearning.h"
 #include "controllers/midi/legacymidicontrollermapping.h"
+#include "controllers/midi/midicontroller.h"
 #include "defs_urls.h"
 #include "moc_dlgprefcontroller.cpp"
 #include "preferences/usersettings.h"
 #include "util/string.h"
-#include "util/versionstore.h"
 
 namespace {
 const QString kMappingExt(".midi.xml");
diff --git a/src/controllers/dlgprefcontroller.h b/src/controllers/dlgprefcontroller.h
index ae425df9d62..0536c65e76f 100644
--- a/src/controllers/dlgprefcontroller.h
+++ b/src/controllers/dlgprefcontroller.h
@@ -1,13 +1,9 @@
 #pragma once
 
-#include <QHash>
 #include <memory>
 
-#include "controllers/controllerinputmappingtablemodel.h"
 #include "controllers/controllermappinginfo.h"
-#include "controllers/controlleroutputmappingtablemodel.h"
-#include "controllers/dlgcontrollerlearning.h"
-#include "controllers/legacycontrollermapping.h"
+#include "controllers/midi/midimessage.h"
 #include "controllers/ui_dlgprefcontrollerdlg.h"
 #include "preferences/dialog/dlgpreferencepage.h"
 #include "preferences/usersettings.h"
@@ -16,6 +12,12 @@
 class Controller;
 class ControllerManager;
 class MappingInfoEnumerator;
+class ControlPickerMenu;
+class DlgControllerLearning;
+class ControllerInputMappingTableModel;
+class ControllerMappingTableProxyModel;
+class ControllerOutputMappingTableModel;
+class ControllerMappingTableProxyModel;
 
 /// Configuration dialog for a single DJ controller
 class DlgPrefController : public DlgPreferencePage {
diff --git a/src/controllers/dlgprefcontrollers.cpp b/src/controllers/dlgprefcontrollers.cpp
index c5f1b612611..69e18291a68 100644
--- a/src/controllers/dlgprefcontrollers.cpp
+++ b/src/controllers/dlgprefcontrollers.cpp
@@ -2,6 +2,7 @@
 
 #include <QDesktopServices>
 
+#include "controllers/controller.h"
 #include "controllers/controllermanager.h"
 #include "controllers/defs_controllers.h"
 #include "controllers/dlgprefcontroller.h"
diff --git a/src/controllers/dlgprefcontrollers.h b/src/controllers/dlgprefcontrollers.h
index 3ebda150c86..d9cca0ebaed 100644
--- a/src/controllers/dlgprefcontrollers.h
+++ b/src/controllers/dlgprefcontrollers.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <QTreeWidgetItem>
 #include <memory>
 
 #include "controllers/ui_dlgprefcontrollersdlg.h"
@@ -10,6 +9,7 @@
 class DlgPreferences;
 class DlgPrefController;
 class ControllerManager;
+class QTreeWidgetItem;
 
 /// Controllers Overview in the preferences
 ///
diff --git a/src/controllers/legacycontrollermappingfilehandler.cpp b/src/controllers/legacycontrollermappingfilehandler.cpp
index 20986456c8c..d311eb5314c 100644
--- a/src/controllers/legacycontrollermappingfilehandler.cpp
+++ b/src/controllers/legacycontrollermappingfilehandler.cpp
@@ -1,9 +1,9 @@
 #include "controllers/legacycontrollermappingfilehandler.h"
 
-#include "controllers/controllermanager.h"
 #include "controllers/defs_controllers.h"
 #include "controllers/hid/legacyhidcontrollermappingfilehandler.h"
 #include "controllers/midi/legacymidicontrollermappingfilehandler.h"
+#include "util/xml.h"
 
 namespace {
 
diff --git a/src/controllers/legacycontrollermappingfilehandler.h b/src/controllers/legacycontrollermappingfilehandler.h
index eb4d6035eee..c7bc6377b6d 100644
--- a/src/controllers/legacycontrollermappingfilehandler.h
+++ b/src/controllers/legacycontrollermappingfilehandler.h
@@ -1,7 +1,12 @@
 #pragma once
 
-#include "controllers/legacycontrollermapping.h"
-#include "util/xml.h"
+#include <QDomElement>
+#include <QString>
+#include <memory>
+
+class QFileInfo;
+class QDir;
+class LegacyControllerMapping;
 
 /// The LegacyControllerMappingFileHandler is used for serializing/deserializing the
 /// LegacyControllerMapping objects to/from XML files and is also responsible
diff --git a/src/controllers/midi/midicontroller.cpp b/src/controllers/midi/midicontroller.cpp
index 04cc3035cd4..fbc30089387 100644
--- a/src/controllers/midi/midicontroller.cpp
+++ b/src/controllers/midi/midicontroller.cpp
@@ -1,9 +1,12 @@
 #include "controllers/midi/midicontroller.h"
 
+#include <QJSValue>
+
 #include "control/controlobject.h"
 #include "controllers/defs_controllers.h"
 #include "controllers/midi/midioutputhandler.h"
 #include "controllers/midi/midiutils.h"
+#include "controllers/scripting/legacy/controllerscriptenginelegacy.h"
 #include "defs_urls.h"
 #include "errordialoghandler.h"
 #include "mixer/playermanager.h"
diff --git a/src/controllers/scripting/controllerscriptenginebase.cpp b/src/controllers/scripting/controllerscriptenginebase.cpp
index 1b616c6c89b..c8576657997 100644
--- a/src/controllers/scripting/controllerscriptenginebase.cpp
+++ b/src/controllers/scripting/controllerscriptenginebase.cpp
@@ -1,10 +1,10 @@
 #include "controllers/scripting/controllerscriptenginebase.h"
 
-#include "control/controlobject.h"
+#include <QJSEngine>
+
 #include "controllers/controller.h"
 #include "controllers/scripting/colormapperjsproxy.h"
 #include "errordialoghandler.h"
-#include "mixer/playermanager.h"
 #include "moc_controllerscriptenginebase.cpp"
 #include "util/cmdlineargs.h"
 
diff --git a/src/controllers/scripting/controllerscriptenginebase.h b/src/controllers/scripting/controllerscriptenginebase.h
index cfb724c5365..619bd005f38 100644
--- a/src/controllers/scripting/controllerscriptenginebase.h
+++ b/src/controllers/scripting/controllerscriptenginebase.h
@@ -1,17 +1,13 @@
 #pragma once
 
-#include <QFileSystemWatcher>
-#include <QJSEngine>
 #include <QJSValue>
 #include <QMessageBox>
 #include <memory>
 
-#include "controllers/legacycontrollermapping.h"
-#include "util/duration.h"
 #include "util/runtimeloggingcategory.h"
 
 class Controller;
-class EvaluationException;
+class QJSEngine;
 
 /// ControllerScriptEngineBase manages the JavaScript engine for controller scripts.
 /// ControllerScriptModuleEngine implements the current system using JS modules.
diff --git a/src/controllers/scripting/controllerscriptmoduleengine.cpp b/src/controllers/scripting/controllerscriptmoduleengine.cpp
index bccb728fc05..ad0cfc53ed4 100644
--- a/src/controllers/scripting/controllerscriptmoduleengine.cpp
+++ b/src/controllers/scripting/controllerscriptmoduleengine.cpp
@@ -1,5 +1,7 @@
 #include "controllers/scripting/controllerscriptmoduleengine.h"
 
+#include <QJSEngine>
+
 #include "moc_controllerscriptmoduleengine.cpp"
 
 ControllerScriptModuleEngine::ControllerScriptModuleEngine(
diff --git a/src/controllers/scripting/controllerscriptmoduleengine.h b/src/controllers/scripting/controllerscriptmoduleengine.h
index 5e32af4306c..464b119d8ec 100644
--- a/src/controllers/scripting/controllerscriptmoduleengine.h
+++ b/src/controllers/scripting/controllerscriptmoduleengine.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <QFileInfo>
+#include <QFileSystemWatcher>
+
 #include "controllers/scripting/controllerscriptenginebase.h"
 
 /// ControllerScriptModuleEngine loads and executes script module files for controller mappings.
diff --git a/src/test/controller_mapping_validation_test.cpp b/src/test/controller_mapping_validation_test.cpp
index 43011c62dd2..29be36d171c 100644
--- a/src/test/controller_mapping_validation_test.cpp
+++ b/src/test/controller_mapping_validation_test.cpp
@@ -3,6 +3,7 @@
 #include <QUrl>
 
 #include "controllers/defs_controllers.h"
+#include "controllers/scripting/legacy/controllerscriptenginelegacy.h"
 #include "moc_controller_mapping_validation_test.cpp"
 
 FakeMidiControllerJSProxy::FakeMidiControllerJSProxy()

From c42c91abb97f60639caad2a87b3e6ae24b3b5db5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sun, 5 Nov 2023 10:55:47 +0100
Subject: [PATCH 261/388] Improve includes of CO classes

---
 src/control/controlindicator.cpp | 1 -
 src/control/controlobject.cpp    | 4 ----
 src/control/controlpotmeter.h    | 3 ---
 src/control/controlproxy.cpp     | 2 --
 4 files changed, 10 deletions(-)

diff --git a/src/control/controlindicator.cpp b/src/control/controlindicator.cpp
index 34f1844cc3a..a73b581f731 100644
--- a/src/control/controlindicator.cpp
+++ b/src/control/controlindicator.cpp
@@ -2,7 +2,6 @@
 
 #include "control/controlproxy.h"
 #include "moc_controlindicator.cpp"
-#include "util/math.h"
 
 namespace {
 const QString kAppGroup = QStringLiteral("[App]");
diff --git a/src/control/controlobject.cpp b/src/control/controlobject.cpp
index ebce489cad2..0ad18dfcdfe 100644
--- a/src/control/controlobject.cpp
+++ b/src/control/controlobject.cpp
@@ -1,13 +1,9 @@
 #include "control/controlobject.h"
 
-#include <QHash>
-#include <QSet>
 #include <QtDebug>
 
 #include "control/control.h"
 #include "moc_controlobject.cpp"
-#include "util/stat.h"
-#include "util/timer.h"
 
 ControlObject::ControlObject()
         : m_pControl(ControlDoublePrivate::getDefaultControl()) {
diff --git a/src/control/controlpotmeter.h b/src/control/controlpotmeter.h
index 35ed41a6694..ee5a8c28029 100644
--- a/src/control/controlpotmeter.h
+++ b/src/control/controlpotmeter.h
@@ -5,9 +5,6 @@
 #include "control/controlpushbutton.h"
 #include "preferences/usersettings.h"
 
-class ControlPushButton;
-class ControlProxy;
-
 class PotmeterControls : public QObject {
     Q_OBJECT
   public:
diff --git a/src/control/controlproxy.cpp b/src/control/controlproxy.cpp
index 5a667624053..85ba24844f6 100644
--- a/src/control/controlproxy.cpp
+++ b/src/control/controlproxy.cpp
@@ -1,7 +1,5 @@
 #include "control/controlproxy.h"
 
-#include <QtDebug>
-
 #include "control/control.h"
 #include "moc_controlproxy.cpp"
 

From 4d26dcdbf7b6b2d572549498e849f67d32bd6387 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sun, 5 Nov 2023 11:05:00 +0100
Subject: [PATCH 262/388] Improve header in analyzer classes

---
 src/analyzer/analyzerbeats.cpp                   |  1 -
 src/analyzer/analyzerbeats.h                     |  8 --------
 src/analyzer/analyzerebur128.cpp                 |  1 -
 src/analyzer/analyzerebur128.h                   |  1 -
 src/analyzer/analyzerkey.cpp                     |  1 -
 src/analyzer/analyzerkey.h                       |  2 --
 src/analyzer/analyzerscheduledtrack.h            |  3 ---
 src/analyzer/analyzersilence.cpp                 |  1 -
 src/analyzer/analyzersilence.h                   | 14 +++++++++++---
 src/analyzer/analyzerthread.cpp                  |  2 --
 src/analyzer/analyzerwaveform.cpp                |  3 ---
 src/analyzer/analyzerwaveform.h                  |  7 ++++---
 src/analyzer/plugins/analyzerqueenmarybeats.h    |  1 -
 src/analyzer/plugins/analyzerqueenmarykey.cpp    |  1 -
 src/analyzer/plugins/analyzerqueenmarykey.h      |  2 --
 src/analyzer/plugins/analyzersoundtouchbeats.cpp |  1 -
 src/analyzer/plugins/buffering_utils.cpp         |  3 ---
 src/analyzer/trackanalysisscheduler.cpp          |  1 -
 src/analyzer/trackanalysisscheduler.h            |  1 -
 19 files changed, 15 insertions(+), 39 deletions(-)

diff --git a/src/analyzer/analyzerbeats.cpp b/src/analyzer/analyzerbeats.cpp
index 1f5162e0596..6a65d2bf32f 100644
--- a/src/analyzer/analyzerbeats.cpp
+++ b/src/analyzer/analyzerbeats.cpp
@@ -11,7 +11,6 @@
 #include "analyzer/plugins/analyzersoundtouchbeats.h"
 #include "library/rekordbox/rekordboxconstants.h"
 #include "track/beatfactory.h"
-#include "track/beatutils.h"
 #include "track/track.h"
 
 // static
diff --git a/src/analyzer/analyzerbeats.h b/src/analyzer/analyzerbeats.h
index 63661d1c7d0..79e8d2a0c1d 100644
--- a/src/analyzer/analyzerbeats.h
+++ b/src/analyzer/analyzerbeats.h
@@ -1,17 +1,9 @@
-/* Beat Tracking test via vamp-plugins
- * analyzerbeats.h
- *
- *  Created on: 16/mar/2011
- *      Author: Vittorio Colao
- */
-
 #pragma once
 
 #include <QHash>
 #include <QList>
 
 #include "analyzer/analyzer.h"
-#include "analyzer/analyzertrack.h"
 #include "analyzer/plugins/analyzerplugin.h"
 #include "preferences/beatdetectionsettings.h"
 #include "preferences/usersettings.h"
diff --git a/src/analyzer/analyzerebur128.cpp b/src/analyzer/analyzerebur128.cpp
index 8b3942ffc72..b46b5e20de0 100644
--- a/src/analyzer/analyzerebur128.cpp
+++ b/src/analyzer/analyzerebur128.cpp
@@ -6,7 +6,6 @@
 #include "analyzer/constants.h"
 #include "track/track.h"
 #include "util/math.h"
-#include "util/sample.h"
 #include "util/timer.h"
 
 namespace {
diff --git a/src/analyzer/analyzerebur128.h b/src/analyzer/analyzerebur128.h
index 1d2b3dce4d3..181daee23d0 100644
--- a/src/analyzer/analyzerebur128.h
+++ b/src/analyzer/analyzerebur128.h
@@ -3,7 +3,6 @@
 #include <ebur128.h>
 
 #include "analyzer/analyzer.h"
-#include "analyzer/analyzertrack.h"
 #include "preferences/replaygainsettings.h"
 
 class AnalyzerEbur128 : public Analyzer {
diff --git a/src/analyzer/analyzerkey.cpp b/src/analyzer/analyzerkey.cpp
index 3887756f656..cf0ac95143b 100644
--- a/src/analyzer/analyzerkey.cpp
+++ b/src/analyzer/analyzerkey.cpp
@@ -1,6 +1,5 @@
 #include "analyzer/analyzerkey.h"
 
-#include <QVector>
 #include <QtDebug>
 
 #include "analyzer/analyzertrack.h"
diff --git a/src/analyzer/analyzerkey.h b/src/analyzer/analyzerkey.h
index bfd40cc4e89..c095ada7b09 100644
--- a/src/analyzer/analyzerkey.h
+++ b/src/analyzer/analyzerkey.h
@@ -5,10 +5,8 @@
 #include <QString>
 
 #include "analyzer/analyzer.h"
-#include "analyzer/analyzertrack.h"
 #include "analyzer/plugins/analyzerplugin.h"
 #include "preferences/keydetectionsettings.h"
-#include "preferences/usersettings.h"
 #include "track/track_decl.h"
 #include "util/memory.h"
 
diff --git a/src/analyzer/analyzerscheduledtrack.h b/src/analyzer/analyzerscheduledtrack.h
index 3df1a93e56c..817ecd94326 100644
--- a/src/analyzer/analyzerscheduledtrack.h
+++ b/src/analyzer/analyzerscheduledtrack.h
@@ -1,9 +1,6 @@
 #pragma once
 
-#include <optional>
-
 #include "analyzer/analyzertrack.h"
-#include "track/track_decl.h"
 #include "track/trackid.h"
 
 /// A track to be scheduled for analysis with additional options.
diff --git a/src/analyzer/analyzersilence.cpp b/src/analyzer/analyzersilence.cpp
index 58fa83f3cff..dde96531b88 100644
--- a/src/analyzer/analyzersilence.cpp
+++ b/src/analyzer/analyzersilence.cpp
@@ -2,7 +2,6 @@
 
 #include "analyzer/analyzertrack.h"
 #include "analyzer/constants.h"
-#include "engine/engine.h"
 #include "track/track.h"
 
 namespace {
diff --git a/src/analyzer/analyzersilence.h b/src/analyzer/analyzersilence.h
index ac74d27426b..c57a9750400 100644
--- a/src/analyzer/analyzersilence.h
+++ b/src/analyzer/analyzersilence.h
@@ -1,12 +1,20 @@
 #pragma once
 
 #include "analyzer/analyzer.h"
-#include "analyzer/analyzertrack.h"
-#include "audio/frame.h"
 #include "preferences/usersettings.h"
 #include "util/span.h"
 
-class CuePointer;
+class AnalyzerTrack;
+class Track;
+
+namespace mixxx {
+namespace audio {
+
+class FramePos;
+class SampleRate;
+
+} // namespace audio
+} // namespace mixxx
 
 class AnalyzerSilence : public Analyzer {
   public:
diff --git a/src/analyzer/analyzerthread.cpp b/src/analyzer/analyzerthread.cpp
index 2956410b173..a81f8848840 100644
--- a/src/analyzer/analyzerthread.cpp
+++ b/src/analyzer/analyzerthread.cpp
@@ -9,7 +9,6 @@
 #include "analyzer/analyzersilence.h"
 #include "analyzer/analyzerwaveform.h"
 #include "analyzer/constants.h"
-#include "engine/engine.h"
 #include "library/dao/analysisdao.h"
 #include "moc_analyzerthread.cpp"
 #include "sources/audiosourcestereoproxy.h"
@@ -18,7 +17,6 @@
 #include "util/db/dbconnectionpooled.h"
 #include "util/db/dbconnectionpooler.h"
 #include "util/logger.h"
-#include "util/timer.h"
 
 namespace {
 
diff --git a/src/analyzer/analyzerwaveform.cpp b/src/analyzer/analyzerwaveform.cpp
index d4580968d2c..3007fe77ca6 100644
--- a/src/analyzer/analyzerwaveform.cpp
+++ b/src/analyzer/analyzerwaveform.cpp
@@ -1,10 +1,7 @@
 #include "analyzer/analyzerwaveform.h"
 
 #include "analyzer/analyzertrack.h"
-#include "analyzer/constants.h"
-#include "engine/engineobject.h"
 #include "engine/filters/enginefilterbessel4.h"
-#include "engine/filters/enginefilterbutterworth8.h"
 #include "track/track.h"
 #include "util/logger.h"
 #include "waveform/waveformfactory.h"
diff --git a/src/analyzer/analyzerwaveform.h b/src/analyzer/analyzerwaveform.h
index 2cab4391290..658ceb98e89 100644
--- a/src/analyzer/analyzerwaveform.h
+++ b/src/analyzer/analyzerwaveform.h
@@ -1,20 +1,21 @@
 #pragma once
 
-#include <QImage>
-#include <QSqlDatabase>
 #include <cmath>
 #include <limits>
 
 #include "analyzer/analyzer.h"
-#include "analyzer/analyzertrack.h"
 #include "library/dao/analysisdao.h"
 #include "util/performancetimer.h"
 #include "waveform/waveform.h"
 
 //NOTS vrince some test to segment sound, to apply color in the waveform
 //#define TEST_HEAT_MAP
+#ifdef TEST_HEAT_MAP
+class QImage;
+#endif
 
 class EngineFilterIIRBase;
+class QSqlDatabase;
 
 inline CSAMPLE scaleSignal(CSAMPLE invalue, FilterIndex index = FilterCount) {
     if (invalue == 0.0) {
diff --git a/src/analyzer/plugins/analyzerqueenmarybeats.h b/src/analyzer/plugins/analyzerqueenmarybeats.h
index 39bc9a3b829..f812600ff61 100644
--- a/src/analyzer/plugins/analyzerqueenmarybeats.h
+++ b/src/analyzer/plugins/analyzerqueenmarybeats.h
@@ -7,7 +7,6 @@
 #include "analyzer/plugins/analyzerplugin.h"
 #include "analyzer/plugins/buffering_utils.h"
 #include "util/memory.h"
-#include "util/samplebuffer.h"
 
 class DetectionFunction;
 
diff --git a/src/analyzer/plugins/analyzerqueenmarykey.cpp b/src/analyzer/plugins/analyzerqueenmarykey.cpp
index 79b70281112..2ba9dd72585 100644
--- a/src/analyzer/plugins/analyzerqueenmarykey.cpp
+++ b/src/analyzer/plugins/analyzerqueenmarykey.cpp
@@ -6,7 +6,6 @@
 
 #include "analyzer/constants.h"
 #include "util/assert.h"
-#include "util/math.h"
 
 using mixxx::track::io::key::ChromaticKey;
 using mixxx::track::io::key::ChromaticKey_IsValid;
diff --git a/src/analyzer/plugins/analyzerqueenmarykey.h b/src/analyzer/plugins/analyzerqueenmarykey.h
index d38dffa767d..28aaf2d3621 100644
--- a/src/analyzer/plugins/analyzerqueenmarykey.h
+++ b/src/analyzer/plugins/analyzerqueenmarykey.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <vector>
-
 #include <QObject>
 
 #include "analyzer/plugins/analyzerplugin.h"
diff --git a/src/analyzer/plugins/analyzersoundtouchbeats.cpp b/src/analyzer/plugins/analyzersoundtouchbeats.cpp
index ab9569f86d7..2a5477a77bb 100644
--- a/src/analyzer/plugins/analyzersoundtouchbeats.cpp
+++ b/src/analyzer/plugins/analyzersoundtouchbeats.cpp
@@ -3,7 +3,6 @@
 #include <soundtouch/BPMDetect.h>
 
 #include "analyzer/constants.h"
-#include "util/sample.h"
 
 namespace mixxx {
 
diff --git a/src/analyzer/plugins/buffering_utils.cpp b/src/analyzer/plugins/buffering_utils.cpp
index 26176b4708f..584cfd60d83 100644
--- a/src/analyzer/plugins/buffering_utils.cpp
+++ b/src/analyzer/plugins/buffering_utils.cpp
@@ -1,9 +1,6 @@
 #include "analyzer/plugins/buffering_utils.h"
 
 #include "util/math.h"
-#include "util/sample.h"
-
-#include <string.h>
 
 namespace mixxx {
 
diff --git a/src/analyzer/trackanalysisscheduler.cpp b/src/analyzer/trackanalysisscheduler.cpp
index 0a1e15017a7..c5804ff2fb6 100644
--- a/src/analyzer/trackanalysisscheduler.cpp
+++ b/src/analyzer/trackanalysisscheduler.cpp
@@ -3,7 +3,6 @@
 #include "analyzer/analyzerscheduledtrack.h"
 #include "analyzer/analyzertrack.h"
 #include "moc_trackanalysisscheduler.cpp"
-#include "track/track.h"
 #include "track/trackid.h"
 #include "util/logger.h"
 
diff --git a/src/analyzer/trackanalysisscheduler.h b/src/analyzer/trackanalysisscheduler.h
index 4aa65f26fe0..d375dc0ee52 100644
--- a/src/analyzer/trackanalysisscheduler.h
+++ b/src/analyzer/trackanalysisscheduler.h
@@ -8,7 +8,6 @@
 
 #include "analyzer/analyzerscheduledtrack.h"
 #include "analyzer/analyzerthread.h"
-#include "analyzer/analyzertrack.h"
 #include "util/db/dbconnectionpool.h"
 
 /// Callbacks for triggering side-effects in the outer context of

From 15825a3e2ce84c7e24209cf8d9fac5dacd9bc42d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Tue, 14 Nov 2023 08:14:38 +0100
Subject: [PATCH 263/388] Remove extra blank line

---
 src/controllers/controller.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/controllers/controller.cpp b/src/controllers/controller.cpp
index 4e1780eb3ec..c9cb45c7e5e 100644
--- a/src/controllers/controller.cpp
+++ b/src/controllers/controller.cpp
@@ -7,7 +7,6 @@
 #include "moc_controller.cpp"
 #include "util/screensaver.h"
 
-
 namespace {
 QString loggingCategoryPrefix(const QString& deviceName) {
     return QStringLiteral("controller.") +

From c9859b4f982c4f47f384cfbdb681ce26c75a9a18 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 14 Nov 2023 14:40:41 +0100
Subject: [PATCH 264/388] (fix)Tag Fetcher: enable Apply button regardless the
 cover art

---
 src/library/dlgtagfetcher.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/library/dlgtagfetcher.cpp b/src/library/dlgtagfetcher.cpp
index 10c580b184a..3d68f6d4594 100644
--- a/src/library/dlgtagfetcher.cpp
+++ b/src/library/dlgtagfetcher.cpp
@@ -511,13 +511,18 @@ void DlgTagFetcher::addDivider(const QString& text, QTreeWidget* pParent) const
 
 void DlgTagFetcher::tagSelected() {
     if (!tags->currentItem()) {
+        btnApply->setDisabled(true);
         return;
     }
 
     if (tags->currentItem()->data(0, Qt::UserRole).toInt() == kOriginalTrackIndex) {
         tags->currentItem()->setFlags(Qt::ItemIsEnabled);
+        btnApply->setDisabled(true);
         return;
     }
+    // Allow applying the tags, regardless the cover art
+    btnApply->setEnabled(true);
+
     const int tagIndex = tags->currentItem()->data(0, Qt::UserRole).toInt();
     m_data.m_selectedTag = tagIndex;
 

From ae459224e0a9cab1ff447525f44ac11edb9e8e98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Wed, 15 Nov 2023 00:51:55 +0100
Subject: [PATCH 265/388] Fix more headers (backport from main)

---
 src/sources/soundsourcemodplug.cpp | 4 ++--
 src/util/timer.cpp                 | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/sources/soundsourcemodplug.cpp b/src/sources/soundsourcemodplug.cpp
index 2f1acd14e47..daab349513b 100644
--- a/src/sources/soundsourcemodplug.cpp
+++ b/src/sources/soundsourcemodplug.cpp
@@ -1,13 +1,13 @@
 #include "sources/soundsourcemodplug.h"
 
+#include <QFile>
+
 #include "audio/streaminfo.h"
 #include "track/trackmetadata.h"
 #include "util/logger.h"
 #include "util/sample.h"
 #include "util/timer.h"
 
-#include <QFile>
-
 namespace mixxx {
 
 namespace {
diff --git a/src/util/timer.cpp b/src/util/timer.cpp
index d34a165c0af..669e9796093 100644
--- a/src/util/timer.cpp
+++ b/src/util/timer.cpp
@@ -2,7 +2,6 @@
 
 #include "moc_timer.cpp"
 #include "util/experiment.h"
-#include "util/time.h"
 
 Timer::Timer(const QString& key, Stat::ComputeFlags compute)
         : m_key(key),

From fc6d032b73c7c33260f739fce76b3d2e177d3da5 Mon Sep 17 00:00:00 2001
From: Uwe Klotz <uwe.klotz@gmail.com>
Date: Wed, 15 Nov 2023 00:29:31 +0100
Subject: [PATCH 266/388] Add missing #include directives

---
 src/effects/backends/effectsbackend.cpp | 2 ++
 src/effects/visibleeffectslist.h        | 1 +
 src/library/librarycontrol.cpp          | 1 +
 src/util/parented_ptr.h                 | 3 +++
 4 files changed, 7 insertions(+)

diff --git a/src/effects/backends/effectsbackend.cpp b/src/effects/backends/effectsbackend.cpp
index 2eca791356f..583814a3330 100644
--- a/src/effects/backends/effectsbackend.cpp
+++ b/src/effects/backends/effectsbackend.cpp
@@ -1,5 +1,7 @@
 #include "effects/backends/effectsbackend.h"
 
+#include <QObject>
+
 namespace {
 const QString backendTypeNameLV2 = QStringLiteral("LV2");
 // QString::tr requires const char[] rather than QString
diff --git a/src/effects/visibleeffectslist.h b/src/effects/visibleeffectslist.h
index 58b898078b7..f6e40935d1a 100644
--- a/src/effects/visibleeffectslist.h
+++ b/src/effects/visibleeffectslist.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <QList>
+#include <QObject>
 
 #include "effects/defs.h"
 
diff --git a/src/library/librarycontrol.cpp b/src/library/librarycontrol.cpp
index 6980c4adc0b..ac0da0e8152 100644
--- a/src/library/librarycontrol.cpp
+++ b/src/library/librarycontrol.cpp
@@ -13,6 +13,7 @@
 #include "library/libraryview.h"
 #include "mixer/playermanager.h"
 #include "moc_librarycontrol.cpp"
+#include "util/cmdlineargs.h"
 #include "widget/wlibrary.h"
 #include "widget/wlibrarysidebar.h"
 #include "widget/wsearchlineedit.h"
diff --git a/src/util/parented_ptr.h b/src/util/parented_ptr.h
index d0884f47c5e..b3556bb04de 100644
--- a/src/util/parented_ptr.h
+++ b/src/util/parented_ptr.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#ifdef MIXXX_DEBUG_ASSERTIONS_ENABLED
+#include <QObject>
+#endif
 #include <QPointer>
 #include <memory>
 

From 7d329f260eb752fe493af8dd164dcbe1d14c5a4b Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Wed, 15 Nov 2023 16:30:04 +0100
Subject: [PATCH 267/388] add missing include /util/time.h

---
 src/util/timer.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/util/timer.cpp b/src/util/timer.cpp
index 669e9796093..d34a165c0af 100644
--- a/src/util/timer.cpp
+++ b/src/util/timer.cpp
@@ -2,6 +2,7 @@
 
 #include "moc_timer.cpp"
 #include "util/experiment.h"
+#include "util/time.h"
 
 Timer::Timer(const QString& key, Stat::ComputeFlags compute)
         : m_key(key),

From d87bca14fd082cefe3b7c5805a868a42b7fca3d9 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Thu, 16 Nov 2023 00:38:24 +0100
Subject: [PATCH 268/388] also create DeckVisuals when more samplers are added
 ...

after the initial samplers (default is 4), e.g. when number of samplers requested by a skin
exceeds the sampler count set by samplers.xml (0 for empty profile)
---
 src/mixer/playermanager.cpp     | 1 +
 src/mixer/playermanager.h       | 1 +
 src/mixxxmainwindow.cpp         | 9 +++++++++
 src/waveform/visualsmanager.cpp | 2 +-
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/mixer/playermanager.cpp b/src/mixer/playermanager.cpp
index 04a247e28e5..a07c6b5c7c2 100644
--- a/src/mixer/playermanager.cpp
+++ b/src/mixer/playermanager.cpp
@@ -342,6 +342,7 @@ void PlayerManager::slotChangeNumSamplers(double v) {
         addSamplerInner();
     }
     m_pCONumSamplers->setAndConfirm(m_samplers.size());
+    emit numberOfSamplersChanged(m_samplers.count());
 }
 
 void PlayerManager::slotChangeNumPreviewDecks(double v) {
diff --git a/src/mixer/playermanager.h b/src/mixer/playermanager.h
index 54dc7b0055b..815b3a83524 100644
--- a/src/mixer/playermanager.h
+++ b/src/mixer/playermanager.h
@@ -241,6 +241,7 @@ class PlayerManager : public QObject, public PlayerManagerInterface {
 
     // Emitted when the number of decks changes.
     void numberOfDecksChanged(int decks);
+    void numberOfSamplersChanged(int samplers);
 
     void trackAnalyzerProgress(TrackId trackId, AnalyzerProgress analyzerProgress);
     void trackAnalyzerIdle();
diff --git a/src/mixxxmainwindow.cpp b/src/mixxxmainwindow.cpp
index b75acd737a8..0d019430fe8 100644
--- a/src/mixxxmainwindow.cpp
+++ b/src/mixxxmainwindow.cpp
@@ -218,6 +218,15 @@ void MixxxMainWindow::initialize() {
                     m_pVisualsManager->addDeckIfNotExist(group);
                 }
             });
+    connect(pPlayerManager.get(),
+            &PlayerManager::numberOfSamplersChanged,
+            this,
+            [this](int decks) {
+                for (int i = 0; i < decks; ++i) {
+                    QString group = PlayerManager::groupForSampler(i);
+                    m_pVisualsManager->addDeckIfNotExist(group);
+                }
+            });
 
 #ifndef MIXXX_USE_QOPENGL
     // Before creating the first skin we need to create a QGLWidget so that all
diff --git a/src/waveform/visualsmanager.cpp b/src/waveform/visualsmanager.cpp
index d5fd0a3490d..38b58358ff0 100644
--- a/src/waveform/visualsmanager.cpp
+++ b/src/waveform/visualsmanager.cpp
@@ -13,7 +13,7 @@ DeckVisuals::DeckVisuals(const QString& group)
           engineKey(ConfigKey(group, "key")) {
     m_pTimeElapsed = std::make_unique<ControlObject>(ConfigKey(m_group, "time_elapsed"));
     m_pTimeRemaining = std::make_unique<ControlObject>(ConfigKey(m_group, "time_remaining"));
-    m_pEndOfTrack = std::make_unique<ControlObject>(ConfigKey(group, "end_of_track"));
+    m_pEndOfTrack = std::make_unique<ControlObject>(ConfigKey(m_group, "end_of_track"));
     m_pVisualBpm = std::make_unique<ControlObject>(ConfigKey(m_group, "visual_bpm"));
     m_pVisualKey = std::make_unique<ControlObject>(ConfigKey(m_group, "visual_key"));
 

From c89da640cca92b1a68896ec53932b05bfc9faf23 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Thu, 16 Nov 2023 00:39:03 +0100
Subject: [PATCH 269/388] CoreServices: use kSamplerCount to create default
 samplers

---
 src/coreservices.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/coreservices.cpp b/src/coreservices.cpp
index 9d1f3c4bcc9..758fbc0e3f8 100644
--- a/src/coreservices.cpp
+++ b/src/coreservices.cpp
@@ -59,6 +59,7 @@ namespace {
 const mixxx::Logger kLogger("CoreServices");
 constexpr int kMicrophoneCount = 4;
 constexpr int kAuxiliaryCount = 4;
+constexpr int kSamplerCount = 4;
 
 #define CLEAR_AND_CHECK_DELETED(x) clearHelper(x, #x);
 
@@ -303,10 +304,11 @@ void CoreServices::initialize(QApplication* pApp) {
     }
 
     m_pPlayerManager->addConfiguredDecks();
-    m_pPlayerManager->addSampler();
-    m_pPlayerManager->addSampler();
-    m_pPlayerManager->addSampler();
-    m_pPlayerManager->addSampler();
+
+    for (int i = 0; i < kSamplerCount; ++i) {
+        m_pPlayerManager->addSampler();
+    }
+
     m_pPlayerManager->addPreviewDeck();
 
     m_pEffectsManager->setup();

From d97cd1a2121a087de46a8b0e6d99c7671ad2c3fd Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Thu, 16 Nov 2023 00:40:31 +0100
Subject: [PATCH 270/388] use get function to contruct default sampler bank
 path

---
 src/mixer/playermanager.cpp | 10 ++++++----
 src/mixer/samplerbank.cpp   |  3 ---
 src/mixer/samplerbank.h     |  1 -
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/mixer/playermanager.cpp b/src/mixer/playermanager.cpp
index a07c6b5c7c2..0db7b13bfad 100644
--- a/src/mixer/playermanager.cpp
+++ b/src/mixer/playermanager.cpp
@@ -86,6 +86,10 @@ T* findFirstStoppedPlayerInList(const QList<T*>& players) {
     return nullptr;
 }
 
+inline QString getDefaultSamplerPath(UserSettingsPointer pConfig) {
+    return pConfig->getSettingsPath() + QStringLiteral("/samplers.xml");
+}
+
 } // anonymous namespace
 
 //static
@@ -144,8 +148,7 @@ PlayerManager::~PlayerManager() {
 
     const auto locker = lockMutex(&m_mutex);
 
-    m_pSamplerBank->saveSamplerBankToPath(
-        m_pConfig->getSettingsPath() + "/samplers.xml");
+    m_pSamplerBank->saveSamplerBankToPath(getDefaultSamplerPath(m_pConfig));
     // No need to delete anything because they are all parented to us and will
     // be destroyed when we are destroyed.
     m_players.clear();
@@ -453,8 +456,7 @@ void PlayerManager::addDeckInner() {
 }
 
 void PlayerManager::loadSamplers() {
-    m_pSamplerBank->loadSamplerBankFromPath(
-            m_pConfig->getSettingsPath() + "/samplers.xml");
+    m_pSamplerBank->loadSamplerBankFromPath(getDefaultSamplerPath(m_pConfig));
 }
 
 void PlayerManager::addSampler() {
diff --git a/src/mixer/samplerbank.cpp b/src/mixer/samplerbank.cpp
index 922884f72ab..267ad218321 100644
--- a/src/mixer/samplerbank.cpp
+++ b/src/mixer/samplerbank.cpp
@@ -46,9 +46,6 @@ SamplerBank::SamplerBank(UserSettingsPointer pConfig,
             this);
 }
 
-SamplerBank::~SamplerBank() {
-}
-
 void SamplerBank::slotSaveSamplerBank(double v) {
     if (v <= 0.0) {
         return;
diff --git a/src/mixer/samplerbank.h b/src/mixer/samplerbank.h
index 3cab4a39aba..5234f045f71 100644
--- a/src/mixer/samplerbank.h
+++ b/src/mixer/samplerbank.h
@@ -17,7 +17,6 @@ class SamplerBank : public QObject {
   public:
     SamplerBank(UserSettingsPointer pConfig,
             PlayerManager* pPlayerManager);
-    ~SamplerBank() override;
 
     bool saveSamplerBankToPath(const QString& samplerBankPath);
     bool loadSamplerBankFromPath(const QString& samplerBankPath);

From 76ea81512eddff87e9ff321bf9f4454e6d523ea6 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Thu, 16 Nov 2023 00:41:42 +0100
Subject: [PATCH 271/388] PlayerManager: unique_ptr for controls "num_decks",
 "num_samplers" etc.

---
 src/mixer/playermanager.cpp | 16 +++++-----------
 src/mixer/playermanager.h   | 10 +++++-----
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/mixer/playermanager.cpp b/src/mixer/playermanager.cpp
index 0db7b13bfad..c8d162a5811 100644
--- a/src/mixer/playermanager.cpp
+++ b/src/mixer/playermanager.cpp
@@ -110,15 +110,15 @@ PlayerManager::PlayerManager(UserSettingsPointer pConfig,
           m_pEngine(pEngine),
           // NOTE(XXX) LegacySkinParser relies on these controls being Controls
           // and not ControlProxies.
-          m_pCONumDecks(new ControlObject(
+          m_pCONumDecks(std::make_unique<ControlObject>(
                   ConfigKey(kAppGroup, QStringLiteral("num_decks")), true, true)),
-          m_pCONumSamplers(new ControlObject(
+          m_pCONumSamplers(std::make_unique<ControlObject>(
                   ConfigKey(kAppGroup, QStringLiteral("num_samplers")), true, true)),
-          m_pCONumPreviewDecks(new ControlObject(
+          m_pCONumPreviewDecks(std::make_unique<ControlObject>(
                   ConfigKey(kAppGroup, QStringLiteral("num_preview_decks")), true, true)),
-          m_pCONumMicrophones(new ControlObject(
+          m_pCONumMicrophones(std::make_unique<ControlObject>(
                   ConfigKey(kAppGroup, QStringLiteral("num_microphones")), true, true)),
-          m_pCONumAuxiliaries(new ControlObject(
+          m_pCONumAuxiliaries(std::make_unique<ControlObject>(
                   ConfigKey(kAppGroup, QStringLiteral("num_auxiliaries")), true, true)),
           m_pTrackAnalysisScheduler(TrackAnalysisScheduler::NullPointer()) {
     m_pCONumDecks->addAlias(ConfigKey(kLegacyGroup, QStringLiteral("num_decks")));
@@ -161,12 +161,6 @@ PlayerManager::~PlayerManager() {
     delete m_pCOPNumSamplers.fetchAndStoreAcquire(nullptr);
     delete m_pCOPNumPreviewDecks.fetchAndStoreAcquire(nullptr);
 
-    delete m_pCONumSamplers;
-    delete m_pCONumDecks;
-    delete m_pCONumPreviewDecks;
-    delete m_pCONumMicrophones;
-    delete m_pCONumAuxiliaries;
-
     if (m_pTrackAnalysisScheduler) {
         m_pTrackAnalysisScheduler->stop();
         m_pTrackAnalysisScheduler.reset();
diff --git a/src/mixer/playermanager.h b/src/mixer/playermanager.h
index 815b3a83524..cbd74d31787 100644
--- a/src/mixer/playermanager.h
+++ b/src/mixer/playermanager.h
@@ -276,11 +276,11 @@ class PlayerManager : public QObject, public PlayerManagerInterface {
     EffectsManager* m_pEffectsManager;
     EngineMixer* m_pEngine;
     SamplerBank* m_pSamplerBank;
-    ControlObject* m_pCONumDecks;
-    ControlObject* m_pCONumSamplers;
-    ControlObject* m_pCONumPreviewDecks;
-    ControlObject* m_pCONumMicrophones;
-    ControlObject* m_pCONumAuxiliaries;
+    std::unique_ptr<ControlObject> m_pCONumDecks;
+    std::unique_ptr<ControlObject> m_pCONumSamplers;
+    std::unique_ptr<ControlObject> m_pCONumPreviewDecks;
+    std::unique_ptr<ControlObject> m_pCONumMicrophones;
+    std::unique_ptr<ControlObject> m_pCONumAuxiliaries;
     parented_ptr<ControlProxy> m_pAutoDjEnabled;
 
     TrackAnalysisScheduler::Pointer m_pTrackAnalysisScheduler;

From 3de11e161709b8925a9f4e474fcae038203e6136 Mon Sep 17 00:00:00 2001
From: Uwe Klotz <uwe.klotz@gmail.com>
Date: Mon, 4 Sep 2023 16:08:01 +0200
Subject: [PATCH 272/388] Improve log output.

---
 src/sources/metadatasourcetaglib.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/sources/metadatasourcetaglib.cpp b/src/sources/metadatasourcetaglib.cpp
index 3893a42d8f7..69dc4d9bafd 100644
--- a/src/sources/metadatasourcetaglib.cpp
+++ b/src/sources/metadatasourcetaglib.cpp
@@ -91,14 +91,17 @@ MetadataSourceTagLib::importTrackMetadataAndCoverImage(
         kLogger.warning()
                 << "Nothing to import"
                 << "from file" << m_fileName
-                << "with type" << m_fileType;
+                << "of type" << m_fileType;
         return afterImport(ImportResult::Unavailable);
     }
     if (kLogger.traceEnabled()) {
         kLogger.trace() << "Importing"
-                        << ((pTrackMetadata && pCoverImage) ? "track metadata and cover art" : (pTrackMetadata ? "track metadata" : "cover art"))
+                        << ((pTrackMetadata && pCoverImage)
+                                           ? "track metadata and cover art"
+                                           : (pTrackMetadata ? "track metadata"
+                                                             : "cover art"))
                         << "from file" << m_fileName
-                        << "with type" << m_fileType;
+                        << "of type" << m_fileType;
     }
 
     // Rationale: If a file contains different types of tags only

From c4e9f51271a7d17dc16f47f48ff510683b6b632f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Fri, 15 Sep 2023 16:47:04 +0200
Subject: [PATCH 273/388] Update cover tooltip after cover is cached.

---
 src/library/basetracktablemodel.cpp | 22 +++++++++++++++++++++-
 src/library/basetracktablemodel.h   |  7 +++++++
 src/test/librarytest.cpp            |  2 ++
 src/test/playermanagertest.cpp      |  4 ++++
 4 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/library/basetracktablemodel.cpp b/src/library/basetracktablemodel.cpp
index 450eb5da5c1..081b1ac3036 100644
--- a/src/library/basetracktablemodel.cpp
+++ b/src/library/basetracktablemodel.cpp
@@ -133,6 +133,13 @@ BaseTrackTableModel::BaseTrackTableModel(
             &PlayerInfo::trackChanged,
             this,
             &BaseTrackTableModel::slotTrackChanged);
+    CoverArtCache* pCache = CoverArtCache::instance();
+    if (pCache) {
+        connect(pCache,
+                &CoverArtCache::coverFound,
+                this,
+                &BaseTrackTableModel::slotCoverFound);
+    }
 }
 
 void BaseTrackTableModel::initTableColumnsAndHeaderProperties(
@@ -550,6 +557,7 @@ QVariant BaseTrackTableModel::composeCoverArtToolTipHtml(
     if (!coverInfo.hasImage()) {
         return QPixmap();
     }
+    m_toolTipIndex = index;
     QPixmap pixmap = CoverArtCache::getCachedCover(
             coverInfo,
             absoluteHeightOfCoverartToolTip);
@@ -557,7 +565,7 @@ QVariant BaseTrackTableModel::composeCoverArtToolTipHtml(
         // Cache miss -> Don't show a tooltip, refresh cache
         // Height used for the width, in assumption that covers are squares
         CoverArtCache::requestUncachedCover(
-                nullptr,
+                this,
                 coverInfo,
                 absoluteHeightOfCoverartToolTip);
         return QVariant();
@@ -1109,3 +1117,15 @@ bool BaseTrackTableModel::updateTrackMood(
     return m_pTrackCollectionManager->updateTrackMood(pTrack, mood);
 }
 #endif // __EXTRA_METADATA__
+
+void BaseTrackTableModel::slotCoverFound(
+        const QObject* pRequester,
+        const CoverInfo& coverInfo,
+        const QPixmap& pixmap) {
+    Q_UNUSED(pixmap);
+    if (pRequester != this ||
+            getTrackLocation(m_toolTipIndex) != coverInfo.trackLocation) {
+        return;
+    }
+    emit dataChanged(m_toolTipIndex, m_toolTipIndex, {Qt::ToolTipRole});
+}
diff --git a/src/library/basetracktablemodel.h b/src/library/basetracktablemodel.h
index 70b4f1ae411..d8daf44ba22 100644
--- a/src/library/basetracktablemodel.h
+++ b/src/library/basetracktablemodel.h
@@ -244,6 +244,11 @@ class BaseTrackTableModel : public QAbstractTableModel, public TrackModel {
 
     void slotRefreshAllRows();
 
+    void slotCoverFound(
+            const QObject* pRequester,
+            const CoverInfo& coverInfo,
+            const QPixmap& pixmap);
+
   private:
     // Track models may reference tracks by an external id
     // TODO: TrackId should only be used for tracks from
@@ -276,5 +281,7 @@ class BaseTrackTableModel : public QAbstractTableModel, public TrackModel {
 
     TrackId m_previewDeckTrackId;
 
+    mutable QModelIndex m_toolTipIndex;
+
     static int s_bpmColumnPrecision;
 };
diff --git a/src/test/librarytest.cpp b/src/test/librarytest.cpp
index c87a1387fc8..14ae1fc00e4 100644
--- a/src/test/librarytest.cpp
+++ b/src/test/librarytest.cpp
@@ -1,5 +1,6 @@
 #include "test/librarytest.h"
 
+#include "library/coverartcache.h"
 #include "library/library_prefs.h"
 #include "track/track.h"
 
@@ -33,6 +34,7 @@ LibraryTest::LibraryTest()
         : MixxxDbTest(kInMemoryDbConnection),
           m_pTrackCollectionManager(newTrackCollectionManager(config(), dbConnectionPooler())),
           m_keyNotationCO(mixxx::library::prefs::kKeyNotationConfigKey) {
+    CoverArtCache::createInstance();
 }
 
 TrackPointer LibraryTest::getOrAddTrackByLocation(
diff --git a/src/test/playermanagertest.cpp b/src/test/playermanagertest.cpp
index 0b3b227a18f..a4c4695d0b1 100644
--- a/src/test/playermanagertest.cpp
+++ b/src/test/playermanagertest.cpp
@@ -8,6 +8,7 @@
 #include "engine/channels/enginedeck.h"
 #include "engine/enginebuffer.h"
 #include "engine/enginemixer.h"
+#include "library/coverartcache.h"
 #include "library/library.h"
 #include "library/trackcollectionmanager.h"
 #include "mixer/basetrackplayer.h"
@@ -61,6 +62,9 @@ class PlayerManagerTest : public MixxxDbTest, SoundSourceProviderRegistration {
         m_pSoundManager = std::make_shared<SoundManager>(m_pConfig, m_pEngine.get());
         m_pControlIndicatorTimer = std::make_shared<mixxx::ControlIndicatorTimer>(nullptr);
         m_pEngine->registerNonEngineChannelSoundIO(m_pSoundManager.get());
+
+        CoverArtCache::createInstance();
+
         m_pPlayerManager = std::make_shared<PlayerManager>(m_pConfig,
                 m_pSoundManager.get(),
                 m_pEffectsManager.get(),

From eb23df97eac781466e5c701362fbd4fb487fd77b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Tue, 19 Sep 2023 22:05:16 +0200
Subject: [PATCH 274/388] refresh tooltip

---
 src/library/basetracktablemodel.cpp |  2 +-
 src/widget/wlibrarytableview.cpp    | 22 ++++++++++++++++++++++
 src/widget/wlibrarytableview.h      |  5 +++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/library/basetracktablemodel.cpp b/src/library/basetracktablemodel.cpp
index 081b1ac3036..c57350458be 100644
--- a/src/library/basetracktablemodel.cpp
+++ b/src/library/basetracktablemodel.cpp
@@ -568,7 +568,7 @@ QVariant BaseTrackTableModel::composeCoverArtToolTipHtml(
                 this,
                 coverInfo,
                 absoluteHeightOfCoverartToolTip);
-        return QVariant();
+        return tr("Fetching image ...");
     }
     QByteArray data;
     QBuffer buffer(&data);
diff --git a/src/widget/wlibrarytableview.cpp b/src/widget/wlibrarytableview.cpp
index f92e7c8efd6..bc097edbfaa 100644
--- a/src/widget/wlibrarytableview.cpp
+++ b/src/widget/wlibrarytableview.cpp
@@ -3,7 +3,9 @@
 #include <QFocusEvent>
 #include <QFontMetrics>
 #include <QHeaderView>
+#include <QHelpEvent>
 #include <QScrollBar>
+#include <QToolTip>
 
 #include "moc_wlibrarytableview.cpp"
 #include "util/math.h"
@@ -389,3 +391,23 @@ QModelIndex WLibraryTableView::moveCursor(CursorAction cursorAction,
 
     return QTableView::moveCursor(cursorAction, modifiers);
 }
+
+void WLibraryTableView::dataChanged(
+        const QModelIndex& topLeft,
+        const QModelIndex& bottomRight,
+        const QVector<int>& roles) {
+    for (auto& role : roles) {
+        // If the tooltip is still visible update with the loaded cover.
+        if (role == Qt::ToolTipRole && QToolTip::isVisible()) {
+            QPoint globalPos = QCursor::pos();
+            QWidget* pViewPort = QApplication::widgetAt(QCursor::pos());
+            if (pViewPort) {
+                QHelpEvent toolTipEvent(QEvent::ToolTip,
+                        pViewPort->mapFromGlobal(globalPos),
+                        globalPos);
+                viewportEvent(&toolTipEvent);
+            }
+        }
+    }
+    QAbstractItemView::dataChanged(topLeft, bottomRight, roles);
+};
diff --git a/src/widget/wlibrarytableview.h b/src/widget/wlibrarytableview.h
index 7be8a461094..7e0e8351dd3 100644
--- a/src/widget/wlibrarytableview.h
+++ b/src/widget/wlibrarytableview.h
@@ -50,6 +50,11 @@ class WLibraryTableView : public QTableView, public virtual LibraryView {
     /// @param optional: index, otherwise row/column member vars are used
     void restoreCurrentIndex(const QModelIndex& index = QModelIndex());
 
+    void dataChanged(
+            const QModelIndex& topLeft,
+            const QModelIndex& bottomRight,
+            const QVector<int>& roles = QVector<int>()) override;
+
   signals:
     void loadTrack(TrackPointer pTrack);
     void loadTrackToPlayer(TrackPointer pTrack, const QString& group, bool play = false);

From d8c49129107597b8a8f5209f09a4dbeb8d08f7ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sun, 15 Oct 2023 22:33:18 +0200
Subject: [PATCH 275/388] Add translator comment for coverart column tootip

---
 src/library/basetracktablemodel.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/library/basetracktablemodel.cpp b/src/library/basetracktablemodel.cpp
index c57350458be..575e2dd4028 100644
--- a/src/library/basetracktablemodel.cpp
+++ b/src/library/basetracktablemodel.cpp
@@ -568,6 +568,7 @@ QVariant BaseTrackTableModel::composeCoverArtToolTipHtml(
                 this,
                 coverInfo,
                 absoluteHeightOfCoverartToolTip);
+        //: Tooltip text on the cover art column shown when the cover is read from disk
         return tr("Fetching image ...");
     }
     QByteArray data;

From 72d5d8460dcb127e7e354d5b5501db6ff11be4ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Thu, 16 Nov 2023 08:07:28 +0100
Subject: [PATCH 276/388] Adjust link to the manual

---
 src/defs_urls.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/defs_urls.h b/src/defs_urls.h
index e8c14799c3d..b9997f27b03 100644
--- a/src/defs_urls.h
+++ b/src/defs_urls.h
@@ -54,7 +54,7 @@
 #define MIXXX_MANUAL_CUE_MODES_URL \
     MIXXX_MANUAL_URL "/chapters/user_interface.html#using-cue-modes"
 #define MIXXX_MANUAL_SYNC_MODES_URL \
-    MIXXX_MANUAL_URL "/chapters/user_interface.html#sync-and-rate-controls"
+    MIXXX_MANUAL_URL "/chapters/djing_with_mixxx#sync-lock-with-dynamic-tempo"
 #define MIXXX_MANUAL_BEATS_URL \
     MIXXX_MANUAL_URL "/chapters/preferences.html#beat-detection"
 #define MIXXX_MANUAL_KEY_URL \

From 6ba80e8891d5b75e74a5cbb96d89d8da34dc96aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Mon, 30 Oct 2023 15:07:00 +0100
Subject: [PATCH 277/388] Check if cursor is still on the tooltip index

---
 src/widget/wlibrarytableview.cpp | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/widget/wlibrarytableview.cpp b/src/widget/wlibrarytableview.cpp
index bc097edbfaa..4964136f9d6 100644
--- a/src/widget/wlibrarytableview.cpp
+++ b/src/widget/wlibrarytableview.cpp
@@ -1,5 +1,6 @@
 #include "widget/wlibrarytableview.h"
 
+#include <QApplication>
 #include <QFocusEvent>
 #include <QFontMetrics>
 #include <QHeaderView>
@@ -396,16 +397,21 @@ void WLibraryTableView::dataChanged(
         const QModelIndex& topLeft,
         const QModelIndex& bottomRight,
         const QVector<int>& roles) {
-    for (auto& role : roles) {
-        // If the tooltip is still visible update with the loaded cover.
-        if (role == Qt::ToolTipRole && QToolTip::isVisible()) {
+    for (const auto& role : roles) {
+        // Note: At this point the tooltip is already showing
+        // "Fetching image ..." or still in an effect progress.
+        // QToolTip::isVisible() is false for the later.
+        if (role == Qt::ToolTipRole) {
             QPoint globalPos = QCursor::pos();
-            QWidget* pViewPort = QApplication::widgetAt(QCursor::pos());
+            QWidget* pViewPort = QApplication::widgetAt(globalPos);
             if (pViewPort) {
-                QHelpEvent toolTipEvent(QEvent::ToolTip,
-                        pViewPort->mapFromGlobal(globalPos),
-                        globalPos);
-                viewportEvent(&toolTipEvent);
+                QPoint viewPortPos = pViewPort->mapFromGlobal(globalPos);
+                if (indexAt(viewPortPos) == topLeft) {
+                    QHelpEvent toolTipEvent(QEvent::ToolTip,
+                            pViewPort->mapFromGlobal(globalPos),
+                            globalPos);
+                    viewportEvent(&toolTipEvent);
+                }
             }
         }
     }

From 4afe03d7dd60dbc8ba671ec6aee505c3a76b1ae0 Mon Sep 17 00:00:00 2001
From: Joerg <JoergAtGithub@worldwartweb.com>
Date: Fri, 17 Nov 2023 21:45:39 +0100
Subject: [PATCH 278/388] Added comments to explain the conditions

---
 src/waveform/visualplayposition.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/waveform/visualplayposition.cpp b/src/waveform/visualplayposition.cpp
index 1b82f51e6b7..a77ee22b464 100644
--- a/src/waveform/visualplayposition.cpp
+++ b/src/waveform/visualplayposition.cpp
@@ -91,6 +91,11 @@ double VisualPlayPosition::determinePlayPosInLoopBoundries(
             if ((data.m_playRate < 0.0) &&
                     (interpolatedPlayPos < data.m_loopStartPos) &&
                     (data.m_playPos >= data.m_loopStartPos)) {
+                // 1. Deck playing reverse
+                // 2. Interpolated playposition at the time of next VSync would
+                // be outsite of the active loop
+                // 3. Playposition is currently inside the active loop
+                //    (not scratching left of an activated loop)
                 interpolatedPlayPos = data.m_loopEndPos -
                         std::remainder(
                                 data.m_loopStartPos - interpolatedPlayPos,
@@ -99,6 +104,11 @@ double VisualPlayPosition::determinePlayPosInLoopBoundries(
             if ((data.m_playRate > 0.0) &&
                     (interpolatedPlayPos > data.m_loopEndPos) &&
                     (data.m_playPos <= data.m_loopEndPos)) {
+                // 1. Deck playing forward
+                // 2. Interpolated playposition at the time of next VSync would
+                // be outsite of the active loop
+                // 3. Playposition is currently inside the active loop
+                //    (not scratching right of an activated loop)
                 interpolatedPlayPos = data.m_loopStartPos +
                         std::remainder(
                                 interpolatedPlayPos - data.m_loopEndPos,

From 53994ef6f8e0d360cbc54f796881f93a550150e3 Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Fri, 17 Nov 2023 21:21:35 +0000
Subject: [PATCH 279/388] Add missing includes

---
 src/controllers/midi/hss1394enumerator.h | 1 +
 src/main.cpp                             | 1 +
 src/preferences/upgrade.cpp              | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/controllers/midi/hss1394enumerator.h b/src/controllers/midi/hss1394enumerator.h
index 725aaba5f1f..f243277f37e 100644
--- a/src/controllers/midi/hss1394enumerator.h
+++ b/src/controllers/midi/hss1394enumerator.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "controllers/midi/midienumerator.h"
+#include "preferences/usersettings.h"
 
 // Handles discovery and enumeration of DJ controllers that appear under the
 // HSS1394 cross-platform API.
diff --git a/src/main.cpp b/src/main.cpp
index 94e0ac9124f..8b18a2272c6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -22,6 +22,7 @@
 #include "util/cmdlineargs.h"
 #include "util/console.h"
 #include "util/logging.h"
+#include "util/sandbox.h"
 #include "util/versionstore.h"
 
 namespace {
diff --git a/src/preferences/upgrade.cpp b/src/preferences/upgrade.cpp
index ff8b90c59bb..a1c0abe5d6d 100644
--- a/src/preferences/upgrade.cpp
+++ b/src/preferences/upgrade.cpp
@@ -14,6 +14,7 @@
 #include "library/trackcollection.h"
 #include "preferences/beatdetectionsettings.h"
 #include "preferences/usersettings.h"
+#include "util/cmdlineargs.h"
 #include "util/db/dbconnectionpooled.h"
 #include "util/db/dbconnectionpooler.h"
 #include "util/math.h"

From 0277e3c4f90b9d6637f7a8ae59eab2c07a9fb879 Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Fri, 17 Nov 2023 01:40:02 +0100
Subject: [PATCH 280/388] draw overlapping marks at increasing level, both in
 legacy and glsl waveform renderers. reduced code duplications, fix setting
 the initial size of the waveform renderers

---
 CMakeLists.txt                                |   1 +
 .../allshader/waveformrendermark.cpp          | 116 ++++--------------
 .../renderers/allshader/waveformrendermark.h  |  36 +++---
 src/waveform/renderers/waveformmark.cpp       |  35 ++++--
 src/waveform/renderers/waveformmark.h         |  74 +++++++----
 src/waveform/renderers/waveformmarkset.cpp    |  28 ++++-
 src/waveform/renderers/waveformmarkset.h      |   2 +
 src/waveform/renderers/waveformrendermark.cpp |  83 +------------
 src/waveform/renderers/waveformrendermark.h   |  27 +---
 .../renderers/waveformrendermarkbase.cpp      |  95 ++++++++++++++
 .../renderers/waveformrendermarkbase.h        |  51 ++++++++
 .../renderers/waveformwidgetrenderer.cpp      |   2 +-
 .../renderers/waveformwidgetrenderer.h        |   3 +-
 src/waveform/widgets/glslwaveformwidget.cpp   |   4 +-
 src/waveform/widgets/glslwaveformwidget.h     |   2 +-
 .../widgets/waveformwidgetabstract.cpp        |   2 +-
 src/widget/wwaveformviewer.cpp                |  15 ++-
 src/widget/wwaveformviewer.h                  |   1 +
 18 files changed, 317 insertions(+), 260 deletions(-)
 create mode 100644 src/waveform/renderers/waveformrendermarkbase.cpp
 create mode 100644 src/waveform/renderers/waveformrendermarkbase.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42cd3f9f02a..1acf469d1cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1405,6 +1405,7 @@ else()
     src/waveform/renderers/waveformrendererrgb.cpp
     src/waveform/renderers/waveformrenderersignalbase.cpp
     src/waveform/renderers/waveformrendermark.cpp
+    src/waveform/renderers/waveformrendermarkbase.cpp
     src/waveform/renderers/waveformrendermarkrange.cpp
     src/waveform/renderers/waveformsignalcolors.cpp
     src/waveform/renderers/waveformwidgetrenderer.cpp
diff --git a/src/waveform/renderers/allshader/waveformrendermark.cpp b/src/waveform/renderers/allshader/waveformrendermark.cpp
index 34c35f8b1bd..de17cdf2c80 100644
--- a/src/waveform/renderers/allshader/waveformrendermark.cpp
+++ b/src/waveform/renderers/allshader/waveformrendermark.cpp
@@ -1,20 +1,13 @@
 #include "waveform/renderers/allshader/waveformrendermark.h"
 
-#include <QDomNode>
 #include <QOpenGLTexture>
 #include <QPainterPath>
 
-#include "track/track.h"
-#include "util/color/color.h"
-#include "util/colorcomponents.h"
 #include "util/texture.h"
 #include "waveform/renderers/allshader/matrixforwidgetgeometry.h"
-#include "waveform/renderers/allshader/moc_waveformrendermark.cpp"
 #include "waveform/renderers/allshader/rgbadata.h"
 #include "waveform/renderers/allshader/vertexdata.h"
-#include "waveform/renderers/waveformsignalcolors.h"
 #include "waveform/renderers/waveformwidgetrenderer.h"
-#include "widget/wimagestore.h"
 
 // On the use of QPainter:
 //
@@ -37,25 +30,30 @@ class TextureGraphics : public WaveformMark::Graphics {
     }
 };
 
-allshader::WaveformRenderMark::WaveformRenderMark(WaveformWidgetRenderer* waveformWidget)
-        : WaveformRenderer(waveformWidget),
-          m_bCuesUpdates(false) {
-}
+// Both allshader::WaveformRenderMark and the non-GL ::WaveformRenderMark derive
+// from WaveformRenderMarkBase. The base-class takes care of updating the marks
+// when needed and flagging them when their image needs to be updated (resizing,
+// cue changes, position changes)
+//
+// While in the case of ::WaveformRenderMark those images can be updated immediately,
+// in the case of allshader::WaveformRenderMark we need to do that when we have an
+// openGL context, as we create new textures.
+//
+// The boolean argument for the WaveformRenderMarkBase constructor indicates
+// that updateMarkImages should not be called immediately.
 
-void allshader::WaveformRenderMark::setup(const QDomNode& node, const SkinContext& context) {
-    WaveformSignalColors signalColors = *m_waveformRenderer->getWaveformSignalColors();
-    m_marks.setup(m_waveformRenderer->getGroup(), node, context, signalColors);
+allshader::WaveformRenderMark::WaveformRenderMark(WaveformWidgetRenderer* waveformWidget)
+        : ::WaveformRenderMarkBase(waveformWidget, false) {
 }
 
 void allshader::WaveformRenderMark::initializeGL() {
-    WaveformRenderer::initializeGL();
+    allshader::WaveformRendererAbstract::initializeGL();
     m_rgbaShader.init();
     m_textureShader.init();
 
-    for (const auto& pMark : std::as_const(m_marks)) {
-        generateMarkImage(pMark);
-    }
-    generatePlayPosMarkTexture();
+    // Will create textures so requires OpenGL context
+    updateMarkImages();
+    updatePlayPosMarkTexture();
 }
 
 void allshader::WaveformRenderMark::drawTexture(float x, float y, QOpenGLTexture* texture) {
@@ -157,16 +155,13 @@ void allshader::WaveformRenderMark::paintGL() {
     const float devicePixelRatio = m_waveformRenderer->getDevicePixelRatio();
     QList<WaveformWidgetRenderer::WaveformMarkOnScreen> marksOnScreen;
 
-    checkCuesUpdated();
-
     glEnable(GL_BLEND);
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
-    for (const auto& pMark : std::as_const(m_marks)) {
-        if (!pMark->m_pGraphics || pMark->m_pGraphics->m_obsolete) {
-            generateMarkImage(pMark);
-        }
+    // Will create textures so requires OpenGL context
+    updateMarkImages();
 
+    for (const auto& pMark : std::as_const(m_marks)) {
         QOpenGLTexture* pTexture =
                 static_cast<TextureGraphics*>(pMark->m_pGraphics.get())
                         ->texture();
@@ -238,7 +233,7 @@ void allshader::WaveformRenderMark::paintGL() {
 // Generate the texture used to draw the play position marker.
 // Note that in the legacy waveform widgets this is drawn directly
 // in the WaveformWidgetRenderer itself. Doing it here is cleaner.
-void allshader::WaveformRenderMark::generatePlayPosMarkTexture() {
+void allshader::WaveformRenderMark::updatePlayPosMarkTexture() {
     float imgwidth;
     float imgheight;
 
@@ -317,71 +312,12 @@ void allshader::WaveformRenderMark::drawTriangle(QPainter* painter,
 }
 
 void allshader::WaveformRenderMark::resizeGL(int, int) {
-    for (const auto& pMark : std::as_const(m_marks)) {
-        generateMarkImage(pMark);
-    }
-    generatePlayPosMarkTexture();
-}
-
-void allshader::WaveformRenderMark::onSetTrack() {
-    slotCuesUpdated();
-
-    TrackPointer trackInfo = m_waveformRenderer->getTrackInfo();
-    if (!trackInfo) {
-        return;
-    }
-    connect(trackInfo.get(),
-            &Track::cuesUpdated,
-            this,
-            &allshader::WaveformRenderMark::slotCuesUpdated);
-}
-
-void allshader::WaveformRenderMark::slotCuesUpdated() {
-    m_bCuesUpdates = true;
-}
-
-void allshader::WaveformRenderMark::checkCuesUpdated() {
-    if (!m_bCuesUpdates) {
-        return;
-    }
-    m_bCuesUpdates = false;
-
-    TrackPointer trackInfo = m_waveformRenderer->getTrackInfo();
-    if (!trackInfo) {
-        return;
-    }
-
-    QList<CuePointer> loadedCues = trackInfo->getCuePoints();
-    for (const CuePointer& pCue : loadedCues) {
-        const int hotCue = pCue->getHotCue();
-        if (hotCue == Cue::kNoHotCue) {
-            continue;
-        }
-
-        // Here we assume no two cues can have the same hotcue assigned,
-        // because WaveformMarkSet stores one mark for each hotcue.
-        WaveformMarkPointer pMark = m_marks.getHotCueMark(hotCue);
-        if (pMark.isNull()) {
-            continue;
-        }
-
-        QString newLabel = pCue->getLabel();
-        QColor newColor = mixxx::RgbColor::toQColor(pCue->getColor());
-        if (pMark->m_text.isNull() || newLabel != pMark->m_text ||
-                !pMark->fillColor().isValid() ||
-                newColor != pMark->fillColor()) {
-            pMark->m_text = newLabel;
-            const int dimBrightThreshold = m_waveformRenderer->getDimBrightThreshold();
-            pMark->setBaseColor(newColor, dimBrightThreshold);
-            generateMarkImage(pMark);
-        }
-    }
-
-    m_marks.update();
+    // Will create textures so requires OpenGL context
+    updateMarkImages();
+    updatePlayPosMarkTexture();
 }
 
-void allshader::WaveformRenderMark::generateMarkImage(WaveformMarkPointer pMark) {
+void allshader::WaveformRenderMark::updateMarkImage(WaveformMarkPointer pMark) {
     pMark->m_pGraphics = std::make_unique<TextureGraphics>(
-            createTexture(pMark->generateImage(m_waveformRenderer->getBreadth(),
-                    m_waveformRenderer->getDevicePixelRatio())));
+            createTexture(pMark->generateImage(m_waveformRenderer->getDevicePixelRatio())));
 }
diff --git a/src/waveform/renderers/allshader/waveformrendermark.h b/src/waveform/renderers/allshader/waveformrendermark.h
index 101a96a0126..a06474cfc07 100644
--- a/src/waveform/renderers/allshader/waveformrendermark.h
+++ b/src/waveform/renderers/allshader/waveformrendermark.h
@@ -1,13 +1,11 @@
 #pragma once
 
 #include <QColor>
-#include <QObject>
 
 #include "shaders/rgbashader.h"
 #include "shaders/textureshader.h"
-#include "util/class.h"
-#include "waveform/renderers/allshader/waveformrenderer.h"
-#include "waveform/renderers/waveformmarkset.h"
+#include "waveform/renderers/allshader/waveformrendererabstract.h"
+#include "waveform/renderers/waveformrendermarkbase.h"
 
 class QDomNode;
 class SkinContext;
@@ -17,32 +15,28 @@ namespace allshader {
 class WaveformRenderMark;
 }
 
-class allshader::WaveformRenderMark final : public QObject, public allshader::WaveformRenderer {
-    Q_OBJECT
+class allshader::WaveformRenderMark : public ::WaveformRenderMarkBase,
+                                      public allshader::WaveformRendererAbstract {
   public:
     explicit WaveformRenderMark(WaveformWidgetRenderer* waveformWidget);
 
-    void setup(const QDomNode& node, const SkinContext& context) override;
+    void draw(QPainter* painter, QPaintEvent* event) override {
+        Q_UNUSED(painter);
+        Q_UNUSED(event);
+    }
+
+    allshader::WaveformRendererAbstract* allshaderWaveformRenderer() override {
+        return this;
+    }
 
     void initializeGL() override;
     void paintGL() override;
     void resizeGL(int w, int h) override;
 
-    // Called when a new track is loaded.
-    void onSetTrack() override;
-
-  public slots:
-    // Called when the loaded track's cues are added, deleted or modified and
-    // when a new track is loaded.
-    // It updates the marks' names and regenerates their image if needed.
-    // This method is used for hotcues.
-    void slotCuesUpdated();
-
   private:
-    void checkCuesUpdated();
+    void updateMarkImage(WaveformMarkPointer pMark) override;
 
-    void generateMarkImage(WaveformMarkPointer pMark);
-    void generatePlayPosMarkTexture();
+    void updatePlayPosMarkTexture();
 
     void drawTriangle(QPainter* painter,
             const QBrush& fillColor,
@@ -50,11 +44,9 @@ class allshader::WaveformRenderMark final : public QObject, public allshader::Wa
             QPointF p2,
             QPointF p3);
 
-    WaveformMarkSet m_marks;
     mixxx::RGBAShader m_rgbaShader;
     mixxx::TextureShader m_textureShader;
     std::unique_ptr<QOpenGLTexture> m_pPlayPosMarkTexture;
-    bool m_bCuesUpdates;
 
     void drawMark(const QRectF& rect, QColor color);
     void drawTexture(float x, float y, QOpenGLTexture* texture);
diff --git a/src/waveform/renderers/waveformmark.cpp b/src/waveform/renderers/waveformmark.cpp
index 6bc63af5cce..e2d5c71c085 100644
--- a/src/waveform/renderers/waveformmark.cpp
+++ b/src/waveform/renderers/waveformmark.cpp
@@ -56,9 +56,10 @@ Qt::Alignment decodeAlignmentFlags(const QString& alignString, Qt::Alignment def
 WaveformMark::WaveformMark(const QString& group,
         const QDomNode& node,
         const SkinContext& context,
+        int priority,
         const WaveformSignalColors& signalColors,
         int hotCue)
-        : m_linePosition{}, m_breadth{}, m_iHotCue{hotCue} {
+        : m_linePosition{}, m_breadth{}, m_level{}, m_iPriority(priority), m_iHotCue(hotCue) {
     QString positionControl;
     QString endPositionControl;
     if (hotCue != Cue::kNoHotCue) {
@@ -121,23 +122,26 @@ WaveformMark::WaveformMark(const QString& group,
 WaveformMark::~WaveformMark() = default;
 
 void WaveformMark::setBaseColor(QColor baseColor, int dimBrightThreshold) {
-    if (m_pGraphics) {
-        m_pGraphics->m_obsolete = true;
+    if (m_fillColor == baseColor) {
+        return;
     }
+
     m_fillColor = baseColor;
     m_borderColor = Color::chooseContrastColor(baseColor, dimBrightThreshold);
     m_labelColor = Color::chooseColorByBrightness(baseColor,
             QColor(255, 255, 255, 255),
             QColor(0, 0, 0, 255),
             dimBrightThreshold);
-};
+
+    setNeedsImageUpdate();
+}
 
 bool WaveformMark::contains(QPoint point, Qt::Orientation orientation) const {
     // Without some padding, the user would only have a single pixel width that
     // would count as hovering over the WaveformMark.
     float lineHoverPadding = 5.0;
     if (orientation == Qt::Vertical) {
-        point = QPoint(point.y(), m_breadth - point.x());
+        point = QPoint(point.y(), static_cast<int>(m_breadth) - point.x());
     }
     bool lineHovered = m_linePosition >= point.x() - lineHoverPadding &&
             m_linePosition <= point.x() + lineHoverPadding;
@@ -148,13 +152,17 @@ bool WaveformMark::contains(QPoint point, Qt::Orientation orientation) const {
 // Helper struct to calculate the geometry and fontsize needed by generateImage
 // to draw the label and text
 struct MarkerGeometry {
-    bool m_isSymbol; // it the label normal text or a single symbol (e.g. open circle arrow)
+    bool m_isSymbol; // is the label normal text or a single symbol (e.g. open circle arrow)
     QFont m_font;
     QRectF m_contentRect;
     QRectF m_labelRect;
     QSizeF m_imageSize;
 
-    MarkerGeometry(const QString& label, bool useIcon, Qt::Alignment align, float breadth) {
+    MarkerGeometry(const QString& label,
+            bool useIcon,
+            Qt::Alignment align,
+            float breadth,
+            int level) {
         // If the label is 1 character long, and this character isn't a letter or a number,
         // we can assume it's a special symbol
         m_isSymbol = !useIcon && label.length() == 1 && !label[0].isLetterOrNumber();
@@ -240,9 +248,10 @@ struct MarkerGeometry {
         if (alignV == Qt::AlignVCenter) {
             m_labelRect.moveTop((m_imageSize.height() - m_labelRect.height()) / 2.f);
         } else if (alignV == Qt::AlignBottom) {
-            m_labelRect.moveBottom(m_imageSize.height() - 0.5f);
+            m_labelRect.moveBottom(m_imageSize.height() - 0.5f -
+                    level * (m_labelRect.height() + 2.f));
         } else {
-            m_labelRect.moveTop(0.5f);
+            m_labelRect.moveTop(0.5f + level * (m_labelRect.height() + 2.f));
         }
     }
     QSize getImageSize(float devicePixelRatio) const {
@@ -251,12 +260,12 @@ struct MarkerGeometry {
     }
 };
 
-QImage WaveformMark::generateImage(float breadth, float devicePixelRatio) {
+QImage WaveformMark::generateImage(float devicePixelRatio) {
+    assert(needsImageUpdate());
+
     // Load the pixmap from file.
     // If that succeeds loading the text and stroke is skipped.
 
-    m_breadth = static_cast<int>(breadth);
-
     if (!m_pixmapPath.isEmpty()) {
         QString path = m_pixmapPath;
         // Use devicePixelRatio to properly scale the image
@@ -292,7 +301,7 @@ QImage WaveformMark::generateImage(float breadth, float devicePixelRatio) {
     const bool useIcon = m_iconPath != "";
 
     // Determine drawing geometries
-    const MarkerGeometry markerGeometry(label, useIcon, m_align, breadth);
+    const MarkerGeometry markerGeometry(label, useIcon, m_align, m_breadth, m_level);
 
     m_label.setAreaRect(markerGeometry.m_labelRect);
 
diff --git a/src/waveform/renderers/waveformmark.h b/src/waveform/renderers/waveformmark.h
index e0548384629..5e7a5431b34 100644
--- a/src/waveform/renderers/waveformmark.h
+++ b/src/waveform/renderers/waveformmark.h
@@ -19,16 +19,16 @@ class WaveformMark {
   public:
     class Graphics {
       public:
-        Graphics()
-                : m_obsolete{false} {
+        Graphics() {
         }
-        bool m_obsolete;
+        bool m_obsolete{};
     };
 
     WaveformMark(
             const QString& group,
             const QDomNode& node,
             const SkinContext& context,
+            int priority,
             const WaveformSignalColors& signalColors,
             int hotCue = Cue::kNoHotCue);
     ~WaveformMark();
@@ -40,6 +40,9 @@ class WaveformMark {
     int getHotCue() const {
         return m_iHotCue;
     };
+    int getPriority() const {
+        return m_iPriority;
+    };
 
     // The m_pPositionCO related function
     bool isValid() const {
@@ -85,22 +88,56 @@ class WaveformMark {
         m_pVisibleCO->connectValueChanged(receiver, slot, Qt::AutoConnection);
     }
 
+    void setText(const QString& text) {
+        if (m_text != text) {
+            m_text = text;
+            setNeedsImageUpdate();
+        }
+    }
+
     // Sets the appropriate mark colors based on the base color
     void setBaseColor(QColor baseColor, int dimBrightThreshold);
+
     QColor fillColor() const {
         return m_fillColor;
     }
+
     QColor borderColor() const {
         return m_borderColor;
     }
+
     QColor labelColor() const {
         return m_labelColor;
     }
 
+    void setNeedsImageUpdate() {
+        if (m_pGraphics) {
+            m_pGraphics->m_obsolete = true;
+        }
+    }
+
+    bool needsImageUpdate() const {
+        return !m_pGraphics || m_pGraphics->m_obsolete;
+    }
+
+    void setBreadth(float breadth) {
+        if (m_breadth != breadth) {
+            m_breadth = breadth;
+            setNeedsImageUpdate();
+        }
+    }
+
+    void setLevel(int level) {
+        if (m_level != level) {
+            m_level = level;
+            setNeedsImageUpdate();
+        }
+    }
+
     // Check if a point (in image coordinates) lies on drawn image.
     bool contains(QPoint point, Qt::Orientation orientation) const;
 
-    QImage generateImage(float breath, float devicePixelRatio);
+    QImage generateImage(float devicePixelRatio);
 
     QColor m_textColor;
     QString m_text;
@@ -109,7 +146,8 @@ class WaveformMark {
     QString m_iconPath;
 
     float m_linePosition;
-    int m_breadth;
+    float m_breadth;
+    int m_level;
 
     WaveformMarkLabel m_label;
 
@@ -118,10 +156,9 @@ class WaveformMark {
     std::unique_ptr<ControlProxy> m_pEndPositionCO;
     std::unique_ptr<ControlProxy> m_pVisibleCO;
 
-    friend class allshader::WaveformRenderMark;
-
     std::unique_ptr<Graphics> m_pGraphics;
 
+    int m_iPriority;
     int m_iHotCue;
 
     QColor m_fillColor;
@@ -129,6 +166,8 @@ class WaveformMark {
     QColor m_labelColor;
 
     friend class WaveformRenderMark;
+    friend class WaveformRenderMarkBase;
+    friend class allshader::WaveformRenderMark;
 };
 
 typedef QSharedPointer<WaveformMark> WaveformMarkPointer;
@@ -140,27 +179,18 @@ typedef QSharedPointer<WaveformMark> WaveformMarkPointer;
 // temporarily incorrect sort order is acceptable.
 class WaveformMarkSortKey {
   public:
-    WaveformMarkSortKey(double samplePosition, int hotcue)
+    WaveformMarkSortKey(double samplePosition, int priority)
             : m_samplePosition(samplePosition),
-              m_hotcue(hotcue) {
+              m_priority(priority) {
     }
 
     bool operator<(const WaveformMarkSortKey& other) const {
-        if (m_samplePosition == other.m_samplePosition) {
-            // Sort WaveformMarks without hotcues before those with hotcues;
-            // if both have hotcues, sort numerically by hotcue number.
-            if (m_hotcue == Cue::kNoHotCue && other.m_hotcue != Cue::kNoHotCue) {
-                return true;
-            } else if (m_hotcue != Cue::kNoHotCue && other.m_hotcue == Cue::kNoHotCue) {
-                return false;
-            } else {
-                return m_hotcue < other.m_hotcue;
-            }
-        }
-        return m_samplePosition < other.m_samplePosition;
+        return m_samplePosition == other.m_samplePosition
+                ? m_priority < other.m_priority
+                : m_samplePosition < other.m_samplePosition;
     }
 
   private:
     double m_samplePosition;
-    int m_hotcue;
+    int m_priority;
 };
diff --git a/src/waveform/renderers/waveformmarkset.cpp b/src/waveform/renderers/waveformmarkset.cpp
index a861df33ec7..ab7d6083ce4 100644
--- a/src/waveform/renderers/waveformmarkset.cpp
+++ b/src/waveform/renderers/waveformmarkset.cpp
@@ -23,13 +23,16 @@ void WaveformMarkSet::setup(const QString& group, const QDomNode& node,
 
     QDomNode child = node.firstChild();
     QDomNode defaultChild;
+    int priority = 0;
     while (!child.isNull()) {
         if (child.nodeName() == "DefaultMark") {
-            m_pDefaultMark = WaveformMarkPointer(new WaveformMark(group, child, context, signalColors));
+            m_pDefaultMark = WaveformMarkPointer(new WaveformMark(
+                    group, child, context, --priority, signalColors));
             hasDefaultMark = true;
             defaultChild = child;
         } else if (child.nodeName() == "Mark") {
-            WaveformMarkPointer pMark(new WaveformMark(group, child, context, signalColors));
+            WaveformMarkPointer pMark(new WaveformMark(
+                    group, child, context, --priority, signalColors));
             if (pMark->isValid()) {
                 // guarantee uniqueness even if there is a misdesigned skin
                 QString item = pMark->getItem();
@@ -52,7 +55,8 @@ void WaveformMarkSet::setup(const QString& group, const QDomNode& node,
         for (int i = 0; i < NUM_HOT_CUES; ++i) {
             if (m_hotCueMarks.value(i).isNull()) {
                 //qDebug() << "WaveformRenderMark::setup - Automatic mark" << hotCueControlItem;
-                WaveformMarkPointer pMark(new WaveformMark(group, defaultChild, context, signalColors, i));
+                WaveformMarkPointer pMark(new WaveformMark(
+                        group, defaultChild, context, i, signalColors, i));
                 m_marks.push_front(pMark);
                 m_hotCueMarks.insert(pMark->getHotCue(), pMark);
             }
@@ -68,6 +72,12 @@ WaveformMarkPointer WaveformMarkSet::getDefaultMark() const {
     return m_pDefaultMark;
 }
 
+void WaveformMarkSet::setBreadth(float breadth) {
+    for (auto& pMark : m_marks) {
+        pMark->setBreadth(breadth);
+    }
+}
+
 void WaveformMarkSet::update() {
     std::map<WaveformMarkSortKey, WaveformMarkPointer> map;
     for (const auto& pMark : std::as_const(m_marks)) {
@@ -77,7 +87,7 @@ void WaveformMarkSet::update() {
                 // Create a stable key for sorting, because the WaveformMark's samplePosition is a
                 // ControlObject which can change at any time by other threads. Such a change causes
                 // another updateCues() call, rebuilding map.
-                auto key = WaveformMarkSortKey(samplePosition, pMark->getHotCue());
+                auto key = WaveformMarkSortKey(samplePosition, pMark->getPriority());
                 map.emplace(key, pMark);
             }
         }
@@ -89,6 +99,16 @@ void WaveformMarkSet::update() {
             map.end(),
             std::back_inserter(m_marksToRender),
             [](auto const& pair) { return pair.second; });
+
+    double prevSamplePosition = Cue::kNoPosition;
+    std::map<Qt::Alignment, int> levels;
+    for (auto& pMark : m_marksToRender) {
+        if (pMark->getSamplePosition() != prevSamplePosition) {
+            prevSamplePosition = pMark->getSamplePosition();
+            levels.clear();
+        }
+        pMark->setLevel(levels[pMark->m_align]++);
+    }
 }
 
 WaveformMarkPointer WaveformMarkSet::findHoveredMark(
diff --git a/src/waveform/renderers/waveformmarkset.h b/src/waveform/renderers/waveformmarkset.h
index faadf3a37fc..2ab37568f2f 100644
--- a/src/waveform/renderers/waveformmarkset.h
+++ b/src/waveform/renderers/waveformmarkset.h
@@ -65,6 +65,8 @@ class WaveformMarkSet {
 
     void update();
 
+    void setBreadth(float breadth);
+
   private:
     void clear() {
         m_marks.clear();
diff --git a/src/waveform/renderers/waveformrendermark.cpp b/src/waveform/renderers/waveformrendermark.cpp
index e7aeb8474ab..1b8aeb469aa 100644
--- a/src/waveform/renderers/waveformrendermark.cpp
+++ b/src/waveform/renderers/waveformrendermark.cpp
@@ -1,10 +1,7 @@
 #include "waveform/renderers/waveformrendermark.h"
 
-#include "moc_waveformrendermark.cpp"
-#include "track/track.h"
 #include "util/painterscope.h"
 #include "waveform/renderers/waveformwidgetrenderer.h"
-#include "widget/wimagestore.h"
 
 class ImageGraphics : public WaveformMark::Graphics {
     QImage m_image;
@@ -20,13 +17,8 @@ class ImageGraphics : public WaveformMark::Graphics {
 };
 
 WaveformRenderMark::WaveformRenderMark(
-        WaveformWidgetRenderer* waveformWidgetRenderer) :
-    WaveformRendererAbstract(waveformWidgetRenderer) {
-}
-
-void WaveformRenderMark::setup(const QDomNode& node, const SkinContext& context) {
-    WaveformSignalColors signalColors = *m_waveformRenderer->getWaveformSignalColors();
-    m_marks.setup(m_waveformRenderer->getGroup(), node, context, signalColors);
+        WaveformWidgetRenderer* waveformWidgetRenderer)
+        : WaveformRenderMarkBase(waveformWidgetRenderer, true) {
 }
 
 void WaveformRenderMark::draw(QPainter* painter, QPaintEvent* /*event*/) {
@@ -37,12 +29,6 @@ void WaveformRenderMark::draw(QPainter* painter, QPaintEvent* /*event*/) {
     painter->setWorldMatrixEnabled(false);
 
     for (const auto& pMark : std::as_const(m_marks)) {
-        // Generate image on first paint can't be done in setup since we need to
-        // wait for the render widget to be resized yet.
-        if (!pMark->m_pGraphics || pMark->m_pGraphics->m_obsolete) {
-            generateMarkImage(pMark);
-        }
-
         const QImage& image = static_cast<ImageGraphics*>(pMark->m_pGraphics.get())->image();
 
         const double samplePosition = pMark->getSamplePosition();
@@ -149,72 +135,13 @@ void WaveformRenderMark::draw(QPainter* painter, QPaintEvent* /*event*/) {
     m_waveformRenderer->setMarkPositions(marksOnScreen);
 }
 
-void WaveformRenderMark::onResize() {
-    // Flag that the mark image has to be updated. New images will be created on next paint.
-    for (const auto& pMark : std::as_const(m_marks)) {
-        if (pMark->m_pGraphics) {
-            pMark->m_pGraphics->m_obsolete = true;
-        }
-    }
-}
-
-void WaveformRenderMark::onSetTrack() {
-    slotCuesUpdated();
-
-    const TrackPointer pTrackInfo = m_waveformRenderer->getTrackInfo();
-    if (!pTrackInfo) {
-        return;
-    }
-    connect(pTrackInfo.get(),
-            &Track::cuesUpdated,
-            this,
-            &WaveformRenderMark::slotCuesUpdated);
-}
-
-void WaveformRenderMark::slotCuesUpdated() {
-    const TrackPointer pTrackInfo = m_waveformRenderer->getTrackInfo();
-    if (!pTrackInfo) {
-        return;
-    }
-
-    QList<CuePointer> loadedCues = pTrackInfo->getCuePoints();
-    for (const CuePointer& pCue : loadedCues) {
-        int hotCue = pCue->getHotCue();
-        if (hotCue == Cue::kNoHotCue) {
-            continue;
-        }
-
-        // Here we assume no two cues can have the same hotcue assigned,
-        // because WaveformMarkSet stores one mark for each hotcue.
-        WaveformMarkPointer pMark = m_marks.getHotCueMark(hotCue);
-        if (pMark.isNull()) {
-            continue;
-        }
-
-        QString newLabel = pCue->getLabel();
-        QColor newColor = mixxx::RgbColor::toQColor(pCue->getColor());
-        if (pMark->m_text.isNull() || newLabel != pMark->m_text ||
-                !pMark->fillColor().isValid() ||
-                newColor != pMark->fillColor()) {
-            pMark->m_text = newLabel;
-            int dimBrightThreshold = m_waveformRenderer->getDimBrightThreshold();
-            pMark->setBaseColor(newColor, dimBrightThreshold);
-            generateMarkImage(pMark);
-        }
-    }
-
-    m_marks.update();
-}
-
-void WaveformRenderMark::generateMarkImage(WaveformMarkPointer pMark) {
+void WaveformRenderMark::updateMarkImage(WaveformMarkPointer pMark) {
     if (m_waveformRenderer->getOrientation() == Qt::Horizontal) {
         pMark->m_pGraphics = std::make_unique<ImageGraphics>(
-                pMark->generateImage(m_waveformRenderer->getBreadth(),
-                        m_waveformRenderer->getDevicePixelRatio()));
+                pMark->generateImage(m_waveformRenderer->getDevicePixelRatio()));
     } else {
         pMark->m_pGraphics = std::make_unique<ImageGraphics>(
-                pMark->generateImage(m_waveformRenderer->getBreadth(),
-                             m_waveformRenderer->getDevicePixelRatio())
+                pMark->generateImage(m_waveformRenderer->getDevicePixelRatio())
                         .transformed(QTransform().rotate(90)));
     }
 }
diff --git a/src/waveform/renderers/waveformrendermark.h b/src/waveform/renderers/waveformrendermark.h
index 1419194e89b..2bf284223f1 100644
--- a/src/waveform/renderers/waveformrendermark.h
+++ b/src/waveform/renderers/waveformrendermark.h
@@ -1,36 +1,15 @@
 #pragma once
 
-#include <QObject>
-
-#include "skin/legacy/skincontext.h"
-#include "util/class.h"
-#include "waveform/renderers/waveformmarkset.h"
-#include "waveform/renderers/waveformrendererabstract.h"
-
-class WaveformRenderMark : public QObject, public WaveformRendererAbstract {
-    Q_OBJECT
+#include "waveform/renderers/waveformrendermarkbase.h"
 
+class WaveformRenderMark : public WaveformRenderMarkBase {
   public:
     explicit WaveformRenderMark(WaveformWidgetRenderer* waveformWidgetRenderer);
 
-    void setup(const QDomNode& node, const SkinContext& context) override;
     void draw(QPainter* painter, QPaintEvent* event) override;
 
-    void onResize() override;
-
-    // Called when a new track is loaded.
-    void onSetTrack() override;
-
-  public slots:
-    // Called when the loaded track's cues are added, deleted or modified and
-    // when a new track is loaded.
-    // It updates the marks' names and regenerates their image if needed.
-    // This method is used for hotcues.
-    void slotCuesUpdated();
-
   private:
-    void generateMarkImage(WaveformMarkPointer pMark);
+    void updateMarkImage(WaveformMarkPointer pMark) override;
 
-    WaveformMarkSet m_marks;
     DISALLOW_COPY_AND_ASSIGN(WaveformRenderMark);
 };
diff --git a/src/waveform/renderers/waveformrendermarkbase.cpp b/src/waveform/renderers/waveformrendermarkbase.cpp
new file mode 100644
index 00000000000..4b49840a36f
--- /dev/null
+++ b/src/waveform/renderers/waveformrendermarkbase.cpp
@@ -0,0 +1,95 @@
+#include "waveform/renderers/waveformrendermarkbase.h"
+#include "moc_waveformrendermarkbase.cpp"
+#include "track/track.h"
+#include "waveform/renderers/waveformwidgetrenderer.h"
+
+WaveformRenderMarkBase::WaveformRenderMarkBase(
+        WaveformWidgetRenderer* waveformWidgetRenderer,
+        bool updateImagesImmediately)
+        : WaveformRendererAbstract(waveformWidgetRenderer),
+          m_updateImagesImmediately(updateImagesImmediately) {
+}
+
+void WaveformRenderMarkBase::setup(const QDomNode& node, const SkinContext& context) {
+    WaveformSignalColors signalColors = *m_waveformRenderer->getWaveformSignalColors();
+    m_marks.setup(m_waveformRenderer->getGroup(), node, context, signalColors);
+    m_marks.connectSamplePositionChanged(this, &WaveformRenderMarkBase::onMarkChanged);
+    m_marks.connectSampleEndPositionChanged(this, &WaveformRenderMarkBase::onMarkChanged);
+    m_marks.connectVisibleChanged(this, &WaveformRenderMarkBase::onMarkChanged);
+}
+
+void WaveformRenderMarkBase::onSetTrack() {
+    updateMarksFromCues();
+
+    const TrackPointer pTrackInfo = m_waveformRenderer->getTrackInfo();
+    if (!pTrackInfo) {
+        return;
+    }
+
+    connect(pTrackInfo.get(),
+            &Track::cuesUpdated,
+            this,
+            &WaveformRenderMarkBase::slotCuesUpdated);
+}
+
+void WaveformRenderMarkBase::onResize() {
+    m_marks.setBreadth(m_waveformRenderer->getBreadth());
+    if (m_updateImagesImmediately) {
+        updateMarkImages();
+    }
+}
+
+void WaveformRenderMarkBase::onMarkChanged(double v) {
+    Q_UNUSED(v);
+
+    updateMarks();
+}
+
+void WaveformRenderMarkBase::slotCuesUpdated() {
+    updateMarksFromCues();
+}
+
+void WaveformRenderMarkBase::updateMarksFromCues() {
+    const TrackPointer pTrackInfo = m_waveformRenderer->getTrackInfo();
+    if (!pTrackInfo) {
+        return;
+    }
+
+    const int dimBrightThreshold = m_waveformRenderer->getDimBrightThreshold();
+    QList<CuePointer> loadedCues = pTrackInfo->getCuePoints();
+    for (const CuePointer& pCue : loadedCues) {
+        const int hotCue = pCue->getHotCue();
+        if (hotCue == Cue::kNoHotCue) {
+            continue;
+        }
+
+        // Here we assume no two cues can have the same hotcue assigned,
+        // because WaveformMarkSet stores one mark for each hotcue.
+        WaveformMarkPointer pMark = m_marks.getHotCueMark(hotCue);
+        if (pMark.isNull()) {
+            continue;
+        }
+
+        QString newLabel = pCue->getLabel();
+        QColor newColor = mixxx::RgbColor::toQColor(pCue->getColor());
+        pMark->setText(newLabel);
+        pMark->setBaseColor(newColor, dimBrightThreshold);
+    }
+
+    updateMarks();
+}
+
+void WaveformRenderMarkBase::updateMarks() {
+    m_marks.update();
+    if (m_updateImagesImmediately) {
+        updateMarkImages();
+    }
+}
+
+void WaveformRenderMarkBase::updateMarkImages() {
+    for (auto& pMark : m_marks) {
+        if (pMark->needsImageUpdate()) {
+            updateMarkImage(pMark);
+        }
+    }
+}
diff --git a/src/waveform/renderers/waveformrendermarkbase.h b/src/waveform/renderers/waveformrendermarkbase.h
new file mode 100644
index 00000000000..b5e4d51dd25
--- /dev/null
+++ b/src/waveform/renderers/waveformrendermarkbase.h
@@ -0,0 +1,51 @@
+#pragma once
+
+#include <QObject>
+
+#include "skin/legacy/skincontext.h"
+#include "util/class.h"
+#include "waveform/renderers/waveformmarkset.h"
+#include "waveform/renderers/waveformrendererabstract.h"
+
+class WaveformRenderMarkBase : public QObject, public WaveformRendererAbstract {
+    Q_OBJECT
+
+  public:
+    explicit WaveformRenderMarkBase(
+            WaveformWidgetRenderer* waveformWidgetRenderer,
+            bool updateImagesImmediately);
+
+    void setup(const QDomNode& node, const SkinContext& context) override;
+
+    // Called when a new track is loaded.
+    void onSetTrack() override;
+
+    void onResize() override;
+
+  public slots:
+    // Called when the loaded track's cues are added, deleted or modified and
+    // when a new track is loaded.
+    // It updates the marks' names and flags the need for an image update.
+    // This method is used for hotcues.
+    void slotCuesUpdated();
+
+  private slots:
+    // Called when a mark position or visibility changes
+    void onMarkChanged(double v);
+
+  protected:
+    WaveformMarkSet m_marks;
+
+    void updateMarkImages();
+
+  private:
+    const bool m_updateImagesImmediately;
+
+    void updateMarksFromCues();
+    void updateMarks();
+
+  private:
+    virtual void updateMarkImage(WaveformMarkPointer pMark) = 0;
+
+    DISALLOW_COPY_AND_ASSIGN(WaveformRenderMarkBase);
+};
diff --git a/src/waveform/renderers/waveformwidgetrenderer.cpp b/src/waveform/renderers/waveformwidgetrenderer.cpp
index dc93dd34bfd..81685e2b7a5 100644
--- a/src/waveform/renderers/waveformwidgetrenderer.cpp
+++ b/src/waveform/renderers/waveformwidgetrenderer.cpp
@@ -350,7 +350,7 @@ void WaveformWidgetRenderer::setPassThroughEnabled(bool enabled) {
     }
 }
 
-void WaveformWidgetRenderer::resize(int width, int height, float devicePixelRatio) {
+void WaveformWidgetRenderer::resizeRenderer(int width, int height, float devicePixelRatio) {
     m_width = width;
     m_height = height;
     m_devicePixelRatio = devicePixelRatio;
diff --git a/src/waveform/renderers/waveformwidgetrenderer.h b/src/waveform/renderers/waveformwidgetrenderer.h
index 927bce8ad5c..0928ff9b130 100644
--- a/src/waveform/renderers/waveformwidgetrenderer.h
+++ b/src/waveform/renderers/waveformwidgetrenderer.h
@@ -115,7 +115,8 @@ class WaveformWidgetRenderer {
         return m_alphaBeatGrid;
     }
 
-    void resize(int width, int height, float devicePixelRatio);
+    virtual void resizeRenderer(int width, int height, float devicePixelRatio);
+
     int getHeight() const {
         return m_height;
     }
diff --git a/src/waveform/widgets/glslwaveformwidget.cpp b/src/waveform/widgets/glslwaveformwidget.cpp
index 65fc318b726..1790c143ad2 100644
--- a/src/waveform/widgets/glslwaveformwidget.cpp
+++ b/src/waveform/widgets/glslwaveformwidget.cpp
@@ -84,10 +84,10 @@ mixxx::Duration GLSLWaveformWidget::render() {
     return t1; // return timer for painter setup
 }
 
-void GLSLWaveformWidget::resize(int width, int height) {
+void GLSLWaveformWidget::resizeRenderer(int width, int height, float devicePixelRatio) {
     // NOTE: (vrince) this is needed since we allocation buffer on resize
     // and the Gl Context should be properly set
     makeCurrentIfNeeded();
-    WaveformWidgetAbstract::resize(width, height);
+    WaveformWidgetRenderer::resizeRenderer(width, height, devicePixelRatio);
     doneCurrent();
 }
diff --git a/src/waveform/widgets/glslwaveformwidget.h b/src/waveform/widgets/glslwaveformwidget.h
index ccfbf3169ae..126c82e2221 100644
--- a/src/waveform/widgets/glslwaveformwidget.h
+++ b/src/waveform/widgets/glslwaveformwidget.h
@@ -17,7 +17,7 @@ class GLSLWaveformWidget : public GLWaveformWidgetAbstract {
             GlslType type);
     ~GLSLWaveformWidget() override = default;
 
-    void resize(int width, int height) override;
+    void resizeRenderer(int width, int height, float devicePixelRatio) override;
 
   protected:
     void castToQWidget() override;
diff --git a/src/waveform/widgets/waveformwidgetabstract.cpp b/src/waveform/widgets/waveformwidgetabstract.cpp
index f3dc9166cf8..d678d4635f4 100644
--- a/src/waveform/widgets/waveformwidgetabstract.cpp
+++ b/src/waveform/widgets/waveformwidgetabstract.cpp
@@ -43,5 +43,5 @@ void WaveformWidgetAbstract::resize(int width, int height) {
         m_widget->resize(width, height);
         devicePixelRatio = m_widget->devicePixelRatioF();
     }
-    WaveformWidgetRenderer::resize(width, height, static_cast<float>(devicePixelRatio));
+    resizeRenderer(width, height, static_cast<float>(devicePixelRatio));
 }
diff --git a/src/widget/wwaveformviewer.cpp b/src/widget/wwaveformviewer.cpp
index 2c400ec5150..34ff9027bdd 100644
--- a/src/widget/wwaveformviewer.cpp
+++ b/src/widget/wwaveformviewer.cpp
@@ -52,17 +52,30 @@ WWaveformViewer::~WWaveformViewer() {
 void WWaveformViewer::setup(const QDomNode& node, const SkinContext& context) {
     if (m_waveformWidget) {
         m_waveformWidget->setup(node, context);
+        m_dimBrightThreshold = m_waveformWidget->getDimBrightThreshold();
     }
-    m_dimBrightThreshold = m_waveformWidget->getDimBrightThreshold();
 }
 
 void WWaveformViewer::resizeEvent(QResizeEvent* event) {
     Q_UNUSED(event);
     if (m_waveformWidget) {
+        // Note m_waveformWidget is a WaveformWidgetAbstract,
+        // so this calls the method of WaveformWidgetAbstract,
+        // note of the derived waveform widgets which are also
+        // a QWidget, though that will be called directly.
         m_waveformWidget->resize(width(), height());
     }
 }
 
+void WWaveformViewer::showEvent(QShowEvent* event) {
+    if (m_waveformWidget) {
+        // We leave it up to Qt to set the size of the derived
+        // waveform widget, but we still need to set the size
+        // of the renderer.
+        m_waveformWidget->resizeRenderer(width(), height(), devicePixelRatioF());
+    }
+}
+
 void WWaveformViewer::mousePressEvent(QMouseEvent* event) {
     if (!m_waveformWidget) {
         return;
diff --git a/src/widget/wwaveformviewer.h b/src/widget/wwaveformviewer.h
index 505288ed974..fddf802bca5 100644
--- a/src/widget/wwaveformviewer.h
+++ b/src/widget/wwaveformviewer.h
@@ -46,6 +46,7 @@ class WWaveformViewer : public WWidget, public TrackDropTarget {
     void slotLoadingTrack(TrackPointer pNewTrack, TrackPointer pOldTrack);
 
   protected:
+    void showEvent(QShowEvent* event) override;
     void resizeEvent(QResizeEvent *event) override;
     void wheelEvent(QWheelEvent *event) override;
 

From c34a91bb8c2298ffd867d4f97cdcecb7e328925b Mon Sep 17 00:00:00 2001
From: Joerg <JoergAtGithub@worldwartweb.com>
Date: Sat, 18 Nov 2023 11:37:47 +0100
Subject: [PATCH 281/388] Update libdjinterop to the latest release 0.20.1

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42cd3f9f02a..739d94e16c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2290,7 +2290,7 @@ option(ENGINEPRIME "Support for library export to Denon Engine Prime" ON)
 if(ENGINEPRIME)
   # libdjinterop does not currently have a stable ABI, so we fetch sources for a specific tag, build here, and link
   # statically.  This situation should be reviewed once libdjinterop hits version 1.x.
-  set(LIBDJINTEROP_VERSION 0.20.0)
+  set(LIBDJINTEROP_VERSION 0.20.1)
   # Look whether an existing installation of libdjinterop matches the required version.
   find_package(DjInterop  ${LIBDJINTEROP_VERSION} EXACT CONFIG)
   if(NOT DjInterop_FOUND)
@@ -2326,7 +2326,7 @@ if(ENGINEPRIME)
       URL
         "https://github.com/xsco/libdjinterop/archive/refs/tags/${LIBDJINTEROP_VERSION}.tar.gz"
         "https://launchpad.net/~xsco/+archive/ubuntu/djinterop/+sourcefiles/libdjinterop/${LIBDJINTEROP_VERSION}-0ubuntu1/libdjinterop_${LIBDJINTEROP_VERSION}.orig.tar.gz"
-      URL_HASH SHA256=0cf85b30629b59277437e2be7e8073c22797e8749920ba2dd5e72c21e14d68db
+      URL_HASH SHA256=69bdbd0e68f12858b79795a76a6023962f93f819ca36ea56a9d4680901865d13
       DOWNLOAD_DIR "${CMAKE_CURRENT_BINARY_DIR}/downloads"
       DOWNLOAD_NAME "libdjinterop-${LIBDJINTEROP_VERSION}.tar.gz"
       INSTALL_DIR ${DJINTEROP_INSTALL_DIR}

From e3c585b1f1878d5e992dfe0d90e1886bf385b7e4 Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Sat, 18 Nov 2023 12:24:01 +0100
Subject: [PATCH 282/388] fix gcc compilation

---
 src/widget/wwaveformviewer.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/widget/wwaveformviewer.cpp b/src/widget/wwaveformviewer.cpp
index 34ff9027bdd..240fee3ba85 100644
--- a/src/widget/wwaveformviewer.cpp
+++ b/src/widget/wwaveformviewer.cpp
@@ -68,11 +68,13 @@ void WWaveformViewer::resizeEvent(QResizeEvent* event) {
 }
 
 void WWaveformViewer::showEvent(QShowEvent* event) {
+    Q_UNUSED(event);
     if (m_waveformWidget) {
         // We leave it up to Qt to set the size of the derived
         // waveform widget, but we still need to set the size
         // of the renderer.
-        m_waveformWidget->resizeRenderer(width(), height(), devicePixelRatioF());
+        m_waveformWidget->resizeRenderer(
+                width(), height(), static_cast<float>(devicePixelRatioF()));
     }
 }
 

From d16dcc8d9abdd5c4f3f2e226cf67226e55878647 Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Sat, 18 Nov 2023 12:32:32 +0100
Subject: [PATCH 283/388] formatting

---
 src/waveform/renderers/waveformrendermarkbase.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/waveform/renderers/waveformrendermarkbase.cpp b/src/waveform/renderers/waveformrendermarkbase.cpp
index 4b49840a36f..0c8904bb3bf 100644
--- a/src/waveform/renderers/waveformrendermarkbase.cpp
+++ b/src/waveform/renderers/waveformrendermarkbase.cpp
@@ -1,4 +1,5 @@
 #include "waveform/renderers/waveformrendermarkbase.h"
+
 #include "moc_waveformrendermarkbase.cpp"
 #include "track/track.h"
 #include "waveform/renderers/waveformwidgetrenderer.h"

From 260711136ad924d144080b2f83dec4fb83c00ff5 Mon Sep 17 00:00:00 2001
From: Uwe Klotz <uwe.klotz@gmail.com>
Date: Sun, 19 Nov 2023 14:26:33 +0100
Subject: [PATCH 284/388] WWaveformViewer: Fix invalid DirectConnection

---
 src/widget/wwaveformviewer.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/widget/wwaveformviewer.cpp b/src/widget/wwaveformviewer.cpp
index 2c400ec5150..4722a2904df 100644
--- a/src/widget/wwaveformviewer.cpp
+++ b/src/widget/wwaveformviewer.cpp
@@ -37,9 +37,7 @@ WWaveformViewer::WWaveformViewer(
             group, "wheel", this, ControlFlag::NoAssertIfMissing);
     m_pPlayEnabled = new ControlProxy(group, "play", this, ControlFlag::NoAssertIfMissing);
     m_pPassthroughEnabled = make_parented<ControlProxy>(group, "passthrough", this);
-    m_pPassthroughEnabled->connectValueChanged(this,
-            &WWaveformViewer::passthroughChanged,
-            Qt::DirectConnection);
+    m_pPassthroughEnabled->connectValueChanged(this, &WWaveformViewer::passthroughChanged);
 
     setAttribute(Qt::WA_OpaquePaintEvent);
     setFocusPolicy(Qt::NoFocus);

From 6e2216842541b747238349413c37b6698d7f296c Mon Sep 17 00:00:00 2001
From: Uwe Klotz <uwe.klotz@gmail.com>
Date: Sun, 19 Nov 2023 14:26:43 +0100
Subject: [PATCH 285/388] WWaveformViewer: Simplify widget connection

---
 src/widget/wwaveformviewer.cpp | 11 +++++++++--
 src/widget/wwaveformviewer.h   |  3 ---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/widget/wwaveformviewer.cpp b/src/widget/wwaveformviewer.cpp
index 4722a2904df..7363623cb50 100644
--- a/src/widget/wwaveformviewer.cpp
+++ b/src/widget/wwaveformviewer.cpp
@@ -258,12 +258,19 @@ void WWaveformViewer::setPlayMarkerPosition(double position) {
 void WWaveformViewer::setWaveformWidget(WaveformWidgetAbstract* waveformWidget) {
     if (m_waveformWidget) {
         QWidget* pWidget = m_waveformWidget->getWidget();
-        disconnect(pWidget, &QWidget::destroyed, this, &WWaveformViewer::slotWidgetDead);
+        disconnect(pWidget);
     }
     m_waveformWidget = waveformWidget;
     if (m_waveformWidget) {
         QWidget* pWidget = m_waveformWidget->getWidget();
-        connect(pWidget, &QWidget::destroyed, this, &WWaveformViewer::slotWidgetDead);
+        DEBUG_ASSERT(pWidget);
+        connect(pWidget,
+                &QWidget::destroyed,
+                this,
+                [this]() {
+                    // The pointer must be considered as dangling!
+                    m_waveformWidget = nullptr;
+                });
         m_waveformWidget->getWidget()->setMouseTracking(true);
 #ifdef MIXXX_USE_QOPENGL
         if (m_waveformWidget->getGLWidget()) {
diff --git a/src/widget/wwaveformviewer.h b/src/widget/wwaveformviewer.h
index 505288ed974..02d14ccefa0 100644
--- a/src/widget/wwaveformviewer.h
+++ b/src/widget/wwaveformviewer.h
@@ -51,9 +51,6 @@ class WWaveformViewer : public WWidget, public TrackDropTarget {
 
   private slots:
     void onZoomChange(double zoom);
-    void slotWidgetDead() {
-        m_waveformWidget = nullptr;
-    }
 
   private:
     void setWaveformWidget(WaveformWidgetAbstract* waveformWidget);

From 47204a6a4a1a4de57da9b58e8c31e768ec26cacd Mon Sep 17 00:00:00 2001
From: Uwe Klotz <uwe.klotz@gmail.com>
Date: Sun, 19 Nov 2023 14:41:47 +0100
Subject: [PATCH 286/388] WWaveformViewer: Fix invalid widget access

---
 src/widget/wwaveformviewer.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/widget/wwaveformviewer.cpp b/src/widget/wwaveformviewer.cpp
index 7363623cb50..67a4608df64 100644
--- a/src/widget/wwaveformviewer.cpp
+++ b/src/widget/wwaveformviewer.cpp
@@ -50,8 +50,8 @@ WWaveformViewer::~WWaveformViewer() {
 void WWaveformViewer::setup(const QDomNode& node, const SkinContext& context) {
     if (m_waveformWidget) {
         m_waveformWidget->setup(node, context);
+        m_dimBrightThreshold = m_waveformWidget->getDimBrightThreshold();
     }
-    m_dimBrightThreshold = m_waveformWidget->getDimBrightThreshold();
 }
 
 void WWaveformViewer::resizeEvent(QResizeEvent* event) {
@@ -246,7 +246,9 @@ void WWaveformViewer::setZoom(double zoom) {
 }
 
 void WWaveformViewer::setDisplayBeatGridAlpha(int alpha) {
-    m_waveformWidget->setDisplayBeatGridAlpha(alpha);
+    if (m_waveformWidget) {
+        m_waveformWidget->setDisplayBeatGridAlpha(alpha);
+    }
 }
 
 void WWaveformViewer::setPlayMarkerPosition(double position) {

From 476b554afb57127007aef5fe60d69d56793153e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sun, 19 Nov 2023 17:51:02 +0100
Subject: [PATCH 287/388] Impove Includes

---
 src/preferences/colorpaletteeditormodel.cpp       | 4 +---
 src/util/rangelist.cpp                            | 4 ++--
 src/waveform/renderers/waveformrendererabstract.h | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/preferences/colorpaletteeditormodel.cpp b/src/preferences/colorpaletteeditormodel.cpp
index 0e42ef6802c..9f2ac1c2a72 100644
--- a/src/preferences/colorpaletteeditormodel.cpp
+++ b/src/preferences/colorpaletteeditormodel.cpp
@@ -1,8 +1,5 @@
 #include "preferences/colorpaletteeditormodel.h"
 
-#include <util/assert.h>
-#include <util/rangelist.h>
-
 #include <QList>
 #include <QMap>
 #include <QMultiMap>
@@ -10,6 +7,7 @@
 
 #include "engine/controls/cuecontrol.h"
 #include "moc_colorpaletteeditormodel.cpp"
+#include "util/rangelist.h"
 
 namespace {
 
diff --git a/src/util/rangelist.cpp b/src/util/rangelist.cpp
index 23576b8e8de..731d1253862 100644
--- a/src/util/rangelist.cpp
+++ b/src/util/rangelist.cpp
@@ -1,10 +1,10 @@
 #include "rangelist.h"
 
-#include <util/assert.h>
-
 #include <QRegularExpression>
 #include <algorithm>
 
+#include "util/assert.h"
+
 namespace {
 
 const QString kGroupSeparator = QStringLiteral(", ");
diff --git a/src/waveform/renderers/waveformrendererabstract.h b/src/waveform/renderers/waveformrendererabstract.h
index fc1f9027f4a..a4687986884 100644
--- a/src/waveform/renderers/waveformrendererabstract.h
+++ b/src/waveform/renderers/waveformrendererabstract.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <qglobal.h>
+#include <QtGlobal>
 
 QT_FORWARD_DECLARE_CLASS(QDomNode)
 QT_FORWARD_DECLARE_CLASS(QPaintEvent)

From 2834dbcdd1ca69a83b7f78974f7cca55251997f2 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Thu, 9 Nov 2023 22:37:41 +0100
Subject: [PATCH 288/388] Effects: center Super knob when loading empty
 (QuickEffect) chain preset

---
 src/effects/presets/effectchainpresetmanager.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/effects/presets/effectchainpresetmanager.cpp b/src/effects/presets/effectchainpresetmanager.cpp
index 011f5a76c69..3278501b7ca 100644
--- a/src/effects/presets/effectchainpresetmanager.cpp
+++ b/src/effects/presets/effectchainpresetmanager.cpp
@@ -41,6 +41,8 @@ EffectChainPresetPointer loadPresetFromFile(const QString& filePath) {
 EffectChainPresetPointer createEmptyChainPreset() {
     EffectManifestPointer pEmptyManifest(new EffectManifest());
     pEmptyManifest->setName(kNoEffectString);
+    // Center the Super knob, eliminates the colored (bipolar) knob ring
+    pEmptyManifest->setMetaknobDefault(0.5);
     // Required for the QuickEffect selector in DlgPrefEQ
     pEmptyManifest->setShortName(kNoEffectString);
     auto pEmptyChainPreset =

From 02925160bdc453f8873a47fd33a61a9a34fc20bf Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Mon, 20 Nov 2023 15:37:19 +0100
Subject: [PATCH 289/388] Tracks table: avoid wrong pre-selection with no
 tracks selected previously

---
 src/widget/wlibrarytableview.cpp | 8 ++++----
 src/widget/wtracktableview.cpp   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/widget/wlibrarytableview.cpp b/src/widget/wlibrarytableview.cpp
index 4964136f9d6..28734f46996 100644
--- a/src/widget/wlibrarytableview.cpp
+++ b/src/widget/wlibrarytableview.cpp
@@ -21,8 +21,8 @@ constexpr int kModelCacheSize = 1000;
 WLibraryTableView::WLibraryTableView(QWidget* parent,
         UserSettingsPointer pConfig)
         : QTableView(parent),
-          m_prevRow(0),
-          m_prevColumn(0),
+          m_prevRow(-1),
+          m_prevColumn(-1),
           m_pConfig(pConfig),
           m_modelStateCache(kModelCacheSize) {
     // Setup properties for table
@@ -212,8 +212,8 @@ void WLibraryTableView::restoreCurrentIndex(const QModelIndex& index) {
         pSelectionModel->setCurrentIndex(idx, QItemSelectionModel::NoUpdate);
         scrollTo(idx);
     }
-    m_prevRow = 0;
-    m_prevColumn = 0;
+    m_prevRow = -1;
+    m_prevColumn = -1;
 }
 
 void WLibraryTableView::setTrackTableFont(const QFont& font) {
diff --git a/src/widget/wtracktableview.cpp b/src/widget/wtracktableview.cpp
index 4f1afb18266..dd6020ef0af 100644
--- a/src/widget/wtracktableview.cpp
+++ b/src/widget/wtracktableview.cpp
@@ -215,7 +215,7 @@ void WTrackTableView::loadTrackModel(QAbstractItemModel* model, bool restoreStat
     // tableview is focused -- and would not restore the previous style when
     // it's unfocused. This can not be overwritten with qss, so it can screw up
     // the skin design. Also, due to selectionModel()->selectedRows() it is not
-    // even useful to highlight the focused column because all colmsn are highlighted.
+    // even useful to indicate the focused column because all columns are highlighted.
     header->setHighlightSections(false);
     header->setSortIndicatorShown(m_sorting);
     header->setDefaultAlignment(Qt::AlignLeft);

From 0345b3cc9039512bfd81e3f744ec3a9e07e025ab Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Mon, 20 Nov 2023 15:45:13 +0100
Subject: [PATCH 290/388] Korg nanoKontrol2: don't try to configure more than 4
 main decks

---
 res/controllers/Korg-nanoKONTROL-2-scripts.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/res/controllers/Korg-nanoKONTROL-2-scripts.js b/res/controllers/Korg-nanoKONTROL-2-scripts.js
index 14c8c6c4ac0..192e6b4502e 100644
--- a/res/controllers/Korg-nanoKONTROL-2-scripts.js
+++ b/res/controllers/Korg-nanoKONTROL-2-scripts.js
@@ -1,7 +1,7 @@
 function NK2() {}
 NK2.debug=0;//set debug level
 NK2.LEDflasheson=true;//false disables led flash timers for debugging purposes
-NK2.numDecks=8;//set to 8 for all [Channels], to 4 for 4 [Channels] and 4 [Samplers], and to 2 for 2 [Channels] and 6 [Samplers]
+NK2.numDecks=4;//set to 4 for 4 [Channels] and 4 [Samplers], and to 2 for 2 [Channels] and 6 [Samplers]
 //############################################################################
 //defaults
 //############################################################################
@@ -36,9 +36,7 @@ NK2.leftButton={"trdown":0x3A,"trup":0x3B,"cycle":0x2E,"mset":0x3C,"mdown":0x3D,
 NK2.faders={0x00:1,0x01:2,0x02:3,0x03:4,0x04:5,0x05:6,0x06:7,0x07:8};
 
 //initialize decks
-if (NK2.numDecks==8){
-    NK2.Deck={1:"[Channel1]",2:"[Channel2]",3:"[Channel3]",4:"[Channel4]",5:"[Channel5]",6:"[Channel6]",7:"[Channel7]",8:"[Channel8]"};//list of decks, applied to each strip - 8 strips, 8 decks.  (8 decks, 0 samplers)
-}else if (NK2.numDecks==4){
+if (NK2.numDecks==4){
     NK2.Deck={1:"[Channel1]",2:"[Channel2]",3:"[Channel3]",4:"[Channel4]",5:"[Sampler1]",6:"[Sampler2]",7:"[Sampler3]",8:"[Sampler4]"};//list of decks, applied to each strip - 8 strips, 8 decks.  (4 decks, 4 samplers)
 }else if (NK2.numDecks==2){
     NK2.Deck={1:"[Channel1]",2:"[Channel2]",3:"[Sampler1]",4:"[Sampler2]",5:"[Sampler3]",6:"[Sampler4]",7:"[Sampler5]",8:"[Sampler6]"};//list of decks, applied to each strip - 8 strips, 8 decks.  (2 decks, 6 samplers)

From e154c5b03fe18bd30e452cc02e62a5a850901036 Mon Sep 17 00:00:00 2001
From: foss- <github@disr.it>
Date: Sat, 18 Nov 2023 17:04:53 +0100
Subject: [PATCH 291/388] Update README.md: added Mastodon link

adding Mastodon to the social links
---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c3a14fd98d8..78277832a91 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ Mixxx is a vibrant community of hackers, DJs and artists. To keep track of
 development and community news:
 
 - Chat with us on [Zulip][zulip].
-- Follow us on [Twitter] and [Facebook].
+- Follow us on [Mastodon], [Twitter] and [Facebook].
 - Subscribe to the [Mixxx Blog][blog].
 - Post on the [Mixxx forums][discourse].
 
@@ -88,6 +88,7 @@ license.
 [download-testing]: https://mixxx.org/download/#testing
 [issues]: https://github.com/mixxxdj/mixxx/issues
 [fileabug]: https://github.com/mixxxdj/mixxx/issues/new/choose
+[mastodon]: https://floss.social/@mixxx
 [twitter]: https://twitter.com/mixxxdj
 [facebook]: https://www.facebook.com/pages/Mixxx-DJ-Software/21723485212
 [blog]: https://mixxx.org/news/

From f16c9a45560499b804538cc7034a631cbfb362a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Wed, 11 Oct 2023 22:40:34 +0200
Subject: [PATCH 292/388] Avoid to look-up the same cover concurrently twice

---
 src/library/coverartcache.cpp   | 26 ++++++++++++--------------
 src/library/coverartcache.h     | 13 +++----------
 src/test/coverartcache_test.cpp |  4 ++--
 3 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/src/library/coverartcache.cpp b/src/library/coverartcache.cpp
index 914ca04be8d..04fb1e40342 100644
--- a/src/library/coverartcache.cpp
+++ b/src/library/coverartcache.cpp
@@ -162,10 +162,12 @@ void CoverArtCache::tryLoadCover(
     }
 
     const auto requestedCacheKey = coverInfo.cacheKey();
-    // keep a list of trackIds for which a future is currently running
+    QString cacheKey = pixmapCacheKey(requestedCacheKey, desiredWidth);
+    // keep a list of cacheKeys for which a future is currently running
     // to avoid loading the same picture again while we are loading it
-    QPair<const QObject*, mixxx::cache_key_t> requestId = qMakePair(pRequester, requestedCacheKey);
-    if (m_runningRequests.contains(requestId)) {
+    bool requestPending = m_runningRequests.contains(cacheKey);
+    m_runningRequests.insert(cacheKey, pRequester);
+    if (requestPending) {
         return;
     }
 
@@ -174,12 +176,11 @@ void CoverArtCache::tryLoadCover(
                 << "requestCover starting future for"
                 << coverInfo;
     }
-    m_runningRequests.insert(requestId);
+
     // The watcher will be deleted in coverLoaded()
     QFutureWatcher<FutureResult>* watcher = new QFutureWatcher<FutureResult>(this);
     QFuture<FutureResult> future = QtConcurrent::run(
             &CoverArtCache::loadCover,
-            pRequester,
             pTrack,
             coverInfo,
             desiredWidth);
@@ -193,7 +194,6 @@ void CoverArtCache::tryLoadCover(
 
 //static
 CoverArtCache::FutureResult CoverArtCache::loadCover(
-        const QObject* pRequester,
         TrackPointer pTrack,
         CoverInfo coverInfo,
         int desiredWidth) {
@@ -207,7 +207,6 @@ CoverArtCache::FutureResult CoverArtCache::loadCover(
             pTrack->getLocation() == coverInfo.trackLocation);
 
     auto res = FutureResult(
-            pRequester,
             coverInfo.cacheKey());
 
     CoverInfo::LoadedImage loadedImage = coverInfo.loadImage(pTrack);
@@ -258,6 +257,8 @@ void CoverArtCache::coverLoaded() {
         kLogger.trace() << "coverLoaded" << res.coverArt;
     }
 
+    QString cacheKey = pixmapCacheKey(
+            res.coverArt.cacheKey(), res.coverArt.resizedToWidth);
     QPixmap pixmap;
     if (res.coverArt.loadedImage.result != CoverInfo::LoadedImage::Result::NoImage) {
         if (res.coverArt.loadedImage.result == CoverInfo::LoadedImage::Result::Ok) {
@@ -293,18 +294,15 @@ void CoverArtCache::coverLoaded() {
             // It is very unlikely that res.coverArt.hash generates the
             // same hash for different images. Otherwise the wrong image would
             // be displayed when loaded from the cache.
-            QString cacheKey = pixmapCacheKey(
-                    res.coverArt.cacheKey(), res.coverArt.resizedToWidth);
             QPixmapCache::insert(cacheKey, pixmap);
         }
     }
 
-    m_runningRequests.remove(qMakePair(res.pRequester, res.requestedCacheKey));
-
-    if (res.pRequester) {
+    const QObject* pRequester;
+    while ((pRequester = m_runningRequests.take(cacheKey)) != nullptr) {
         emit coverFound(
-                res.pRequester,
-                std::move(res.coverArt),
+                pRequester,
+                res.coverArt,
                 pixmap);
     }
 }
diff --git a/src/library/coverartcache.h b/src/library/coverartcache.h
index dae92eeb598..22f7eefd50c 100644
--- a/src/library/coverartcache.h
+++ b/src/library/coverartcache.h
@@ -40,25 +40,18 @@ class CoverArtCache : public QObject, public Singleton<CoverArtCache> {
     // Only public for testing
     struct FutureResult {
         FutureResult()
-                : pRequester(nullptr),
-                  requestedCacheKey(CoverImageUtils::defaultCacheKey()) {
+                : requestedCacheKey(CoverImageUtils::defaultCacheKey()) {
         }
         FutureResult(
-                const QObject* pRequestorArg,
                 mixxx::cache_key_t requestedCacheKeyArg)
-                : pRequester(pRequestorArg),
-                  requestedCacheKey(requestedCacheKeyArg) {
+                : requestedCacheKey(requestedCacheKeyArg) {
         }
-
-        const QObject* pRequester;
         mixxx::cache_key_t requestedCacheKey;
-
         CoverArt coverArt;
     };
     // Load cover from path indicated in coverInfo. WARNING: This is run in a
     // worker thread.
     static FutureResult loadCover(
-            const QObject* pRequester,
             TrackPointer pTrack,
             CoverInfo coverInfo,
             int desiredWidth);
@@ -91,5 +84,5 @@ class CoverArtCache : public QObject, public Singleton<CoverArtCache> {
             const CoverInfo& info,
             int desiredWidth);
 
-    QSet<QPair<const QObject*, mixxx::cache_key_t>> m_runningRequests;
+    QMultiHash<QString, const QObject*> m_runningRequests;
 };
diff --git a/src/test/coverartcache_test.cpp b/src/test/coverartcache_test.cpp
index be9017c103d..38e84ca493c 100644
--- a/src/test/coverartcache_test.cpp
+++ b/src/test/coverartcache_test.cpp
@@ -29,7 +29,7 @@ class CoverArtCacheTest : public LibraryTest, public CoverArtCache {
         info.trackLocation = trackLocation;
 
         CoverArtCache::FutureResult res;
-        res = CoverArtCache::loadCover(nullptr, TrackPointer(), info, 0);
+        res = CoverArtCache::loadCover(TrackPointer(), info, 0);
         EXPECT_EQ(img, res.coverArt.loadedImage.image);
         EXPECT_TRUE(res.coverArt.coverLocation.isNull());
     }
@@ -47,7 +47,7 @@ class CoverArtCacheTest : public LibraryTest, public CoverArtCache {
         info.trackLocation = trackLocation;
 
         CoverArtCache::FutureResult res;
-        res = CoverArtCache::loadCover(nullptr, TrackPointer(), info, 0);
+        res = CoverArtCache::loadCover(TrackPointer(), info, 0);
         EXPECT_EQ(img, res.coverArt.loadedImage.image);
         EXPECT_QSTRING_EQ(info.coverLocation, res.coverArt.coverLocation);
     }

From 94538c23fd489bc1f3c40f567c84361cd0d81aa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Thu, 12 Oct 2023 16:14:23 +0200
Subject: [PATCH 293/388] Avoid simultaneous access of the same file for two
 diffrent width

---
 src/library/coverartcache.cpp | 39 ++++++++++++++++++++++++-----------
 src/library/coverartcache.h   |  6 +++++-
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/library/coverartcache.cpp b/src/library/coverartcache.cpp
index 04fb1e40342..ff0d7a53ba8 100644
--- a/src/library/coverartcache.cpp
+++ b/src/library/coverartcache.cpp
@@ -161,12 +161,13 @@ void CoverArtCache::tryLoadCover(
         return;
     }
 
-    const auto requestedCacheKey = coverInfo.cacheKey();
-    QString cacheKey = pixmapCacheKey(requestedCacheKey, desiredWidth);
-    // keep a list of cacheKeys for which a future is currently running
-    // to avoid loading the same picture again while we are loading it
-    bool requestPending = m_runningRequests.contains(cacheKey);
-    m_runningRequests.insert(cacheKey, pRequester);
+    const mixxx::cache_key_t requestedCacheKey = coverInfo.cacheKey();
+    // keep a list of cache keys for which a future is currently running
+    // to avoid loading the same picture again while we are loading it.
+    // This fixes also https://github.com/mixxxdj/mixxx/issues/11131 on
+    // Windows where simultaneous open the same file from two threads fails.
+    bool requestPending = m_runningRequests.contains(requestedCacheKey);
+    m_runningRequests.insert(requestedCacheKey, {pRequester, desiredWidth});
     if (requestPending) {
         return;
     }
@@ -298,11 +299,25 @@ void CoverArtCache::coverLoaded() {
         }
     }
 
-    const QObject* pRequester;
-    while ((pRequester = m_runningRequests.take(cacheKey)) != nullptr) {
-        emit coverFound(
-                pRequester,
-                res.coverArt,
-                pixmap);
+    auto runningRequests = m_runningRequests;
+    // First remove all requests for this cover that way we can
+    // re-add cover with different sizes via tryLoadCover() as usual
+    m_runningRequests.remove(res.coverArt.cacheKey());
+
+    auto i = runningRequests.find(res.coverArt.cacheKey());
+    while (i != runningRequests.end() && i.key() == res.coverArt.cacheKey()) {
+        if (i.value().desiredWidth == res.coverArt.resizedToWidth) {
+            emit coverFound(
+                    i.value().pRequester,
+                    res.coverArt,
+                    pixmap);
+        } else {
+            tryLoadCover(
+                    i.value().pRequester,
+                    nullptr,
+                    res.coverArt,
+                    i.value().desiredWidth);
+        }
+        ++i;
     }
 }
diff --git a/src/library/coverartcache.h b/src/library/coverartcache.h
index 22f7eefd50c..5f5aee09639 100644
--- a/src/library/coverartcache.h
+++ b/src/library/coverartcache.h
@@ -84,5 +84,9 @@ class CoverArtCache : public QObject, public Singleton<CoverArtCache> {
             const CoverInfo& info,
             int desiredWidth);
 
-    QMultiHash<QString, const QObject*> m_runningRequests;
+    struct RequestData {
+        const QObject* pRequester;
+        int desiredWidth;
+    };
+    QMultiHash<mixxx::cache_key_t, RequestData> m_runningRequests;
 };

From da1c0b48b0fc3b90050bba7498463d66acb355fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Wed, 22 Nov 2023 21:52:34 +0100
Subject: [PATCH 294/388] improve headers

---
 src/encoder/encoderffmpegcore.h                    | 3 +--
 src/engine/sidechain/enginenetworkstream.h         | 3 +--
 src/engine/sidechain/networkinputstreamworker.cpp  | 2 +-
 src/engine/sidechain/networkoutputstreamworker.cpp | 3 ++-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/encoder/encoderffmpegcore.h b/src/encoder/encoderffmpegcore.h
index 8eea67cb82b..e22614c3e94 100644
--- a/src/encoder/encoderffmpegcore.h
+++ b/src/encoder/encoderffmpegcore.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <encoder/encoderffmpegresample.h>
-
 extern "C" {
 #include <libavutil/opt.h>
 #include <libavcodec/avcodec.h>
@@ -24,6 +22,7 @@ extern "C" {
 #include <QLibrary>
 
 #include "encoder/encoder.h"
+#include "encoder/encoderffmpegresample.h"
 #include "track/track_decl.h"
 #include "util/types.h"
 
diff --git a/src/engine/sidechain/enginenetworkstream.h b/src/engine/sidechain/enginenetworkstream.h
index 2501456bac7..e140b56bb9c 100644
--- a/src/engine/sidechain/enginenetworkstream.h
+++ b/src/engine/sidechain/enginenetworkstream.h
@@ -1,9 +1,8 @@
 #pragma once
 
-#include <engine/sidechain/networkoutputstreamworker.h>
-
 #include <QVector>
 
+#include "engine/sidechain/networkoutputstreamworker.h"
 #include "util/types.h"
 
 class NetworkInputStreamWorker;
diff --git a/src/engine/sidechain/networkinputstreamworker.cpp b/src/engine/sidechain/networkinputstreamworker.cpp
index 62802979266..efc50fce7f2 100644
--- a/src/engine/sidechain/networkinputstreamworker.cpp
+++ b/src/engine/sidechain/networkinputstreamworker.cpp
@@ -1,4 +1,4 @@
-#include <engine/sidechain/networkinputstreamworker.h>
+#include "engine/sidechain/networkinputstreamworker.h"
 
 NetworkInputStreamWorker::NetworkInputStreamWorker() {
 }
diff --git a/src/engine/sidechain/networkoutputstreamworker.cpp b/src/engine/sidechain/networkoutputstreamworker.cpp
index 988ded84791..59c09707a54 100644
--- a/src/engine/sidechain/networkoutputstreamworker.cpp
+++ b/src/engine/sidechain/networkoutputstreamworker.cpp
@@ -1,4 +1,5 @@
-#include <engine/sidechain/networkoutputstreamworker.h>
+#include "engine/sidechain/networkoutputstreamworker.h"
+
 #include "engine/sidechain/enginenetworkstream.h"
 #include "util/logger.h"
 

From 64802f09db6bded81fda246811155de050073f98 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Wed, 22 Nov 2023 22:20:19 +0100
Subject: [PATCH 295/388] Skins: fix style of selected QComboBox items on
 Windows

---
 res/skins/Deere/style.qss               | 10 ++++++++++
 res/skins/LateNight/style_classic.qss   | 13 ++++++++++++-
 res/skins/LateNight/style_palemoon.qss  | 10 ++++++++++
 res/skins/Shade/style.qss               | 10 ++++++++++
 res/skins/Shade/style_dark.qss          |  7 +++++++
 res/skins/Shade/style_summer_sunset.qss |  7 +++++++
 res/skins/Tango/style.qss               | 12 +++++++++++-
 7 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index c345236d546..293ec874de6 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -2039,6 +2039,16 @@ WSearchLineEdit QAbstractScrollArea,
     /* remove OS focus indicator */
     outline: none;
     }
+    /* required on Windows since the QAbstractItemViews don't inherit styles from
+       the respective QComboBoxes */
+    WEffectSelector QAbstractItemView,
+    WEffectChainPresetSelector QAbstractItemView,
+    WSearchLineEdit QAbstractItemView {
+      selection-color: #fff;
+      selection-background-color: #565353;
+      border: 0px;
+      outline: none;
+    }
     /* Remove 3D border from unchecked effects checkmark space */
     WEffectSelector::item:selected,
     WEffectChainPresetSelector::item:selected,
diff --git a/res/skins/LateNight/style_classic.qss b/res/skins/LateNight/style_classic.qss
index 5e94f67ed63..8d419e0dbf4 100644
--- a/res/skins/LateNight/style_classic.qss
+++ b/res/skins/LateNight/style_classic.qss
@@ -2504,10 +2504,21 @@ WSearchLineEdit::item:selected,
 #SkinSettingsMixerToggle[hover="true"],
 #SkinSettingsLabelButton[hover="true"] {
   background-color: #5E4507;
-  color: white;
+  color: #fff;
   /* remove OS focus indicator */
   outline: none;
   }
+  /* required on Windows since the QAbstractItemViews don't inherit styles from
+     the respective QComboBoxes */
+  WEffectSelector QAbstractItemView,
+  WEffectChainPresetSelector QAbstractItemView,
+  WSearchLineEdit QAbstractItemView {
+    selection-color: #fff;
+    selection-background-color: #5E4507;
+    border-radius: 1px;
+    border: 0px;
+    outline: none;
+  }
   /* checked item */
   WEffectSelector::item:checked,
   WEffectChainPresetSelector::item:checked,
diff --git a/res/skins/LateNight/style_palemoon.qss b/res/skins/LateNight/style_palemoon.qss
index 47594d2e8f1..c0d775092a1 100644
--- a/res/skins/LateNight/style_palemoon.qss
+++ b/res/skins/LateNight/style_palemoon.qss
@@ -1327,6 +1327,7 @@ WEffectChainPresetSelector:!editable:on,
 #RateText, #RateRangePrefix, #RateRangeText,
 #MixerMainHeadphone #FxAssignButtons WPushButton[displayValue="0"],
 #PreviewLabel,
+WSearchLineEdit QAbstractScrollArea,
 WEffectSelector QAbstractScrollArea,
 WEffectChainPresetSelector QAbstractScrollArea,
 #fadeModeCombobox QAbstractScrollArea,
@@ -2998,6 +2999,15 @@ WSearchLineEdit::item:selected,
   /* remove OS focus indicator */
   outline: none;
   }
+  WEffectSelector QAbstractItemView,
+  WEffectChainPresetSelector QAbstractItemView,
+  WSearchLineEdit QAbstractItemView {
+    selection-color: #fff;
+    selection-background-color: #2c454f;
+    border-radius: 1px;
+    border: 0px;
+    outline: none;
+  }
   /* checked item */
   WEffectSelector::item:checked,
   WEffectChainPresetSelector::item:checked,
diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss
index 733ef4e107f..657f0b1e302 100644
--- a/res/skins/Shade/style.qss
+++ b/res/skins/Shade/style.qss
@@ -173,6 +173,16 @@ WEffectSelector::indicator:unchecked:selected,
   /* remove OS focus indicator */
   outline: none;
   }
+  /* required on Windows since the QAbstractItemViews don't inherit styles from
+     the respective QComboBoxes */
+  WEffectSelector QAbstractItemView,
+  WEffectChainPresetSelector QAbstractItemView,
+  WSearchLineEdit QAbstractItemView {
+    selection-color: #000;
+    selection-background-color: lightgray;
+    border: 0px;
+    outline: none;
+  }
   /* Remove 3D border from unchecked effects checkmark space */
   WEffectSelector::item:selected,
   WSearchLineEdit::item:selected,
diff --git a/res/skins/Shade/style_dark.qss b/res/skins/Shade/style_dark.qss
index edb6d1ac61a..f981c2ec60d 100644
--- a/res/skins/Shade/style_dark.qss
+++ b/res/skins/Shade/style_dark.qss
@@ -71,6 +71,13 @@ WEffectSelector::indicator:unchecked:selected,
 #fadeModeCombobox::indicator:unchecked:selected {
   background-color: #999;
   }
+  /* required on Windows since the QAbstractItemViews don't inherit styles from
+     the respective QComboBoxes */
+  WEffectSelector QAbstractItemView,
+  WEffectChainPresetSelector QAbstractItemView,
+  WSearchLineEdit QAbstractItemView {
+    selection-background-color: #999;
+  }
   WEffectSelector::indicator:unchecked:selected,
   #fadeModeCombobox::indicator:unchecked:selected {
     border-color: #999;
diff --git a/res/skins/Shade/style_summer_sunset.qss b/res/skins/Shade/style_summer_sunset.qss
index b6d449a02d8..772e53cf606 100644
--- a/res/skins/Shade/style_summer_sunset.qss
+++ b/res/skins/Shade/style_summer_sunset.qss
@@ -81,6 +81,13 @@ WEffectSelector::indicator:unchecked:selected,
 #fadeModeCombobox::indicator:unchecked:selected {
   background-color: #d9c663;
   }
+  /* required on Windows since the QAbstractItemViews don't inherit styles from
+     the respective QComboBoxes */
+  WEffectSelector QAbstractItemView,
+  WEffectChainPresetSelector QAbstractItemView,
+  WSearchLineEdit QAbstractItemView {
+    selection-background-color: #d9c663;
+  }
   WEffectSelector::indicator:unchecked:selected,
   #fadeModeCombobox::indicator:unchecked:selected {
     border-color: #d9c663;
diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
index e1320f4f668..648fb73df72 100644
--- a/res/skins/Tango/style.qss
+++ b/res/skins/Tango/style.qss
@@ -2377,7 +2377,17 @@ WSearchLineEdit::item:selected,
   color: #fff;
   /* remove OS focus indicator */
   outline: none;
-}
+  }
+  /* required on Windows since the QAbstractItemViews don't inherit styles from
+     the respective QComboBoxes */
+  WEffectSelector QAbstractItemView,
+  WEffectChainPresetSelector QAbstractItemView,
+  WSearchLineEdit QAbstractItemView {
+    selection-color: #fff;
+    selection-background-color: #555;
+    border: 0px;
+    outline: none;
+  }
 
 /* disabled menu items and checkboxes */
 #MainMenu::item:disabled,

From f1c9808a01cf84323d064e2ca916b406529d3fc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Thu, 23 Nov 2023 00:34:52 +0100
Subject: [PATCH 296/388] Destroy PlayerInfo after EngineRecord is stopped to
 fix a debug assert

---
 src/coreservices.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/coreservices.cpp b/src/coreservices.cpp
index 758fbc0e3f8..636c83ef83c 100644
--- a/src/coreservices.cpp
+++ b/src/coreservices.cpp
@@ -569,11 +569,6 @@ void CoreServices::finalize() {
     qDebug() << t.elapsed(false).debugMillisWithUnit() << "deleting PlayerManager";
     CLEAR_AND_CHECK_DELETED(m_pPlayerManager);
 
-    // Destroy PlayerInfo explicitly to release the track
-    // pointers of tracks that were still loaded in decks
-    // or samplers when PlayerManager was destroyed!
-    PlayerInfo::destroy();
-
     // Delete the library after the view so there are no dangling pointers to
     // the data models.
     // Depends on RecordingManager and PlayerManager
@@ -594,6 +589,13 @@ void CoreServices::finalize() {
     qDebug() << t.elapsed(false).debugMillisWithUnit() << "deleting EngineMixer";
     CLEAR_AND_CHECK_DELETED(m_pEngine);
 
+    // Destroy PlayerInfo explicitly to release the track
+    // pointers of tracks that were still loaded in decks
+    // or samplers when PlayerManager was destroyed!
+    // Do this after deleting EngineMixer which makes use of
+    // PlayerInfo in EngineRecord.
+    PlayerInfo::destroy();
+
     qDebug() << t.elapsed(false).debugMillisWithUnit() << "deleting EffectsManager";
     CLEAR_AND_CHECK_DELETED(m_pEffectsManager);
 

From c15cc67a33dac859f5cf15ce28dceac651806b67 Mon Sep 17 00:00:00 2001
From: djantti <djantti@proton.me>
Date: Fri, 24 Nov 2023 02:21:56 +0200
Subject: [PATCH 297/388] Add mapping for Native Instruments Traktor Kontrol Z1

---
 res/controllers/Traktor Kontrol Z1.hid.xml    |  18 ++
 res/controllers/Traktor-Kontrol-Z1-scripts.js | 250 ++++++++++++++++++
 2 files changed, 268 insertions(+)
 create mode 100644 res/controllers/Traktor Kontrol Z1.hid.xml
 create mode 100644 res/controllers/Traktor-Kontrol-Z1-scripts.js

diff --git a/res/controllers/Traktor Kontrol Z1.hid.xml b/res/controllers/Traktor Kontrol Z1.hid.xml
new file mode 100644
index 00000000000..94435f4ef9d
--- /dev/null
+++ b/res/controllers/Traktor Kontrol Z1.hid.xml	
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='utf-8'?>
+<MixxxControllerPreset mixxxVersion="2.4.0" schemaVersion="1">
+    <info>
+        <name>Native Instruments Traktor Kontrol Z1</name>
+        <author>djantti</author>
+        <description>HID mapping for Native Instruments Traktor Kontrol Z1</description>
+        <manual>native_instruments_traktor_kontrol_z1</manual>
+        <devices>
+            <product protocol="hid" vendor_id="0x17cc" product_id="0x1210" />
+        </devices>
+    </info>
+    <controller id="Traktor">
+        <scriptfiles>
+            <file filename="common-hid-packet-parser.js" functionprefix="" />
+            <file filename="Traktor-Kontrol-Z1-scripts.js" functionprefix="KontrolZ1" />
+        </scriptfiles>
+    </controller>
+</MixxxControllerPreset>
diff --git a/res/controllers/Traktor-Kontrol-Z1-scripts.js b/res/controllers/Traktor-Kontrol-Z1-scripts.js
new file mode 100644
index 00000000000..a33c4bc85b3
--- /dev/null
+++ b/res/controllers/Traktor-Kontrol-Z1-scripts.js
@@ -0,0 +1,250 @@
+//
+// Native Instruments Traktor Kontrol Z1 HID controller script for Mixxx 2.4
+// Based on Traktor Kontrol S2 MK3 script by Michael Schmidt
+// Author: djantti
+// Last modified: 20231123
+//
+// Extra functionality:
+// Mode + FX -> Playback start / stop
+// Mode + Headphone -> Stop and rewind track
+//
+
+var KontrolZ1 = new function() {
+    this.controller = new HIDController();
+
+    // Modifier state
+    this.modePressed = false;
+
+    // VuMeter
+    this.vuLeftConnection = {};
+    this.vuRightConnection = {};
+    this.vuMeterThresholds = {"vu-30": (1 / 7), "vu-15": (2 / 7), "vu-6": (3 / 7), "vu-3": (4 / 7), "vu0": (5 / 7), "vu3": (6 / 7), "vu6": (7 / 7)};
+};
+
+KontrolZ1.init = function(_id) {
+    KontrolZ1.id = _id;
+    KontrolZ1.registerInputPackets();
+    KontrolZ1.registerOutputPackets();
+    print(KontrolZ1.id + " initialized");
+};
+
+KontrolZ1.registerInputPackets = function() {
+    const message = new HIDPacket("message", 0x1, this.messageCallback);
+
+    // Mode button
+    this.registerInputButton(message, "[Controls]", "!mode", 0x1D, 0x2, this.modeHandler);
+
+    // Headphone buttons
+    this.registerInputButton(message, "[Channel1]", "!pfl", 0x1D, 0x10, this.headphoneHandler);
+    this.registerInputButton(message, "[Channel2]", "!pfl", 0x1D, 0x1, this.headphoneHandler);
+
+    // FX buttons
+    this.registerInputButton(message, "[Channel1]", "!fx", 0x1D, 0x4, this.fxHandler);
+    this.registerInputButton(message, "[Channel2]", "!fx", 0x1D, 0x8, this.fxHandler);
+
+    // EQ knobs
+    this.registerInputScaler(message, "[EqualizerRack1_[Channel1]_Effect1]", "parameter3", 0x3, 0xFFFF, this.parameterHandler);
+    this.registerInputScaler(message, "[EqualizerRack1_[Channel1]_Effect1]", "parameter2", 0x5, 0xFFFF, this.parameterHandler);
+    this.registerInputScaler(message, "[EqualizerRack1_[Channel1]_Effect1]", "parameter1", 0x7, 0xFFFF, this.parameterHandler);
+    this.registerInputScaler(message, "[EqualizerRack1_[Channel2]_Effect1]", "parameter3", 0xD, 0xFFFF, this.parameterHandler);
+    this.registerInputScaler(message, "[EqualizerRack1_[Channel2]_Effect1]", "parameter2", 0xF, 0xFFFF, this.parameterHandler);
+    this.registerInputScaler(message, "[EqualizerRack1_[Channel2]_Effect1]", "parameter1", 0x11, 0xFFFF, this.parameterHandler);
+
+    // FX knobs
+    this.registerInputScaler(message, "[QuickEffectRack1_[Channel1]]", "super1", 0x9, 0xFFFF, this.parameterHandler);
+    this.registerInputScaler(message, "[QuickEffectRack1_[Channel2]]", "super1", 0x13, 0xFFFF, this.parameterHandler);
+
+    // Gain knobs
+    this.registerInputScaler(message, "[Channel1]", "pregain", 0x1, 0xFFFF, this.parameterHandler);
+    this.registerInputScaler(message, "[Channel2]", "pregain", 0xB, 0xFFFF, this.parameterHandler);
+
+    // Headphone mix
+    this.registerInputScaler(message, "[Master]", "headMix", 0x15, 0xFFFF, this.parameterHandler);
+
+    // Volume faders
+    this.registerInputScaler(message, "[Channel1]", "volume", 0x17, 0xFFFF, this.parameterHandler);
+    this.registerInputScaler(message, "[Channel2]", "volume", 0x19, 0xFFFF, this.parameterHandler);
+
+    // Crossfader
+    this.registerInputScaler(message, "[Master]", "crossfader", 0x1B, 0xFFFF, this.parameterHandler);
+
+    this.controller.registerInputPacket(message);
+
+    // Soft takeover for all knobs and faders
+    engine.softTakeover("[EqualizerRack1_[Channel1]_Effect1]", "parameter3", true);
+    engine.softTakeover("[EqualizerRack1_[Channel1]_Effect1]", "parameter2", true);
+    engine.softTakeover("[EqualizerRack1_[Channel1]_Effect1]", "parameter1", true);
+
+    engine.softTakeover("[EqualizerRack1_[Channel2]_Effect1]", "parameter3", true);
+    engine.softTakeover("[EqualizerRack1_[Channel2]_Effect1]", "parameter2", true);
+    engine.softTakeover("[EqualizerRack1_[Channel2]_Effect1]", "parameter1", true);
+
+    engine.softTakeover("[QuickEffectRack1_[Channel1]]", "super1", true);
+    engine.softTakeover("[QuickEffectRack1_[Channel2]]", "super1", true);
+
+    engine.softTakeover("[Channel1]", "pregain", true);
+    engine.softTakeover("[Channel2]", "pregain", true);
+
+    engine.softTakeover("[Master]", "headMix", true);
+
+    engine.softTakeover("[Channel1]", "volume", true);
+    engine.softTakeover("[Channel2]", "volume", true);
+
+    engine.softTakeover("[Master]", "crossfader", true);
+};
+
+KontrolZ1.registerInputButton = function(message, group, name, offset, bitmask, callback) {
+    message.addControl(group, name, offset, "B", bitmask);
+    message.setCallback(group, name, callback);
+};
+
+KontrolZ1.registerInputScaler = function(message, group, name, offset, bitmask, callback) {
+    message.addControl(group, name, offset, "H", bitmask);
+    message.setCallback(group, name, callback);
+};
+
+KontrolZ1.registerOutputPackets = function() {
+    const output = new HIDPacket("output", 0x80);
+
+    output.addOutput("[Controls]", "mode", 0x13, "B");
+
+    output.addOutput("[Channel1]", "pfl", 0xF, "B");
+    output.addOutput("[Channel2]", "pfl", 0x10, "B");
+
+    output.addOutput("[Channel1]", "play_indicator", 0x11, "B");
+    output.addOutput("[Channel2]", "play_indicator", 0x14, "B");
+
+    output.addOutput("[QuickEffectRack1_[Channel1]]", "enabled", 0x12, "B");
+    output.addOutput("[QuickEffectRack1_[Channel2]]", "enabled", 0x15, "B");
+
+    output.addOutput("[Channel1]", "vu-30", 0x1, "B");
+    output.addOutput("[Channel1]", "vu-15", 0x2, "B");
+    output.addOutput("[Channel1]", "vu-6", 0x3, "B");
+    output.addOutput("[Channel1]", "vu-3", 0x4, "B");
+    output.addOutput("[Channel1]", "vu0", 0x5, "B");
+    output.addOutput("[Channel1]", "vu3", 0x6, "B");
+    output.addOutput("[Channel1]", "vu6", 0x7, "B");
+
+    output.addOutput("[Channel2]", "vu-30", 0x8, "B");
+    output.addOutput("[Channel2]", "vu-15", 0x9, "B");
+    output.addOutput("[Channel2]", "vu-6", 0xA, "B");
+    output.addOutput("[Channel2]", "vu-3", 0xB, "B");
+    output.addOutput("[Channel2]", "vu0", 0xC, "B");
+    output.addOutput("[Channel2]", "vu3", 0xD, "B");
+    output.addOutput("[Channel2]", "vu6", 0xE, "B");
+
+    this.controller.registerOutputPacket(output);
+
+    engine.makeConnection("[QuickEffectRack1_[Channel1]]", "enabled", this.outputHandler);
+    engine.makeConnection("[QuickEffectRack1_[Channel2]]", "enabled", this.outputHandler);
+
+    engine.makeConnection("[Channel1]", "pfl", this.outputHandler);
+    engine.makeConnection("[Channel2]", "pfl", this.outputHandler);
+
+    this.vuLeftConnection = engine.makeUnbufferedConnection("[Channel1]", "vu_meter", this.vuMeterHandler);
+    this.vuRightConnection = engine.makeUnbufferedConnection("[Channel2]", "vu_meter", this.vuMeterHandler);
+
+    KontrolZ1.lightDeck(false);
+}
+
+KontrolZ1.modeHandler = function(field) {
+    KontrolZ1.modePressed = field.value;
+    KontrolZ1.outputHandler(field.value, field.group, "mode");
+};
+
+KontrolZ1.headphoneHandler = function(field) {
+    if (field.value === 0) {
+        return;
+    }
+    // Seek to start and stop when modifier is active
+    if (KontrolZ1.modePressed) {
+        engine.setValue(field.group, "start_stop", field.value);
+    } else {
+        script.toggleControl(field.group, "pfl");
+    }
+};
+
+KontrolZ1.fxHandler = function(field) {
+    if (field.value === 0) {
+        // Always clear play indicator on button release
+        KontrolZ1.controller.setOutput(field.group, "play_indicator", 0x0, true);
+        return;
+    }
+    // Control playback when modifier is active
+    if (KontrolZ1.modePressed) {
+        // Match play indicator (red led) brightness to fx indicator (blue led)
+        current = (engine.getValue("[QuickEffectRack1_" + field.group + "]", "enabled")) ? 0x7F : 0xA;
+        KontrolZ1.controller.setOutput(field.group, "play_indicator", current, true);
+        script.toggleControl(field.group, "play");
+    } else {
+        script.toggleControl("[QuickEffectRack1_" + field.group + "]", "enabled");
+    }
+};
+
+KontrolZ1.vuMeterHandler = function(value, group, _key) {
+    const vuKeys = Object.keys(KontrolZ1.vuMeterThresholds);
+    for (let i = 0; i < vuKeys.length; ++i) {
+        // Avoid spamming HID by only sending last LED update
+        const last = (i === (vuKeys.length - 1));
+        if (KontrolZ1.vuMeterThresholds[vuKeys[i]] > value) {
+            KontrolZ1.controller.setOutput(group, vuKeys[i], 0x00, last);
+        } else {
+            KontrolZ1.controller.setOutput(group, vuKeys[i], 0x7E, last);
+        }
+    }
+};
+
+KontrolZ1.parameterHandler = function(field) {
+    engine.setParameter(field.group, field.name, field.value / 4095);
+}
+
+KontrolZ1.outputHandler = function(value, group, key) {
+    if (value === 0 || value === false) {
+        // Off value (dimmed)
+        ledValue = 0xA;
+    } else if (value === 1 || value === true) {
+        // On value
+        ledValue = 0x7F;
+    }
+    KontrolZ1.controller.setOutput(group, key, ledValue, true);
+};
+
+KontrolZ1.lightDeck = function(switchOff) {
+    let softLight = 0xA;
+    let fullLight = 0x7F;
+
+    if (switchOff) {
+        softLight = 0x00;
+        fullLight = 0x00;
+    }
+
+    KontrolZ1.controller.setOutput("[Controls]", "mode", softLight, true);
+
+    current = (engine.getValue("[QuickEffectRack1_[Channel1]]", "enabled")) ? fullLight : softLight;
+    KontrolZ1.controller.setOutput("[QuickEffectRack1_[Channel1]]", "enabled", current, true);
+    current = (engine.getValue("[QuickEffectRack1_[Channel2]]", "enabled")) ? fullLight : softLight;
+    KontrolZ1.controller.setOutput("[QuickEffectRack1_[Channel2]]", "enabled", current, true);
+
+    current = (engine.getValue("[Channel1]", "pfl")) ? fullLight : softLight;
+    KontrolZ1.controller.setOutput("[Channel1]", "pfl", current, true);
+    current = (engine.getValue("[Channel2]", "pfl")) ? fullLight : softLight;
+    KontrolZ1.controller.setOutput("[Channel2]", "pfl", current, true);
+}
+
+KontrolZ1.messageCallback = function(packet, data) {
+    for (const name in data) {
+        if (Object.hasOwnProperty.call(data, name)) {
+            KontrolZ1.controller.processButton(data[name]);
+        }
+    }
+}
+
+KontrolZ1.shutdown = function() {
+    // Deactivate all LEDs
+    KontrolZ1.lightDeck(true);
+    print(KontrolZ1.id + " shut down");
+};
+
+KontrolZ1.incomingData = function(data, length) {
+    KontrolZ1.controller.parsePacket(data, length);
+};

From 27408810de9a3e425e56a6968fef10ef12e00523 Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Fri, 24 Nov 2023 02:50:09 +0000
Subject: [PATCH 298/388] ITunesDAO: Add missing `<ostream>` include

---
 src/library/itunes/itunesdao.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/library/itunes/itunesdao.h b/src/library/itunes/itunesdao.h
index 5113e54ee61..25e72ccfae7 100644
--- a/src/library/itunes/itunesdao.h
+++ b/src/library/itunes/itunesdao.h
@@ -6,6 +6,7 @@
 #include <QString>
 #include <gsl/pointers>
 #include <map>
+#include <ostream>
 
 #include "library/dao/dao.h"
 

From 191ef5b14113180fb773532515e0bf12606d33d9 Mon Sep 17 00:00:00 2001
From: djantti <djantti@proton.me>
Date: Fri, 24 Nov 2023 13:25:08 +0200
Subject: [PATCH 299/388] Change headphone buttons secondary function to cue
 point seek and stop

---
 res/controllers/Traktor-Kontrol-Z1-scripts.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/controllers/Traktor-Kontrol-Z1-scripts.js b/res/controllers/Traktor-Kontrol-Z1-scripts.js
index a33c4bc85b3..372e26b856f 100644
--- a/res/controllers/Traktor-Kontrol-Z1-scripts.js
+++ b/res/controllers/Traktor-Kontrol-Z1-scripts.js
@@ -6,7 +6,7 @@
 //
 // Extra functionality:
 // Mode + FX -> Playback start / stop
-// Mode + Headphone -> Stop and rewind track
+// Mode + Headphone -> Go to cue and stop
 //
 
 var KontrolZ1 = new function() {
@@ -156,9 +156,9 @@ KontrolZ1.headphoneHandler = function(field) {
     if (field.value === 0) {
         return;
     }
-    // Seek to start and stop when modifier is active
+    // Go to cue and stop when modifier is active
     if (KontrolZ1.modePressed) {
-        engine.setValue(field.group, "start_stop", field.value);
+        engine.setValue(field.group, "cue_gotoandstop", field.value);
     } else {
         script.toggleControl(field.group, "pfl");
     }

From 0b52a65f19d0511508098223da0306764ffc6ed3 Mon Sep 17 00:00:00 2001
From: djantti <djantti@proton.me>
Date: Fri, 24 Nov 2023 14:06:40 +0200
Subject: [PATCH 300/388] Remove unnecessary parentheses for more legible code

---
 res/controllers/Traktor-Kontrol-Z1-scripts.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/res/controllers/Traktor-Kontrol-Z1-scripts.js b/res/controllers/Traktor-Kontrol-Z1-scripts.js
index 372e26b856f..32da458143e 100644
--- a/res/controllers/Traktor-Kontrol-Z1-scripts.js
+++ b/res/controllers/Traktor-Kontrol-Z1-scripts.js
@@ -173,7 +173,7 @@ KontrolZ1.fxHandler = function(field) {
     // Control playback when modifier is active
     if (KontrolZ1.modePressed) {
         // Match play indicator (red led) brightness to fx indicator (blue led)
-        current = (engine.getValue("[QuickEffectRack1_" + field.group + "]", "enabled")) ? 0x7F : 0xA;
+        current = engine.getValue("[QuickEffectRack1_" + field.group + "]", "enabled") ? 0x7F : 0xA;
         KontrolZ1.controller.setOutput(field.group, "play_indicator", current, true);
         script.toggleControl(field.group, "play");
     } else {
@@ -185,7 +185,7 @@ KontrolZ1.vuMeterHandler = function(value, group, _key) {
     const vuKeys = Object.keys(KontrolZ1.vuMeterThresholds);
     for (let i = 0; i < vuKeys.length; ++i) {
         // Avoid spamming HID by only sending last LED update
-        const last = (i === (vuKeys.length - 1));
+        const last = i === (vuKeys.length - 1);
         if (KontrolZ1.vuMeterThresholds[vuKeys[i]] > value) {
             KontrolZ1.controller.setOutput(group, vuKeys[i], 0x00, last);
         } else {
@@ -220,14 +220,14 @@ KontrolZ1.lightDeck = function(switchOff) {
 
     KontrolZ1.controller.setOutput("[Controls]", "mode", softLight, true);
 
-    current = (engine.getValue("[QuickEffectRack1_[Channel1]]", "enabled")) ? fullLight : softLight;
+    current = engine.getValue("[QuickEffectRack1_[Channel1]]", "enabled") ? fullLight : softLight;
     KontrolZ1.controller.setOutput("[QuickEffectRack1_[Channel1]]", "enabled", current, true);
-    current = (engine.getValue("[QuickEffectRack1_[Channel2]]", "enabled")) ? fullLight : softLight;
+    current = engine.getValue("[QuickEffectRack1_[Channel2]]", "enabled") ? fullLight : softLight;
     KontrolZ1.controller.setOutput("[QuickEffectRack1_[Channel2]]", "enabled", current, true);
 
-    current = (engine.getValue("[Channel1]", "pfl")) ? fullLight : softLight;
+    current = engine.getValue("[Channel1]", "pfl") ? fullLight : softLight;
     KontrolZ1.controller.setOutput("[Channel1]", "pfl", current, true);
-    current = (engine.getValue("[Channel2]", "pfl")) ? fullLight : softLight;
+    current = engine.getValue("[Channel2]", "pfl") ? fullLight : softLight;
     KontrolZ1.controller.setOutput("[Channel2]", "pfl", current, true);
 }
 

From fa7cdef4391a7367f3debaf866ccfc8cb52f8836 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Fri, 24 Nov 2023 14:18:38 +0100
Subject: [PATCH 301/388] Add missing qtscript5-dev to debian_buildenv.sh

---
 tools/debian_buildenv.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/debian_buildenv.sh b/tools/debian_buildenv.sh
index f0d6ce12066..44ed7287950 100755
--- a/tools/debian_buildenv.sh
+++ b/tools/debian_buildenv.sh
@@ -99,6 +99,7 @@ case "$1" in
             protobuf-compiler \
             qt5keychain-dev \
             qtdeclarative5-dev \
+            qtscript5-dev \
             qml-module-qtquick-controls \
             qml-module-qtquick-controls2 \
             qml-module-qt-labs-qmlmodels \

From fee4c55606dea566c8dff05d8c5abed4afe87f28 Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Fri, 24 Nov 2023 03:07:26 +0000
Subject: [PATCH 302/388] Beats: Fix unsafe integer overflow checks

---
 src/track/beats.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/track/beats.cpp b/src/track/beats.cpp
index 2f41027f927..7f73b798e9a 100644
--- a/src/track/beats.cpp
+++ b/src/track/beats.cpp
@@ -60,23 +60,23 @@ Beats::ConstIterator Beats::ConstIterator::operator+=(Beats::ConstIterator::diff
     }
 
     DEBUG_ASSERT(n > 0);
-    const int beatOffset = m_beatOffset + n;
 #ifdef MIXXX_DEBUG_ASSERTIONS_ENABLED
     const auto origValue = m_value;
 #endif
 
-    // Detect integer overflow
-    if (beatOffset < m_beatOffset) {
+    // Detect integer overflow in `m_beatOffset + n`
+    const int maxBeatOffset = std::numeric_limits<Beats::ConstIterator::difference_type>::max();
+    if (m_beatOffset > maxBeatOffset - n) {
         qWarning() << "Beats: Iterator would go out of possible range, capping "
                       "at latest possible position.";
         m_it = m_beats->m_markers.cend();
-        m_beatOffset = std::numeric_limits<Beats::ConstIterator::difference_type>::max();
+        m_beatOffset = maxBeatOffset;
         updateValue();
         DEBUG_ASSERT(m_value > origValue);
         return *this;
     }
 
-    m_beatOffset = beatOffset;
+    m_beatOffset += n;
     while (m_it != m_beats->m_markers.cend() && m_beatOffset >= m_it->beatsTillNextMarker()) {
         m_beatOffset -= m_it->beatsTillNextMarker();
         m_it++;
@@ -108,23 +108,23 @@ Beats::ConstIterator Beats::ConstIterator::operator-=(Beats::ConstIterator::diff
     }
 
     DEBUG_ASSERT(n > 0);
-    const int beatOffset = m_beatOffset - n;
 #ifdef MIXXX_DEBUG_ASSERTIONS_ENABLED
     const auto origValue = m_value;
 #endif
 
     // Detect integer overflow
-    if (beatOffset > m_beatOffset) {
+    const int minBeatOffset = std::numeric_limits<Beats::ConstIterator::difference_type>::lowest();
+    if (m_beatOffset < minBeatOffset + n) {
         qWarning() << "Beats: Iterator would go out of possible range, capping "
                       "at earliest possible position.";
         m_it = m_beats->m_markers.cbegin();
-        m_beatOffset = std::numeric_limits<Beats::ConstIterator::difference_type>::lowest();
+        m_beatOffset = minBeatOffset;
         updateValue();
         DEBUG_ASSERT(m_value < origValue);
         return *this;
     }
 
-    m_beatOffset = beatOffset;
+    m_beatOffset -= n;
     while (m_it != m_beats->m_markers.cbegin() && m_beatOffset < 0) {
         m_it--;
         m_beatOffset += m_it->beatsTillNextMarker();

From 915555bfd5ed3c53005ee4d5b324172709eedc83 Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Fri, 24 Nov 2023 14:44:09 +0000
Subject: [PATCH 303/388] Beats: Update overflow debug asserts

We should accept equality at the end points where the interator cannot
go further than the bounds.
---
 src/track/beats.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/track/beats.cpp b/src/track/beats.cpp
index 7f73b798e9a..dc2f0674ade 100644
--- a/src/track/beats.cpp
+++ b/src/track/beats.cpp
@@ -72,7 +72,7 @@ Beats::ConstIterator Beats::ConstIterator::operator+=(Beats::ConstIterator::diff
         m_it = m_beats->m_markers.cend();
         m_beatOffset = maxBeatOffset;
         updateValue();
-        DEBUG_ASSERT(m_value > origValue);
+        DEBUG_ASSERT(m_value >= origValue);
         return *this;
     }
 
@@ -120,7 +120,7 @@ Beats::ConstIterator Beats::ConstIterator::operator-=(Beats::ConstIterator::diff
         m_it = m_beats->m_markers.cbegin();
         m_beatOffset = minBeatOffset;
         updateValue();
-        DEBUG_ASSERT(m_value < origValue);
+        DEBUG_ASSERT(m_value <= origValue);
         return *this;
     }
 

From b006298c05e1180a4703ae608dddb571356ec26e Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Fri, 24 Nov 2023 15:24:51 +0000
Subject: [PATCH 304/388] CMakeLists: Relativize `__FILE__` paths by default

---
 CMakeLists.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 739d94e16c3..a3067d9da29 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1586,6 +1586,13 @@ if (INFO_VECTORIZE)
     endif()
 endif()
 
+option(RELATIVE_MACRO_PATHS "Relativize __FILE__ paths" ON)
+if(RELATIVE_MACRO_PATHS)
+  if(NOT MSVC)
+    target_compile_options(mixxx-lib PUBLIC "-fmacro-prefix-map=${CMAKE_SOURCE_DIR}=.")
+  endif()
+endif()
+
 option(WARNINGS_FATAL "Fail if compiler generates a warning" OFF)
 if(WARNINGS_FATAL)
   if(MSVC)

From 69190d302077fff28ddc52b590691e187b9fd477 Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Thu, 23 Nov 2023 21:39:09 +0000
Subject: [PATCH 305/388] Debug: Add Rust-inspired `DBG` macro for quick
 print-debugging

---
 src/util/debug.h | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/util/debug.h b/src/util/debug.h
index 6adb46b6c37..1a7051cc64a 100644
--- a/src/util/debug.h
+++ b/src/util/debug.h
@@ -5,6 +5,19 @@
 
 #include "errordialoghandler.h"
 
+#ifdef MIXXX_DEBUG_ASSERTIONS_ENABLED
+#define DBG(value)                                                       \
+    (qDebug().nospace() << __FILE__ << ":" << __LINE__ << ": " << #value \
+                        << " = " << value)
+#else
+// We have to stop clang-format from breaking up the string literal since that
+// breaks the pragma (at least when using Clang).
+// clang-format off
+#define DBG(value)                                                            \
+    _Pragma("message \"DBG(...) should not be used in a build without debug assertions, please remove it! This will be a no-op.\"")
+// clang-format on
+#endif
+
 template <typename T>
 QString toDebugString(const T& object) {
     QString output;

From 974dec6ffeeda76c4d76b75d703a2f968caa4735 Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Thu, 23 Nov 2023 21:57:57 +0000
Subject: [PATCH 306/388] Debug: Place file path after invocation for better
 readability

---
 src/util/debug.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/util/debug.h b/src/util/debug.h
index 1a7051cc64a..c3c1f4310b7 100644
--- a/src/util/debug.h
+++ b/src/util/debug.h
@@ -6,9 +6,8 @@
 #include "errordialoghandler.h"
 
 #ifdef MIXXX_DEBUG_ASSERTIONS_ENABLED
-#define DBG(value)                                                       \
-    (qDebug().nospace() << __FILE__ << ":" << __LINE__ << ": " << #value \
-                        << " = " << value)
+#define DBG(value) \
+    (qDebug().nospace() << #value << " = " << value << " [" << __FILE__ << ":" << __LINE__ << "]")
 #else
 // We have to stop clang-format from breaking up the string literal since that
 // breaks the pragma (at least when using Clang).

From e987a536b9088176ad7ce29cb95e4243f350694b Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Fri, 24 Nov 2023 03:13:45 +0000
Subject: [PATCH 307/388] Debug: Parenthesize debugged expression

---
 src/util/debug.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/util/debug.h b/src/util/debug.h
index c3c1f4310b7..cfe0e0bfb0d 100644
--- a/src/util/debug.h
+++ b/src/util/debug.h
@@ -7,7 +7,7 @@
 
 #ifdef MIXXX_DEBUG_ASSERTIONS_ENABLED
 #define DBG(value) \
-    (qDebug().nospace() << #value << " = " << value << " [" << __FILE__ << ":" << __LINE__ << "]")
+    (qDebug().nospace() << #value << " = " << (value) << " [" << __FILE__ << ":" << __LINE__ << "]")
 #else
 // We have to stop clang-format from breaking up the string literal since that
 // breaks the pragma (at least when using Clang).

From 9b347b26327da44e783361dde012fd962caf2caa Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Fri, 24 Nov 2023 11:09:53 +0000
Subject: [PATCH 308/388] Debug: Use static assert from `DBG`

---
 src/util/debug.h | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/util/debug.h b/src/util/debug.h
index cfe0e0bfb0d..860c3c522be 100644
--- a/src/util/debug.h
+++ b/src/util/debug.h
@@ -9,12 +9,10 @@
 #define DBG(value) \
     (qDebug().nospace() << #value << " = " << (value) << " [" << __FILE__ << ":" << __LINE__ << "]")
 #else
-// We have to stop clang-format from breaking up the string literal since that
-// breaks the pragma (at least when using Clang).
-// clang-format off
-#define DBG(value)                                                            \
-    _Pragma("message \"DBG(...) should not be used in a build without debug assertions, please remove it! This will be a no-op.\"")
-// clang-format on
+#define DBG(value)                                                             \
+    static_assert(false,                                                       \
+            "DBG() is not allowed in builds without debug assertions, please " \
+            "remove it!")
 #endif
 
 template <typename T>

From 1dbc9390c81728ef2eb13535e9ffa82d6fa2cc1f Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Fri, 24 Nov 2023 11:54:13 +0000
Subject: [PATCH 309/388] CMakeLists: Set debug assertions macro in QML lib too

---
 CMakeLists.txt | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 739d94e16c3..13642b8141b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1595,14 +1595,6 @@ if(WARNINGS_FATAL)
   endif()
 endif()
 
-option(DEBUG_ASSERTIONS_FATAL "Fail if debug become true assertions" OFF)
-if(DEBUG_ASSERTIONS_FATAL)
-  target_compile_definitions(mixxx-lib PUBLIC MIXXX_DEBUG_ASSERTIONS_FATAL MIXXX_DEBUG_ASSERTIONS_ENABLED)
-  if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-    message(STATUS "DEBUG_ASSERT statements have been enabled because DEBUG_ASSERTIONS_FATAL is ON.")
-  endif()
-endif()
-
 target_compile_definitions(mixxx-lib PUBLIC
   "${CMAKE_SYSTEM_PROCESSOR}"
   $<$<CONFIG:Debug>:MIXXX_BUILD_DEBUG>
@@ -2655,6 +2647,17 @@ if(QT_EXTRA_COMPONENTS)
   qt_finalize_target(mixxx)
 endif()
 
+option(DEBUG_ASSERTIONS_FATAL "Fail if debug become true assertions" OFF)
+if(DEBUG_ASSERTIONS_FATAL)
+  target_compile_definitions(mixxx-lib PUBLIC MIXXX_DEBUG_ASSERTIONS_FATAL MIXXX_DEBUG_ASSERTIONS_ENABLED)
+  if(QML)
+    target_compile_definitions(mixxx-qml-lib PUBLIC MIXXX_DEBUG_ASSERTIONS_FATAL MIXXX_DEBUG_ASSERTIONS_ENABLED)
+  endif()
+  if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
+    message(STATUS "DEBUG_ASSERT statements have been enabled because DEBUG_ASSERTIONS_FATAL is ON.")
+  endif()
+endif()
+
 target_compile_definitions(mixxx-lib PUBLIC QT_TABLET_SUPPORT QT_USE_QSTRINGBUILDER)
 is_static_library(Qt_IS_STATIC Qt${QT_VERSION_MAJOR}::Core)
 if(Qt_IS_STATIC)

From 52a0956c252d1e71d035aeff201c7f2437abfb2f Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Fri, 24 Nov 2023 19:16:06 +0100
Subject: [PATCH 310/388] optimization: use 1 sqrt instead of two (thanks
 daschuer for the suggestion)

---
 .../allshader/waveformrendererlrrgb.cpp        | 18 ++++++++++--------
 .../allshader/waveformrendererrgb.cpp          | 18 ++++++++++--------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp b/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp
index 5c6f7c60f08..72f0bd01346 100644
--- a/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp
@@ -160,23 +160,25 @@ void WaveformRendererLRRGB::paintGL() {
             float maxHigh = static_cast<float>(u8maxHigh);
             float maxAll = static_cast<float>(u8maxAll);
 
-            // Calculate the magnitude of the maxLow, maxMid and maxHigh values
-            const float magnitude = std::sqrt(
-                    math_pow2(maxLow) + math_pow2(maxMid) + math_pow2(maxHigh));
+            // Calculate the squared magnitude of the maxLow, maxMid and maxHigh values.
+            // We take the square root to get the magnitude below.
+            const float sum = math_pow2(maxLow) + math_pow2(maxMid) + math_pow2(maxHigh);
 
             // Apply the gains
             maxLow *= lowGain;
             maxMid *= midGain;
             maxHigh *= highGain;
 
-            // Calculate the magnitude of the gained maxLow, maxMid and maxHigh values
-            const float magnitudeGained = std::sqrt(
-                    math_pow2(maxLow) + math_pow2(maxMid) + math_pow2(maxHigh));
+            // Calculate the squared magnitude of the gained maxLow, maxMid and maxHigh values
+            // We take the square root to get the magnitude below.
+            const float sumGained = math_pow2(maxLow) + math_pow2(maxMid) + math_pow2(maxHigh);
 
             // The maxAll value will be used to draw the amplitude. We scale them according to
             // magnitude of the gained maxLow, maxMid and maxHigh values
-            if (magnitude != 0.f) {
-                const float factor = magnitudeGained / magnitude;
+            if (sum != 0.f) {
+                // magnitude = sqrt(sum) and magnitudeGained = sqrt(sumGained), and
+                // factor = magnitudeGained / magnitude, but we can do with a single sqrt:
+                const float factor = std::sqrt(sumGained / sum);
                 maxAll *= factor;
             }
 
diff --git a/src/waveform/renderers/allshader/waveformrendererrgb.cpp b/src/waveform/renderers/allshader/waveformrendererrgb.cpp
index deadc9d2a18..b4348239727 100644
--- a/src/waveform/renderers/allshader/waveformrendererrgb.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererrgb.cpp
@@ -162,23 +162,25 @@ void WaveformRendererRGB::paintGL() {
         float maxHigh = static_cast<float>(u8maxHigh);
         float maxAllChn[2]{static_cast<float>(u8maxAllChn[0]), static_cast<float>(u8maxAllChn[1])};
 
-        // Calculate the magnitude of the maxLow, maxMid and maxHigh values
-        const float magnitude = std::sqrt(
-                math_pow2(maxLow) + math_pow2(maxMid) + math_pow2(maxHigh));
+        // Calculate the squared magnitude of the maxLow, maxMid and maxHigh values.
+        // We take the square root to get the magnitude below.
+        const float sum = math_pow2(maxLow) + math_pow2(maxMid) + math_pow2(maxHigh);
 
         // Apply the gains
         maxLow *= lowGain;
         maxMid *= midGain;
         maxHigh *= highGain;
 
-        // Calculate the magnitude of the gained maxLow, maxMid and maxHigh values
-        const float magnitudeGained = std::sqrt(
-                math_pow2(maxLow) + math_pow2(maxMid) + math_pow2(maxHigh));
+        // Calculate the squared magnitude of the gained maxLow, maxMid and maxHigh values
+        // We take the square root to get the magnitude below.
+        const float sumGained = math_pow2(maxLow) + math_pow2(maxMid) + math_pow2(maxHigh);
 
         // The maxAll values will be used to draw the amplitude. We scale them according to
         // magnitude of the gained maxLow, maxMid and maxHigh values
-        if (magnitude != 0.f) {
-            const float factor = magnitudeGained / magnitude;
+        if (sum != 0.f) {
+            // magnitude = sqrt(sum) and magnitudeGained = sqrt(sumGained), and
+            // factor = magnitudeGained / magnitude, but we can do with a single sqrt:
+            const float factor = std::sqrt(sumGained / sum);
             maxAllChn[0] *= factor;
             maxAllChn[1] *= factor;
         }

From 069f14329374b734b8f43286f11e8250c7695308 Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Fri, 24 Nov 2023 19:32:24 +0000
Subject: [PATCH 311/388] CMakeLists: Fix doubly escaped gitinfo paths

---
 CMakeLists.txt | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bdd000c8c95..d3512bc1a08 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2193,12 +2193,15 @@ if(GIT_COMMIT_DATE AND NOT GIT_COMMIT_DATE MATCHES "^[0-9]*-[0-9]*-[0-9]*T[0-9]*
 endif()
 
 add_custom_target(mixxx-gitinfo
+  # Note: We don't quote the paths in the command since CMake already inserts
+  # escapes (which, if quoted, lead to paths wrongly containing backslashes).
+  # See https://stackoverflow.com/questions/8925396/why-does-cmake-prefixes-spaces-with-backslashes-when-executing-a-command
   COMMAND ${CMAKE_COMMAND}
-    -DGIT_DESCRIBE="${GIT_DESCRIBE}"
-    -DGIT_COMMIT_DATE="${GIT_COMMIT_DATE}"
-    -DINPUT_FILE="${CMAKE_CURRENT_SOURCE_DIR}/src/gitinfo.h.in"
-    -DOUTPUT_FILE="${CMAKE_CURRENT_BINARY_DIR}/src/gitinfo.h"
-    -P "${CMAKE_CURRENT_SOURCE_DIR}/cmake/scripts/gitinfo.cmake"
+    -DGIT_DESCRIBE=${GIT_DESCRIBE}
+    -DGIT_COMMIT_DATE=${GIT_COMMIT_DATE}
+    -DINPUT_FILE=${CMAKE_CURRENT_SOURCE_DIR}/src/gitinfo.h.in
+    -DOUTPUT_FILE=${CMAKE_CURRENT_BINARY_DIR}/src/gitinfo.h
+    -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/scripts/gitinfo.cmake
   COMMENT "Update git version information in gitinfo.h"
   BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/src/gitinfo.h"
   WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"

From 0d5f966fee07076c2de19871dc49ca891c5aa9ec Mon Sep 17 00:00:00 2001
From: djantti <djantti@proton.me>
Date: Fri, 24 Nov 2023 22:43:35 +0200
Subject: [PATCH 312/388] We're using git and have a proper manual now, so
 remove modification date and usage hints from script header

---
 res/controllers/Traktor-Kontrol-Z1-scripts.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/res/controllers/Traktor-Kontrol-Z1-scripts.js b/res/controllers/Traktor-Kontrol-Z1-scripts.js
index 32da458143e..abe2026b5bf 100644
--- a/res/controllers/Traktor-Kontrol-Z1-scripts.js
+++ b/res/controllers/Traktor-Kontrol-Z1-scripts.js
@@ -2,11 +2,6 @@
 // Native Instruments Traktor Kontrol Z1 HID controller script for Mixxx 2.4
 // Based on Traktor Kontrol S2 MK3 script by Michael Schmidt
 // Author: djantti
-// Last modified: 20231123
-//
-// Extra functionality:
-// Mode + FX -> Playback start / stop
-// Mode + Headphone -> Go to cue and stop
 //
 
 var KontrolZ1 = new function() {

From 7300b60f8bf66f0b552c5a350a5a9aff65b8523b Mon Sep 17 00:00:00 2001
From: djantti <djantti@proton.me>
Date: Fri, 24 Nov 2023 23:02:33 +0200
Subject: [PATCH 313/388] Add discussion forum topic link

---
 res/controllers/Traktor Kontrol Z1.hid.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/controllers/Traktor Kontrol Z1.hid.xml b/res/controllers/Traktor Kontrol Z1.hid.xml
index 94435f4ef9d..a4a6a2b6736 100644
--- a/res/controllers/Traktor Kontrol Z1.hid.xml	
+++ b/res/controllers/Traktor Kontrol Z1.hid.xml	
@@ -4,6 +4,7 @@
         <name>Native Instruments Traktor Kontrol Z1</name>
         <author>djantti</author>
         <description>HID mapping for Native Instruments Traktor Kontrol Z1</description>
+        <forums>https://mixxx.discourse.group/t/new-mapping-for-native-instruments-traktor-kontrol-z1/28436</forums>
         <manual>native_instruments_traktor_kontrol_z1</manual>
         <devices>
             <product protocol="hid" vendor_id="0x17cc" product_id="0x1210" />

From d9019565545262903d591cf6c44345b4c8f563e6 Mon Sep 17 00:00:00 2001
From: djantti <djantti@proton.me>
Date: Sat, 25 Nov 2023 12:46:26 +0200
Subject: [PATCH 314/388] Add a more complete script header

---
 res/controllers/Traktor-Kontrol-Z1-scripts.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/controllers/Traktor-Kontrol-Z1-scripts.js b/res/controllers/Traktor-Kontrol-Z1-scripts.js
index abe2026b5bf..3e62145418d 100644
--- a/res/controllers/Traktor-Kontrol-Z1-scripts.js
+++ b/res/controllers/Traktor-Kontrol-Z1-scripts.js
@@ -1,6 +1,7 @@
 //
 // Native Instruments Traktor Kontrol Z1 HID controller script for Mixxx 2.4
-// Based on Traktor Kontrol S2 MK3 script by Michael Schmidt
+// -------------------------------------------------------------------------
+// Based on: Kontrol S2 MK3 script by mi01 and Kontrol Z1 script by xeruf
 // Author: djantti
 //
 

From a696dd07afdde04308a76a164f1a06dd0072aa6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sat, 25 Nov 2023 11:51:27 +0100
Subject: [PATCH 315/388] Improve header off soundsourceffmpeg

---
 src/sources/soundsourceffmpeg.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/sources/soundsourceffmpeg.cpp b/src/sources/soundsourceffmpeg.cpp
index 3eaca638c5a..3c0a9ec881e 100644
--- a/src/sources/soundsourceffmpeg.cpp
+++ b/src/sources/soundsourceffmpeg.cpp
@@ -1,9 +1,14 @@
 #include "sources/soundsourceffmpeg.h"
 
+extern "C" {
+
+#include <libavutil/avutil.h>
 #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(57, 28, 100) // FFmpeg 5.1
 #include <libavutil/channel_layout.h>
 #endif
 
+} // extern "C"
+
 #include "util/logger.h"
 #include "util/sample.h"
 

From 3ac5dbe886c42ae0ab939ea1f4b716294ac8825f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sat, 25 Nov 2023 12:16:16 +0100
Subject: [PATCH 316/388] Welcome Ubuntu Noble Numbat

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d3512bc1a08..887eea6f20f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3447,7 +3447,7 @@ if (NOT CPACK_DEBIAN_PACKAGE_RELEASE)
    set(CPACK_DEBIAN_PACKAGE_RELEASE 1)
 endif()
 
-set(CPACK_DEBIAN_DISTRIBUTION_RELEASES focal jammy kinetic lunar mantic)
+set(CPACK_DEBIAN_DISTRIBUTION_RELEASES focal jammy kinetic lunar mantic noble)
 set(CPACK_DEBIAN_SOURCE_DIR ${CMAKE_SOURCE_DIR})
 set(CPACK_DEBIAN_UPLOAD_PPA_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/packaging/CPackDebUploadPPA.cmake")
 set(CPACK_DEBIAN_INSTALL_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/packaging/CPackDebInstall.cmake")

From 84d28b6cdb1b5692aff5559085dc1909920d127d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sat, 25 Nov 2023 12:18:38 +0100
Subject: [PATCH 317/388] Good bye Kinetic Kudu

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 887eea6f20f..9d58d847e64 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3447,7 +3447,7 @@ if (NOT CPACK_DEBIAN_PACKAGE_RELEASE)
    set(CPACK_DEBIAN_PACKAGE_RELEASE 1)
 endif()
 
-set(CPACK_DEBIAN_DISTRIBUTION_RELEASES focal jammy kinetic lunar mantic noble)
+set(CPACK_DEBIAN_DISTRIBUTION_RELEASES focal jammy lunar mantic noble)
 set(CPACK_DEBIAN_SOURCE_DIR ${CMAKE_SOURCE_DIR})
 set(CPACK_DEBIAN_UPLOAD_PPA_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/packaging/CPackDebUploadPPA.cmake")
 set(CPACK_DEBIAN_INSTALL_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/packaging/CPackDebInstall.cmake")

From 20bbf2634d4afa61c33ec64bdc462d9121f645f0 Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Sat, 25 Nov 2023 13:13:09 +0100
Subject: [PATCH 318/388] avoid confusion between visual waveform samples and
 frames by better naming and use correct range (was double!). TODO: re-add
 comments and apply to other waveform renderers

---
 .../allshader/waveformrendererlrrgb.cpp       | 58 +++++++------------
 .../allshader/waveformrendererrgb.cpp         | 58 +++++++------------
 2 files changed, 40 insertions(+), 76 deletions(-)

diff --git a/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp b/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp
index 72f0bd01346..5257d83f77c 100644
--- a/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp
@@ -55,17 +55,15 @@ void WaveformRendererLRRGB::paintGL() {
     const float devicePixelRatio = m_waveformRenderer->getDevicePixelRatio();
     const int length = static_cast<int>(m_waveformRenderer->getLength() * devicePixelRatio);
 
-    // Not multiplying with devicePixelRatio will also work. In that case, on
-    // High-DPI-Display the lines will be devicePixelRatio pixels wide (which is
-    // also what is used for the beat grid and the markers), or in other words
-    // each block of samples is represented by devicePixelRatio pixels (width).
+    const int visualFramesSize = dataSize / 2;
+    const double firstVisualFrame =
+            m_waveformRenderer->getFirstDisplayedPosition() * visualFramesSize;
+    const double lastVisualFrame =
+            m_waveformRenderer->getLastDisplayedPosition() * visualFramesSize;
 
-    const double firstVisualIndex = m_waveformRenderer->getFirstDisplayedPosition() * dataSize;
-    const double lastVisualIndex = m_waveformRenderer->getLastDisplayedPosition() * dataSize;
-
-    // Represents the # of waveform data points per horizontal pixel.
+    // Represents the # of visual frames per horizontal pixel.
     const double visualIncrementPerPixel =
-            (lastVisualIndex - firstVisualIndex) / static_cast<double>(length);
+            (lastVisualFrame - firstVisualFrame) / static_cast<double>(length);
 
     // Per-band gain from the EQ knobs.
     float allGain(1.0), lowGain(1.0), midGain(1.0), highGain(1.0);
@@ -87,8 +85,8 @@ void WaveformRendererLRRGB::paintGL() {
     const float mid_b = static_cast<float>(m_rgbMidColor_b);
     const float high_b = static_cast<float>(m_rgbHighColor_b);
 
-    // Effective visual index of x
-    double xVisualSampleIndex = firstVisualIndex;
+    // Effective visual frame for x
+    double xVisualFrame = firstVisualFrame;
 
     const int numVerticesPerLine = 6; // 2 triangles
 
@@ -108,33 +106,17 @@ void WaveformRendererLRRGB::paintGL() {
             static_cast<float>(m_axesColor_g),
             static_cast<float>(m_axesColor_b));
 
+    double maxSamplingRange = visualIncrementPerPixel / 2.0;
+
     for (int pos = 0; pos < length; ++pos) {
-        // Our current pixel (x) corresponds to a number of visual samples
-        // (visualSamplerPerPixel) in our waveform object. We take the max of
-        // all the data points on either side of xVisualSampleIndex within a
-        // window of 'maxSamplingRange' visual samples to measure the maximum
-        // data point contained by this pixel.
-        double maxSamplingRange = visualIncrementPerPixel / 2.0;
-
-        // Since xVisualSampleIndex is in visual-samples (e.g. R,L,R,L) we want
-        // to check +/- maxSamplingRange frames, not samples. To do this, divide
-        // xVisualSampleIndex by 2. Since frames indices are integers, we round
-        // to the nearest integer by adding 0.5 before casting to int.
-        int visualFrameStart = int(xVisualSampleIndex / 2.0 - maxSamplingRange + 0.5);
-        int visualFrameStop = int(xVisualSampleIndex / 2.0 + maxSamplingRange + 0.5);
-        const int lastVisualFrame = dataSize / 2 - 1;
-
-        // We now know that some subset of [visualFrameStart, visualFrameStop]
-        // lies within the valid range of visual frames. Clamp
-        // visualFrameStart/Stop to within [0, lastVisualFrame].
-        visualFrameStart = math_clamp(visualFrameStart, 0, lastVisualFrame);
-        visualFrameStop = math_clamp(visualFrameStop, 0, lastVisualFrame);
-
-        int visualIndexStart = visualFrameStart * 2;
-        int visualIndexStop = visualFrameStop * 2;
-
-        visualIndexStart = std::max(visualIndexStart, 0);
-        visualIndexStop = std::min(visualIndexStop, dataSize);
+        const int visualFrameStart = int(xVisualFrame - maxSamplingRange + 0.5);
+        const int visualFrameStop = int(xVisualFrame + maxSamplingRange + 0.5);
+
+        const int visualIndexStart = math_clamp(visualFrameStart * 2, 0, dataSize - 1);
+        const int visualIndexStop =
+                math_clamp(std::max(visualFrameStart + 1, visualFrameStop) * 2,
+                        0,
+                        dataSize - 1);
 
         const float fpos = static_cast<float>(pos);
 
@@ -211,7 +193,7 @@ void WaveformRendererLRRGB::paintGL() {
             m_colors.addForRectangle(red, green, blue);
         }
 
-        xVisualSampleIndex += visualIncrementPerPixel;
+        xVisualFrame += visualIncrementPerPixel;
     }
 
     DEBUG_ASSERT(reserved == m_vertices.size());
diff --git a/src/waveform/renderers/allshader/waveformrendererrgb.cpp b/src/waveform/renderers/allshader/waveformrendererrgb.cpp
index b4348239727..8b403697a33 100644
--- a/src/waveform/renderers/allshader/waveformrendererrgb.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererrgb.cpp
@@ -55,17 +55,15 @@ void WaveformRendererRGB::paintGL() {
     const float devicePixelRatio = m_waveformRenderer->getDevicePixelRatio();
     const int length = static_cast<int>(m_waveformRenderer->getLength() * devicePixelRatio);
 
-    // Not multiplying with devicePixelRatio will also work. In that case, on
-    // High-DPI-Display the lines will be devicePixelRatio pixels wide (which is
-    // also what is used for the beat grid and the markers), or in other words
-    // each block of samples is represented by devicePixelRatio pixels (width).
+    const int visualFramesSize = dataSize / 2;
+    const double firstVisualFrame =
+            m_waveformRenderer->getFirstDisplayedPosition() * visualFramesSize;
+    const double lastVisualFrame =
+            m_waveformRenderer->getLastDisplayedPosition() * visualFramesSize;
 
-    const double firstVisualIndex = m_waveformRenderer->getFirstDisplayedPosition() * dataSize;
-    const double lastVisualIndex = m_waveformRenderer->getLastDisplayedPosition() * dataSize;
-
-    // Represents the # of waveform data points per horizontal pixel.
+    // Represents the # of visual frames per horizontal pixel.
     const double visualIncrementPerPixel =
-            (lastVisualIndex - firstVisualIndex) / static_cast<double>(length);
+            (lastVisualFrame - firstVisualFrame) / static_cast<double>(length);
 
     // Per-band gain from the EQ knobs.
     float allGain(1.0), lowGain(1.0), midGain(1.0), highGain(1.0);
@@ -86,8 +84,8 @@ void WaveformRendererRGB::paintGL() {
     const float mid_b = static_cast<float>(m_rgbMidColor_b);
     const float high_b = static_cast<float>(m_rgbHighColor_b);
 
-    // Effective visual index of x
-    double xVisualSampleIndex = firstVisualIndex;
+    // Effective visual frame for x
+    double xVisualFrame = firstVisualFrame;
 
     const int numVerticesPerLine = 6; // 2 triangles
 
@@ -107,33 +105,17 @@ void WaveformRendererRGB::paintGL() {
             static_cast<float>(m_axesColor_g),
             static_cast<float>(m_axesColor_b));
 
+    double maxSamplingRange = visualIncrementPerPixel / 2.0;
+
     for (int pos = 0; pos < length; ++pos) {
-        // Our current pixel (x) corresponds to a number of visual samples
-        // (visualSamplerPerPixel) in our waveform object. We take the max of
-        // all the data points on either side of xVisualSampleIndex within a
-        // window of 'maxSamplingRange' visual samples to measure the maximum
-        // data point contained by this pixel.
-        double maxSamplingRange = visualIncrementPerPixel / 2.0;
-
-        // Since xVisualSampleIndex is in visual-samples (e.g. R,L,R,L) we want
-        // to check +/- maxSamplingRange frames, not samples. To do this, divide
-        // xVisualSampleIndex by 2. Since frames indices are integers, we round
-        // to the nearest integer by adding 0.5 before casting to int.
-        int visualFrameStart = int(xVisualSampleIndex / 2.0 - maxSamplingRange + 0.5);
-        int visualFrameStop = int(xVisualSampleIndex / 2.0 + maxSamplingRange + 0.5);
-        const int lastVisualFrame = dataSize / 2 - 1;
-
-        // We now know that some subset of [visualFrameStart, visualFrameStop]
-        // lies within the valid range of visual frames. Clamp
-        // visualFrameStart/Stop to within [0, lastVisualFrame].
-        visualFrameStart = math_clamp(visualFrameStart, 0, lastVisualFrame);
-        visualFrameStop = math_clamp(visualFrameStop, 0, lastVisualFrame);
-
-        int visualIndexStart = visualFrameStart * 2;
-        int visualIndexStop = visualFrameStop * 2;
-
-        visualIndexStart = std::max(visualIndexStart, 0);
-        visualIndexStop = std::min(visualIndexStop, dataSize);
+        const int visualFrameStart = int(xVisualFrame - maxSamplingRange + 0.5);
+        const int visualFrameStop = int(xVisualFrame + maxSamplingRange + 0.5);
+
+        const int visualIndexStart = math_clamp(visualFrameStart * 2, 0, dataSize - 1);
+        const int visualIndexStop =
+                math_clamp(std::max(visualFrameStart + 1, visualFrameStop) * 2,
+                        0,
+                        dataSize - 1);
 
         const float fpos = static_cast<float>(pos);
 
@@ -211,7 +193,7 @@ void WaveformRendererRGB::paintGL() {
                 halfBreadth + heightFactor * maxAllChn[1]);
         m_colors.addForRectangle(red, green, blue);
 
-        xVisualSampleIndex += visualIncrementPerPixel;
+        xVisualFrame += visualIncrementPerPixel;
     }
 
     DEBUG_ASSERT(reserved == m_vertices.size());

From bee795b59c7649ca565f7106e62b45c8e9d48bae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sat, 25 Nov 2023 14:52:28 +0100
Subject: [PATCH 319/388] Don't use private Qt include files.

---
 src/qml/qmlapplication.cpp  | 2 +-
 src/util/desktophelper.cpp  | 2 +-
 src/util/performancetimer.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/qml/qmlapplication.cpp b/src/qml/qmlapplication.cpp
index d2862b709b0..3157cbd32c7 100644
--- a/src/qml/qmlapplication.cpp
+++ b/src/qml/qmlapplication.cpp
@@ -1,6 +1,6 @@
 #include "qmlapplication.h"
 
-#include <QtQml/qqmlextensionplugin.h>
+#include <QQmlEngineExtensionPlugin>
 
 #include "control/controlsortfiltermodel.h"
 #include "controllers/controllermanager.h"
diff --git a/src/util/desktophelper.cpp b/src/util/desktophelper.cpp
index 64c57c5b28c..64757514017 100644
--- a/src/util/desktophelper.cpp
+++ b/src/util/desktophelper.cpp
@@ -8,8 +8,8 @@
 #include <QProcess>
 
 #ifdef Q_OS_LINUX
-#include <QtDBus/QtDBus>
 #include <QFileInfo>
+#include <QtDBus>
 #endif
 
 namespace {
diff --git a/src/util/performancetimer.h b/src/util/performancetimer.h
index 2625d5010a6..a017c472bae 100644
--- a/src/util/performancetimer.h
+++ b/src/util/performancetimer.h
@@ -48,7 +48,7 @@
 // Returns time in nanosecond resolution.
 //
 
-#include <QtCore/qglobal.h>
+#include <QtGlobal>
 
 #include "util/duration.h"
 

From cbf508095e3e645c7525008631ef531353c85528 Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Sun, 26 Nov 2023 02:02:34 +0100
Subject: [PATCH 320/388] avoid confusion between visual waveform samples and
 frames by better naming and use correct range (was double!) for simple,
 filtered and hsv allshader waveforms

---
 .../allshader/waveformrendererfiltered.cpp    | 62 +++++---------
 .../allshader/waveformrendererhsv.cpp         | 84 ++++++++-----------
 .../allshader/waveformrendererlrrgb.cpp       |  2 +-
 .../allshader/waveformrendererrgb.cpp         |  2 +-
 .../allshader/waveformrenderersimple.cpp      | 65 ++++++--------
 5 files changed, 84 insertions(+), 131 deletions(-)

diff --git a/src/waveform/renderers/allshader/waveformrendererfiltered.cpp b/src/waveform/renderers/allshader/waveformrendererfiltered.cpp
index 1adf16e2900..c2d7f024a92 100644
--- a/src/waveform/renderers/allshader/waveformrendererfiltered.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererfiltered.cpp
@@ -46,17 +46,15 @@ void WaveformRendererFiltered::paintGL() {
     const float devicePixelRatio = m_waveformRenderer->getDevicePixelRatio();
     const int length = static_cast<int>(m_waveformRenderer->getLength() * devicePixelRatio);
 
-    // Not multiplying with devicePixelRatio will also work. In that case, on
-    // High-DPI-Display the lines will be devicePixelRatio pixels wide (which is
-    // also what is used for the beat grid and the markers), or in other words
-    // each block of samples is represented by devicePixelRatio pixels (width).
+    const int visualFramesSize = dataSize / 2;
+    const double firstVisualFrame =
+            m_waveformRenderer->getFirstDisplayedPosition() * visualFramesSize;
+    const double lastVisualFrame =
+            m_waveformRenderer->getLastDisplayedPosition() * visualFramesSize;
 
-    const double firstVisualIndex = m_waveformRenderer->getFirstDisplayedPosition() * dataSize;
-    const double lastVisualIndex = m_waveformRenderer->getLastDisplayedPosition() * dataSize;
-
-    // Represents the # of waveform data points per horizontal pixel.
+    // Represents the # of visual frames per horizontal pixel.
     const double visualIncrementPerPixel =
-            (lastVisualIndex - firstVisualIndex) / static_cast<double>(length);
+            (lastVisualFrame - firstVisualFrame) / static_cast<double>(length);
 
     // Per-band gain from the EQ knobs.
     float allGain{1.0};
@@ -68,8 +66,8 @@ void WaveformRendererFiltered::paintGL() {
 
     const float heightFactor = allGain * halfBreadth / 255.f;
 
-    // Effective visual index of x
-    double xVisualSampleIndex = firstVisualIndex;
+    // Effective visual frame for x
+    double xVisualFrame = firstVisualFrame;
 
     const int numVerticesPerLine = 6; // 2 triangles
 
@@ -92,33 +90,19 @@ void WaveformRendererFiltered::paintGL() {
             static_cast<float>(length),
             halfBreadth + 0.5f * devicePixelRatio);
 
+    const double maxSamplingRange = visualIncrementPerPixel / 2.0;
+
     for (int pos = 0; pos < length; ++pos) {
-        // Our current pixel (x) corresponds to a number of visual samples
-        // (visualSamplerPerPixel) in our waveform object. We take the max of
-        // all the data points on either side of xVisualSampleIndex within a
-        // window of 'maxSamplingRange' visual samples to measure the maximum
-        // data point contained by this pixel.
-        double maxSamplingRange = visualIncrementPerPixel / 2.0;
-
-        // Since xVisualSampleIndex is in visual-samples (e.g. R,L,R,L) we want
-        // to check +/- maxSamplingRange frames, not samples. To do this, divide
-        // xVisualSampleIndex by 2. Since frames indices are integers, we round
-        // to the nearest integer by adding 0.5 before casting to int.
-        int visualFrameStart = int(xVisualSampleIndex / 2.0 - maxSamplingRange + 0.5);
-        int visualFrameStop = int(xVisualSampleIndex / 2.0 + maxSamplingRange + 0.5);
-        const int lastVisualFrame = dataSize / 2 - 1;
-
-        // We now know that some subset of [visualFrameStart, visualFrameStop]
-        // lies within the valid range of visual frames. Clamp
-        // visualFrameStart/Stop to within [0, lastVisualFrame].
-        visualFrameStart = math_clamp(visualFrameStart, 0, lastVisualFrame);
-        visualFrameStop = math_clamp(visualFrameStop, 0, lastVisualFrame);
-
-        int visualIndexStart = visualFrameStart * 2;
-        int visualIndexStop = visualFrameStop * 2;
-
-        visualIndexStart = std::max(visualIndexStart, 0);
-        visualIndexStop = std::min(visualIndexStop, dataSize);
+        const int visualFrameStart = int(xVisualFrame - maxSamplingRange + 0.5);
+        const int visualFrameStop = int(xVisualFrame + maxSamplingRange + 0.5);
+
+        const int visualIndexStart = math_clamp(visualFrameStart * 2, 0, dataSize - 1);
+        const int visualIndexStop =
+                math_clamp(std::max(visualFrameStart + 1, visualFrameStop) * 2,
+                        0,
+                        dataSize - 1);
+
+        const float fpos = static_cast<float>(pos);
 
         // 3 bands, 2 channels
         float max[3][2]{};
@@ -136,8 +120,6 @@ void WaveformRendererFiltered::paintGL() {
             }
         }
 
-        const float fpos = static_cast<float>(pos);
-
         for (int bandIndex = 0; bandIndex < 3; bandIndex++) {
             max[bandIndex][0] *= bandGain[bandIndex];
             max[bandIndex][1] *= bandGain[bandIndex];
@@ -150,7 +132,7 @@ void WaveformRendererFiltered::paintGL() {
                     halfBreadth + heightFactor * max[bandIndex][1]);
         }
 
-        xVisualSampleIndex += visualIncrementPerPixel;
+        xVisualFrame += visualIncrementPerPixel;
     }
 
     const QMatrix4x4 matrix = matrixForWidgetGeometry(m_waveformRenderer, true);
diff --git a/src/waveform/renderers/allshader/waveformrendererhsv.cpp b/src/waveform/renderers/allshader/waveformrendererhsv.cpp
index 5c130a64fbd..11c93b5cd63 100644
--- a/src/waveform/renderers/allshader/waveformrendererhsv.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererhsv.cpp
@@ -47,17 +47,15 @@ void WaveformRendererHSV::paintGL() {
     const float devicePixelRatio = m_waveformRenderer->getDevicePixelRatio();
     const int length = static_cast<int>(m_waveformRenderer->getLength() * devicePixelRatio);
 
-    // Not multiplying with devicePixelRatio will also work. In that case, on
-    // High-DPI-Display the lines will be devicePixelRatio pixels wide (which is
-    // also what is used for the beat grid and the markers), or in other words
-    // each block of samples is represented by devicePixelRatio pixels (width).
+    const int visualFramesSize = dataSize / 2;
+    const double firstVisualFrame =
+            m_waveformRenderer->getFirstDisplayedPosition() * visualFramesSize;
+    const double lastVisualFrame =
+            m_waveformRenderer->getLastDisplayedPosition() * visualFramesSize;
 
-    const double firstVisualIndex = m_waveformRenderer->getFirstDisplayedPosition() * dataSize;
-    const double lastVisualIndex = m_waveformRenderer->getLastDisplayedPosition() * dataSize;
-
-    // Represents the # of waveform data points per horizontal pixel.
+    // Represents the # of visual frames per horizontal pixel.
     const double visualIncrementPerPixel =
-            (lastVisualIndex - firstVisualIndex) / static_cast<double>(length);
+            (lastVisualFrame - firstVisualFrame) / static_cast<double>(length);
 
     float allGain(1.0);
     getGains(&allGain, nullptr, nullptr, nullptr);
@@ -69,10 +67,10 @@ void WaveformRendererHSV::paintGL() {
     const float breadth = static_cast<float>(m_waveformRenderer->getBreadth()) * devicePixelRatio;
     const float halfBreadth = breadth / 2.0f;
 
-    const float heightFactor = allGain * halfBreadth / 256.f;
+    const float heightFactor = allGain * halfBreadth / 255.f;
 
-    // Effective visual index of x
-    double xVisualSampleIndex = firstVisualIndex;
+    // Effective visual frame for x
+    double xVisualFrame = firstVisualFrame;
 
     const int numVerticesPerLine = 6; // 2 triangles
 
@@ -92,33 +90,17 @@ void WaveformRendererHSV::paintGL() {
             static_cast<float>(m_axesColor_g),
             static_cast<float>(m_axesColor_b));
 
+    const double maxSamplingRange = visualIncrementPerPixel / 2.0;
+
     for (int pos = 0; pos < length; ++pos) {
-        // Our current pixel (x) corresponds to a number of visual samples
-        // (visualSamplerPerPixel) in our waveform object. We take the max of
-        // all the data points on either side of xVisualSampleIndex within a
-        // window of 'maxSamplingRange' visual samples to measure the maximum
-        // data point contained by this pixel.
-        double maxSamplingRange = visualIncrementPerPixel / 2.0;
-
-        // Since xVisualSampleIndex is in visual-samples (e.g. R,L,R,L) we want
-        // to check +/- maxSamplingRange frames, not samples. To do this, divide
-        // xVisualSampleIndex by 2. Since frames indices are integers, we round
-        // to the nearest integer by adding 0.5 before casting to int.
-        int visualFrameStart = int(xVisualSampleIndex / 2.0 - maxSamplingRange + 0.5);
-        int visualFrameStop = int(xVisualSampleIndex / 2.0 + maxSamplingRange + 0.5);
-        const int lastVisualFrame = dataSize / 2 - 1;
-
-        // We now know that some subset of [visualFrameStart, visualFrameStop]
-        // lies within the valid range of visual frames. Clamp
-        // visualFrameStart/Stop to within [0, lastVisualFrame].
-        visualFrameStart = math_clamp(visualFrameStart, 0, lastVisualFrame);
-        visualFrameStop = math_clamp(visualFrameStop, 0, lastVisualFrame);
-
-        int visualIndexStart = visualFrameStart * 2;
-        int visualIndexStop = visualFrameStop * 2;
-
-        visualIndexStart = std::max(visualIndexStart, 0);
-        visualIndexStop = std::min(visualIndexStop, dataSize);
+        const int visualFrameStart = int(xVisualFrame - maxSamplingRange + 0.5);
+        const int visualFrameStop = int(xVisualFrame + maxSamplingRange + 0.5);
+
+        const int visualIndexStart = math_clamp(visualFrameStart * 2, 0, dataSize - 1);
+        const int visualIndexStop =
+                math_clamp(std::max(visualFrameStart + 1, visualFrameStop) * 2,
+                        0,
+                        dataSize - 1);
 
         const float fpos = static_cast<float>(pos);
 
@@ -129,20 +111,26 @@ void WaveformRendererHSV::paintGL() {
         float maxAll[2]{};
 
         for (int chn = 0; chn < 2; chn++) {
+            // Find the max values for low, mid, high and all in the waveform data
+            uchar u8maxLow{};
+            uchar u8maxMid{};
+            uchar u8maxHigh{};
+            uchar u8maxAll{};
             // data is interleaved left / right
             for (int i = visualIndexStart + chn; i < visualIndexStop + chn; i += 2) {
                 const WaveformData& waveformData = data[i];
 
-                const float filteredLow = static_cast<float>(waveformData.filtered.low);
-                const float filteredMid = static_cast<float>(waveformData.filtered.mid);
-                const float filteredHigh = static_cast<float>(waveformData.filtered.high);
-                const float filteredAll = static_cast<float>(waveformData.filtered.all);
-
-                maxLow[chn] = math_max(maxLow[chn], filteredLow);
-                maxMid[chn] = math_max(maxMid[chn], filteredMid);
-                maxHigh[chn] = math_max(maxHigh[chn], filteredHigh);
-                maxAll[chn] = math_max(maxAll[chn], filteredAll);
+                u8maxLow = math_max(u8maxLow, waveformData.filtered.low);
+                u8maxMid = math_max(u8maxMid, waveformData.filtered.mid);
+                u8maxHigh = math_max(u8maxHigh, waveformData.filtered.high);
+                u8maxAll = math_max(u8maxAll, waveformData.filtered.all);
             }
+
+            // Cast to float
+            maxLow[chn] = static_cast<float>(u8maxLow);
+            maxMid[chn] = static_cast<float>(u8maxMid);
+            maxHigh[chn] = static_cast<float>(u8maxHigh);
+            maxAll[chn] = static_cast<float>(u8maxAll);
         }
 
         float total{};
@@ -179,7 +167,7 @@ void WaveformRendererHSV::paintGL() {
                 static_cast<float>(color.greenF()),
                 static_cast<float>(color.blueF()));
 
-        xVisualSampleIndex += visualIncrementPerPixel;
+        xVisualFrame += visualIncrementPerPixel;
     }
 
     DEBUG_ASSERT(reserved == m_vertices.size());
diff --git a/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp b/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp
index d76282d2b0c..2690be3db95 100644
--- a/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp
@@ -103,7 +103,7 @@ void WaveformRendererLRRGB::paintGL() {
             static_cast<float>(m_axesColor_g),
             static_cast<float>(m_axesColor_b));
 
-    double maxSamplingRange = visualIncrementPerPixel / 2.0;
+    const double maxSamplingRange = visualIncrementPerPixel / 2.0;
 
     for (int pos = 0; pos < length; ++pos) {
         const int visualFrameStart = int(xVisualFrame - maxSamplingRange + 0.5);
diff --git a/src/waveform/renderers/allshader/waveformrendererrgb.cpp b/src/waveform/renderers/allshader/waveformrendererrgb.cpp
index d84fea5f508..3b30a024d9c 100644
--- a/src/waveform/renderers/allshader/waveformrendererrgb.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererrgb.cpp
@@ -102,7 +102,7 @@ void WaveformRendererRGB::paintGL() {
             static_cast<float>(m_axesColor_g),
             static_cast<float>(m_axesColor_b));
 
-    double maxSamplingRange = visualIncrementPerPixel / 2.0;
+    const double maxSamplingRange = visualIncrementPerPixel / 2.0;
 
     for (int pos = 0; pos < length; ++pos) {
         const int visualFrameStart = int(xVisualFrame - maxSamplingRange + 0.5);
diff --git a/src/waveform/renderers/allshader/waveformrenderersimple.cpp b/src/waveform/renderers/allshader/waveformrenderersimple.cpp
index 70215ebb373..5c477a6416a 100644
--- a/src/waveform/renderers/allshader/waveformrenderersimple.cpp
+++ b/src/waveform/renderers/allshader/waveformrenderersimple.cpp
@@ -46,17 +46,15 @@ void WaveformRendererSimple::paintGL() {
     const float devicePixelRatio = m_waveformRenderer->getDevicePixelRatio();
     const int length = static_cast<int>(m_waveformRenderer->getLength() * devicePixelRatio);
 
-    // Not multiplying with devicePixelRatio will also work. In that case, on
-    // High-DPI-Display the lines will be devicePixelRatio pixels wide (which is
-    // also what is used for the beat grid and the markers), or in other words
-    // each block of samples is represented by devicePixelRatio pixels (width).
+    const int visualFramesSize = dataSize / 2;
+    const double firstVisualFrame =
+            m_waveformRenderer->getFirstDisplayedPosition() * visualFramesSize;
+    const double lastVisualFrame =
+            m_waveformRenderer->getLastDisplayedPosition() * visualFramesSize;
 
-    const double firstVisualIndex = m_waveformRenderer->getFirstDisplayedPosition() * dataSize;
-    const double lastVisualIndex = m_waveformRenderer->getLastDisplayedPosition() * dataSize;
-
-    // Represents the # of waveform data points per horizontal pixel.
+    // Represents the # of visual frames per horizontal pixel.
     const double visualIncrementPerPixel =
-            (lastVisualIndex - firstVisualIndex) / static_cast<double>(length);
+            (lastVisualFrame - firstVisualFrame) / static_cast<double>(length);
 
     // Per-band gain from the EQ knobs.
     float allGain{1.0};
@@ -68,8 +66,8 @@ void WaveformRendererSimple::paintGL() {
 
     const float heightFactor = allGain * halfBreadth / 255.f;
 
-    // Effective visual index of x
-    double xVisualSampleIndex = firstVisualIndex;
+    // Effective visual frame for x
+    double xVisualFrame = firstVisualFrame;
 
     const int numVerticesPerLine = 6; // 2 triangles
 
@@ -90,40 +88,25 @@ void WaveformRendererSimple::paintGL() {
             static_cast<float>(length),
             halfBreadth + 0.5f * devicePixelRatio);
 
+    const double maxSamplingRange = visualIncrementPerPixel / 2.0;
+
     for (int pos = 0; pos < length; ++pos) {
-        // Our current pixel (x) corresponds to a number of visual samples
-        // (visualSamplerPerPixel) in our waveform object. We take the max of
-        // all the data points on either side of xVisualSampleIndex within a
-        // window of 'maxSamplingRange' visual samples to measure the maximum
-        // data point contained by this pixel.
-        double maxSamplingRange = visualIncrementPerPixel / 2.0;
-
-        // Since xVisualSampleIndex is in visual-samples (e.g. R,L,R,L) we want
-        // to check +/- maxSamplingRange frames, not samples. To do this, divide
-        // xVisualSampleIndex by 2. Since frames indices are integers, we round
-        // to the nearest integer by adding 0.5 before casting to int.
-        int visualFrameStart = int(xVisualSampleIndex / 2.0 - maxSamplingRange + 0.5);
-        int visualFrameStop = int(xVisualSampleIndex / 2.0 + maxSamplingRange + 0.5);
-        const int lastVisualFrame = dataSize / 2 - 1;
-
-        // We now know that some subset of [visualFrameStart, visualFrameStop]
-        // lies within the valid range of visual frames. Clamp
-        // visualFrameStart/Stop to within [0, lastVisualFrame].
-        visualFrameStart = math_clamp(visualFrameStart, 0, lastVisualFrame);
-        visualFrameStop = math_clamp(visualFrameStop, 0, lastVisualFrame);
-
-        int visualIndexStart = visualFrameStart * 2;
-        int visualIndexStop = visualFrameStop * 2;
-
-        visualIndexStart = std::max(visualIndexStart, 0);
-        visualIndexStop = std::min(visualIndexStop, dataSize);
+        const int visualFrameStart = int(xVisualFrame - maxSamplingRange + 0.5);
+        const int visualFrameStop = int(xVisualFrame + maxSamplingRange + 0.5);
+
+        const int visualIndexStart = math_clamp(visualFrameStart * 2, 0, dataSize - 1);
+        const int visualIndexStop =
+                math_clamp(std::max(visualFrameStart + 1, visualFrameStop) * 2,
+                        0,
+                        dataSize - 1);
 
         // 2 channels
         float max[2]{};
 
-        for (int i = visualIndexStart; i < visualIndexStop; i += 2) {
-            for (int chn = 0; chn < 2; chn++) {
-                const WaveformData& waveformData = data[i + chn];
+        for (int chn = 0; chn < 2; chn++) {
+            // data is interleaved left / right
+            for (int i = visualIndexStart + chn; i < visualIndexStop + chn; i += 2) {
+                const WaveformData& waveformData = data[i];
                 const float filteredAll = static_cast<float>(waveformData.filtered.all);
 
                 max[chn] = math_max(max[chn], filteredAll);
@@ -139,7 +122,7 @@ void WaveformRendererSimple::paintGL() {
                 fpos + 0.5f,
                 halfBreadth + heightFactor * max[1]);
 
-        xVisualSampleIndex += visualIncrementPerPixel;
+        xVisualFrame += visualIncrementPerPixel;
     }
 
     const QMatrix4x4 matrix = matrixForWidgetGeometry(m_waveformRenderer, true);

From ed37eda7f001523f4a5398f0ae987d442b1a717c Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Sun, 26 Nov 2023 11:32:54 +0100
Subject: [PATCH 321/388] missing include

---
 src/waveform/renderers/allshader/waveformrendermark.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/waveform/renderers/allshader/waveformrendermark.cpp b/src/waveform/renderers/allshader/waveformrendermark.cpp
index de17cdf2c80..3c643e73178 100644
--- a/src/waveform/renderers/allshader/waveformrendermark.cpp
+++ b/src/waveform/renderers/allshader/waveformrendermark.cpp
@@ -3,6 +3,7 @@
 #include <QOpenGLTexture>
 #include <QPainterPath>
 
+#include "util/colorcomponents.h"
 #include "util/texture.h"
 #include "waveform/renderers/allshader/matrixforwidgetgeometry.h"
 #include "waveform/renderers/allshader/rgbadata.h"

From 887dea6a880963978ba2c2c0964873d4307733fa Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Sun, 26 Nov 2023 11:33:28 +0100
Subject: [PATCH 322/388] slightly improved hovering detection

---
 src/waveform/renderers/waveformmark.cpp        | 11 ++++++++---
 src/waveform/renderers/waveformmark.h          |  2 ++
 src/waveform/renderers/waveformmarkset.cpp     |  6 ++++++
 .../renderers/waveformwidgetrenderer.cpp       | 18 ++++++++++++++++++
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/waveform/renderers/waveformmark.cpp b/src/waveform/renderers/waveformmark.cpp
index e2d5c71c085..3a1e2651f68 100644
--- a/src/waveform/renderers/waveformmark.cpp
+++ b/src/waveform/renderers/waveformmark.cpp
@@ -136,17 +136,22 @@ void WaveformMark::setBaseColor(QColor baseColor, int dimBrightThreshold) {
     setNeedsImageUpdate();
 }
 
-bool WaveformMark::contains(QPoint point, Qt::Orientation orientation) const {
+bool WaveformMark::lineHovered(QPoint point, Qt::Orientation orientation) const {
     // Without some padding, the user would only have a single pixel width that
     // would count as hovering over the WaveformMark.
     float lineHoverPadding = 5.0;
     if (orientation == Qt::Vertical) {
         point = QPoint(point.y(), static_cast<int>(m_breadth) - point.x());
     }
-    bool lineHovered = m_linePosition >= point.x() - lineHoverPadding &&
+    return m_linePosition >= point.x() - lineHoverPadding &&
             m_linePosition <= point.x() + lineHoverPadding;
+}
 
-    return m_label.area().contains(point) || lineHovered;
+bool WaveformMark::contains(QPoint point, Qt::Orientation orientation) const {
+    if (orientation == Qt::Vertical) {
+        point = QPoint(point.y(), static_cast<int>(m_breadth) - point.x());
+    }
+    return m_label.area().contains(point);
 }
 
 // Helper struct to calculate the geometry and fontsize needed by generateImage
diff --git a/src/waveform/renderers/waveformmark.h b/src/waveform/renderers/waveformmark.h
index 5e7a5431b34..abb738b3d79 100644
--- a/src/waveform/renderers/waveformmark.h
+++ b/src/waveform/renderers/waveformmark.h
@@ -134,6 +134,8 @@ class WaveformMark {
         }
     }
 
+    // Check if a point (in image coordinates) lies on the line
+    bool lineHovered(QPoint point, Qt::Orientation orientation) const;
     // Check if a point (in image coordinates) lies on drawn image.
     bool contains(QPoint point, Qt::Orientation orientation) const;
 
diff --git a/src/waveform/renderers/waveformmarkset.cpp b/src/waveform/renderers/waveformmarkset.cpp
index ab7d6083ce4..2d600744405 100644
--- a/src/waveform/renderers/waveformmarkset.cpp
+++ b/src/waveform/renderers/waveformmarkset.cpp
@@ -125,5 +125,11 @@ WaveformMarkPointer WaveformMarkSet::findHoveredMark(
             return pMark;
         }
     }
+    for (auto it = m_marksToRender.crbegin(); it != m_marksToRender.crend(); ++it) {
+        const WaveformMarkPointer& pMark = *it;
+        if (pMark->lineHovered(pos, orientation)) {
+            return pMark;
+        }
+    }
     return nullptr;
 }
diff --git a/src/waveform/renderers/waveformwidgetrenderer.cpp b/src/waveform/renderers/waveformwidgetrenderer.cpp
index 81685e2b7a5..6def0215d5b 100644
--- a/src/waveform/renderers/waveformwidgetrenderer.cpp
+++ b/src/waveform/renderers/waveformwidgetrenderer.cpp
@@ -437,6 +437,24 @@ WaveformMarkPointer WaveformWidgetRenderer::getCueMarkAtPoint(QPoint point) cons
             return pMark;
         }
     }
+    for (auto it = m_markPositions.crbegin(); it != m_markPositions.crend(); ++it) {
+        const WaveformMarkPointer& pMark = it->m_pMark;
+        VERIFY_OR_DEBUG_ASSERT(pMark) {
+            continue;
+        }
+
+        int markImagePositionInWidgetSpace = it->m_offsetOnScreen;
+        QPoint pointInImageSpace;
+        if (getOrientation() == Qt::Horizontal) {
+            pointInImageSpace = QPoint(point.x() - markImagePositionInWidgetSpace, point.y());
+        } else {
+            DEBUG_ASSERT(getOrientation() == Qt::Vertical);
+            pointInImageSpace = QPoint(point.x(), point.y() - markImagePositionInWidgetSpace);
+        }
+        if (pMark->lineHovered(pointInImageSpace, getOrientation())) {
+            return pMark;
+        }
+    }
     return nullptr;
 }
 

From bd0bf34f111338070046df8705823bf2aaa19f2d Mon Sep 17 00:00:00 2001
From: Joerg <JoergAtGithub@worldwartweb.com>
Date: Sun, 19 Nov 2023 18:57:52 +0100
Subject: [PATCH 323/388] Fix 500ms blocking of the whole event loop, when
 holding mouse down on title bar on Windows

---
 CMakeLists.txt                | 11 +++++++++++
 src/main.cpp                  |  8 ++++++++
 src/nativeeventhandlerwin.cpp | 35 +++++++++++++++++++++++++++++++++++
 src/nativeeventhandlerwin.h   | 13 +++++++++++++
 4 files changed, 67 insertions(+)
 create mode 100644 src/nativeeventhandlerwin.cpp
 create mode 100644 src/nativeeventhandlerwin.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 739d94e16c3..72e5abd270b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -617,8 +617,16 @@ endif()
 
 set(CLANG_TIDY "" CACHE STRING "CMAKE_CXX_CLANG_TIDY equivalent that only applies to mixxx sources, not bundled dependencies")
 
+if(WIN32)
+  set(NATIVE_SOURCE_FILES src/nativeeventhandlerwin.cpp)
+else()
+  set(NATIVE_SOURCE_FILES "")
+endif()
+
+
 # Mixxx itself
 add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
+  ${NATIVE_SOURCE_FILES}
   src/analyzer/analyzerbeats.cpp
   src/analyzer/analyzerebur128.cpp
   src/analyzer/analyzergain.cpp
@@ -2738,6 +2746,9 @@ elseif(UNIX AND NOT APPLE)
     Qt${QT_VERSION_MAJOR}::DBus
   )
 elseif(WIN32)
+    target_link_libraries(mixxx-lib PRIVATE
+    Comctl32
+    )
   if(Qt_IS_STATIC)
     target_link_libraries(mixxx-lib PRIVATE
       # Pulled from qt-4.8.2-source\mkspecs\win32-msvc2010\qmake.conf
diff --git a/src/main.cpp b/src/main.cpp
index 8b18a2272c6..9f78fa0061a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,6 +18,9 @@
 #else
 #include "mixxxmainwindow.h"
 #endif
+#if defined(__WINDOWS__)
+#include "nativeeventhandlerwin.h"
+#endif
 #include "sources/soundsourceproxy.h"
 #include "util/cmdlineargs.h"
 #include "util/console.h"
@@ -55,6 +58,11 @@ int runMixxx(MixxxApplication* pApp, const CmdlineArgs& args) {
         pApp->processEvents();
         pApp->installEventFilter(&mainWindow);
 
+#if defined(__WINDOWS__)
+        WindowsEventHandler winEventHandler(pApp);
+        pApp->installNativeEventFilter(&winEventHandler);
+#endif
+
         QObject::connect(pCoreServices.get(),
                 &mixxx::CoreServices::initializationProgressUpdate,
                 &mainWindow,
diff --git a/src/nativeeventhandlerwin.cpp b/src/nativeeventhandlerwin.cpp
new file mode 100644
index 00000000000..d350fb2193e
--- /dev/null
+++ b/src/nativeeventhandlerwin.cpp
@@ -0,0 +1,35 @@
+#include "nativeeventhandlerwin.h"
+
+#include <commctrl.h>
+#include <windows.h>
+#include <winuser.h>
+
+#include "moc_nativeeventhandlerwin.cpp"
+
+WindowsEventHandler::WindowsEventHandler(MixxxApplication* pApp)
+        : m_pApp(pApp) {
+}
+
+bool WindowsEventHandler::nativeEventFilter(
+        const QByteArray& eventType, void* message, long* result) {
+    MSG* msg = (MSG*)message;
+    if (msg && msg->message == WM_NCLBUTTONDOWN) {
+        // Trigger the modal loop to prevent 500ms wait in Event Loop
+        // when Windows setting "Show window contents while dragging" is enabled
+        // and the user left-clicks and holds with the mouse on the titlebar of
+        // a window
+        RedrawWindow(
+                msg->hwnd,
+                nullptr,
+                0,
+                RDW_INTERNALPAINT);
+
+        if (msg->wParam == HTCAPTION) {
+            PostMessageW(msg->hwnd, WM_MOUSEMOVE, 0, 0);
+        }
+
+        DefSubclassProc(msg->hwnd, msg->message, msg->wParam, msg->lParam);
+    }
+
+    return false;
+}
diff --git a/src/nativeeventhandlerwin.h b/src/nativeeventhandlerwin.h
new file mode 100644
index 00000000000..f314108cdd3
--- /dev/null
+++ b/src/nativeeventhandlerwin.h
@@ -0,0 +1,13 @@
+#include <QAbstractNativeEventFilter>
+
+#include "mixxxapplication.h"
+
+class WindowsEventHandler : public QAbstractNativeEventFilter {
+  public:
+    WindowsEventHandler(MixxxApplication* pApp);
+
+    bool nativeEventFilter(const QByteArray& eventType, void* message, long* result);
+
+  private:
+    MixxxApplication* m_pApp;
+};

From 735086114f62935d81ebe80df995908b5bf879f9 Mon Sep 17 00:00:00 2001
From: m0dB <79429057+m0dB@users.noreply.github.com>
Date: Sun, 26 Nov 2023 12:26:40 +0100
Subject: [PATCH 324/388] some cleanup and added comments

---
 .../allshader/waveformrendererfiltered.cpp    | 12 +++----
 .../allshader/waveformrendererhsv.cpp         | 12 +++----
 .../allshader/waveformrendererlrrgb.cpp       | 12 +++----
 .../allshader/waveformrendererrgb.cpp         | 12 +++----
 .../allshader/waveformrenderersignalbase.h    |  4 +++
 .../allshader/waveformrenderersimple.cpp      | 31 +++++++++++++------
 6 files changed, 50 insertions(+), 33 deletions(-)

diff --git a/src/waveform/renderers/allshader/waveformrendererfiltered.cpp b/src/waveform/renderers/allshader/waveformrendererfiltered.cpp
index c2d7f024a92..48e93a1ca51 100644
--- a/src/waveform/renderers/allshader/waveformrendererfiltered.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererfiltered.cpp
@@ -46,6 +46,7 @@ void WaveformRendererFiltered::paintGL() {
     const float devicePixelRatio = m_waveformRenderer->getDevicePixelRatio();
     const int length = static_cast<int>(m_waveformRenderer->getLength() * devicePixelRatio);
 
+    // See waveformrenderersimple.cpp for a detailed explanation of the frame and index calculation
     const int visualFramesSize = dataSize / 2;
     const double firstVisualFrame =
             m_waveformRenderer->getFirstDisplayedPosition() * visualFramesSize;
@@ -64,7 +65,7 @@ void WaveformRendererFiltered::paintGL() {
     const float breadth = static_cast<float>(m_waveformRenderer->getBreadth()) * devicePixelRatio;
     const float halfBreadth = breadth / 2.0f;
 
-    const float heightFactor = allGain * halfBreadth / 255.f;
+    const float heightFactor = allGain * halfBreadth / m_maxValue;
 
     // Effective visual frame for x
     double xVisualFrame = firstVisualFrame;
@@ -93,13 +94,12 @@ void WaveformRendererFiltered::paintGL() {
     const double maxSamplingRange = visualIncrementPerPixel / 2.0;
 
     for (int pos = 0; pos < length; ++pos) {
-        const int visualFrameStart = int(xVisualFrame - maxSamplingRange + 0.5);
-        const int visualFrameStop = int(xVisualFrame + maxSamplingRange + 0.5);
+        const int visualFrameStart = std::lround(xVisualFrame - maxSamplingRange);
+        const int visualFrameStop = std::lround(xVisualFrame + maxSamplingRange);
 
-        const int visualIndexStart = math_clamp(visualFrameStart * 2, 0, dataSize - 1);
+        const int visualIndexStart = std::max(visualFrameStart * 2, 0);
         const int visualIndexStop =
-                math_clamp(std::max(visualFrameStart + 1, visualFrameStop) * 2,
-                        0,
+                std::min(std::max(visualFrameStop * 2, visualIndexStart + 1),
                         dataSize - 1);
 
         const float fpos = static_cast<float>(pos);
diff --git a/src/waveform/renderers/allshader/waveformrendererhsv.cpp b/src/waveform/renderers/allshader/waveformrendererhsv.cpp
index 11c93b5cd63..82c0dda1b9f 100644
--- a/src/waveform/renderers/allshader/waveformrendererhsv.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererhsv.cpp
@@ -47,6 +47,7 @@ void WaveformRendererHSV::paintGL() {
     const float devicePixelRatio = m_waveformRenderer->getDevicePixelRatio();
     const int length = static_cast<int>(m_waveformRenderer->getLength() * devicePixelRatio);
 
+    // See waveformrenderersimple.cpp for a detailed explanation of the frame and index calculation
     const int visualFramesSize = dataSize / 2;
     const double firstVisualFrame =
             m_waveformRenderer->getFirstDisplayedPosition() * visualFramesSize;
@@ -67,7 +68,7 @@ void WaveformRendererHSV::paintGL() {
     const float breadth = static_cast<float>(m_waveformRenderer->getBreadth()) * devicePixelRatio;
     const float halfBreadth = breadth / 2.0f;
 
-    const float heightFactor = allGain * halfBreadth / 255.f;
+    const float heightFactor = allGain * halfBreadth / m_maxValue;
 
     // Effective visual frame for x
     double xVisualFrame = firstVisualFrame;
@@ -93,13 +94,12 @@ void WaveformRendererHSV::paintGL() {
     const double maxSamplingRange = visualIncrementPerPixel / 2.0;
 
     for (int pos = 0; pos < length; ++pos) {
-        const int visualFrameStart = int(xVisualFrame - maxSamplingRange + 0.5);
-        const int visualFrameStop = int(xVisualFrame + maxSamplingRange + 0.5);
+        const int visualFrameStart = std::lround(xVisualFrame - maxSamplingRange);
+        const int visualFrameStop = std::lround(xVisualFrame + maxSamplingRange);
 
-        const int visualIndexStart = math_clamp(visualFrameStart * 2, 0, dataSize - 1);
+        const int visualIndexStart = std::max(visualFrameStart * 2, 0);
         const int visualIndexStop =
-                math_clamp(std::max(visualFrameStart + 1, visualFrameStop) * 2,
-                        0,
+                std::min(std::max(visualFrameStop * 2, visualIndexStart + 1),
                         dataSize - 1);
 
         const float fpos = static_cast<float>(pos);
diff --git a/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp b/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp
index 2690be3db95..e1082257be0 100644
--- a/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp
@@ -52,6 +52,7 @@ void WaveformRendererLRRGB::paintGL() {
     const float devicePixelRatio = m_waveformRenderer->getDevicePixelRatio();
     const int length = static_cast<int>(m_waveformRenderer->getLength() * devicePixelRatio);
 
+    // See waveformrenderersimple.cpp for a detailed explanation of the frame and index calculation
     const int visualFramesSize = dataSize / 2;
     const double firstVisualFrame =
             m_waveformRenderer->getFirstDisplayedPosition() * visualFramesSize;
@@ -69,7 +70,7 @@ void WaveformRendererLRRGB::paintGL() {
     const float breadth = static_cast<float>(m_waveformRenderer->getBreadth()) * devicePixelRatio;
     const float halfBreadth = breadth / 2.0f;
 
-    const float heightFactorAbs = allGain * halfBreadth / 255.f;
+    const float heightFactorAbs = allGain * halfBreadth / m_maxValue;
     const float heightFactor[2] = {-heightFactorAbs, heightFactorAbs};
 
     const float low_r = static_cast<float>(m_rgbLowColor_r);
@@ -106,13 +107,12 @@ void WaveformRendererLRRGB::paintGL() {
     const double maxSamplingRange = visualIncrementPerPixel / 2.0;
 
     for (int pos = 0; pos < length; ++pos) {
-        const int visualFrameStart = int(xVisualFrame - maxSamplingRange + 0.5);
-        const int visualFrameStop = int(xVisualFrame + maxSamplingRange + 0.5);
+        const int visualFrameStart = std::lround(xVisualFrame - maxSamplingRange);
+        const int visualFrameStop = std::lround(xVisualFrame + maxSamplingRange);
 
-        const int visualIndexStart = math_clamp(visualFrameStart * 2, 0, dataSize - 1);
+        const int visualIndexStart = std::max(visualFrameStart * 2, 0);
         const int visualIndexStop =
-                math_clamp(std::max(visualFrameStart + 1, visualFrameStop) * 2,
-                        0,
+                std::min(std::max(visualFrameStop * 2, visualIndexStart + 1),
                         dataSize - 1);
 
         const float fpos = static_cast<float>(pos);
diff --git a/src/waveform/renderers/allshader/waveformrendererrgb.cpp b/src/waveform/renderers/allshader/waveformrendererrgb.cpp
index 3b30a024d9c..906d0d47b32 100644
--- a/src/waveform/renderers/allshader/waveformrendererrgb.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererrgb.cpp
@@ -52,6 +52,7 @@ void WaveformRendererRGB::paintGL() {
     const float devicePixelRatio = m_waveformRenderer->getDevicePixelRatio();
     const int length = static_cast<int>(m_waveformRenderer->getLength() * devicePixelRatio);
 
+    // See waveformrenderersimple.cpp for a detailed explanation of the frame and index calculation
     const int visualFramesSize = dataSize / 2;
     const double firstVisualFrame =
             m_waveformRenderer->getFirstDisplayedPosition() * visualFramesSize;
@@ -69,7 +70,7 @@ void WaveformRendererRGB::paintGL() {
     const float breadth = static_cast<float>(m_waveformRenderer->getBreadth()) * devicePixelRatio;
     const float halfBreadth = breadth / 2.0f;
 
-    const float heightFactor = allGain * halfBreadth / 255.f;
+    const float heightFactor = allGain * halfBreadth / m_maxValue;
 
     const float low_r = static_cast<float>(m_rgbLowColor_r);
     const float mid_r = static_cast<float>(m_rgbMidColor_r);
@@ -105,13 +106,12 @@ void WaveformRendererRGB::paintGL() {
     const double maxSamplingRange = visualIncrementPerPixel / 2.0;
 
     for (int pos = 0; pos < length; ++pos) {
-        const int visualFrameStart = int(xVisualFrame - maxSamplingRange + 0.5);
-        const int visualFrameStop = int(xVisualFrame + maxSamplingRange + 0.5);
+        const int visualFrameStart = std::lround(xVisualFrame - maxSamplingRange);
+        const int visualFrameStop = std::lround(xVisualFrame + maxSamplingRange);
 
-        const int visualIndexStart = math_clamp(visualFrameStart * 2, 0, dataSize - 1);
+        const int visualIndexStart = std::max(visualFrameStart * 2, 0);
         const int visualIndexStop =
-                math_clamp(std::max(visualFrameStart + 1, visualFrameStop) * 2,
-                        0,
+                std::min(std::max(visualFrameStop * 2, visualIndexStart + 1),
                         dataSize - 1);
 
         const float fpos = static_cast<float>(pos);
diff --git a/src/waveform/renderers/allshader/waveformrenderersignalbase.h b/src/waveform/renderers/allshader/waveformrenderersignalbase.h
index 13429181164..1b0e53d0758 100644
--- a/src/waveform/renderers/allshader/waveformrenderersignalbase.h
+++ b/src/waveform/renderers/allshader/waveformrenderersignalbase.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <limits>
+
 #include "util/class.h"
 #include "waveform/renderers/allshader/waveformrendererabstract.h"
 #include "waveform/renderers/waveformrenderersignalbase.h"
@@ -13,6 +15,8 @@ class WaveformRendererSignalBase;
 class allshader::WaveformRendererSignalBase : public ::WaveformRendererSignalBase,
                                               public allshader::WaveformRendererAbstract {
   public:
+    static constexpr float m_maxValue{static_cast<float>(std::numeric_limits<uint8_t>::max())};
+
     explicit WaveformRendererSignalBase(WaveformWidgetRenderer* waveformWidget);
 
     void draw(QPainter* painter, QPaintEvent* event) override {
diff --git a/src/waveform/renderers/allshader/waveformrenderersimple.cpp b/src/waveform/renderers/allshader/waveformrenderersimple.cpp
index 5c477a6416a..f1339309fc0 100644
--- a/src/waveform/renderers/allshader/waveformrenderersimple.cpp
+++ b/src/waveform/renderers/allshader/waveformrenderersimple.cpp
@@ -46,13 +46,19 @@ void WaveformRendererSimple::paintGL() {
     const float devicePixelRatio = m_waveformRenderer->getDevicePixelRatio();
     const int length = static_cast<int>(m_waveformRenderer->getLength() * devicePixelRatio);
 
+    // Note that waveform refers to the visual waveform, not to audio samples.
+    //
+    // WaveformData* data contains the L and R waveform values interleaved. In the calculations
+    // below, 'frame' refers to the index of such an L-R pair.
     const int visualFramesSize = dataSize / 2;
+
+    // Calculate the first and last frame to draw, from the normalized display position
     const double firstVisualFrame =
             m_waveformRenderer->getFirstDisplayedPosition() * visualFramesSize;
     const double lastVisualFrame =
             m_waveformRenderer->getLastDisplayedPosition() * visualFramesSize;
 
-    // Represents the # of visual frames per horizontal pixel.
+    // Calculate the number of visual frames per horizontal pixel.
     const double visualIncrementPerPixel =
             (lastVisualFrame - firstVisualFrame) / static_cast<double>(length);
 
@@ -64,9 +70,9 @@ void WaveformRendererSimple::paintGL() {
     const float breadth = static_cast<float>(m_waveformRenderer->getBreadth()) * devicePixelRatio;
     const float halfBreadth = breadth / 2.0f;
 
-    const float heightFactor = allGain * halfBreadth / 255.f;
+    const float heightFactor = allGain * halfBreadth / m_maxValue;
 
-    // Effective visual frame for x
+    // Effective visual frame for x, which we will increment for each pixel advanced
     double xVisualFrame = firstVisualFrame;
 
     const int numVerticesPerLine = 6; // 2 triangles
@@ -88,16 +94,23 @@ void WaveformRendererSimple::paintGL() {
             static_cast<float>(length),
             halfBreadth + 0.5f * devicePixelRatio);
 
+    // We will iterate over a range of waveform data, centered around xVisualFrame
     const double maxSamplingRange = visualIncrementPerPixel / 2.0;
 
     for (int pos = 0; pos < length; ++pos) {
-        const int visualFrameStart = int(xVisualFrame - maxSamplingRange + 0.5);
-        const int visualFrameStop = int(xVisualFrame + maxSamplingRange + 0.5);
-
-        const int visualIndexStart = math_clamp(visualFrameStart * 2, 0, dataSize - 1);
+        // Calculate the start and end of the range of waveform data, centered around xVisualFrame
+        const int visualFrameStart = std::lround(xVisualFrame - maxSamplingRange);
+        const int visualFrameStop = std::lround(xVisualFrame + maxSamplingRange);
+
+        // Calculate the actual (deinterleaved) indices.
+        //
+        // Make sure we stay inside data at the lower boundary
+        const int visualIndexStart = std::max(visualFrameStart * 2, 0);
+        // and at the upper boundary.
+        // Note: * dataSize - 1, because below we add chn = 1
+        //       * visualIndexStart + 1, because we want to have at least 1 value
         const int visualIndexStop =
-                math_clamp(std::max(visualFrameStart + 1, visualFrameStop) * 2,
-                        0,
+                std::min(std::max(visualFrameStop * 2, visualIndexStart + 1),
                         dataSize - 1);
 
         // 2 channels

From a987ef848217f02b6800f3bcbcca42f93ee3642a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sun, 26 Nov 2023 10:36:24 +0100
Subject: [PATCH 325/388] Add missing header to console.cpp

---
 src/util/console.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/util/console.cpp b/src/util/console.cpp
index 7238253ce7a..9c3f5a85059 100644
--- a/src/util/console.cpp
+++ b/src/util/console.cpp
@@ -1,11 +1,13 @@
 #include "console.h"
 
 #ifdef __WINDOWS__
+#include <conio.h>
 #include <io.h> // Debug Console
 #include <string.h>
-#include <conio.h>
 #include <strsafe.h>
 
+#include "util/versionstore.h"
+
 typedef BOOL(WINAPI* pfGetCurrentConsoleFontEx)(HANDLE, BOOL, PCONSOLE_FONT_INFOEX);
 typedef BOOL(WINAPI* pfSetCurrentConsoleFontEx)(HANDLE, BOOL, PCONSOLE_FONT_INFOEX);
 

From b0e00aa5d08c254da36056dcb3a91f43ed5f5665 Mon Sep 17 00:00:00 2001
From: Joerg <JoergAtGithub@worldwartweb.com>
Date: Sun, 26 Nov 2023 13:25:37 +0100
Subject: [PATCH 326/388] #ifdef the content out instead of CMakeLists.txt
 solution

---
 CMakeLists.txt                | 9 +--------
 src/nativeeventhandlerwin.cpp | 3 ++-
 src/nativeeventhandlerwin.h   | 2 ++
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72e5abd270b..09b29517864 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -617,16 +617,8 @@ endif()
 
 set(CLANG_TIDY "" CACHE STRING "CMAKE_CXX_CLANG_TIDY equivalent that only applies to mixxx sources, not bundled dependencies")
 
-if(WIN32)
-  set(NATIVE_SOURCE_FILES src/nativeeventhandlerwin.cpp)
-else()
-  set(NATIVE_SOURCE_FILES "")
-endif()
-
-
 # Mixxx itself
 add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
-  ${NATIVE_SOURCE_FILES}
   src/analyzer/analyzerbeats.cpp
   src/analyzer/analyzerebur128.cpp
   src/analyzer/analyzergain.cpp
@@ -966,6 +958,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/musicbrainz/web/coverartarchiveimagetask.cpp
   src/musicbrainz/web/coverartarchivelinkstask.cpp
   src/musicbrainz/web/musicbrainzrecordingstask.cpp
+  src/nativeeventhandlerwin.cpp
   src/network/jsonwebtask.cpp
   src/network/networktask.cpp
   src/network/webtask.cpp
diff --git a/src/nativeeventhandlerwin.cpp b/src/nativeeventhandlerwin.cpp
index d350fb2193e..217d6756d05 100644
--- a/src/nativeeventhandlerwin.cpp
+++ b/src/nativeeventhandlerwin.cpp
@@ -1,5 +1,5 @@
 #include "nativeeventhandlerwin.h"
-
+#if defined(__WINDOWS__)
 #include <commctrl.h>
 #include <windows.h>
 #include <winuser.h>
@@ -33,3 +33,4 @@ bool WindowsEventHandler::nativeEventFilter(
 
     return false;
 }
+#endif
diff --git a/src/nativeeventhandlerwin.h b/src/nativeeventhandlerwin.h
index f314108cdd3..3f1f4f0016c 100644
--- a/src/nativeeventhandlerwin.h
+++ b/src/nativeeventhandlerwin.h
@@ -1,5 +1,6 @@
 #include <QAbstractNativeEventFilter>
 
+#if defined(__WINDOWS__)
 #include "mixxxapplication.h"
 
 class WindowsEventHandler : public QAbstractNativeEventFilter {
@@ -11,3 +12,4 @@ class WindowsEventHandler : public QAbstractNativeEventFilter {
   private:
     MixxxApplication* m_pApp;
 };
+#endif

From ea02f88502e1b94aabe9ac219ee762ffc36148c4 Mon Sep 17 00:00:00 2001
From: Joerg <JoergAtGithub@worldwartweb.com>
Date: Sun, 26 Nov 2023 13:49:08 +0100
Subject: [PATCH 327/388] Move link library comctl32 from Qt dependency
 section, to general Windows section

---
 CMakeLists.txt | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09b29517864..1d6b3b866d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1672,7 +1672,7 @@ if(WIN32)
     target_compile_definitions(mixxx-lib PUBLIC WIN64)
   endif()
 
-  target_link_libraries(mixxx-lib PRIVATE shell32)
+  target_link_libraries(mixxx-lib PRIVATE comctl32 shell32)
 
   if(MSVC)
     target_link_options(mixxx-lib PUBLIC /entry:mainCRTStartup)
@@ -2739,9 +2739,6 @@ elseif(UNIX AND NOT APPLE)
     Qt${QT_VERSION_MAJOR}::DBus
   )
 elseif(WIN32)
-    target_link_libraries(mixxx-lib PRIVATE
-    Comctl32
-    )
   if(Qt_IS_STATIC)
     target_link_libraries(mixxx-lib PRIVATE
       # Pulled from qt-4.8.2-source\mkspecs\win32-msvc2010\qmake.conf

From 958342da13c3d14641ea36e79f8919c9e319d24e Mon Sep 17 00:00:00 2001
From: Joerg <JoergAtGithub@worldwartweb.com>
Date: Sun, 26 Nov 2023 14:00:05 +0100
Subject: [PATCH 328/388] Added comments

---
 src/nativeeventhandlerwin.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/nativeeventhandlerwin.cpp b/src/nativeeventhandlerwin.cpp
index 217d6756d05..a8db4c62c64 100644
--- a/src/nativeeventhandlerwin.cpp
+++ b/src/nativeeventhandlerwin.cpp
@@ -18,6 +18,9 @@ bool WindowsEventHandler::nativeEventFilter(
         // when Windows setting "Show window contents while dragging" is enabled
         // and the user left-clicks and holds with the mouse on the titlebar of
         // a window
+        // For reference, have a look at:
+        // https://www.gamedev.net/forums/topic/520860-sizemove-loop-and-delay-in-defwindowproc/4382282/
+        // https://github.com/rust-windowing/winit/pull/839
         RedrawWindow(
                 msg->hwnd,
                 nullptr,
@@ -31,6 +34,8 @@ bool WindowsEventHandler::nativeEventFilter(
         DefSubclassProc(msg->hwnd, msg->message, msg->wParam, msg->lParam);
     }
 
+    // Returning false indicates that the event itself has not been finally processed here,
+    // so other recipients will also receive this message subsequently
     return false;
 }
 #endif

From dab89310385af7d12da8deecb11a42fc635b65dc Mon Sep 17 00:00:00 2001
From: djantti <djantti@proton.me>
Date: Mon, 27 Nov 2023 00:23:13 +0200
Subject: [PATCH 329/388] Use ControlX group for Mode button

---
 res/controllers/Traktor-Kontrol-Z1-scripts.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/controllers/Traktor-Kontrol-Z1-scripts.js b/res/controllers/Traktor-Kontrol-Z1-scripts.js
index 3e62145418d..659e576226d 100644
--- a/res/controllers/Traktor-Kontrol-Z1-scripts.js
+++ b/res/controllers/Traktor-Kontrol-Z1-scripts.js
@@ -28,7 +28,7 @@ KontrolZ1.registerInputPackets = function() {
     const message = new HIDPacket("message", 0x1, this.messageCallback);
 
     // Mode button
-    this.registerInputButton(message, "[Controls]", "!mode", 0x1D, 0x2, this.modeHandler);
+    this.registerInputButton(message, "[ControlX]", "!mode", 0x1D, 0x2, this.modeHandler);
 
     // Headphone buttons
     this.registerInputButton(message, "[Channel1]", "!pfl", 0x1D, 0x10, this.headphoneHandler);
@@ -102,7 +102,7 @@ KontrolZ1.registerInputScaler = function(message, group, name, offset, bitmask,
 KontrolZ1.registerOutputPackets = function() {
     const output = new HIDPacket("output", 0x80);
 
-    output.addOutput("[Controls]", "mode", 0x13, "B");
+    output.addOutput("[ControlX]", "mode", 0x13, "B");
 
     output.addOutput("[Channel1]", "pfl", 0xF, "B");
     output.addOutput("[Channel2]", "pfl", 0x10, "B");
@@ -214,7 +214,7 @@ KontrolZ1.lightDeck = function(switchOff) {
         fullLight = 0x00;
     }
 
-    KontrolZ1.controller.setOutput("[Controls]", "mode", softLight, true);
+    KontrolZ1.controller.setOutput("[ControlX]", "mode", softLight, true);
 
     current = engine.getValue("[QuickEffectRack1_[Channel1]]", "enabled") ? fullLight : softLight;
     KontrolZ1.controller.setOutput("[QuickEffectRack1_[Channel1]]", "enabled", current, true);

From e9a6e299fbd4fd0d84bd4936688daf0644bc56a1 Mon Sep 17 00:00:00 2001
From: djantti <djantti@proton.me>
Date: Mon, 27 Nov 2023 01:55:36 +0200
Subject: [PATCH 330/388] Add missing semicolons

---
 res/controllers/Traktor-Kontrol-Z1-scripts.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/res/controllers/Traktor-Kontrol-Z1-scripts.js b/res/controllers/Traktor-Kontrol-Z1-scripts.js
index 659e576226d..51fb8181823 100644
--- a/res/controllers/Traktor-Kontrol-Z1-scripts.js
+++ b/res/controllers/Traktor-Kontrol-Z1-scripts.js
@@ -141,7 +141,7 @@ KontrolZ1.registerOutputPackets = function() {
     this.vuRightConnection = engine.makeUnbufferedConnection("[Channel2]", "vu_meter", this.vuMeterHandler);
 
     KontrolZ1.lightDeck(false);
-}
+};
 
 KontrolZ1.modeHandler = function(field) {
     KontrolZ1.modePressed = field.value;
@@ -192,7 +192,7 @@ KontrolZ1.vuMeterHandler = function(value, group, _key) {
 
 KontrolZ1.parameterHandler = function(field) {
     engine.setParameter(field.group, field.name, field.value / 4095);
-}
+};
 
 KontrolZ1.outputHandler = function(value, group, key) {
     if (value === 0 || value === false) {
@@ -225,7 +225,7 @@ KontrolZ1.lightDeck = function(switchOff) {
     KontrolZ1.controller.setOutput("[Channel1]", "pfl", current, true);
     current = engine.getValue("[Channel2]", "pfl") ? fullLight : softLight;
     KontrolZ1.controller.setOutput("[Channel2]", "pfl", current, true);
-}
+};
 
 KontrolZ1.messageCallback = function(packet, data) {
     for (const name in data) {
@@ -233,7 +233,7 @@ KontrolZ1.messageCallback = function(packet, data) {
             KontrolZ1.controller.processButton(data[name]);
         }
     }
-}
+};
 
 KontrolZ1.shutdown = function() {
     // Deactivate all LEDs

From 9ac3b40077439066a9f5abeace7f18b79452eb5f Mon Sep 17 00:00:00 2001
From: djantti <djantti@proton.me>
Date: Mon, 27 Nov 2023 03:24:56 +0200
Subject: [PATCH 331/388] Fix undefined variables

---
 res/controllers/Traktor-Kontrol-Z1-scripts.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/res/controllers/Traktor-Kontrol-Z1-scripts.js b/res/controllers/Traktor-Kontrol-Z1-scripts.js
index 51fb8181823..75eab994c91 100644
--- a/res/controllers/Traktor-Kontrol-Z1-scripts.js
+++ b/res/controllers/Traktor-Kontrol-Z1-scripts.js
@@ -169,7 +169,7 @@ KontrolZ1.fxHandler = function(field) {
     // Control playback when modifier is active
     if (KontrolZ1.modePressed) {
         // Match play indicator (red led) brightness to fx indicator (blue led)
-        current = engine.getValue("[QuickEffectRack1_" + field.group + "]", "enabled") ? 0x7F : 0xA;
+        const current = engine.getValue("[QuickEffectRack1_" + field.group + "]", "enabled") ? 0x7F : 0xA;
         KontrolZ1.controller.setOutput(field.group, "play_indicator", current, true);
         script.toggleControl(field.group, "play");
     } else {
@@ -195,6 +195,7 @@ KontrolZ1.parameterHandler = function(field) {
 };
 
 KontrolZ1.outputHandler = function(value, group, key) {
+    let ledValue;
     if (value === 0 || value === false) {
         // Off value (dimmed)
         ledValue = 0xA;
@@ -208,6 +209,7 @@ KontrolZ1.outputHandler = function(value, group, key) {
 KontrolZ1.lightDeck = function(switchOff) {
     let softLight = 0xA;
     let fullLight = 0x7F;
+    let current;
 
     if (switchOff) {
         softLight = 0x00;

From 00e74e38ed24958f97097127aef14009c6bac653 Mon Sep 17 00:00:00 2001
From: djantti <djantti@proton.me>
Date: Mon, 27 Nov 2023 03:27:56 +0200
Subject: [PATCH 332/388] Replace print() with console.log()

---
 res/controllers/Traktor-Kontrol-Z1-scripts.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/controllers/Traktor-Kontrol-Z1-scripts.js b/res/controllers/Traktor-Kontrol-Z1-scripts.js
index 75eab994c91..152d9f41abd 100644
--- a/res/controllers/Traktor-Kontrol-Z1-scripts.js
+++ b/res/controllers/Traktor-Kontrol-Z1-scripts.js
@@ -21,7 +21,7 @@ KontrolZ1.init = function(_id) {
     KontrolZ1.id = _id;
     KontrolZ1.registerInputPackets();
     KontrolZ1.registerOutputPackets();
-    print(KontrolZ1.id + " initialized");
+    console.log(KontrolZ1.id + " initialized");
 };
 
 KontrolZ1.registerInputPackets = function() {
@@ -240,7 +240,7 @@ KontrolZ1.messageCallback = function(packet, data) {
 KontrolZ1.shutdown = function() {
     // Deactivate all LEDs
     KontrolZ1.lightDeck(true);
-    print(KontrolZ1.id + " shut down");
+    console.log(KontrolZ1.id + " shut down");
 };
 
 KontrolZ1.incomingData = function(data, length) {

From 34af7d1c477165bba56f692913577ba6279e671f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Mon, 27 Nov 2023 07:25:59 +0100
Subject: [PATCH 333/388] Add some line breaks

---
 src/track/beats.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/track/beats.h b/src/track/beats.h
index 43008b3bcb5..3edf87c1146 100644
--- a/src/track/beats.h
+++ b/src/track/beats.h
@@ -77,7 +77,9 @@ class Beats : private std::enable_shared_from_this<Beats> {
         ConstIterator(const Beats* beats,
                 std::vector<BeatMarker>::const_iterator it,
                 int beatOffset)
-                : m_beats(beats), m_it(it), m_beatOffset(beatOffset) {
+                : m_beats(beats),
+                  m_it(it),
+                  m_beatOffset(beatOffset) {
             updateValue();
         }
 
@@ -133,7 +135,8 @@ class Beats : private std::enable_shared_from_this<Beats> {
         difference_type operator-(const ConstIterator& other) const;
 
         friend bool operator==(const ConstIterator& lhs, const ConstIterator& rhs) {
-            return lhs.m_beats == rhs.m_beats && lhs.m_it == rhs.m_it &&
+            return lhs.m_beats == rhs.m_beats &&
+                    lhs.m_it == rhs.m_it &&
                     lhs.m_beatOffset == rhs.m_beatOffset;
         }
 

From 3225af2f1439f814496700b32159308f5ed809fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Mon, 27 Nov 2023 07:31:43 +0100
Subject: [PATCH 334/388] Add values to warnings in case of beat iterator
 overflow protection

---
 src/track/beats.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/track/beats.cpp b/src/track/beats.cpp
index dc2f0674ade..0bcc3143135 100644
--- a/src/track/beats.cpp
+++ b/src/track/beats.cpp
@@ -67,8 +67,8 @@ Beats::ConstIterator Beats::ConstIterator::operator+=(Beats::ConstIterator::diff
     // Detect integer overflow in `m_beatOffset + n`
     const int maxBeatOffset = std::numeric_limits<Beats::ConstIterator::difference_type>::max();
     if (m_beatOffset > maxBeatOffset - n) {
-        qWarning() << "Beats: Iterator would go out of possible range, capping "
-                      "at latest possible position.";
+        qWarning() << "Beats: Iterator" << m_beatOffset << "+" << n
+                   << "would go out of possible range, capping at latest possible position.";
         m_it = m_beats->m_markers.cend();
         m_beatOffset = maxBeatOffset;
         updateValue();
@@ -115,8 +115,8 @@ Beats::ConstIterator Beats::ConstIterator::operator-=(Beats::ConstIterator::diff
     // Detect integer overflow
     const int minBeatOffset = std::numeric_limits<Beats::ConstIterator::difference_type>::lowest();
     if (m_beatOffset < minBeatOffset + n) {
-        qWarning() << "Beats: Iterator would go out of possible range, capping "
-                      "at earliest possible position.";
+        qWarning() << "Beats Iterator" << m_beatOffset << "-" << n
+                   << "would go out of possible range, capping at earliest possible position.";
         m_it = m_beats->m_markers.cbegin();
         m_beatOffset = minBeatOffset;
         updateValue();

From 04d88d1be27f2c99e1101ef0fbd5032268df5e39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Mon, 27 Nov 2023 08:04:08 +0100
Subject: [PATCH 335/388] Use overall average BPM before the play position is
 adjusted (kInitialPlayPosition)

---
 src/engine/controls/bpmcontrol.cpp  | 4 +++-
 src/engine/controls/enginecontrol.h | 7 +++++++
 src/engine/enginebuffer.cpp         | 7 -------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/engine/controls/bpmcontrol.cpp b/src/engine/controls/bpmcontrol.cpp
index bf9dccc043a..9219af09304 100644
--- a/src/engine/controls/bpmcontrol.cpp
+++ b/src/engine/controls/bpmcontrol.cpp
@@ -1017,7 +1017,9 @@ mixxx::Bpm BpmControl::updateLocalBpm() {
     const mixxx::BeatsPointer pBeats = m_pBeats;
     const FrameInfo info = frameInfo();
     if (pBeats) {
-        localBpm = pBeats->getBpmAroundPosition(info.currentPosition, kLocalBpmSpan);
+        if (info.currentPosition.isValid() && info.currentPosition != kInitialPlayPosition) {
+            localBpm = pBeats->getBpmAroundPosition(info.currentPosition, kLocalBpmSpan);
+        }
         if (!localBpm.isValid()) {
             localBpm = pBeats->getBpmInRange(mixxx::audio::kStartFramePos, info.trackEndPosition);
         }
diff --git a/src/engine/controls/enginecontrol.h b/src/engine/controls/enginecontrol.h
index 517a29e6285..6c2f451ec10 100644
--- a/src/engine/controls/enginecontrol.h
+++ b/src/engine/controls/enginecontrol.h
@@ -21,6 +21,13 @@ static_assert(
         mixxx::audio::FramePos::kLegacyInvalidEnginePosition == kNoTrigger,
         "Invalid engine position value mismatch");
 
+// This value is used to make sure the initial seek after loading a track is
+// not omitted. Therefore this value must be different for 0.0 or any likely
+// value for the main cue
+constexpr auto kInitialPlayPosition =
+        mixxx::audio::FramePos::fromEngineSamplePos(
+                std::numeric_limits<double>::lowest());
+
 /**
  * EngineControl is an abstract base class for objects which implement
  * functionality pertaining to EngineBuffer. An EngineControl is meant to be a
diff --git a/src/engine/enginebuffer.cpp b/src/engine/enginebuffer.cpp
index d75fb9e38ee..97874b0e946 100644
--- a/src/engine/enginebuffer.cpp
+++ b/src/engine/enginebuffer.cpp
@@ -41,13 +41,6 @@
 namespace {
 const mixxx::Logger kLogger("EngineBuffer");
 
-// This value is used to make sure the initial seek after loading a track is
-// not omitted. Therefore this value must be different for 0.0 or any likely
-// value for the main cue
-constexpr auto kInitialPlayPosition =
-        mixxx::audio::FramePos::fromEngineSamplePos(
-                std::numeric_limits<double>::lowest());
-
 constexpr double kLinearScalerElipsis =
         1.00058; // 2^(0.01/12): changes < 1 cent allows a linear scaler
 

From f13630edd3ddd94c701669e15a9be70fc410c71d Mon Sep 17 00:00:00 2001
From: Joerg <JoergAtGithub@worldwartweb.com>
Date: Mon, 27 Nov 2023 22:04:42 +0100
Subject: [PATCH 336/388] Reformatted code to modern ES6 class structure

---
 res/controllers/Traktor-Kontrol-Z1-scripts.js | 401 +++++++++---------
 1 file changed, 203 insertions(+), 198 deletions(-)

diff --git a/res/controllers/Traktor-Kontrol-Z1-scripts.js b/res/controllers/Traktor-Kontrol-Z1-scripts.js
index 152d9f41abd..bde7fca988a 100644
--- a/res/controllers/Traktor-Kontrol-Z1-scripts.js
+++ b/res/controllers/Traktor-Kontrol-Z1-scripts.js
@@ -5,244 +5,249 @@
 // Author: djantti
 //
 
-var KontrolZ1 = new function() {
-    this.controller = new HIDController();
+class TraktorZ1Class {
+    constructor() {
+        this.controller = new HIDController();
 
-    // Modifier state
-    this.modePressed = false;
+        // Modifier state
+        this.modePressed = false;
 
-    // VuMeter
-    this.vuLeftConnection = {};
-    this.vuRightConnection = {};
-    this.vuMeterThresholds = {"vu-30": (1 / 7), "vu-15": (2 / 7), "vu-6": (3 / 7), "vu-3": (4 / 7), "vu0": (5 / 7), "vu3": (6 / 7), "vu6": (7 / 7)};
-};
+        // VuMeter
+        this.vuLeftConnection = {};
+        this.vuRightConnection = {};
+        this.vuMeterThresholds = {"vu-30": (1 / 7), "vu-15": (2 / 7), "vu-6": (3 / 7), "vu-3": (4 / 7), "vu0": (5 / 7), "vu3": (6 / 7), "vu6": (7 / 7)};
+    }
 
-KontrolZ1.init = function(_id) {
-    KontrolZ1.id = _id;
-    KontrolZ1.registerInputPackets();
-    KontrolZ1.registerOutputPackets();
-    console.log(KontrolZ1.id + " initialized");
-};
+    init(_id) {
+        this.id = _id;
+        this.registerInputPackets();
+        this.registerOutputPackets();
+        console.log(this.id + " initialized");
+    }
 
-KontrolZ1.registerInputPackets = function() {
-    const message = new HIDPacket("message", 0x1, this.messageCallback);
+    registerInputPackets() {
+        const message = new HIDPacket("message", 0x1, this.messageCallback);
 
-    // Mode button
-    this.registerInputButton(message, "[ControlX]", "!mode", 0x1D, 0x2, this.modeHandler);
+        // Mode button
+        this.registerInputButton(message, "[ControlX]", "!mode", 0x1D, 0x2, this.modeHandler);
 
-    // Headphone buttons
-    this.registerInputButton(message, "[Channel1]", "!pfl", 0x1D, 0x10, this.headphoneHandler);
-    this.registerInputButton(message, "[Channel2]", "!pfl", 0x1D, 0x1, this.headphoneHandler);
+        // Headphone buttons
+        this.registerInputButton(message, "[Channel1]", "!pfl", 0x1D, 0x10, this.headphoneHandler);
+        this.registerInputButton(message, "[Channel2]", "!pfl", 0x1D, 0x1, this.headphoneHandler);
 
-    // FX buttons
-    this.registerInputButton(message, "[Channel1]", "!fx", 0x1D, 0x4, this.fxHandler);
-    this.registerInputButton(message, "[Channel2]", "!fx", 0x1D, 0x8, this.fxHandler);
+        // FX buttons
+        this.registerInputButton(message, "[Channel1]", "!fx", 0x1D, 0x4, this.fxHandler);
+        this.registerInputButton(message, "[Channel2]", "!fx", 0x1D, 0x8, this.fxHandler);
 
-    // EQ knobs
-    this.registerInputScaler(message, "[EqualizerRack1_[Channel1]_Effect1]", "parameter3", 0x3, 0xFFFF, this.parameterHandler);
-    this.registerInputScaler(message, "[EqualizerRack1_[Channel1]_Effect1]", "parameter2", 0x5, 0xFFFF, this.parameterHandler);
-    this.registerInputScaler(message, "[EqualizerRack1_[Channel1]_Effect1]", "parameter1", 0x7, 0xFFFF, this.parameterHandler);
-    this.registerInputScaler(message, "[EqualizerRack1_[Channel2]_Effect1]", "parameter3", 0xD, 0xFFFF, this.parameterHandler);
-    this.registerInputScaler(message, "[EqualizerRack1_[Channel2]_Effect1]", "parameter2", 0xF, 0xFFFF, this.parameterHandler);
-    this.registerInputScaler(message, "[EqualizerRack1_[Channel2]_Effect1]", "parameter1", 0x11, 0xFFFF, this.parameterHandler);
+        // EQ knobs
+        this.registerInputScaler(message, "[EqualizerRack1_[Channel1]_Effect1]", "parameter3", 0x3, 0xFFFF, this.parameterHandler);
+        this.registerInputScaler(message, "[EqualizerRack1_[Channel1]_Effect1]", "parameter2", 0x5, 0xFFFF, this.parameterHandler);
+        this.registerInputScaler(message, "[EqualizerRack1_[Channel1]_Effect1]", "parameter1", 0x7, 0xFFFF, this.parameterHandler);
+        this.registerInputScaler(message, "[EqualizerRack1_[Channel2]_Effect1]", "parameter3", 0xD, 0xFFFF, this.parameterHandler);
+        this.registerInputScaler(message, "[EqualizerRack1_[Channel2]_Effect1]", "parameter2", 0xF, 0xFFFF, this.parameterHandler);
+        this.registerInputScaler(message, "[EqualizerRack1_[Channel2]_Effect1]", "parameter1", 0x11, 0xFFFF, this.parameterHandler);
 
-    // FX knobs
-    this.registerInputScaler(message, "[QuickEffectRack1_[Channel1]]", "super1", 0x9, 0xFFFF, this.parameterHandler);
-    this.registerInputScaler(message, "[QuickEffectRack1_[Channel2]]", "super1", 0x13, 0xFFFF, this.parameterHandler);
+        // FX knobs
+        this.registerInputScaler(message, "[QuickEffectRack1_[Channel1]]", "super1", 0x9, 0xFFFF, this.parameterHandler);
+        this.registerInputScaler(message, "[QuickEffectRack1_[Channel2]]", "super1", 0x13, 0xFFFF, this.parameterHandler);
 
-    // Gain knobs
-    this.registerInputScaler(message, "[Channel1]", "pregain", 0x1, 0xFFFF, this.parameterHandler);
-    this.registerInputScaler(message, "[Channel2]", "pregain", 0xB, 0xFFFF, this.parameterHandler);
+        // Gain knobs
+        this.registerInputScaler(message, "[Channel1]", "pregain", 0x1, 0xFFFF, this.parameterHandler);
+        this.registerInputScaler(message, "[Channel2]", "pregain", 0xB, 0xFFFF, this.parameterHandler);
 
-    // Headphone mix
-    this.registerInputScaler(message, "[Master]", "headMix", 0x15, 0xFFFF, this.parameterHandler);
+        // Headphone mix
+        this.registerInputScaler(message, "[Master]", "headMix", 0x15, 0xFFFF, this.parameterHandler);
 
-    // Volume faders
-    this.registerInputScaler(message, "[Channel1]", "volume", 0x17, 0xFFFF, this.parameterHandler);
-    this.registerInputScaler(message, "[Channel2]", "volume", 0x19, 0xFFFF, this.parameterHandler);
+        // Volume faders
+        this.registerInputScaler(message, "[Channel1]", "volume", 0x17, 0xFFFF, this.parameterHandler);
+        this.registerInputScaler(message, "[Channel2]", "volume", 0x19, 0xFFFF, this.parameterHandler);
 
-    // Crossfader
-    this.registerInputScaler(message, "[Master]", "crossfader", 0x1B, 0xFFFF, this.parameterHandler);
+        // Crossfader
+        this.registerInputScaler(message, "[Master]", "crossfader", 0x1B, 0xFFFF, this.parameterHandler);
 
-    this.controller.registerInputPacket(message);
+        this.controller.registerInputPacket(message);
 
-    // Soft takeover for all knobs and faders
-    engine.softTakeover("[EqualizerRack1_[Channel1]_Effect1]", "parameter3", true);
-    engine.softTakeover("[EqualizerRack1_[Channel1]_Effect1]", "parameter2", true);
-    engine.softTakeover("[EqualizerRack1_[Channel1]_Effect1]", "parameter1", true);
+        // Soft takeover for all knobs and faders
+        engine.softTakeover("[EqualizerRack1_[Channel1]_Effect1]", "parameter3", true);
+        engine.softTakeover("[EqualizerRack1_[Channel1]_Effect1]", "parameter2", true);
+        engine.softTakeover("[EqualizerRack1_[Channel1]_Effect1]", "parameter1", true);
 
-    engine.softTakeover("[EqualizerRack1_[Channel2]_Effect1]", "parameter3", true);
-    engine.softTakeover("[EqualizerRack1_[Channel2]_Effect1]", "parameter2", true);
-    engine.softTakeover("[EqualizerRack1_[Channel2]_Effect1]", "parameter1", true);
+        engine.softTakeover("[EqualizerRack1_[Channel2]_Effect1]", "parameter3", true);
+        engine.softTakeover("[EqualizerRack1_[Channel2]_Effect1]", "parameter2", true);
+        engine.softTakeover("[EqualizerRack1_[Channel2]_Effect1]", "parameter1", true);
 
-    engine.softTakeover("[QuickEffectRack1_[Channel1]]", "super1", true);
-    engine.softTakeover("[QuickEffectRack1_[Channel2]]", "super1", true);
+        engine.softTakeover("[QuickEffectRack1_[Channel1]]", "super1", true);
+        engine.softTakeover("[QuickEffectRack1_[Channel2]]", "super1", true);
 
-    engine.softTakeover("[Channel1]", "pregain", true);
-    engine.softTakeover("[Channel2]", "pregain", true);
-
-    engine.softTakeover("[Master]", "headMix", true);
-
-    engine.softTakeover("[Channel1]", "volume", true);
-    engine.softTakeover("[Channel2]", "volume", true);
-
-    engine.softTakeover("[Master]", "crossfader", true);
-};
-
-KontrolZ1.registerInputButton = function(message, group, name, offset, bitmask, callback) {
-    message.addControl(group, name, offset, "B", bitmask);
-    message.setCallback(group, name, callback);
-};
-
-KontrolZ1.registerInputScaler = function(message, group, name, offset, bitmask, callback) {
-    message.addControl(group, name, offset, "H", bitmask);
-    message.setCallback(group, name, callback);
-};
-
-KontrolZ1.registerOutputPackets = function() {
-    const output = new HIDPacket("output", 0x80);
-
-    output.addOutput("[ControlX]", "mode", 0x13, "B");
-
-    output.addOutput("[Channel1]", "pfl", 0xF, "B");
-    output.addOutput("[Channel2]", "pfl", 0x10, "B");
-
-    output.addOutput("[Channel1]", "play_indicator", 0x11, "B");
-    output.addOutput("[Channel2]", "play_indicator", 0x14, "B");
-
-    output.addOutput("[QuickEffectRack1_[Channel1]]", "enabled", 0x12, "B");
-    output.addOutput("[QuickEffectRack1_[Channel2]]", "enabled", 0x15, "B");
-
-    output.addOutput("[Channel1]", "vu-30", 0x1, "B");
-    output.addOutput("[Channel1]", "vu-15", 0x2, "B");
-    output.addOutput("[Channel1]", "vu-6", 0x3, "B");
-    output.addOutput("[Channel1]", "vu-3", 0x4, "B");
-    output.addOutput("[Channel1]", "vu0", 0x5, "B");
-    output.addOutput("[Channel1]", "vu3", 0x6, "B");
-    output.addOutput("[Channel1]", "vu6", 0x7, "B");
-
-    output.addOutput("[Channel2]", "vu-30", 0x8, "B");
-    output.addOutput("[Channel2]", "vu-15", 0x9, "B");
-    output.addOutput("[Channel2]", "vu-6", 0xA, "B");
-    output.addOutput("[Channel2]", "vu-3", 0xB, "B");
-    output.addOutput("[Channel2]", "vu0", 0xC, "B");
-    output.addOutput("[Channel2]", "vu3", 0xD, "B");
-    output.addOutput("[Channel2]", "vu6", 0xE, "B");
-
-    this.controller.registerOutputPacket(output);
-
-    engine.makeConnection("[QuickEffectRack1_[Channel1]]", "enabled", this.outputHandler);
-    engine.makeConnection("[QuickEffectRack1_[Channel2]]", "enabled", this.outputHandler);
+        engine.softTakeover("[Channel1]", "pregain", true);
+        engine.softTakeover("[Channel2]", "pregain", true);
 
-    engine.makeConnection("[Channel1]", "pfl", this.outputHandler);
-    engine.makeConnection("[Channel2]", "pfl", this.outputHandler);
-
-    this.vuLeftConnection = engine.makeUnbufferedConnection("[Channel1]", "vu_meter", this.vuMeterHandler);
-    this.vuRightConnection = engine.makeUnbufferedConnection("[Channel2]", "vu_meter", this.vuMeterHandler);
-
-    KontrolZ1.lightDeck(false);
-};
+        engine.softTakeover("[Master]", "headMix", true);
 
-KontrolZ1.modeHandler = function(field) {
-    KontrolZ1.modePressed = field.value;
-    KontrolZ1.outputHandler(field.value, field.group, "mode");
-};
+        engine.softTakeover("[Channel1]", "volume", true);
+        engine.softTakeover("[Channel2]", "volume", true);
 
-KontrolZ1.headphoneHandler = function(field) {
-    if (field.value === 0) {
-        return;
+        engine.softTakeover("[Master]", "crossfader", true);
     }
-    // Go to cue and stop when modifier is active
-    if (KontrolZ1.modePressed) {
-        engine.setValue(field.group, "cue_gotoandstop", field.value);
-    } else {
-        script.toggleControl(field.group, "pfl");
+
+    registerInputButton(message, group, name, offset, bitmask, callback) {
+        message.addControl(group, name, offset, "B", bitmask);
+        message.setCallback(group, name, callback);
     }
-};
 
-KontrolZ1.fxHandler = function(field) {
-    if (field.value === 0) {
-        // Always clear play indicator on button release
-        KontrolZ1.controller.setOutput(field.group, "play_indicator", 0x0, true);
-        return;
+    registerInputScaler(message, group, name, offset, bitmask, callback) {
+        message.addControl(group, name, offset, "H", bitmask);
+        message.setCallback(group, name, callback);
     }
-    // Control playback when modifier is active
-    if (KontrolZ1.modePressed) {
-        // Match play indicator (red led) brightness to fx indicator (blue led)
-        const current = engine.getValue("[QuickEffectRack1_" + field.group + "]", "enabled") ? 0x7F : 0xA;
-        KontrolZ1.controller.setOutput(field.group, "play_indicator", current, true);
-        script.toggleControl(field.group, "play");
-    } else {
-        script.toggleControl("[QuickEffectRack1_" + field.group + "]", "enabled");
+
+    registerOutputPackets() {
+        const output = new HIDPacket("output", 0x80);
+
+        output.addOutput("[ControlX]", "mode", 0x13, "B");
+
+        output.addOutput("[Channel1]", "pfl", 0xF, "B");
+        output.addOutput("[Channel2]", "pfl", 0x10, "B");
+
+        output.addOutput("[Channel1]", "play_indicator", 0x11, "B");
+        output.addOutput("[Channel2]", "play_indicator", 0x14, "B");
+
+        output.addOutput("[QuickEffectRack1_[Channel1]]", "enabled", 0x12, "B");
+        output.addOutput("[QuickEffectRack1_[Channel2]]", "enabled", 0x15, "B");
+
+        output.addOutput("[Channel1]", "vu-30", 0x1, "B");
+        output.addOutput("[Channel1]", "vu-15", 0x2, "B");
+        output.addOutput("[Channel1]", "vu-6", 0x3, "B");
+        output.addOutput("[Channel1]", "vu-3", 0x4, "B");
+        output.addOutput("[Channel1]", "vu0", 0x5, "B");
+        output.addOutput("[Channel1]", "vu3", 0x6, "B");
+        output.addOutput("[Channel1]", "vu6", 0x7, "B");
+
+        output.addOutput("[Channel2]", "vu-30", 0x8, "B");
+        output.addOutput("[Channel2]", "vu-15", 0x9, "B");
+        output.addOutput("[Channel2]", "vu-6", 0xA, "B");
+        output.addOutput("[Channel2]", "vu-3", 0xB, "B");
+        output.addOutput("[Channel2]", "vu0", 0xC, "B");
+        output.addOutput("[Channel2]", "vu3", 0xD, "B");
+        output.addOutput("[Channel2]", "vu6", 0xE, "B");
+
+        this.controller.registerOutputPacket(output);
+
+        engine.makeConnection("[QuickEffectRack1_[Channel1]]", "enabled", this.outputHandler);
+        engine.makeConnection("[QuickEffectRack1_[Channel2]]", "enabled", this.outputHandler);
+
+        engine.makeConnection("[Channel1]", "pfl", this.outputHandler);
+        engine.makeConnection("[Channel2]", "pfl", this.outputHandler);
+
+        this.vuLeftConnection = engine.makeUnbufferedConnection("[Channel1]", "vu_meter", this.vuMeterHandler);
+        this.vuRightConnection = engine.makeUnbufferedConnection("[Channel2]", "vu_meter", this.vuMeterHandler);
+
+        this.lightDeck(false);
+    }
+
+    modeHandler(field) {
+        this.modePressed = field.value;
+        this.outputHandler(field.value, field.group, "mode");
     }
-};
-
-KontrolZ1.vuMeterHandler = function(value, group, _key) {
-    const vuKeys = Object.keys(KontrolZ1.vuMeterThresholds);
-    for (let i = 0; i < vuKeys.length; ++i) {
-        // Avoid spamming HID by only sending last LED update
-        const last = i === (vuKeys.length - 1);
-        if (KontrolZ1.vuMeterThresholds[vuKeys[i]] > value) {
-            KontrolZ1.controller.setOutput(group, vuKeys[i], 0x00, last);
+
+    headphoneHandler(field) {
+        if (field.value === 0) {
+            return;
+        }
+        // Go to cue and stop when modifier is active
+        if (this.modePressed) {
+            engine.setValue(field.group, "cue_gotoandstop", field.value);
         } else {
-            KontrolZ1.controller.setOutput(group, vuKeys[i], 0x7E, last);
+            script.toggleControl(field.group, "pfl");
         }
     }
-};
 
-KontrolZ1.parameterHandler = function(field) {
-    engine.setParameter(field.group, field.name, field.value / 4095);
-};
+    fxHandler(field) {
+        if (field.value === 0) {
+            // Always clear play indicator on button release
+            this.controller.setOutput(field.group, "play_indicator", 0x0, true);
+            return;
+        }
+        // Control playback when modifier is active
+        if (this.modePressed) {
+            // Match play indicator (red led) brightness to fx indicator (blue led)
+            const current = engine.getValue("[QuickEffectRack1_" + field.group + "]", "enabled") ? 0x7F : 0xA;
+            this.controller.setOutput(field.group, "play_indicator", current, true);
+            script.toggleControl(field.group, "play");
+        } else {
+            script.toggleControl("[QuickEffectRack1_" + field.group + "]", "enabled");
+        }
+    }
 
-KontrolZ1.outputHandler = function(value, group, key) {
-    let ledValue;
-    if (value === 0 || value === false) {
-        // Off value (dimmed)
-        ledValue = 0xA;
-    } else if (value === 1 || value === true) {
-        // On value
-        ledValue = 0x7F;
+    vuMeterHandler(value, group, _key) {
+        const vuKeys = Object.keys(this.vuMeterThresholds);
+        for (let i = 0; i < vuKeys.length; ++i) {
+            // Avoid spamming HID by only sending last LED update
+            const last = i === (vuKeys.length - 1);
+            if (this.vuMeterThresholds[vuKeys[i]] > value) {
+                this.controller.setOutput(group, vuKeys[i], 0x00, last);
+            } else {
+                this.controller.setOutput(group, vuKeys[i], 0x7E, last);
+            }
+        }
     }
-    KontrolZ1.controller.setOutput(group, key, ledValue, true);
-};
 
-KontrolZ1.lightDeck = function(switchOff) {
-    let softLight = 0xA;
-    let fullLight = 0x7F;
-    let current;
 
-    if (switchOff) {
-        softLight = 0x00;
-        fullLight = 0x00;
+    parameterHandler(field) {
+        engine.setParameter(field.group, field.name, field.value / 4095);
     }
 
-    KontrolZ1.controller.setOutput("[ControlX]", "mode", softLight, true);
+    outputHandler(value, group, key) {
+        let ledValue;
+        if (value === 0 || value === false) {
+            // Off value (dimmed)
+            ledValue = 0xA;
+        } else if (value === 1 || value === true) {
+            // On value
+            ledValue = 0x7F;
+        }
+        this.controller.setOutput(group, key, ledValue, true);
+    }
 
-    current = engine.getValue("[QuickEffectRack1_[Channel1]]", "enabled") ? fullLight : softLight;
-    KontrolZ1.controller.setOutput("[QuickEffectRack1_[Channel1]]", "enabled", current, true);
-    current = engine.getValue("[QuickEffectRack1_[Channel2]]", "enabled") ? fullLight : softLight;
-    KontrolZ1.controller.setOutput("[QuickEffectRack1_[Channel2]]", "enabled", current, true);
+    lightDeck(switchOff) {
+        let softLight = 0xA;
+        let fullLight = 0x7F;
+        let current;
 
-    current = engine.getValue("[Channel1]", "pfl") ? fullLight : softLight;
-    KontrolZ1.controller.setOutput("[Channel1]", "pfl", current, true);
-    current = engine.getValue("[Channel2]", "pfl") ? fullLight : softLight;
-    KontrolZ1.controller.setOutput("[Channel2]", "pfl", current, true);
-};
+        if (switchOff) {
+            softLight = 0x00;
+            fullLight = 0x00;
+        }
+
+        this.controller.setOutput("[ControlX]", "mode", softLight, true);
+
+        current = engine.getValue("[QuickEffectRack1_[Channel1]]", "enabled") ? fullLight : softLight;
+        this.controller.setOutput("[QuickEffectRack1_[Channel1]]", "enabled", current, true);
+        current = engine.getValue("[QuickEffectRack1_[Channel2]]", "enabled") ? fullLight : softLight;
+        this.controller.setOutput("[QuickEffectRack1_[Channel2]]", "enabled", current, true);
+
+        current = engine.getValue("[Channel1]", "pfl") ? fullLight : softLight;
+        this.controller.setOutput("[Channel1]", "pfl", current, true);
+        current = engine.getValue("[Channel2]", "pfl") ? fullLight : softLight;
+        this.controller.setOutput("[Channel2]", "pfl", current, true);
+    }
 
-KontrolZ1.messageCallback = function(packet, data) {
-    for (const name in data) {
-        if (Object.hasOwnProperty.call(data, name)) {
-            KontrolZ1.controller.processButton(data[name]);
+    messageCallback(packet, data) {
+        for (const name in data) {
+            if (Object.hasOwnProperty.call(data, name)) {
+                this.controller.processButton(data[name]);
+            }
         }
     }
-};
 
-KontrolZ1.shutdown = function() {
-    // Deactivate all LEDs
-    KontrolZ1.lightDeck(true);
-    console.log(KontrolZ1.id + " shut down");
-};
+    shutdown() {
+        // Deactivate all LEDs
+        this.lightDeck(true);
+        console.log(this.id + " shut down");
+    }
+
+    incomingData(data, length) {
+        this.controller.parsePacket(data, length);
+    }
+}
 
-KontrolZ1.incomingData = function(data, length) {
-    KontrolZ1.controller.parsePacket(data, length);
-};
+var TraktorZ1 = new TraktorZ1Class;  // eslint-disable-line no-var, no-unused-vars

From 5bdc21eabe5ecdfb61dd628807faa271674e8caf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Tue, 28 Nov 2023 00:13:14 +0100
Subject: [PATCH 337/388] Lower clamping warning to debug message, because it
 can happen and it is no issue.

---
 src/track/beats.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/track/beats.cpp b/src/track/beats.cpp
index 0bcc3143135..d8600979c2b 100644
--- a/src/track/beats.cpp
+++ b/src/track/beats.cpp
@@ -67,8 +67,8 @@ Beats::ConstIterator Beats::ConstIterator::operator+=(Beats::ConstIterator::diff
     // Detect integer overflow in `m_beatOffset + n`
     const int maxBeatOffset = std::numeric_limits<Beats::ConstIterator::difference_type>::max();
     if (m_beatOffset > maxBeatOffset - n) {
-        qWarning() << "Beats: Iterator" << m_beatOffset << "+" << n
-                   << "would go out of possible range, capping at latest possible position.";
+        qDebug() << "Beats: Iterator" << m_beatOffset << "+" << n
+                 << "would go out of possible range, capping at latest possible position.";
         m_it = m_beats->m_markers.cend();
         m_beatOffset = maxBeatOffset;
         updateValue();
@@ -115,8 +115,8 @@ Beats::ConstIterator Beats::ConstIterator::operator-=(Beats::ConstIterator::diff
     // Detect integer overflow
     const int minBeatOffset = std::numeric_limits<Beats::ConstIterator::difference_type>::lowest();
     if (m_beatOffset < minBeatOffset + n) {
-        qWarning() << "Beats Iterator" << m_beatOffset << "-" << n
-                   << "would go out of possible range, capping at earliest possible position.";
+        qDebug() << "Beats Iterator" << m_beatOffset << "-" << n
+                 << "would go out of possible range, capping at earliest possible position.";
         m_it = m_beats->m_markers.cbegin();
         m_beatOffset = minBeatOffset;
         updateValue();

From 6a41f12abffb1f251760219e20c541a6f504bc86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Wed, 29 Nov 2023 14:10:24 +0100
Subject: [PATCH 338/388] Use compiler/CMake macros to detect target OS

This makes them independent from Qt includes
---
 src/encoder/encodersndfileflac.h |  2 +-
 src/encoder/encoderwave.h        |  2 +-
 src/test/playlisttest.cpp        |  2 +-
 src/util/battery/battery.cpp     |  4 ++--
 src/util/screensaver.cpp         | 10 +++++-----
 src/util/threadcputimer.cpp      | 11 +++--------
 6 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/encoder/encodersndfileflac.h b/src/encoder/encodersndfileflac.h
index 40270f29d5a..6e57b592738 100644
--- a/src/encoder/encodersndfileflac.h
+++ b/src/encoder/encodersndfileflac.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#ifdef Q_OS_WIN
+#ifdef _WIN32
 //Enable unicode in libsndfile on Windows
 //(sf_open uses UTF-8 otherwise)
 #include <windows.h>
diff --git a/src/encoder/encoderwave.h b/src/encoder/encoderwave.h
index 0811bf1287b..7be763f4781 100644
--- a/src/encoder/encoderwave.h
+++ b/src/encoder/encoderwave.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#ifdef Q_OS_WIN
+#ifdef _WIN32
 // Enable unicode in libsndfile on Windows
 // (sf_open uses UTF-8 otherwise)
 #include <windows.h>
diff --git a/src/test/playlisttest.cpp b/src/test/playlisttest.cpp
index 9fb6a585d0b..3796eec99c5 100644
--- a/src/test/playlisttest.cpp
+++ b/src/test/playlisttest.cpp
@@ -32,7 +32,7 @@ TEST_F(PlaylistTest, Normalize) {
             parser.playlistEntryToFilePath("file:///foo/bar.mp3"));
     EXPECT_EQ(QString("foo/bar.mp3"),
             parser.playlistEntryToFilePath("file:foo/bar.mp3"));
-#ifdef Q_OS_WIN
+#ifdef _WIN32
     EXPECT_EQ(QString("c:/foo/bar.mp3"),
             parser.playlistEntryToFilePath("file:///c:/foo/bar.mp3"));
 #else
diff --git a/src/util/battery/battery.cpp b/src/util/battery/battery.cpp
index bd2cdee41ae..7d9c8146081 100644
--- a/src/util/battery/battery.cpp
+++ b/src/util/battery/battery.cpp
@@ -5,9 +5,9 @@
 // Do not include platform-specific battery implementation unless we are built
 // with battery support (__BATTERY__).
 #ifdef __BATTERY__
-#if defined(Q_OS_WIN)
+#if defined(_WIN32)
 #include "util/battery/batterywindows.h"
-#elif defined(Q_OS_MAC)
+#elif defined(__APPLE__)
 #include "util/battery/batterymac.h"
 #else
 #include "util/battery/batterylinux.h"
diff --git a/src/util/screensaver.cpp b/src/util/screensaver.cpp
index d5a11aaa556..613210455c0 100644
--- a/src/util/screensaver.cpp
+++ b/src/util/screensaver.cpp
@@ -19,17 +19,17 @@ With the help of the following source codes:
 
 #include <QDebug>
 
-#if defined(Q_OS_MAC)
+#if defined(__APPLE__)
 #  include "util/mac.h"
-#elif defined(Q_OS_WIN)
+#elif defined(_WIN32)
 #  include <windows.h>
-#elif defined(Q_OS_LINUX)
+#elif defined(__LINUX__)
 #  include <QtDBus>
 #elif defined(HAVE_XSCREENSAVER_SUSPEND) && HAVE_XSCREENSAVER_SUSPEND
 #  include <X11/extensions/scrnsaver.h>
-#endif // Q_OS_WIN
+#endif
 
-#if defined(Q_OS_LINUX) || (defined(HAVE_XSCREENSAVER_SUSPEND) && HAVE_XSCREENSAVER_SUSPEND)
+#if defined(__LINUX__) || (defined(HAVE_XSCREENSAVER_SUSPEND) && HAVE_XSCREENSAVER_SUSPEND)
 #  define None XNone
 #  define Window XWindow
 #  include <X11/Xlib.h>
diff --git a/src/util/threadcputimer.cpp b/src/util/threadcputimer.cpp
index 8759aee4531..a40cb7b021a 100644
--- a/src/util/threadcputimer.cpp
+++ b/src/util/threadcputimer.cpp
@@ -1,18 +1,13 @@
 #include "util/threadcputimer.h"
 
-#if defined(Q_OS_MAC)
+#if defined(__APPLE__)
 #include <sys/time.h>
 #include <unistd.h>
 #include <mach/mach_time.h>
-#elif defined(Q_OS_SYMBIAN)
-#include <e32std.h>
-#include <sys/time.h>
-#include <hal.h>
-#include <hal_data.h>
-#elif defined(Q_OS_UNIX)
+#elif defined(__UNIX__)
 #include <time.h>
 #include <unistd.h>
-#elif defined(Q_OS_WIN)
+#elif defined(_WIN32)
 #include <windows.h>
 #endif
 

From a3ba412f7eeb45b8d9f9b00924d5717169fd8256 Mon Sep 17 00:00:00 2001
From: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com>
Date: Fri, 1 Dec 2023 11:49:29 +0100
Subject: [PATCH 339/388] feat(debug): make DBG macro usable within expressions

The DBG macro now accuraletely models the rust dbg! macro by
returning the argument its been given verbatim, making it possible
to embed in the middle of expressions.
---
 src/util/debug.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/util/debug.h b/src/util/debug.h
index 860c3c522be..d282ffe2cb4 100644
--- a/src/util/debug.h
+++ b/src/util/debug.h
@@ -6,8 +6,11 @@
 #include "errordialoghandler.h"
 
 #ifdef MIXXX_DEBUG_ASSERTIONS_ENABLED
-#define DBG(value) \
-    (qDebug().nospace() << #value << " = " << (value) << " [" << __FILE__ << ":" << __LINE__ << "]")
+#define DBG(value)                                                                         \
+    (([](auto&& val) {                                                                     \
+        qDebug().nospace() << #value " = " << val << " [" __FILE__ ":" << __LINE__ << "]"; \
+        return val;                                                                        \
+    })(value))
 #else
 #define DBG(value)                                                             \
     static_assert(false,                                                       \
@@ -15,7 +18,7 @@
             "remove it!")
 #endif
 
-template <typename T>
+template<typename T>
 QString toDebugString(const T& object) {
     QString output;
 #ifndef QT_NO_DEBUG_OUTPUT

From c24cbc17f264bdcbc10d306009900a2bf13bfcd1 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Sat, 2 Dec 2023 00:49:50 +0100
Subject: [PATCH 340/388] track menu: enable Lock BPM action if any selected
 track BPM is unlocked

Co-authored-by: JoergAtGithub <64457745+JoergAtGithub@users.noreply.github.com>
---
 src/widget/wtrackmenu.cpp | 30 +++++++++++++++++++-----------
 src/widget/wtrackmenu.h   |  2 +-
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/widget/wtrackmenu.cpp b/src/widget/wtrackmenu.cpp
index bd3d3277377..0b51f595ad4 100644
--- a/src/widget/wtrackmenu.cpp
+++ b/src/widget/wtrackmenu.cpp
@@ -660,23 +660,29 @@ void WTrackMenu::setupActions() {
     }
 }
 
-bool WTrackMenu::isAnyTrackBpmLocked() const {
+std::pair<bool, bool> WTrackMenu::getTrackBpmLockStates() const {
+    bool anyBpmLocked = false;
+    bool anyBpmNotLocked = false;
     if (m_pTrackModel) {
-        const int column =
-                m_pTrackModel->fieldIndex(LIBRARYTABLE_BPM_LOCK);
+        const int column = m_pTrackModel->fieldIndex(LIBRARYTABLE_BPM_LOCK);
         for (const auto& trackIndex : m_trackIndexList) {
-            QModelIndex bpmLockedIndex =
-                    trackIndex.sibling(trackIndex.row(), column);
+            QModelIndex bpmLockedIndex = trackIndex.sibling(trackIndex.row(), column);
             if (bpmLockedIndex.data().toBool()) {
-                return true;
+                anyBpmLocked = true;
+            } else {
+                anyBpmNotLocked = true;
+            }
+            if (anyBpmLocked && anyBpmNotLocked) {
+                break;
             }
         }
     } else {
-        if (m_pTrack && m_pTrack->isBpmLocked()) {
-            return true;
+        if (m_pTrack) {
+            anyBpmLocked = m_pTrack->isBpmLocked();
+            anyBpmNotLocked = !anyBpmLocked;
         }
     }
-    return false;
+    return std::pair<bool, bool>(anyBpmLocked, anyBpmNotLocked);
 }
 
 std::optional<std::optional<mixxx::RgbColor>> WTrackMenu::getCommonTrackColor() const {
@@ -875,13 +881,15 @@ void WTrackMenu::updateMenus() {
 
     if (featureIsEnabled(Feature::Reset) ||
             featureIsEnabled(Feature::BPM)) {
-        const bool anyBpmLocked = isAnyTrackBpmLocked();
+        bool anyBpmLocked;
+        bool anyBpmNotLocked;
+        std::tie(anyBpmLocked, anyBpmNotLocked) = getTrackBpmLockStates();
         if (featureIsEnabled(Feature::Reset)) {
             m_pClearBeatsAction->setEnabled(!anyBpmLocked);
         }
         if (featureIsEnabled(Feature::BPM)) {
             m_pBpmUnlockAction->setEnabled(anyBpmLocked);
-            m_pBpmLockAction->setEnabled(!anyBpmLocked);
+            m_pBpmLockAction->setEnabled(anyBpmNotLocked);
             m_pBpmDoubleAction->setEnabled(!anyBpmLocked);
             m_pBpmHalveAction->setEnabled(!anyBpmLocked);
             m_pBpmTwoThirdsAction->setEnabled(!anyBpmLocked);
diff --git a/src/widget/wtrackmenu.h b/src/widget/wtrackmenu.h
index 507216fd35f..c7ecc79f5f5 100644
--- a/src/widget/wtrackmenu.h
+++ b/src/widget/wtrackmenu.h
@@ -201,7 +201,7 @@ class WTrackMenu : public QMenu {
     void loadSelectionToGroup(const QString& group, bool play = false);
     void clearTrackSelection();
 
-    bool isAnyTrackBpmLocked() const;
+    std::pair<bool, bool> getTrackBpmLockStates() const;
 
     /// Get the common track color of all tracks this menu is shown for, or
     /// return `nullopt` if there is no common color. Tracks may have no color

From 84cdd61206784feaa5e211fc6c34e463230b1223 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Mon, 4 Dec 2023 00:22:49 +0100
Subject: [PATCH 341/388] Tracks table: don't wrap around when Shift is pressed

---
 src/widget/wlibrarytableview.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/widget/wlibrarytableview.cpp b/src/widget/wlibrarytableview.cpp
index 28734f46996..d4885207c3b 100644
--- a/src/widget/wlibrarytableview.cpp
+++ b/src/widget/wlibrarytableview.cpp
@@ -324,6 +324,7 @@ QModelIndex WLibraryTableView::moveCursor(CursorAction cursorAction,
         // handler in `QAbstractItemView` uses to either move the cursor, move
         // the selection, or extend the selection depending on which modifier
         // keys are held down.
+        // Note: Shift modifier prevents wrap-around.
         case QAbstractItemView::MoveUp:
         case QAbstractItemView::MoveDown: {
             const QModelIndex current = currentIndex();
@@ -333,13 +334,13 @@ QModelIndex WLibraryTableView::moveCursor(CursorAction cursorAction,
                 if (cursorAction == QAbstractItemView::MoveDown) {
                     if (row + 1 < pModel->rowCount()) {
                         return pModel->index(row + 1, column);
-                    } else {
+                    } else if (!modifiers.testFlag(Qt::ShiftModifier)) {
                         return pModel->index(0, column);
                     }
                 } else {
                     if (row - 1 >= 0) {
                         return pModel->index(row - 1, column);
-                    } else {
+                    } else if (!modifiers.testFlag(Qt::ShiftModifier)) {
                         return pModel->index(pModel->rowCount() - 1, column);
                     }
                 }

From f87e4ed6c7a27ea4479a750cc42b8b47ac77965d Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Mon, 4 Dec 2023 00:40:08 +0100
Subject: [PATCH 342/388] add "loop_remove" to control picker menu

---
 src/controllers/controlpickermenu.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/controllers/controlpickermenu.cpp b/src/controllers/controlpickermenu.cpp
index 33a8dc15763..ca0c10b1082 100644
--- a/src/controllers/controlpickermenu.cpp
+++ b/src/controllers/controlpickermenu.cpp
@@ -668,6 +668,11 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent)
                 loopmoveBwdSubmenu);
     }
 
+    addDeckControl("loop_remove",
+            tr("Remove Temporary Loop"),
+            tr("Remove the temporary loop"),
+            loopMenu);
+
     addSeparator();
 
     // Library Controls

From cbe31d4c5f17c9de0c9de585efae6c0b66f9d51d Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Mon, 4 Dec 2023 14:01:56 +0100
Subject: [PATCH 343/388] KeyControl: std::unique_ptr, parented_ptr

---
 src/engine/controls/keycontrol.cpp | 107 ++++++++++++++++-------------
 src/engine/controls/keycontrol.h   |  25 ++++---
 2 files changed, 70 insertions(+), 62 deletions(-)

diff --git a/src/engine/controls/keycontrol.cpp b/src/engine/controls/keycontrol.cpp
index b26f9ac61ec..a759486176e 100644
--- a/src/engine/controls/keycontrol.cpp
+++ b/src/engine/controls/keycontrol.cpp
@@ -18,100 +18,109 @@ static const double kKeepUnlockedKey = 1;
 
 KeyControl::KeyControl(const QString& group,
         UserSettingsPointer pConfig)
-        : EngineControl(group, pConfig) {
+        : EngineControl(group, pConfig),
+          // pitch is the distance to the original pitch in semitones
+          // knob in semitones; 9.4 ct per midi step allowOutOfBounds = true;
+          m_pPitch(std::make_unique<ControlPotmeter>(
+                  ConfigKey(group, "pitch"), -6.0, 6.0, true)),
+          // pitch_adjust is the distance to the linear pitch in semitones
+          // set by the speed slider or to the locked key.
+          // pitch_adjust knob in semitones; 4.7 ct per midi step; allowOutOfBounds = true;
+          m_pPitchAdjust(std::make_unique<ControlPotmeter>(
+                  ConfigKey(group, "pitch_adjust"), -3.0, 3.0, true)),
+          m_pButtonSyncKey(std::make_unique<ControlPushButton>(
+                  ConfigKey(group, "sync_key"))),
+          m_pButtonResetKey(std::make_unique<ControlPushButton>(
+                  ConfigKey(group, "reset_key"))),
+          m_keylockMode(std::make_unique<ControlPushButton>(ConfigKey(group, "keylockMode"))),
+          m_keyunlockMode(std::make_unique<ControlPushButton>(ConfigKey(group, "keyunlockMode"))),
+          m_pFileKey(std::make_unique<ControlObject>(ConfigKey(group, "file_key"))),
+          m_pEngineKey(std::make_unique<ControlObject>(ConfigKey(group, "key"))),
+          m_pEngineKeyDistance(std::make_unique<ControlPotmeter>(
+                  ConfigKey(group, "visual_key_distance"), -0.5, 0.5)) {
     m_pitchRateInfo.pitchRatio = 1.0;
     m_pitchRateInfo.tempoRatio = 1.0;
     m_pitchRateInfo.pitchTweakRatio = 1.0;
     m_pitchRateInfo.keylock = false;
 
-    // pitch is the distance to the original pitch in semitones
-    // knob in semitones; 9.4 ct per midi step allowOutOfBounds = true;
-    m_pPitch = new ControlPotmeter(ConfigKey(group, "pitch"), -6.0, 6.0, true);
     // Coarse adjust by full semitone steps.
     m_pPitch->setStepCount(12);
     // Fine adjust with semitone / 10 = 10 ct;.
     m_pPitch->setSmallStepCount(120);
-    connect(m_pPitch, &ControlObject::valueChanged,
-            this, &KeyControl::slotPitchChanged,
-            Qt::DirectConnection);
 
-    // pitch_adjust is the distance to the linear pitch in semitones
-    // set by the speed slider or to the locked key.
-    // pitch_adjust knob in semitones; 4.7 ct per midi step; allowOutOfBounds = true;
-    m_pPitchAdjust = new ControlPotmeter(ConfigKey(group, "pitch_adjust"), -3.0, 3.0, true);
     // Coarse adjust by full semitone steps.
     m_pPitchAdjust->setStepCount(6);
     // Fine adjust with semitone / 10 = 10 ct;.
     m_pPitchAdjust->setSmallStepCount(60);
-    connect(m_pPitchAdjust, &ControlObject::valueChanged,
-            this, &KeyControl::slotPitchAdjustChanged,
-            Qt::DirectConnection);
 
-    m_pButtonSyncKey = new ControlPushButton(ConfigKey(group, "sync_key"));
-    connect(m_pButtonSyncKey, &ControlObject::valueChanged,
-            this, &KeyControl::slotSyncKey,
+    m_keylockMode->setButtonMode(ControlPushButton::TOGGLE);
+
+    m_keyunlockMode->setButtonMode(ControlPushButton::TOGGLE);
+
+    connect(m_pPitch.get(),
+            &ControlObject::valueChanged,
+            this,
+            &KeyControl::slotPitchChanged,
             Qt::DirectConnection);
 
-    m_pButtonResetKey = new ControlPushButton(ConfigKey(group, "reset_key"));
-    connect(m_pButtonResetKey, &ControlObject::valueChanged,
-            this, &KeyControl::slotResetKey,
+    connect(m_pPitchAdjust.get(),
+            &ControlObject::valueChanged,
+            this,
+            &KeyControl::slotPitchAdjustChanged,
             Qt::DirectConnection);
 
-    m_pFileKey = new ControlObject(ConfigKey(group, "file_key"));
-    connect(m_pFileKey, &ControlObject::valueChanged,
-            this, &KeyControl::slotFileKeyChanged,
+    connect(m_pButtonSyncKey.get(),
+            &ControlObject::valueChanged,
+            this,
+            &KeyControl::slotSyncKey,
             Qt::DirectConnection);
 
-    m_pEngineKey = new ControlObject(ConfigKey(group, "key"));
-    connect(m_pEngineKey, &ControlObject::valueChanged,
-            this, &KeyControl::slotSetEngineKey,
+    connect(m_pButtonResetKey.get(),
+            &ControlObject::valueChanged,
+            this,
+            &KeyControl::slotResetKey,
             Qt::DirectConnection);
 
-    m_pEngineKeyDistance = new ControlPotmeter(ConfigKey(group, "visual_key_distance"),
-                                               -0.5, 0.5);
-    connect(m_pEngineKeyDistance, &ControlObject::valueChanged,
-            this, &KeyControl::slotSetEngineKeyDistance,
+    connect(m_pFileKey.get(),
+            &ControlObject::valueChanged,
+            this,
+            &KeyControl::slotFileKeyChanged,
             Qt::DirectConnection);
 
-    m_keylockMode = new ControlPushButton(ConfigKey(group, "keylockMode"));
-    m_keylockMode->setButtonMode(ControlPushButton::TOGGLE);
+    connect(m_pEngineKey.get(),
+            &ControlObject::valueChanged,
+            this,
+            &KeyControl::slotSetEngineKey,
+            Qt::DirectConnection);
 
-    m_keyunlockMode = new ControlPushButton(ConfigKey(group, "keyunlockMode"));
-    m_keyunlockMode->setButtonMode(ControlPushButton::TOGGLE);
+    connect(m_pEngineKeyDistance.get(),
+            &ControlObject::valueChanged,
+            this,
+            &KeyControl::slotSetEngineKeyDistance,
+            Qt::DirectConnection);
 
     // In case of vinyl control "rate_ratio" is a filtered mean value for display
     m_pRateRatio = make_parented<ControlProxy>(ConfigKey(group, "rate_ratio"), this);
     m_pRateRatio->connectValueChanged(this, &KeyControl::slotRateChanged,
             Qt::DirectConnection);
 
-    m_pVCEnabled = new ControlProxy(group, "vinylcontrol_enabled", this);
+    m_pVCEnabled = make_parented<ControlProxy>(group, "vinylcontrol_enabled", this);
     m_pVCEnabled->connectValueChanged(this, &KeyControl::slotRateChanged,
             Qt::DirectConnection);
 
-    m_pVCRate = new ControlProxy(group, "vinylcontrol_rate", this);
+    m_pVCRate = make_parented<ControlProxy>(group, "vinylcontrol_rate", this);
     m_pVCRate->connectValueChanged(this, &KeyControl::slotRateChanged,
                 Qt::DirectConnection);
 
-    m_pKeylock = new ControlProxy(group, "keylock", this);
+    m_pKeylock = make_parented<ControlProxy>(group, "keylock", this);
     m_pKeylock->connectValueChanged(this, &KeyControl::slotRateChanged,
             Qt::DirectConnection);
+
     // m_pitchRateInfo members are initialized with default values, only keylock
     // is persistent and needs to be updated from config
     m_pitchRateInfo.keylock = m_pKeylock->toBool();
 }
 
-KeyControl::~KeyControl() {
-    delete m_pPitch;
-    delete m_pPitchAdjust;
-    delete m_pButtonSyncKey;
-    delete m_pButtonResetKey;
-    delete m_pFileKey;
-    delete m_pEngineKey;
-    delete m_pEngineKeyDistance;
-    delete m_keylockMode;
-    delete m_keyunlockMode;
-}
-
 KeyControl::PitchTempoRatio KeyControl::getPitchTempoRatio() {
     // TODO(XXX) remove code duplication by adding this
     // "Update pending" atomic flag to the ControlObject API
diff --git a/src/engine/controls/keycontrol.h b/src/engine/controls/keycontrol.h
index 513d195be72..e18a2d533e3 100644
--- a/src/engine/controls/keycontrol.h
+++ b/src/engine/controls/keycontrol.h
@@ -26,7 +26,6 @@ class KeyControl : public EngineControl {
     };
 
     KeyControl(const QString& group, UserSettingsPointer pConfig);
-    ~KeyControl() override;
 
     // Returns a struct, with the results of the last pitch and tempo calculations
     KeyControl::PitchTempoRatio getPitchTempoRatio();
@@ -54,23 +53,23 @@ class KeyControl : public EngineControl {
     // ControlObjects that come from EngineBuffer
     parented_ptr<ControlProxy> m_pRateRatio;
 
-    ControlProxy* m_pVCRate;
-    ControlProxy* m_pVCEnabled;
+    parented_ptr<ControlProxy> m_pVCRate;
+    parented_ptr<ControlProxy> m_pVCEnabled;
 
-    ControlProxy* m_pKeylock;
-    ControlPotmeter* m_pPitch;
-    ControlPotmeter* m_pPitchAdjust;
-    ControlPushButton* m_pButtonSyncKey;
-    ControlPushButton* m_pButtonResetKey;
-    ControlPushButton* m_keylockMode;
-    ControlPushButton* m_keyunlockMode;
+    parented_ptr<ControlProxy> m_pKeylock;
+    std::unique_ptr<ControlPotmeter> m_pPitch;
+    std::unique_ptr<ControlPotmeter> m_pPitchAdjust;
+    std::unique_ptr<ControlPushButton> m_pButtonSyncKey;
+    std::unique_ptr<ControlPushButton> m_pButtonResetKey;
+    std::unique_ptr<ControlPushButton> m_keylockMode;
+    std::unique_ptr<ControlPushButton> m_keyunlockMode;
 
     // The current loaded file's detected key
-    ControlObject* m_pFileKey;
+    std::unique_ptr<ControlObject> m_pFileKey;
 
     // The current effective key of the engine
-    ControlObject* m_pEngineKey;
-    ControlPotmeter* m_pEngineKeyDistance;
+    std::unique_ptr<ControlObject> m_pEngineKey;
+    std::unique_ptr<ControlPotmeter> m_pEngineKeyDistance;
 
     struct PitchTempoRatio m_pitchRateInfo;
     QAtomicInt m_updatePitchRequest;

From 854b315002ff7ad974d0d5dc3dc7249b3e2728a5 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Sat, 2 Dec 2023 17:41:49 +0100
Subject: [PATCH 344/388] controllers: fix zoom ranges

---
 res/controllers/KANE_QuNeo_scripts.js                  | 7 ++++---
 res/controllers/Korg-nanoKONTROL-2-scripts.js          | 8 ++++----
 res/controllers/Novation-Launchpad MK2-scripts.js      | 2 +-
 res/controllers/Novation-Launchpad Mini MK3-scripts.js | 2 +-
 res/controllers/Novation-Launchpad-Mini-scripts.js     | 3 ++-
 res/controllers/Novation-Launchpad-scripts.js          | 2 +-
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/res/controllers/KANE_QuNeo_scripts.js b/res/controllers/KANE_QuNeo_scripts.js
index de835cd4aa7..e7d30677981 100644
--- a/res/controllers/KANE_QuNeo_scripts.js
+++ b/res/controllers/KANE_QuNeo_scripts.js
@@ -888,7 +888,8 @@ KANE_QuNeo.closeSliderMode = function () {
 KANE_QuNeo.deckZoom = function (deck, value) {
     var channel = deck - 1; // track channels start at 0 to properly reference arrays
     var channelName = KANE_QuNeo.getChannelName(deck)
-    var normalized = Math.ceil(6 * ((127 - value) / 127))
+    // range is 1..10
+    var normalized = Math.ceil(9 * ((127 - value) / 127)) + 1;
     // adjust zoom
     engine.setValue(channelName, "waveform_zoom", normalized)
 }
@@ -2347,8 +2348,8 @@ KANE_QuNeo.masterVuMeter = function (value) {
 // Sliders
 KANE_QuNeo.deckZoomLEDs = function (deck, value) {
     var LEDGroup = KANE_QuNeo.getLEDGroup(deck);
-    // normalize zoom LED value to be 0-127
-    var zoom = ((value - 1) / 5) * 127
+    // normalize zoom LED value to be 0-127, range is 1..10
+    var zoom = ((value - 1) / 9) * 127
     // determine which control we are manipulating
     var control = KANE_QuNeo.getSliderControl(deck, 0)
     // emit message
diff --git a/res/controllers/Korg-nanoKONTROL-2-scripts.js b/res/controllers/Korg-nanoKONTROL-2-scripts.js
index 192e6b4502e..5bd1190d5bc 100644
--- a/res/controllers/Korg-nanoKONTROL-2-scripts.js
+++ b/res/controllers/Korg-nanoKONTROL-2-scripts.js
@@ -506,9 +506,9 @@ NK2.toggleBinaryControlAll = function toggleBinaryControlAll(control){
 NK2.wavezoomAll = function wavezoomAll(value){
     if (NK2.debug>2){print("##function: "+NK2.getFunctionName())};
 
-    var range=6-1;
+    var range=10-1;
     var newValue=Math.round(1+((value/127)*range));
-    if (newValue>6)newValue=6;
+    if (newValue>10)newValue=10;
     if (newValue<1)newValue=1;
     if (NK2.lastwavevalue!=value){
         for (var i=1; i<9; i++){
@@ -522,9 +522,9 @@ NK2.wavezoomDeck = function wavezoomDeck(value, group){
     if (NK2.debug>2){print("##function: "+NK2.getFunctionName())};
     if (group=="default"){group=NK2.Deck[NK2.curDeck];};
 
-    var range=6-1;
+    var range=10-1;
     var newValue=Math.round(1+((value/127)*range));
-    if (newValue>6)newValue=6;
+    if (newValue>10)newValue=10;
     if (newValue<1)newValue=1;
     if (NK2.lastwavevalue!=value){
         engine.setValue(group, "waveform_zoom", newValue);
diff --git a/res/controllers/Novation-Launchpad MK2-scripts.js b/res/controllers/Novation-Launchpad MK2-scripts.js
index f9a65dd9356..03f37109ace 100644
--- a/res/controllers/Novation-Launchpad MK2-scripts.js	
+++ b/res/controllers/Novation-Launchpad MK2-scripts.js	
@@ -4410,7 +4410,7 @@ var NLMK2 = (function () {
 	    waveform_zoom: {
 	      group: `[${type}${i}]`,
 	      name: 'waveform_zoom',
-	      type: '1.0 - 6.0'
+	      type: '1.0 - 10.0'
 	    },
 	    waveform_zoom_up: {
 	      group: `[${type}${i}]`,
diff --git a/res/controllers/Novation-Launchpad Mini MK3-scripts.js b/res/controllers/Novation-Launchpad Mini MK3-scripts.js
index ce1fb372417..ced3dfb1608 100644
--- a/res/controllers/Novation-Launchpad Mini MK3-scripts.js	
+++ b/res/controllers/Novation-Launchpad Mini MK3-scripts.js	
@@ -4410,7 +4410,7 @@ var NLMMK3 = (function () {
 	    waveform_zoom: {
 	      group: `[${type}${i}]`,
 	      name: 'waveform_zoom',
-	      type: '1.0 - 6.0'
+	      type: '1.0 - 10.0'
 	    },
 	    waveform_zoom_up: {
 	      group: `[${type}${i}]`,
diff --git a/res/controllers/Novation-Launchpad-Mini-scripts.js b/res/controllers/Novation-Launchpad-Mini-scripts.js
index bacdb0de531..7f981a609c9 100644
--- a/res/controllers/Novation-Launchpad-Mini-scripts.js
+++ b/res/controllers/Novation-Launchpad-Mini-scripts.js
@@ -337,7 +337,8 @@ function ZoomKey(dir) {
     that.onPushOrig = that.onPush;
     that.onPush = function()
     {
-        if ( ZoomKey.zoom < 6 && this.dir == "+" ) {
+        // range is 1..10
+        if ( ZoomKey.zoom < 10 && this.dir == "+" ) {
             ZoomKey.zoom++;
         }
         if ( ZoomKey.zoom > 1 && this.dir == "-") {
diff --git a/res/controllers/Novation-Launchpad-scripts.js b/res/controllers/Novation-Launchpad-scripts.js
index bc1d5643634..ab65c3a511b 100644
--- a/res/controllers/Novation-Launchpad-scripts.js
+++ b/res/controllers/Novation-Launchpad-scripts.js
@@ -4410,7 +4410,7 @@ var NLMK1 = (function () {
 	    waveform_zoom: {
 	      group: `[${type}${i}]`,
 	      name: 'waveform_zoom',
-	      type: '1.0 - 6.0'
+	      type: '1.0 - 10.0'
 	    },
 	    waveform_zoom_up: {
 	      group: `[${type}${i}]`,

From 40d23f3147efec618ca10f0c015c6d1f96045327 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Mon, 4 Dec 2023 19:30:42 +0100
Subject: [PATCH 345/388] Deere: fix main VU meter control [Master] > [Main]

---
 res/skins/Deere/vumeter_main.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/skins/Deere/vumeter_main.xml b/res/skins/Deere/vumeter_main.xml
index 702dd715287..70959a1ecda 100644
--- a/res/skins/Deere/vumeter_main.xml
+++ b/res/skins/Deere/vumeter_main.xml
@@ -15,13 +15,13 @@
         <Layout>horizontal</Layout>
         <Children>
           <Template src="skin:vumeter_v.xml">
-            <SetVariable name="group">[Master]</SetVariable>
+            <SetVariable name="group">[Main]</SetVariable>
             <SetVariable name="side">_left</SetVariable>
             <SetVariable name="tooltip_meter">main_VuMeterL</SetVariable>
             <SetVariable name="tooltip_clip">main_peak_indicator_left</SetVariable>
           </Template>
           <Template src="skin:vumeter_v.xml">
-            <SetVariable name="group">[Master]</SetVariable>
+            <SetVariable name="group">[Main]</SetVariable>
             <SetVariable name="side">_right</SetVariable>
             <SetVariable name="tooltip_meter">main_VuMeterR</SetVariable>
             <SetVariable name="tooltip_clip">main_peak_indicator_right</SetVariable>

From a93beb72172407ff3643d7febc55fa3769bce9f1 Mon Sep 17 00:00:00 2001
From: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com>
Date: Tue, 5 Dec 2023 22:08:27 +0100
Subject: [PATCH 346/388] feat(pre-commit): only run eslint on changed lines as
 clang-format

This will make it less scaring to make changes to outdated
mappings that are not style-conform.
---
 .eslintrc.json          | 3 ++-
 .pre-commit-config.yaml | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 5c9dc72c7eb..7d2927c69ba 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,6 +1,7 @@
 {
   "extends": [ "eslint:recommended",
-               "plugin:jsdoc/recommended"],
+               "plugin:jsdoc/recommended",
+               "plugin:diff/diff"],
 
   "parser": "@typescript-eslint/parser",
   "parserOptions": {
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 796ac018574..8584592ca90 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -79,6 +79,7 @@ repos:
           - eslint-plugin-jsdoc@^v46.5.1
           - "@typescript-eslint/eslint-plugin"
           - "@typescript-eslint/parser"
+          - eslint-plugin-diff@^2.0.3
   - repo: local
     hooks:
       - id: clang-format

From 306bbe447ee96815d6a49ce93c58442fe23f883f Mon Sep 17 00:00:00 2001
From: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com>
Date: Tue, 28 Nov 2023 19:14:35 +0100
Subject: [PATCH 347/388] fix(controller): mass replace outdated usage idioms
 of `engine.beginTimer`

Due to the switch to QJSEngine in Mixxx 2.4 the previous API
where the `this` of the callback function was set to the `this` in the
calling context of the `beginTimer` is not possible to retain
(nor does it make much sense anymore). For this reason this commit
fixes all controllers where this behavior was assumed and updates
the rest of them to use arrow functions instead of anonymous function
expressions or strings.
---
 res/controllers/Akai-LPD8-RK-scripts.js       | 10 ++--
 .../American-Audio-VMS2-scripts.js            |  2 +-
 .../Behringer-BCD3000-Advanced-scripts.js     |  2 +-
 .../Behringer-CMDStudio4a-scripts.js          |  2 +-
 .../Behringer-Extension-scripts.js            |  9 ++--
 res/controllers/DJ-Tech-CDJ-101-scripts.js    |  2 +-
 .../DJ-Tech-Kontrol-One-scripts.js            | 16 +++---
 .../DJ-Tech-i-Mix-Reload-scripts.js           |  2 +-
 res/controllers/Denon-DN-SC2000.midi.js       | 20 +++----
 res/controllers/Denon-MC7000-scripts.js       | 22 +++-----
 res/controllers/EKS-Otus.js                   |  4 +-
 res/controllers/Electrix-Tweaker-scripts.js   |  8 +--
 res/controllers/Gemini-FirstMix-scripts.js    |  2 +-
 .../Hercules DJ Control MP3 e2-scripts.js     |  4 +-
 .../Hercules-DJ-Console-4-Mx-scripts.js       |  4 +-
 .../Hercules-DJ-Console-Mk1-hid-scripts.js    |  4 +-
 .../Hercules-DJ-Console-Mk2-hid-scripts.js    |  4 +-
 .../Hercules-DJ-Console-RMX-2-scripts.js      |  6 ++-
 .../Hercules-DJ-Console-RMX-hid-scripts.js    |  6 +--
 .../Hercules-DJ-Console-RMX-scripts.js        | 16 ++----
 .../Hercules-DJ-Control-MP3-hid-scripts.js    |  2 +-
 .../Hercules-DJ-Control-MP3-scripts.js        | 12 ++---
 .../Hercules-DJ-Control-Steel-scripts.js      | 28 +++++-----
 .../Hercules-DJControl-Compact-scripts.js     |  2 +-
 .../Hercules_DJControl_Jogvision-scripts.js   |  2 +-
 .../Ion-Discover-DJ-Pro-scripts.js            |  2 +-
 res/controllers/Ion-Discover-DJ-scripts.js    |  2 +-
 res/controllers/KANE_QuNeo_scripts.js         | 41 +++++++-------
 res/controllers/Korg-nanoKONTROL-2-scripts.js | 14 ++---
 res/controllers/Korg-nanoPAD2-scripts.js      |  2 +-
 res/controllers/Midi_for_light-scripts.js     |  6 +--
 res/controllers/Nintendo-Wiimote.js           |  4 +-
 res/controllers/Novation-Dicer-scripts.js     |  4 +-
 .../Novation-Launchpad MK2-scripts.js         |  2 +-
 .../Novation-Launchpad Mini MK3-scripts.js    |  2 +-
 res/controllers/Novation-Launchpad-scripts.js |  2 +-
 res/controllers/Numark-DJ2Go-scripts.js       | 32 +++++------
 res/controllers/Numark-Mixtrack-2-scripts.js  |  6 +--
 res/controllers/Numark-Mixtrack-3-scripts.js  | 12 ++---
 .../Numark-Mixtrack-Platinum-scripts.js       |  6 +--
 .../Numark-Mixtrack-Pro-FX-scripts.js         |  2 +-
 .../Numark-Mixtrack-Pro-scripts.js            |  9 ++--
 res/controllers/Numark-N4-scripts.js          | 12 ++---
 .../Numark-Omni-Control-scripts.js            | 12 ++---
 res/controllers/Numark-Party-Mix.scripts.js   |  4 +-
 .../Numark-Total-Control-scripts.js           | 12 ++---
 res/controllers/Numark-V7-scripts.js          | 54 +++++++++----------
 res/controllers/Pioneer-DDJ-200-scripts.js    |  8 +--
 res/controllers/Pioneer-DDJ-400-script.js     |  4 +-
 res/controllers/Pioneer-DDJ-FLX4-script.js    |  4 +-
 res/controllers/Pioneer-DDJ-SB2-scripts.js    |  6 +--
 res/controllers/Pioneer-DDJ-SB3-scripts.js    |  6 +--
 res/controllers/Pioneer-DDJ-SX-scripts.js     |  4 +-
 res/controllers/Reloop Terminal Mix 2-4.js    |  4 +-
 res/controllers/Reloop-Beatmix-2-4-scripts.js | 19 +++----
 res/controllers/Reloop-Beatpad-scripts.js     | 43 +++++----------
 res/controllers/Reloop-Jockey-3-ME-scripts.js | 26 ++++-----
 res/controllers/Roland_DJ-505-scripts.js      | 26 ++++-----
 res/controllers/Sony-SixxAxis.js              |  2 +-
 res/controllers/Soundless_joyMIDI_scripts.js  |  8 +--
 res/controllers/Stanton-SCS1d-scripts.js      |  8 +--
 res/controllers/Stanton-SCS1m-scripts.js      |  4 +-
 res/controllers/Stanton-SCS3d-scripts.js      | 10 ++--
 res/controllers/Stanton-SCS3m-scripts.js      |  4 +-
 res/controllers/TrakProDJ-iPad-scripts.js     |  4 +-
 res/controllers/Traktor-Kontrol-F1-scripts.js |  2 +-
 .../Traktor-Kontrol-S2-MK1-hid-scripts.js     | 14 ++---
 .../Traktor-Kontrol-S2-MK2-hid-scripts.js     | 11 ++--
 .../Traktor-Kontrol-S2-MK3-hid-scripts.js     |  4 +-
 .../Traktor-Kontrol-S3-hid-scripts.js         |  8 +--
 .../Traktor-Kontrol-S4-MK2-hid-scripts.js     |  4 +-
 res/controllers/Traktor-Kontrol-S4-MK3.js     | 12 ++---
 res/controllers/Vestax-Spin-scripts.js        |  2 +-
 .../Vestax-VCI-100-3DEX-scripts.js            |  2 +-
 res/controllers/Vestax-VCI-100MKII-scripts.js |  6 +--
 res/controllers/Vestax-VCI-300-scripts.js     |  4 +-
 res/controllers/Vestax-VCI-400-scripts.js     |  6 +--
 res/controllers/Yaeltex-MiniMixxx-scripts.js  |  8 +--
 res/controllers/common-controller-scripts.js  |  4 +-
 res/controllers/midi-components-0.0.js        |  8 +--
 80 files changed, 333 insertions(+), 385 deletions(-)

diff --git a/res/controllers/Akai-LPD8-RK-scripts.js b/res/controllers/Akai-LPD8-RK-scripts.js
index 30165dbc105..45b4d5954ef 100644
--- a/res/controllers/Akai-LPD8-RK-scripts.js
+++ b/res/controllers/Akai-LPD8-RK-scripts.js
@@ -253,7 +253,7 @@ LPD8RK.init = function (id, debug) { // called when the device is opened & set u
     engine.softTakeover("[Sampler2]","rate",true);
 
     //set LED timer
-    LPD8RK.ledTimer = engine.beginTimer(LPD8RK.LEDinterval, "LPD8RK.setLeds()");
+    LPD8RK.ledTimer = engine.beginTimer(LPD8RK.LEDinterval, LPD8RK.setLeds);
 };
 
 LPD8RK.shutdown = function () {
@@ -263,7 +263,7 @@ LPD8RK.shutdown = function () {
 LPD8RK.resetLEDTimer = function () {
     engine.stopTimer(LPD8RK.ledTimer);
     LPD8RK.setLeds()
-    LPD8RK.ledTimer = engine.beginTimer(LPD8RK.LEDinterval, "LPD8RK.setLeds()");
+    LPD8RK.ledTimer = engine.beginTimer(LPD8RK.LEDinterval, LPD8RK.setLeds);
 };
 
 LPD8RK.setLeds = function () {
@@ -376,7 +376,7 @@ LPD8RK.reloopButton = function (channel, control, value, status, group) {
         engine.stopTimer(LPD8RK.reloopTimer);
         LPD8RK.loopbuttonDown=true;
         LPD8RK.doreloop=true;
-        LPD8RK.reloopTimer = engine.beginTimer(500, "LPD8RK.disablereloop()", true);
+        LPD8RK.reloopTimer = engine.beginTimer(500, LPD8RK.disablereloop, true);
         } else {//button was released
         LPD8RK.loopbuttonDown=false;
         if (LPD8RK.doreloop===true) {engine.setValue(group, "reloop_exit", 1);};
@@ -437,11 +437,11 @@ LPD8RK.hotcueBankDial = function (channel, control, value, status, group) {
     LPD8RK.oldHotcueBank=LPD8RK.hotcueBank;
     //set timer to clear old bank number after 500 msec, so bank indicator light will light up
     engine.stopTimer(LPD8RK.oldbanktimer);
-    LPD8RK.oldbanktimer = engine.beginTimer(500, "LPD8RK.resetOldBank()", true);
+    LPD8RK.oldbanktimer = engine.beginTimer(500, LPD8RK.resetOldBank, true);
 
     //set timer to restart LED updates in 500 msec
     engine.stopTimer(LPD8RK.LEDPauseTimer);
-    LPD8RK.LEDPauseTimer = engine.beginTimer(LPD8RK.LEDinterval, "LPD8RK.resetLEDTimer()", true);
+    LPD8RK.LEDPauseTimer = engine.beginTimer(LPD8RK.LEDinterval, LPD8RK.resetLEDTimer, true);
     };
 
 LPD8RK.looplenDial = function (channel, control, value, status, group) {
diff --git a/res/controllers/American-Audio-VMS2-scripts.js b/res/controllers/American-Audio-VMS2-scripts.js
index cbed294a067..8224dfd1fe9 100644
--- a/res/controllers/American-Audio-VMS2-scripts.js
+++ b/res/controllers/American-Audio-VMS2-scripts.js
@@ -323,7 +323,7 @@ VMS2.playlight = function(value, group, control) {
         deck.Buttons.Pause.setLed(LedState.on);
         // start a fancy blink timer
         deck.switchPlaylightOff = true;
-        deck.playTimer = engine.beginTimer(500,"VMS2.playlightflash(\""+group+"\")");
+        deck.playTimer = engine.beginTimer(500,()=>VMS2.playlightflash(group));
     }
 };
 
diff --git a/res/controllers/Behringer-BCD3000-Advanced-scripts.js b/res/controllers/Behringer-BCD3000-Advanced-scripts.js
index f86503f1e8b..40a93bdd096 100644
--- a/res/controllers/Behringer-BCD3000-Advanced-scripts.js
+++ b/res/controllers/Behringer-BCD3000-Advanced-scripts.js
@@ -75,7 +75,7 @@ BehringerBCD3000.jogWheel = function (channel, control, value, status, group) {
         scratchValue = (value - 0x40);
         engine.scratchEnable(deck + 1, 100, 33+1/3, 1.0/8, (1.0/8)/32);
         engine.scratchTick(deck + 1, scratchValue);
-        BehringerBCD3000.scratchTimer[deck] = engine.beginTimer(20, "BehringerBCD3000.stopScratch(" + deck + ")", true);
+        BehringerBCD3000.scratchTimer[deck] = engine.beginTimer(20, ()=>BehringerBCD3000.stopScratch(deck), true);
 
     } else if (BehringerBCD3000.onKey) {
         if (value > 0x40){
diff --git a/res/controllers/Behringer-CMDStudio4a-scripts.js b/res/controllers/Behringer-CMDStudio4a-scripts.js
index 2fc79f1003c..1fa284cff52 100644
--- a/res/controllers/Behringer-CMDStudio4a-scripts.js
+++ b/res/controllers/Behringer-CMDStudio4a-scripts.js
@@ -211,7 +211,7 @@ BehringerCMDStudio4a.hotcue = function (channel, control, value, status, group)
                     // https://github.com/mixxxdj/mixxx/issues/8456
                     // Changed timer from 50 to 100 after the pathology of this
                     // bug was explained in the bug report.
-                    engine.beginTimer(100, function() { engine.setValue(group, "slip_enabled", 1); }, 1);
+                    engine.beginTimer(100, () => engine.setValue(group, "slip_enabled", 1), 1);
                 }
             }
         } else {
diff --git a/res/controllers/Behringer-Extension-scripts.js b/res/controllers/Behringer-Extension-scripts.js
index f2901042905..f83d6dd45d4 100644
--- a/res/controllers/Behringer-Extension-scripts.js
+++ b/res/controllers/Behringer-Extension-scripts.js
@@ -239,12 +239,11 @@
         isEnabled: function() { return this.id !== 0; },
         start: function() {
             this.reset();
-            var timer = this;
-            this.id = engine.beginTimer(this.timeout, function() {
-                if (timer.oneShot) {
-                    timer.disable();
+            this.id = engine.beginTimer(this.timeout, () => {
+                if (this.oneShot) {
+                    this.disable();
                 }
-                timer.action.call(timer.owner);
+                this.action.call(this.owner);
             }, this.oneShot);
         },
         reset: function() {
diff --git a/res/controllers/DJ-Tech-CDJ-101-scripts.js b/res/controllers/DJ-Tech-CDJ-101-scripts.js
index 9d09e7a5c06..daea57c3718 100644
--- a/res/controllers/DJ-Tech-CDJ-101-scripts.js
+++ b/res/controllers/DJ-Tech-CDJ-101-scripts.js
@@ -188,7 +188,7 @@ DJTechCDJ101.jogtouch = function(channel, control, value, status, group)
         }
         else {
             DJTechCDJ101.outer2inner = true;
-            DJTechCDJ101.scratch_timer = engine.beginTimer(DJTechCDJ101.scratch_timeout, 'DJTechCDJ101.finishScratch(' + deck + ', true)');
+            DJTechCDJ101.scratch_timer = engine.beginTimer(DJTechCDJ101.scratch_timeout, () => DJTechCDJ101.finishScratch(deck, true));
         }
     }
 }
diff --git a/res/controllers/DJ-Tech-Kontrol-One-scripts.js b/res/controllers/DJ-Tech-Kontrol-One-scripts.js
index ee7d1cd1083..20dacb610b0 100644
--- a/res/controllers/DJ-Tech-Kontrol-One-scripts.js
+++ b/res/controllers/DJ-Tech-Kontrol-One-scripts.js
@@ -68,7 +68,7 @@ KONTROL1.mod["s"]={state:"o",timer:false,doshift:true};
 KONTROL1.init = function init(id, debug) { // called when the device is opened & set up
     if (KONTROL1.debug>2){print("##function: "+KONTROL1.getFunctionName())};
     KONTROL1.updateLEDs();
-    if(KONTROL1.disableFlash!==true)KONTROL1.ledTimer = engine.beginTimer(1000, "KONTROL1.doLEDs()");//set timer for LED indicator flashes
+    if(KONTROL1.disableFlash!==true)KONTROL1.ledTimer = engine.beginTimer(1000, KONTROL1.doLEDs);//set timer for LED indicator flashes
     engine.connectControl("[Channel1]", "volume", "KONTROL1.testconnect");
     };
 
@@ -113,7 +113,7 @@ KONTROL1.knobPress = function knobPress(knobnum){
     //{state:"o",timer:false,dobankswitch:true};
     KONTROL1.modPress(knobnum);//turn mod on
     engine.stopTimer(KONTROL1.mod[knobnum]["timer"]);//kill any previous timer
-    KONTROL1.mod[knobnum]["timer"]=engine.beginTimer(KONTROL1.modTimeout, "KONTROL1.disableBankSwitch('"+knobnum+"')", true);
+    KONTROL1.mod[knobnum]["timer"]=engine.beginTimer(KONTROL1.modTimeout, () => KONTROL1.disableBankSwitch(knobnum), true);
     }
 
 KONTROL1.knobRelease = function knobRelease(knobnum){
@@ -145,7 +145,7 @@ KONTROL1.shiftPress = function shiftPress(){
     var knobnum="s";
     KONTROL1.modPress(knobnum);//turn mod on
     engine.stopTimer(KONTROL1.mod[knobnum]["timer"]);//kill any previous timer
-    KONTROL1.mod[knobnum]["timer"]=engine.beginTimer(500, "KONTROL1.disableShiftSwitch('"+knobnum+"')", true);
+    KONTROL1.mod[knobnum]["timer"]=engine.beginTimer(500, () => KONTROL1.disableShiftSwitch(knobnum), true);
     }
 
 KONTROL1.shiftRelease = function shiftRelease(){
@@ -198,7 +198,7 @@ KONTROL1.modRelease = function modRelease(knobnum){
 KONTROL1.doLEDs = function doLEDs() {
     if (KONTROL1.debug>2){print("##function: "+KONTROL1.getFunctionName())};
     engine.stopTimer(KONTROL1.flashTimer);
-    KONTROL1.flashTimer=engine.beginTimer(30, "KONTROL1.bankIndicators()");
+    KONTROL1.flashTimer=engine.beginTimer(30, KONTROL1.bankIndicators);
     return;
     };
 
@@ -589,7 +589,7 @@ KONTROL1.cueClear = function cueClear(cue, control, deck){//clear hotcue - OR mo
     if(engine.getValue(group, "hotcue_"+cue+"_enabled")!=true){//hotcue not set - prepare to move next hotcue pressed to this button
         KONTROL1.cueMoveToNum=cue;
         engine.stopTimer(KONTROL1.cueMoveIndicator);
-        KONTROL1.cueMoveIndicator=engine.beginTimer(100, "KONTROL1.cueMoveIndicatorLEDs("+control+")");//start timer for LED indicator flasher showing the button we're moving to
+        KONTROL1.cueMoveIndicator=engine.beginTimer(100, () => KONTROL1.cueMoveIndicatorLEDs(control));//start timer for LED indicator flasher showing the button we're moving to
         return true;
     }
 
@@ -881,7 +881,7 @@ KONTROL1.loopIn = function loopIn(value, deck) {
     if (value>0){//button was pressed
         KONTROL1.loopinbuttonDown=true;
         KONTROL1.doloopin=true;
-        KONTROL1.loopinbuttonTimer = engine.beginTimer(500, "KONTROL1.disableloopin()", true);
+        KONTROL1.loopinbuttonTimer = engine.beginTimer(500, KONTROL1.disableloopin, true);
         } else {//button was released
         KONTROL1.loopinbuttonDown=false;
         if (KONTROL1.doloopin===true) {engine.setValue(group, "loop_in", 1);engine.setValue(group, "loop_in", 0);};
@@ -900,7 +900,7 @@ KONTROL1.loopOut = function loopOut(value, deck) {
     if (value>0){//button was pressed
         KONTROL1.loopoutbuttonDown=true;
         KONTROL1.doloopout=true;
-        KONTROL1.loopoutbuttonTimer = engine.beginTimer(500, "KONTROL1.disableloopout()", true);
+        KONTROL1.loopoutbuttonTimer = engine.beginTimer(500, KONTROL1.disableloopout, true);
         } else {//button was released
         KONTROL1.loopoutbuttonDown=false;
         if (KONTROL1.doloopout===true) {engine.setValue(group, "loop_out", 1);};
@@ -1307,7 +1307,7 @@ KONTROL1.test = function test(channel, control, value, status, group) {
     };
 
 
-    //KONTROL1.ledTimer = engine.beginTimer(250, "KONTROL1.testflash()");
+    //KONTROL1.ledTimer = engine.beginTimer(250, KONTROL1.testflash);
     //midi.sendShortMsg(status, ctrl, state);
     //engine.stopTimer(KONTROL1.ledTimer);
 
diff --git a/res/controllers/DJ-Tech-i-Mix-Reload-scripts.js b/res/controllers/DJ-Tech-i-Mix-Reload-scripts.js
index 4cf1dbf5f9f..60fd662ab20 100644
--- a/res/controllers/DJ-Tech-i-Mix-Reload-scripts.js
+++ b/res/controllers/DJ-Tech-i-Mix-Reload-scripts.js
@@ -84,7 +84,7 @@ DJTechiMixReload.init = function(ID)
     DJTechiMixReload.setbutton["[Channel2]"] = false;
 
     DJTechiMixReload.allleadson();
-    engine.beginTimer(4000,"DJTechiMixReload.allleadsoff()",true);
+    engine.beginTimer(4000, DJTechiMixReload.allleadsoff ,true);
     for(var deck = 1; deck <= 2; deck++){
     engine.connectControl("[Channel" + deck + "]","play","DJTechiMixReload.deck" + deck + "play");
     engine.connectControl("[Channel" + deck + "]","cue_default","DJTechiMixReload.deck" + deck + "cue");
diff --git a/res/controllers/Denon-DN-SC2000.midi.js b/res/controllers/Denon-DN-SC2000.midi.js
index f2cef7139f1..0f54089d030 100644
--- a/res/controllers/Denon-DN-SC2000.midi.js
+++ b/res/controllers/Denon-DN-SC2000.midi.js
@@ -60,7 +60,7 @@ DenonDNSC2000.newValue = function(currentVal,min,max,increment,ticksCount) {
 
 DenonDNSC2000.flanger = function (midino, control, value, status, group) {
     DenonDNSC2000.toggleBinaryValue(group,'flanger');
-    engine.beginTimer(100, 'DenonDNSC2000.handleFlangerLed("'+group+'")', true);
+    engine.beginTimer(100, ()=>DenonDNSC2000.handleFlangerLed(group), true);
 }
 
 DenonDNSC2000.changeDepth = function (midino, control, value, status, group) {
@@ -100,7 +100,7 @@ DenonDNSC2000.loadSelectedTrack = function (midino, control, value, status, grou
     }
     else {
         engine.setValue(group, 'LoadSelectedTrack', 1);
-        engine.beginTimer(1500, 'DenonDNSC2000.handleLeds("'+group+'")', true);
+        engine.beginTimer(1500, ()=>DenonDNSC2000.handleLeds(group), true);
     }
 }
 
@@ -170,7 +170,7 @@ DenonDNSC2000.hotcue = function(cueIndex, group, value, shift) {
         else
         engine.setValue(group, 'hotcue_' + cueIndex + '_clear',1);
     }
-    engine.beginTimer(100, 'DenonDNSC2000.handleLoopAndHotcuesLeds("'+group+'")', true);
+    engine.beginTimer(100, ()=>DenonDNSC2000.handleLoopAndHotcuesLeds(group), true);
 }
 
 DenonDNSC2000.loopIn = function(group, value, shift) {
@@ -179,7 +179,7 @@ DenonDNSC2000.loopIn = function(group, value, shift) {
     }
     else
         engine.setValue(group, 'loop_in', 1);
-    engine.beginTimer(100, 'DenonDNSC2000.handleLoopAndHotcuesLeds("'+group+'")', true);
+    engine.beginTimer(100, ()=>DenonDNSC2000.handleLoopAndHotcuesLeds(group), true);
 }
 
 DenonDNSC2000.loopOut = function(group, value, shift) {
@@ -190,7 +190,7 @@ DenonDNSC2000.loopOut = function(group, value, shift) {
     }
     else
         engine.setValue(group, 'loop_out', 1);
-    engine.beginTimer(100, 'DenonDNSC2000.handleLoopAndHotcuesLeds("'+group+'")', true);
+    engine.beginTimer(100, ()=>DenonDNSC2000.handleLoopAndHotcuesLeds(group), true);
 }
 
 DenonDNSC2000.reloop = function(group, value, shift) {
@@ -221,7 +221,7 @@ DenonDNSC2000.reloop = function(group, value, shift) {
             engine.setValue(group, 'reloop_exit', 1);
         }
     }
-    engine.beginTimer(100, 'DenonDNSC2000.handleLoopAndHotcuesLeds("'+group+'")', true);
+    engine.beginTimer(100, ()=>DenonDNSC2000.handleLoopAndHotcuesLeds(group), true);
 }
 
 DenonDNSC2000.resizeLoop = function(midino, control, value, status, group) {
@@ -267,7 +267,7 @@ DenonDNSC2000.resizeLoop = function(midino, control, value, status, group) {
         newLoopOutPosition = Math.max(0,newLoopOutPosition - newLoopOutPosition % 2);
         engine.setValue(group, 'loop_end_position', newLoopOutPosition);
     }
-    engine.beginTimer(100, 'DenonDNSC2000.handleLoopAndHotcuesLeds("'+group+'")', true);
+    engine.beginTimer(100, ()=>DenonDNSC2000.handleLoopAndHotcuesLeds(group), true);
 }
 
 DenonDNSC2000.moveLoopLeft = function(midino, control, value, status, group) {
@@ -311,7 +311,7 @@ DenonDNSC2000.play = function (midino, control, value, status, group) {
             DenonDNSC2000.toggleBinaryValue(group,'play');
         }
     }
-    engine.beginTimer(100, 'DenonDNSC2000.handlePlayLed("'+group+'")', true);
+    engine.beginTimer(100, ()=>DenonDNSC2000.handlePlayLed(group), true);
 }
 
 DenonDNSC2000.cue = function (midino, control, value, status, group) {
@@ -330,14 +330,14 @@ DenonDNSC2000.cue = function (midino, control, value, status, group) {
 DenonDNSC2000.keyLock = function (midino, control, value, status, group) {
     if ((status & 0xF0) == 0x90) {
         DenonDNSC2000.toggleBinaryValue(group,'keylock');
-        engine.beginTimer(100, 'DenonDNSC2000.handleKeyLockLed("'+group+'")', true);
+        engine.beginTimer(100, ()=>DenonDNSC2000.handleKeyLockLed(group), true);
     }
 }
 
 DenonDNSC2000.beatSync = function (midino, control, value, status, group) {
     if ((status & 0xF0) == 0x90) {
         DenonDNSC2000.toggleBinaryValue(group,'beatsync');
-        engine.beginTimer(100, 'DenonDNSC2000.handleBeatSyncLed("'+group+'")', true);
+        engine.beginTimer(100, () => DenonDNSC2000.handleBeatSyncLed(group), true);
     }
 }
 
diff --git a/res/controllers/Denon-MC7000-scripts.js b/res/controllers/Denon-MC7000-scripts.js
index e37884220f4..f9937681767 100644
--- a/res/controllers/Denon-MC7000-scripts.js
+++ b/res/controllers/Denon-MC7000-scripts.js
@@ -249,7 +249,7 @@ MC7000.init = function() {
         engine.makeConnection("[Sampler"+samplerIdx+"]", "play", MC7000.VelSampLED);
     }
     // send Softtakeover delayed to avoid conflicts with ControllerStatusSysex
-    engine.beginTimer(2000, function() {
+    engine.beginTimer(2000, () => {
         // Softtakeover for Pitch Faders only
         for (let chanIdx = 1; chanIdx <= 4; chanIdx++) {
             engine.softTakeover("[Channel" + chanIdx + "]", "rate", true);
@@ -430,9 +430,7 @@ MC7000.PadButtons = function(channel, control, value, status, group) {
                 engine.setValue(group, "hotcue_" + cueIdx + "_activate", false);
                 if (engine.getValue(group, "slip_enabled")) {
                     engine.setValue(group, "slip_enabled", false);
-                    engine.beginTimer(50, function() {
-                        engine.setValue(group, "slip_enabled", true);
-                    }, true);
+                    engine.beginTimer(50, () => engine.setValue(group, "slip_enabled", true), true);
                 }
             } else if (control === 0x1C + cueIdx - 1 && value === 0x7F) {
                 engine.setValue(group, "hotcue_" + cueIdx + "_clear", true);
@@ -589,9 +587,7 @@ MC7000.PadButtons = function(channel, control, value, status, group) {
                     // midi.sendShortMsg(0x94 + deckIndex, 0x14 + pitchIdx - 1, MC7000.padColor.pitchoff); // switch to pitch off color
                     if (engine.getValue(group, "slip_enabled")) {
                         engine.setValue(group, "slip_enabled", false);
-                        engine.beginTimer(50, function() {
-                            engine.setValue(group, "slip_enabled", true);
-                        }, true);
+                        engine.beginTimer(50, () => engine.setValue(group, "slip_enabled", true), true);
                     }
                 } else if (isButtonPressed && isControlAddressShift) { //shifted buttons deselect hotcue for pitch
                     engine.setValue(group, "pitch", 0);
@@ -691,9 +687,7 @@ MC7000.wheelTouch = function(channel, control, value, status, group) {
             if (engine.getValue(group, "slip_enabled")) {
                 engine.scratchDisable(deckNumber, false); // stops scratching immediately
                 engine.setValue(group, "slip_enabled", false);
-                engine.beginTimer(50, function() {
-                    engine.setValue(group, "slip_enabled", true);
-                }, true);
+                engine.beginTimer(50, () => engine.setValue(group, "slip_enabled", true), true);
             } else {
                 engine.scratchDisable(deckNumber); // continues scratching e.g. for backspin
             }
@@ -909,9 +903,7 @@ MC7000.reverse = function(channel, control, value, status, group) {
             engine.brake(deckNumber, false); // disable brake effect
             engine.setValue(group, "play", 1);
             engine.setValue(group, "slip_enabled", false);
-            engine.beginTimer(50, function() {
-                engine.setValue(group, "slip_enabled", true);
-            }, true);
+            engine.beginTimer(50, () => engine.setValue(group, "slip_enabled", true), true);
         } else {
             engine.softStart(deckNumber, true, MC7000.spinbackFactor[deckIndex]);
         }
@@ -927,9 +919,7 @@ MC7000.censor = function(channel, control, value, status, group) {
         } else {
             engine.setValue(group, "reverseroll", 0);
         }
-        engine.beginTimer(50, function() {
-            engine.setValue(group, "slip_enabled", true);
-        }, true);
+        engine.beginTimer(50, () => engine.setValue(group, "slip_enabled", true), true);
     } else {
         // reverse play while button pressed
         if (value > 0) {
diff --git a/res/controllers/EKS-Otus.js b/res/controllers/EKS-Otus.js
index 079111e24ca..1ae93195ea3 100644
--- a/res/controllers/EKS-Otus.js
+++ b/res/controllers/EKS-Otus.js
@@ -365,7 +365,7 @@ EksOtus.init = function (id) {
     if (EksOtus.LEDUpdateInterval!=undefined) {
         controller.timers["led_update"] = engine.beginTimer(
             EksOtus.LEDUpdateInterval,
-            "EksOtus.updateLEDs(true)"
+            () => EksOtus.updateLEDs(true)
         );
     }
 
@@ -670,7 +670,7 @@ EksOtus.deckSwitch = function(field) {
         if (EksOtus.deckSwitchClicked==false) {
             EksOtus.deckSwitchClicked=true;
             controller.timers["deck_switch"] = engine.beginTimer(
-                250,"EksOtus.deckSwitchClickedClear()"
+                250, EksOtus.deckSwitchClickedClear
             );
         } else {
             EksOtus.deckSwitchDoubleClick();
diff --git a/res/controllers/Electrix-Tweaker-scripts.js b/res/controllers/Electrix-Tweaker-scripts.js
index 985784a00fc..97388d78c8a 100644
--- a/res/controllers/Electrix-Tweaker-scripts.js
+++ b/res/controllers/Electrix-Tweaker-scripts.js
@@ -515,7 +515,7 @@ ElectrixTweaker.arrowSide = function(channel, control, value, status, group) {
     if (value) {
         if (ElectrixTweaker.topShift) {
             engine.setValue(group, "eject", 1);
-            engine.beginTimer(250, "engine.setValue(\""+group+"\", \"eject\", 0)", true);
+            engine.beginTimer(250, () => engine.setValue(group, eject, 0), true);
         } else {
             engine.setValue(group, "LoadSelectedTrack", 1);
         }
@@ -554,7 +554,7 @@ ElectrixTweaker.oneShot = function(channel, control, value, status, group) {
                 engine.setValue(group, "repeat", 0);
                 engine.setValue(group, "play", 0);
                 engine.setValue(group, "eject", 1);
-                engine.beginTimer(250, "engine.setValue(\""+group+"\", \"eject\", 0)", true);
+                engine.beginTimer(250, () => engine.setValue(group, eject, 0), true);
             } else {
                 if (ElectrixTweaker.samplerVelocityAsVolume) {
                     engine.setValue(group, "volume", script.absoluteNonLin(value * ElectrixTweaker.samplerSensitivity, 0, .25, 1));
@@ -696,7 +696,7 @@ ElectrixTweaker.midEncoder = function(channel, control, value, status, group) {
             engine.setValue(group, "beatjump_32_forward", 1);
             midi.sendShortMsg(0xB0, ElectrixTweaker.encoders[group].Mid.ring, 127);
         }
-        ElectrixTweaker.midEncoderLEDTimer[group] = engine.beginTimer(1000, "midi.sendShortMsg(0xB0, ElectrixTweaker.encoders[\""+group+"\"][\"Mid\"][\"ring\"], 64)", true);
+        ElectrixTweaker.midEncoderLEDTimer[group] = engine.beginTimer(1000, () => midi.sendShortMsg(0xB0, ElectrixTweaker.encoders[group].Mid.ring, 64), true);
     } else {
         switch (ElectrixTweaker.mode[group]) {
         case "eq":
@@ -712,7 +712,7 @@ ElectrixTweaker.midEncoder = function(channel, control, value, status, group) {
                 engine.setValue(group, "loop_move_" + ElectrixTweaker.loopMoveSize[group] + "_forward", 1);
                 midi.sendShortMsg(0xB0, ElectrixTweaker.encoders[group].Mid.ring, 127);
             }
-            ElectrixTweaker.midEncoderLEDTimer[group] = engine.beginTimer(1000, "midi.sendShortMsg(0xB0, ElectrixTweaker.encoders[\""+group+"\"][\"Mid\"][\"ring\"], 64)", true);
+            ElectrixTweaker.midEncoderLEDTimer[group] = engine.beginTimer(1000, () => midi.sendShortMsg(0xB0, ElectrixTweaker.encoders[group].Mid.ring, 64), true);
             break;
         }
     }
diff --git a/res/controllers/Gemini-FirstMix-scripts.js b/res/controllers/Gemini-FirstMix-scripts.js
index a2570cedbb8..749ea3acc27 100644
--- a/res/controllers/Gemini-FirstMix-scripts.js
+++ b/res/controllers/Gemini-FirstMix-scripts.js
@@ -168,7 +168,7 @@ firstmix.preview = function (channel, control, value, status, group) {
         engine.setValue("[Sampler4]", "volume", 0);
         engine.setValue("[Sampler4]", "pfl", 1);
         engine.setValue("[Sampler4]", "LoadSelectedTrack", 1);
-        engine.beginTimer(250,"engine.setValue(\"[Sampler4]\", \"play\", 1)",true); // I had to add a delay because this wouldn't work otherwise
+        engine.beginTimer(250, () => engine.setValue("[Sampler4]", "play", 1),true); // I had to add a delay because this wouldn't work otherwise
         firstmix.setLED(firstmix.leds[0]["preview"], 0x7f);
         firstmix.previewButton = true;
     }
diff --git a/res/controllers/Hercules DJ Control MP3 e2-scripts.js b/res/controllers/Hercules DJ Control MP3 e2-scripts.js
index 40c4052b30d..f85b5c6b40f 100644
--- a/res/controllers/Hercules DJ Control MP3 e2-scripts.js	
+++ b/res/controllers/Hercules DJ Control MP3 e2-scripts.js	
@@ -352,7 +352,7 @@ HerculesMP3e2.holdButton = function (group, value, first, second) {
 
     if (value) {
         engine.setValue(group, first, 1);    // Set "On" the first function
-        holdTimerID = engine.beginTimer(2000, "HerculesMP3e2.holdTimer(\""+group+"\", \""+first+"\", \""+second+"\")", true);
+        holdTimerID = engine.beginTimer(2000, () => HerculesMP3e2.holdTimer(group, first, second), true);
         }
     else {
         if (holdButtonFlag) {
@@ -606,7 +606,7 @@ HerculesMP3e2.scratch = function(midino, control, value, status, group) {
             if (scratchMode === 0) {
                 // Enable the scratch mode on the corresponding deck and start the timer
                 scratchMode = 1;
-                scratchTimer = engine.beginTimer(scratchResetTime, "HerculesMP3e2.wheelOnOff()");
+                scratchTimer = engine.beginTimer(scratchResetTime, HerculesMP3e2.wheelOnOff);
                 midi.sendShortMsg(0x90, 45, 0x7F); // Switch-on the Scratch led
                 engine.setValue("[Channel1]", "keylock", 0);
                 engine.setValue("[Channel2]", "keylock", 0);
diff --git a/res/controllers/Hercules-DJ-Console-4-Mx-scripts.js b/res/controllers/Hercules-DJ-Console-4-Mx-scripts.js
index 69570785a29..c595e7bdb25 100644
--- a/res/controllers/Hercules-DJ-Console-4-Mx-scripts.js
+++ b/res/controllers/Hercules-DJ-Console-4-Mx-scripts.js
@@ -343,7 +343,7 @@ Hercules4Mx.init = function(id, debugging) {
         Hercules4Mx.setupFXButtonsCustomMixx21();
     }
 
-    engine.beginTimer(3000, "Hercules4Mx.doDelayedSetup", true);
+    engine.beginTimer(3000, Hercules4Mx.doDelayedSetup, true);
 };
 //timer-called (delayed) setup.
 Hercules4Mx.doDelayedSetup = function() {
@@ -569,7 +569,7 @@ Hercules4Mx.onAutoDJFade = function(value, group, control) {
     //After 5 seconds, restore non-flashing led. It would be perfect if autoDJFade was triggered also
     //when the fading ends, but right now it seems this is not possible. Also, it doesn't seem to be
     //an option to get the duration of the fading, that's why i simply put there 5 seconds.
-    Hercules4Mx.autoDJfadingId = engine.beginTimer(5000, "Hercules4Mx.doEndAutoDJFadeOffAction", true);
+    Hercules4Mx.autoDJfadingId = engine.beginTimer(5000, Hercules4Mx.doEndAutoDJFadeOffAction, true);
 };
 Hercules4Mx.doEndAutoDJFadeOffAction = function() {
     midi.sendShortMsg(Hercules4Mx.NOnC1, 0x7C, 0x00);
diff --git a/res/controllers/Hercules-DJ-Console-Mk1-hid-scripts.js b/res/controllers/Hercules-DJ-Console-Mk1-hid-scripts.js
index 6ac1d587f77..05f194ac7f3 100644
--- a/res/controllers/Hercules-DJ-Console-Mk1-hid-scripts.js
+++ b/res/controllers/Hercules-DJ-Console-Mk1-hid-scripts.js
@@ -139,7 +139,7 @@ HerculesMk1Hid.init = function() {
 
             if (v < 30) v = 30;
             if (HerculesMk1Hid.track_timer) engine.stopTimer(HerculesMk1Hid.track_timer);
-            HerculesMk1Hid.track_timer = engine.beginTimer(parseInt(5120 / v), 'HerculesMk1Hid.scroll_tracks_joystick');
+            HerculesMk1Hid.track_timer = engine.beginTimer(parseInt(5120 / v), HerculesMk1Hid.scroll_tracks_joystick);
         }
     });
     */
@@ -318,7 +318,7 @@ HerculesMk1Hid.scroll_tracks = function(g, e, v) {
     if (v > 0) {
         engine.setValue("[Playlist]", e == "track_next_a" ? "SelectNextTrack" : "SelectPrevTrack", 1);
         if (!HerculesMk1Hid.scroll_timer) {
-            HerculesMk1Hid.scroll_timer = engine.beginTimer(150, 'HerculesMk1Hid.scroll_tracks("[Playlist]","' + e + '",' + v + ')');
+            HerculesMk1Hid.scroll_timer = engine.beginTimer(150, () => HerculesMk1Hid.scroll_tracks("[Playlist]",e,v));
         }
     }
     else {
diff --git a/res/controllers/Hercules-DJ-Console-Mk2-hid-scripts.js b/res/controllers/Hercules-DJ-Console-Mk2-hid-scripts.js
index ed71a388c81..a491711aa29 100644
--- a/res/controllers/Hercules-DJ-Console-Mk2-hid-scripts.js
+++ b/res/controllers/Hercules-DJ-Console-Mk2-hid-scripts.js
@@ -139,7 +139,7 @@ HerculesMk2Hid.init = function() {
 
             if (v < 30) v = 30;
             if (HerculesMk2Hid.track_timer) engine.stopTimer(HerculesMk2Hid.track_timer);
-            HerculesMk2Hid.track_timer = engine.beginTimer(parseInt(5120 / v), 'HerculesMk2Hid.scroll_tracks_joystick');
+            HerculesMk2Hid.track_timer = engine.beginTimer(parseInt(5120 / v), HerculesMk2Hid.scroll_tracks_joystick);
         }
     });
     */
@@ -301,7 +301,7 @@ HerculesMk2Hid.scroll_tracks = function(g, e, v) {
     if (v > 0) {
         engine.setValue("[Playlist]", e == "track_next_a" ? "SelectNextTrack" : "SelectPrevTrack", 1);
         if (!HerculesMk2Hid.scroll_timer) {
-            HerculesMk2Hid.scroll_timer = engine.beginTimer(150, 'HerculesMk2Hid.scroll_tracks("[Playlist]","' + e + '",' + v + ')');
+            HerculesMk2Hid.scroll_timer = engine.beginTimer(150, () => HerculesMk2Hid.scroll_tracks("[Playlist]", e, v));
         }
     }
     else {
diff --git a/res/controllers/Hercules-DJ-Console-RMX-2-scripts.js b/res/controllers/Hercules-DJ-Console-RMX-2-scripts.js
index c81169eeab9..351793ea6b5 100644
--- a/res/controllers/Hercules-DJ-Console-RMX-2-scripts.js
+++ b/res/controllers/Hercules-DJ-Console-RMX-2-scripts.js
@@ -58,7 +58,9 @@ DJCRMX2.Deck.prototype.wheelPress = function (value) {
             this.finishWheelPress();
         } else {
             this.scratchTimer = engine.beginTimer(
-                    100, "DJCRMX2.decks[" + this.number + "].finishWheelPress()", true);
+                    // we delay the lookup here since this.number may have changed
+                    // by the time the timer fires
+                    100, () => DJCRMX2.decks[this.number].finishWheelPress(), true);
         }
     }
 }
@@ -79,6 +81,8 @@ DJCRMX2.Deck.prototype.finishWheelPress = function() {
         } else {
             // Check again soon.
             this.scratchTimer = engine.beginTimer(
+                    // we delay the lookup here since this.number may have changed
+                    // by the time the timer fires
                     100, "DJCRMX2.decks[" + this.number + "].finishWheelPress()", true);
         }
     }
diff --git a/res/controllers/Hercules-DJ-Console-RMX-hid-scripts.js b/res/controllers/Hercules-DJ-Console-RMX-hid-scripts.js
index 09d8cd53fbf..456d657ab65 100644
--- a/res/controllers/Hercules-DJ-Console-RMX-hid-scripts.js
+++ b/res/controllers/Hercules-DJ-Console-RMX-hid-scripts.js
@@ -228,8 +228,7 @@ RMX.scroll_tracks = function(g, e, v) {
     engine.setValue("[Playlist]", direction, 1);
 
     if (!RMX.scroll_timer) {
-      var callback = 'RMX.scroll_tracks("[Playlist]","' + e + '",' + v + ')';
-      RMX.scroll_timer = engine.beginTimer(150, callback);
+      RMX.scroll_timer = engine.beginTimer(150, () => RMX.scroll_tracks("Playlist", e, v), true);
     }
   }
   else {
@@ -283,8 +282,7 @@ RMX.jog = function(g, e, v, ctrl) {
     }
     engine.scratchTick(deck, ctrl.relative);
 
-    var callback = 'RMX.stopScratching(\"' + g + '\")';
-    RMX.scratchTimer = engine.beginTimer(20, callback, true);
+    RMX.scratchTimer = engine.beginTimer(20, () => RMX.stopScratching(g), true);
   }
 
   // fine jog mode when playing
diff --git a/res/controllers/Hercules-DJ-Console-RMX-scripts.js b/res/controllers/Hercules-DJ-Console-RMX-scripts.js
index 13d5ccbd970..14a23f45ea8 100644
--- a/res/controllers/Hercules-DJ-Console-RMX-scripts.js
+++ b/res/controllers/Hercules-DJ-Console-RMX-scripts.js
@@ -39,11 +39,7 @@ HerculesRMX.Button.prototype.setLed = function(ledState, blink) {
     } else {
         midi.sendShortMsg(0xB0,this.controlId,LedState.off);
     }
-    if(blink) {
-       engine.beginTimer(20, "midi.sendShortMsg(0xB0," + (this.controlId + 0x30) + ", " + LedState.on + ")", true);
-    } else {
-       engine.beginTimer(20, "midi.sendShortMsg(0xB0," + (this.controlId + 0x30) + ", " + LedState.off + ")", true);
-    }
+    engine.beginTimer(20, () => midi.sendShortMsg(0xB0, this.controlId, blink ? LedState.on : LedState.off), true);
 };
 
 HerculesRMX.shiftHandler = function(value) {
@@ -856,14 +852,13 @@ HerculesRMX.shutdown = function() {
 HerculesRMX.killLeds = function() {
    HerculesRMX.Buttons.Scratch.setLed(LedState.off);
    //TODO: remove timers when alsa midi work properly.
-   var button;
    var time = 20;
    for (var key in HerculesRMX.Decks.Left.Buttons) {
-      engine.beginTimer(time, "HerculesRMX.Decks.Left.Buttons['" + key + "'].setLed(LedState.off)", true);
+      engine.beginTimer(time, () => HerculesRMX.Decks.Left.Buttons[key].setLed(LedState.off), true);
       time = time + 5;
    }
    for (var key in HerculesRMX.Decks.Right.Buttons) {
-      engine.beginTimer(time, "HerculesRMX.Decks.Right.Buttons['" + key + "'].setLed(LedState.off)", true);
+      engine.beginTimer(time, () => HerculesRMX.Decks.Right.Buttons[key].setLed(LedState.off), true);
       time = time + 5;
    }
 }
@@ -875,11 +870,10 @@ HerculesRMX.rateChange = function (value, group) {
       HerculesRMX.Decks.Left.Buttons.Sync.setLed(LedState.off);
    }
    if (HerculesRMX.Decks.Right.Buttons.Sync.state != ButtonState.pressed) {
-      engine.beginTimer(25, "HerculesRMX.Decks.Right.Buttons.Sync.setLed(LedState.off)", true);
+      engine.beginTimer(25, () => HerculesRMX.Decks.Right.Buttons.Sync.setLed(LedState.off), true);
    }
    if (value != 0.0) {
-      var deck = HerculesRMX.GetDeck(group);
-      engine.beginTimer(30, "HerculesRMX.GetDeck('" + group + "').Buttons.PitchReset.setLed(LedState.off)", true);
+      engine.beginTimer(30, () => HerculesRMX.GetDeck(group).Buttons.PitchReset.setLed(LedState.off), true);
    }
 };
 
diff --git a/res/controllers/Hercules-DJ-Control-MP3-hid-scripts.js b/res/controllers/Hercules-DJ-Control-MP3-hid-scripts.js
index 2184422e7d4..367b228b2ac 100644
--- a/res/controllers/Hercules-DJ-Control-MP3-hid-scripts.js
+++ b/res/controllers/Hercules-DJ-Control-MP3-hid-scripts.js
@@ -338,7 +338,7 @@ HerculesMP3Hid.scroll_tracks = function(g, e, v) {
     if (v > 0) {
         engine.setValue("[Playlist]", e == "track_next_a" ? "SelectNextTrack" : "SelectPrevTrack", 1);
         if (!HerculesMP3Hid.scroll_timer) {
-            HerculesMP3Hid.scroll_timer = engine.beginTimer(150, function () {
+            HerculesMP3Hid.scroll_timer = engine.beginTimer(150, () => {
                 HerculesMP3Hid.scroll_tracks("[Playlist]", e, v);
             });
         }
diff --git a/res/controllers/Hercules-DJ-Control-MP3-scripts.js b/res/controllers/Hercules-DJ-Control-MP3-scripts.js
index c03c319a614..e0edeb80293 100644
--- a/res/controllers/Hercules-DJ-Control-MP3-scripts.js
+++ b/res/controllers/Hercules-DJ-Control-MP3-scripts.js
@@ -123,13 +123,13 @@ HerculesMp3.init = function (id) { // called when the device is opened & set up
 //  a timer and a buffer will rectify this.
 //  Setting it to 20ms instead of 11ms as this first is the lowest value accepted for a timer.
 
-    engine.beginTimer(20, "HerculesMp3.ledhelper()");
+    engine.beginTimer(20, HerculesMp3.ledhelper);
 
 
 //  Be the leds!
 
     HerculesMp3.leds(true);
-    engine.beginTimer(500, "HerculesMp3.leds(false)",true);
+    engine.beginTimer(500, () => HerculesMp3.leds(false),true);
 
 //  Connect leds here and not in xml. This is to avoid an annoying bug (maybe) in controller drivers.
 
@@ -193,7 +193,7 @@ HerculesMp3.leds = function (onoff) {
 HerculesMp3.ledblink = function (control,onoff){
     if(onoff) {
         actual_status = HerculesMp3.controls.outputs[control].status;
-        blinktimer[control] = engine.beginTimer(300,"HerculesMp3.ledblinkhelper("+control+")");
+        blinktimer[control] = engine.beginTimer(300,() => HerculesMp3.ledblinkhelper(control));
         HerculesMp3.controls.outputs[control].isblinking = true;
     }
     else
@@ -287,7 +287,7 @@ HerculesMp3.loophold = function (deck) {
 HerculesMp3.loop = function (deck, control, value) {
     if(value) {
         is_hold_loop[deck] = false;
-        timerloopID[deck] = engine.beginTimer(700,"HerculesMp3.loophold("+deck+")",true);
+        timerloopID[deck] = engine.beginTimer(700, HerculesMp3.loophold(deck),true);
     }
     else {
         engine.stopTimer(timerloopID[deck]);
@@ -329,7 +329,7 @@ HerculesMp3.hotcue = function (deck, control, value) {
     hotcue_string = HerculesMp3.fxbutton(HerculesMp3.controls.inputs[control].name);
     if(value){
         is_hold_hotcue[control] = false;
-        timerhotcueID[control] = engine.beginTimer(500,"HerculesMp3.hchold("+deck+","+control+","+"\""+hotcue_string+"\")",true);
+        timerhotcueID[control] = engine.beginTimer(500, () => HerculesMp3.hchold(deck,control,hotcue_string),true);
     }
     else {
         engine.stopTimer(timerhotcueID[control]);
@@ -556,7 +556,7 @@ HerculesMp3.jog_wheel = function (group, control, value, status) {
         if(engine.getValue(Deck[n],"scratch2_enable"))
         {
             //when not moved for 200 msecs, probably we are not touching the wheel anymore
-            scratch_timer[n] = engine.beginTimer(200,"HerculesMp3.jog_wheelhelper("+n+")",true);
+            scratch_timer[n] = engine.beginTimer(200, () => HerculesMp3.jog_wheelhelper(n),true);
             scratch_timer_on[n] = true;
         }
     }
diff --git a/res/controllers/Hercules-DJ-Control-Steel-scripts.js b/res/controllers/Hercules-DJ-Control-Steel-scripts.js
index e9691f32073..f9182adab26 100644
--- a/res/controllers/Hercules-DJ-Control-Steel-scripts.js
+++ b/res/controllers/Hercules-DJ-Control-Steel-scripts.js
@@ -63,17 +63,17 @@ HerculesSteel.Button = function (controlId, blinkId) {
 
     HerculesSteel.Button.prototype.setLed = function(lightState) {
         if(lightState == HerculesSteel.LedState.on)
-        {
-            engine.beginTimer(20, "midi.sendShortMsg(0xB0," + (this.controlId) + ", " + HerculesSteel.LedState.on + ")", true);
+        {   
+            engine.beginTimer(20, () => midi.sendShortMsg(0xB0, this.controlId, HerculesSteel.LedState.on), true);
         }
         else if(lightState == HerculesSteel.LedState.blink)
-        {
-            engine.beginTimer(20, "midi.sendShortMsg(0xB0," + (this.controlId + 0x30) + ", " + HerculesSteel.LedState.on + ")", true);
+        {   
+            engine.beginTimer(20, () => midi.sendShortMsg(0xB0, this.controlId + 0x30, HerculesSteel.LedState.on), true);
         }
         else
-        {
-            engine.beginTimer(20, "midi.sendShortMsg(0xB0," + (this.controlId) + ", " + HerculesSteel.LedState.off + ")", true);
-            engine.beginTimer(40, "midi.sendShortMsg(0xB0," + (this.controlId + 0x30) + ", " + HerculesSteel.LedState.off + ")", true);
+        {   
+            engine.beginTimer(20, () => midi.sendShortMsg(0xB0, this.controlId, HerculesSteel.LedState.off), true);
+            engine.beginTimer(40, () => midi.sendShortMsg(0xB0, this.controlId + 0x30, HerculesSteel.LedState.off), true);
         }
     };
 
@@ -973,7 +973,7 @@ HerculesSteel.LedsON = function() {
     {
         //TODO: remove timers when alsa midi work properly.
         //midi.sendShortMsg(0xB0, i, 0x7F);
-        engine.beginTimer(time, "midi.sendShortMsg(0xB0, '" + i + "', 0x7F);", true);
+        engine.beginTimer(time, () => midi.sendShortMsg(0xB0, i, 0x7F), true);
         time = time + 5;
     }
 
@@ -985,7 +985,7 @@ HerculesSteel.LedsON = function() {
     {
         //TODO: remove timers when alsa midi work properly.
         //midi.sendShortMsg(0xB0, i, 0x7F);
-        engine.beginTimer(time, "midi.sendShortMsg(0xB0, '" + i + "', 0x7F);", true);
+        engine.beginTimer(time, () => midi.sendShortMsg(0xB0, i, 0x7F), true);
         time = time + 5;
     }
     // Some buttons stays OFF : rewind A/B, forward A/B, Load Deck A, Load Deck B, Up, Down, Apply Ctrl. on
@@ -994,16 +994,15 @@ HerculesSteel.LedsON = function() {
 HerculesSteel.LedsOFF = function() {
     HerculesSteel.Buttons.Scratch.setLed(HerculesSteel.LedState.off);
     //TODO: remove timers when alsa midi work properly.
-    var button;
     var time = 20;
     print("switch off Left deck LEDs");
     for (var key in HerculesSteel.Decks.Left.Buttons) {
-        engine.beginTimer(time, "HerculesSteel.Decks.Left.Buttons['" + key + "'].setLed(HerculesSteel.LedState.off)", true);
+        engine.beginTimer(time, () => HerculesSteel.Decks.Left.Buttons[key].setLed(HerculesSteel.LedState.off), true);
         time = time + 5;
     }
     print("switch off Right deck LEDs");
     for (var key in HerculesSteel.Decks.Right.Buttons) {
-        engine.beginTimer(time, "HerculesSteel.Decks.Right.Buttons['" + key + "'].setLed(HerculesSteel.LedState.off)", true);
+        engine.beginTimer(time, () => HerculesSteel.Decks.Right.Buttons[key].setLed(HerculesSteel.LedState.off), true);
         time = time + 5;
     }
 }
@@ -1015,10 +1014,9 @@ HerculesSteel.rateChange = function (value, group) {
         HerculesSteel.Decks.Left.Buttons.Sync.setLed(HerculesSteel.LedState.off);
     }
     if (HerculesSteel.Decks.Right.Buttons.Sync.state != HerculesSteel.ButtonState.pressed) {
-        engine.beginTimer(25, "HerculesSteel.Decks.Right.Buttons.Sync.setLed(HerculesSteel.LedState.off)", true);
+        engine.beginTimer(25, () => HerculesSteel.Decks.Right.Buttons.Sync.setLed(HerculesSteel.LedState.off), true);
     }
     if (value != 0.0) {
-        var deck = HerculesSteel.GetDeck(group);
-        engine.beginTimer(30, "HerculesSteel.GetDeck('" + group + "').Buttons.PitchReset.setLed(HerculesSteel.LedState.off)", true);
+        engine.beginTimer(30, () => HerculesSteel.GetDeck(group).Buttons.PitchReset.setLed(HerculesSteel.LedState.off), true);
     }
 };
diff --git a/res/controllers/Hercules-DJControl-Compact-scripts.js b/res/controllers/Hercules-DJControl-Compact-scripts.js
index e5e57090120..a860f66069f 100644
--- a/res/controllers/Hercules-DJControl-Compact-scripts.js
+++ b/res/controllers/Hercules-DJControl-Compact-scripts.js
@@ -67,7 +67,7 @@ HercDJCompact.jog_wheel = function (group, control, value, status) {
         if(engine.getValue(input.group, "scratch2_enable")) {
             //when not moved for 200 msecs, probably we are not touching the wheel anymore
             scratch_timer[input.channel] =
-                engine.beginTimer(200, "HercDJCompact.jog_wheelhelper("+input.channel+")", true);
+                engine.beginTimer(200, () => HercDJCompact.jog_wheelhelper(input.channel), true);
             scratch_timer_on[input.channel] = true;
         }
     } else {
diff --git a/res/controllers/Hercules_DJControl_Jogvision-scripts.js b/res/controllers/Hercules_DJControl_Jogvision-scripts.js
index 7e95eeab127..d20c9a118ae 100644
--- a/res/controllers/Hercules_DJControl_Jogvision-scripts.js
+++ b/res/controllers/Hercules_DJControl_Jogvision-scripts.js
@@ -208,7 +208,7 @@ var DJCJV = {
         }
 
         if (CFG.user.beatHelper === 1) {
-            DJCJV.other.beatHelpTimer = engine.beginTimer(100, "DJCJV.beatHelp");
+            DJCJV.other.beatHelpTimer = engine.beginTimer(100, DJCJV.beatHelp);
         }
 
         // Ask the controller to send all current knob/slider values over MIDI, which will update the corresponding GUI controls in MIXXX.
diff --git a/res/controllers/Ion-Discover-DJ-Pro-scripts.js b/res/controllers/Ion-Discover-DJ-Pro-scripts.js
index 211d6848a5f..21e3a5c3e53 100644
--- a/res/controllers/Ion-Discover-DJ-Pro-scripts.js
+++ b/res/controllers/Ion-Discover-DJ-Pro-scripts.js
@@ -181,7 +181,7 @@ IonDiscoverDjPro.jogWheel = function(channel, control, value, status, group) {
             engine.stopTimer(IonDiscoverDjPro.scratchTimer[deck]);
         }
         engine.scratchTick(deck, adjustedJog);
-        IonDiscoverDjPro.scratchTimer[deck] = engine.beginTimer(20, "IonDiscoverDjPro.jogWheelStopScratch(" + deck + ")", true);
+        IonDiscoverDjPro.scratchTimer[deck] = engine.beginTimer(20, () => IonDiscoverDjPro.jogWheelStopScratch(deck), true);
     } else {
         var gammaInputRange = 23;	// Max jog speed
         var maxOutFraction = 0.5;	// Where on the curve it should peak; 0.5 is half-way
diff --git a/res/controllers/Ion-Discover-DJ-scripts.js b/res/controllers/Ion-Discover-DJ-scripts.js
index f1cb4eef136..bcae1653267 100644
--- a/res/controllers/Ion-Discover-DJ-scripts.js
+++ b/res/controllers/Ion-Discover-DJ-scripts.js
@@ -52,7 +52,7 @@ IonDiscoverDJ.sendMidi = function(status, control, value, timeToWait) {
    if(timeToWait == 0) {
       midi.sendShortMsg(status, control, value);
    } else {
-      engine.beginTimer(timeToWait, "midi.sendShortMsg(" + status + ", " + control + ", " + value + ")", true);
+      engine.beginTimer(timeToWait, () => midi.sendShortMsg(status, control, value), true);
    }
 };
 
diff --git a/res/controllers/KANE_QuNeo_scripts.js b/res/controllers/KANE_QuNeo_scripts.js
index de835cd4aa7..373122b8082 100644
--- a/res/controllers/KANE_QuNeo_scripts.js
+++ b/res/controllers/KANE_QuNeo_scripts.js
@@ -531,7 +531,7 @@ KANE_QuNeo.jumpLoop = function (deck, numBeats) {
     if (KANE_QuNeo.jumpHoldTimers[channel].length < 1)
     KANE_QuNeo.jumpHoldTimers[channel].push(
         engine.beginTimer(KANE_QuNeo.jumpHoldTime,
-                  "KANE_QuNeo.jumpHeld("+deck+","+numBeats+")",
+                  () => KANE_QuNeo.jumpHeld(deck, numBeats),
                   true));
 
     // calculate samples per beat
@@ -599,7 +599,8 @@ KANE_QuNeo.jumpLoop = function (deck, numBeats) {
 KANE_QuNeo.scheduleSync = function (deck, syncType) {
     engine.beginTimer(
     KANE_QuNeo.jumpSyncTimer,
-    "KANE_QuNeo.doSync("+deck+", \"" + syncType + "\")",true)
+    () => KANE_QuNeo.doSync(deck, syncType),
+    true);
 }
 
 KANE_QuNeo.doSync = function (deck, syncType) {
@@ -614,7 +615,7 @@ KANE_QuNeo.doSync = function (deck, syncType) {
 
     // if our operation somehow changed loop enabling, immediately change it back
     engine.beginTimer(KANE_QuNeo.checkLoopDelay,
-              "KANE_QuNeo.checkLoop("+deck+","+loopEnabled+")", true);
+              () => KANE_QuNeo.checkLoop(deck, loopEnabled), true);
     }
 }
 
@@ -637,8 +638,7 @@ KANE_QuNeo.syncTrack = function (deck, type, scheduleFlag) {
 
 KANE_QuNeo.scheduleLoop = function (deck, numBeats) {
     engine.beginTimer(KANE_QuNeo.jumpLoopTimer,
-              "KANE_QuNeo.doLoop("+deck+","+numBeats+")"
-              ,true)
+              () => KANE_QuNeo.doLoop(deck, numBeats), true);
 }
 
 KANE_QuNeo.doLoop = function (deck, numBeats) {
@@ -669,7 +669,7 @@ KANE_QuNeo.deckMultiplyLoop = function (deck, factor) {
 
     // if our operation somehow changed loop enabling, immediately change it back
     engine.beginTimer(KANE_QuNeo.checkLoopDelay,
-              "KANE_QuNeo.checkLoop("+deck+","+loopEnabled+")", true);
+              () => KANE_QuNeo.checkLoop(deck, loopEnabled), true);
 
     // emit LED updates, timer because engine is slow at registering loop stuffs
     KANE_QuNeo.delayedAssertion("KANE_QuNeo.assertBeatLEDs("+deck+")",true);
@@ -694,7 +694,7 @@ KANE_QuNeo.jumpHeld = function (deck, numBeats) {
     print("=====> AUTO JUMPING ACTIVATED WITH NUMBEATS: "+numBeats)
     KANE_QuNeo.jumpHoldTimers[channel].push(
         engine.beginTimer(KANE_QuNeo.autoJumpSpeed,
-                  "KANE_QuNeo.jumpLoop("+deck+","+numBeats+")"));
+                  () => KANE_QuNeo.jumpLoop(deck, numBeats)));
     }
 }
 
@@ -717,7 +717,7 @@ KANE_QuNeo.verticalSliderTouch = function (slider, value) {
     KANE_QuNeo.verticalSliderDoubleTap[slider - 1] = 1;
     // then begin the reset timer
     engine.beginTimer(KANE_QuNeo.doubleTapWindow,
-              "KANE_QuNeo.resetDoubleTap("+slider+")",
+              () => KANE_QuNeo.resetDoubleTap(slider),
               true);
     }
 
@@ -913,7 +913,7 @@ KANE_QuNeo.visualNudge = function (deck, direction) {
     // then set timer to see if button is held for more than half a second
     KANE_QuNeo.visualNudgeTimers[channel].push(
         engine.beginTimer(KANE_QuNeo.visualNudgeHoldTime,
-                  "KANE_QuNeo.visualNudgeHeld("+deck+","+direction+")",
+                  () => KANE_QuNeo.visualNudgeHeld(deck, direction),
                   true))
     // then do the pressed nudge
     KANE_QuNeo.doVisualNudge(deck, direction);
@@ -930,7 +930,7 @@ KANE_QuNeo.visualNudgeHeld = function (deck, direction) {
     // ...so set a persistent scroll timer
     KANE_QuNeo.visualNudgeTimers[channel].push(
     engine.beginTimer(KANE_QuNeo.visualNudgeSpeed,
-              "KANE_QuNeo.doVisualNudge("+deck+","+direction+")"))
+              () => KANE_QuNeo.visualNudgeAll(deck, direction)))
 }
 
 KANE_QuNeo.doVisualNudge = function (deck, direction) {
@@ -963,7 +963,7 @@ KANE_QuNeo.rateNudgePress = function (deck, direction) {
     if (!(KANE_QuNeo.rateNudge))
     KANE_QuNeo.rateNudgeTimers.push(
         engine.beginTimer(KANE_QuNeo.rateNudgeHoldTime,
-                  "KANE_QuNeo.rateNudgeHeld("+deck+","+direction+")",
+                  () => KANE_QuNeo.rateNudgeHeld(deck, direction),
                   true))
     else { // if we are currently auto nudging,
     KANE_QuNeo.cancelRateNudge(); // toggle it off
@@ -979,7 +979,7 @@ KANE_QuNeo.rateNudgeHeld = function (deck, direction) {
     // then set a persistent nudge timer
     KANE_QuNeo.rateNudgeTimers.push(
     engine.beginTimer(KANE_QuNeo.rateNudgeSpeed,
-              "KANE_QuNeo.rateNudgeAll("+deck+","+direction+")"))
+                () => KANE_QuNeo.rateNudgeAll(deck, direction)))
 }
 
 KANE_QuNeo.rateNudgeAll = function (callingDeck, direction) {
@@ -1210,9 +1210,7 @@ KANE_QuNeo.timeKeeper = function (deck, value) {
     KANE_QuNeo.nextBeatTimer[channel].length == 0)
     KANE_QuNeo.nextBeatTimer[channel] =
         [engine.beginTimer(KANE_QuNeo.beatOffset,
-                  "KANE_QuNeo.handleBeat("+deck+")",
-                  true)];
-
+                    () => KANE_QuNeo.handleBeat(deck), true)];
     // now determine whether or not the track has changed
     var channelName = KANE_QuNeo.getChannelName(deck);
     var trackSamples = engine.getValue(channelName, "track_samples");
@@ -1253,8 +1251,8 @@ KANE_QuNeo.handleBeat = function (deck) {
 
     // signify that this beat was reached outside the beat_active window
     engine.beginTimer(KANE_QuNeo.beatOffset,
-              "KANE_QuNeo.resetNextBeatTimer("+deck+")",
-              true);
+        () => KANE_QuNeo.resetNextBeatTimer(deck),
+        true);
 
     // record last beat number
     var lastWholeBeat = KANE_QuNeo.wholeBeat[channel];
@@ -1360,19 +1358,20 @@ KANE_QuNeo.scheduleBeat = function (deck, wholeBeat, direction) {
     and = 1000*(spb * 1/2); // and is symmetric in either direction
 
     // now set and store actual timers, in case we want to cancel them
-    var startOfCall = "KANE_QuNeo.deckBeatLEDs("+deck+","+wholeBeat+",";
+
+    let makeHandler = division => () => KANE_QuNeo.deckBeatLEDs(deck,wholeBeat,division);
 
     // the beat itself, do it now
     KANE_QuNeo.deckBeatLEDs(deck,wholeBeat,0);
     // e, add this and the following quarters to our list of timers
     KANE_QuNeo.scheduledBeats[channel].push(
-    engine.beginTimer(e,startOfCall+"1/4)", true))
+    engine.beginTimer(e,makeHandler(1/4), true))
     // and
     KANE_QuNeo.scheduledBeats[channel].push(
-    engine.beginTimer(and,startOfCall+"1/2)", true))
+    engine.beginTimer(and,makeHandler(1/2), true))
     // uh
     KANE_QuNeo.scheduledBeats[channel].push(
-    engine.beginTimer(uh,startOfCall+"3/4)", true))
+    engine.beginTimer(uh,makeHandler(3/4), true))
 }
 
 /***** (U) Utilities *****/
diff --git a/res/controllers/Korg-nanoKONTROL-2-scripts.js b/res/controllers/Korg-nanoKONTROL-2-scripts.js
index 192e6b4502e..1c3b6a15f25 100644
--- a/res/controllers/Korg-nanoKONTROL-2-scripts.js
+++ b/res/controllers/Korg-nanoKONTROL-2-scripts.js
@@ -92,7 +92,7 @@ NK2.bankSelect = function bankSelect(deck, bank) {
     }else if (NK2.curNSMR=="R"){
         NK2.LEDBankIndicator=NK2.Rbutton[NK2.curDeck];
     }
-    if (NK2.LEDflasheson===true){engine.stopTimer(NK2.LEDtimer);NK2.LEDtimer=engine.beginTimer(750, "NK2.indicatorLEDs()");}//start timer for LED indicator flasher
+    if (NK2.LEDflasheson===true){engine.stopTimer(NK2.LEDtimer);NK2.LEDtimer=engine.beginTimer(750, NK2.indicatorLEDs);}//start timer for LED indicator flasher
     NK2.updateLEDs();
 };
 
@@ -288,7 +288,7 @@ NK2.indicatorLEDs = function indicatorLEDs(value,group,control){
     NK2.flashon=0;
     NK2.flashcount=0;
 
-    NK2.flashTimer=engine.beginTimer(100, "NK2.flashIndicators()");
+    NK2.flashTimer=engine.beginTimer(100, NK2.flashIndicators);
     return true;
 };
 
@@ -596,7 +596,7 @@ NK2.cueClear = function cueClear(cue, control){//clear hotcue - OR move hotcue t
     if(engine.getValue(NK2.Deck[NK2.curDeck], "hotcue_"+cue+"_enabled")!=true){//hotcue not set - prepare to move next hotcue pressed to this button
         NK2.cueMoveToNum=cue;
         engine.stopTimer(NK2.cueMoveIndicator);
-        NK2.cueMoveIndicator=engine.beginTimer(100, "NK2.cueMoveIndicatorLEDs("+control+")");//start timer for LED indicator flasher showing the button we're moving to
+        NK2.cueMoveIndicator=engine.beginTimer(100, () => NK2.cueMoveIndicatorLEDs(control));//start timer for LED indicator flasher showing the button we're moving to
         return true;
     }
 
@@ -705,7 +705,7 @@ NK2.reloopButton = function reloopButton(value) {
         engine.stopTimer(NK2.reloopTimer);
         NK2.loopbuttonDown=true;
         NK2.doreloop=true;
-        NK2.reloopTimer = engine.beginTimer(500, "NK2.disablereloop()", true);
+        NK2.reloopTimer = engine.beginTimer(500, NK2.disablereloop, true);
         } else {//button was released
         NK2.loopbuttonDown=false;
         if (NK2.doreloop===true) {engine.setValue(NK2.Deck[NK2.curDeck], "reloop_exit", 1);engine.setValue(NK2.Deck[NK2.curDeck], "reloop_exit", 0);};
@@ -723,7 +723,7 @@ NK2.loopin = function loopin(value) {
         engine.stopTimer(NK2.loopinTimer);
         NK2.loopinbuttonDown=true;
         NK2.doloopin=true;
-        NK2.loopinTimer = engine.beginTimer(500, "NK2.disableloopin()", true);
+        NK2.loopinTimer = engine.beginTimer(500, NK2.disableloopin, true);
         } else {//button was released
         NK2.loopinbuttonDown=false;
         if (NK2.doloopin===true) {engine.setValue(NK2.Deck[NK2.curDeck], "loop_in", 1);engine.setValue(NK2.Deck[NK2.curDeck], "loop_in", 0);};
@@ -741,7 +741,7 @@ NK2.loopout = function loopout(value) {
         engine.stopTimer(NK2.loopoutTimer);
         NK2.loopoutbuttonDown=true;
         NK2.doloopout=true;
-        NK2.loopoutTimer = engine.beginTimer(500, "NK2.disableloopout()", true);
+        NK2.loopoutTimer = engine.beginTimer(500, NK2.disableloopout, true);
         } else {//button was released
         NK2.loopoutbuttonDown=false;
         if (NK2.doloopout===true) {engine.setValue(NK2.Deck[NK2.curDeck], "loop_out", 1);engine.setValue(NK2.Deck[NK2.curDeck], "loop_out", 0);};
@@ -874,7 +874,7 @@ NK2.testleds=function testleds(){//sends LED on messages to all
     if (NK2.testLED>=127){return false; }
     NK2.testLED++
     midi.sendShortMsg(0xB0, NK2.testLED, 0x7F);
-    NK2.LEDtimer=engine.beginTimer(100, "NK2.testleds()", true);
+    NK2.LEDtimer=engine.beginTimer(100, NK2.testleds, true);
 }
 
 //############################################################################
diff --git a/res/controllers/Korg-nanoPAD2-scripts.js b/res/controllers/Korg-nanoPAD2-scripts.js
index 1032728321a..61c6757698f 100644
--- a/res/controllers/Korg-nanoPAD2-scripts.js
+++ b/res/controllers/Korg-nanoPAD2-scripts.js
@@ -130,7 +130,7 @@ NANOPAD2RK.reloopButton = function (channel, control, value, status, group) {
 
     NANOPAD2RK.loopbuttonDown=true;
     NANOPAD2RK.doreloop=true;
-    NANOPAD2RK.reloopTimer = engine.beginTimer(500, "NANOPAD2RK.disablereloop()", true);
+    NANOPAD2RK.reloopTimer = engine.beginTimer(500, NANOPAD2RK.disablereloop, true);
     };
 
 NANOPAD2RK.reloopButtonRelease = function (channel, control, value, status, group) {//button was released
diff --git a/res/controllers/Midi_for_light-scripts.js b/res/controllers/Midi_for_light-scripts.js
index 7945223f524..6c6cc073d8c 100644
--- a/res/controllers/Midi_for_light-scripts.js
+++ b/res/controllers/Midi_for_light-scripts.js
@@ -91,7 +91,7 @@ midi_for_light.init = function(id) { // called when the MIDI device is opened &
     if (midi_channel < 1) midi_channel = 1;
 
     for (var i = 0; i <= 3; i++) {
-        deck_beat_watchdog_timer[i] = engine.beginTimer(beat_watchdog_time, function() { midi_for_light.deckBeatWatchdog(i); });
+        deck_beat_watchdog_timer[i] = engine.beginTimer(beat_watchdog_time, () => { midi_for_light.deckBeatWatchdog(i); });
         engine.connectControl("[Channel" + (i + 1) + "]", "beat_active", "midi_for_light.deckBeatOutputToMidi");
         engine.connectControl("[Channel" + (i + 1) + "]", "volume", "midi_for_light.deckVolumeChange");
         engine.connectControl("[Channel" + (i + 1) + "]", "play", "midi_for_light.deckButtonPlay");
@@ -118,7 +118,7 @@ midi_for_light.deckButtonPlay = function(value, group, control) { // called when
     if (value == 1) { // deck play on
         engine.stopTimer(deck_beat_watchdog_timer[deck]);
         beat_watchdog[deck] = false;
-        deck_beat_watchdog_timer[deck] = engine.beginTimer(beat_watchdog_time, function() { midi_for_light.deckBeatWatchdog(deck); });
+        deck_beat_watchdog_timer[deck] = engine.beginTimer(beat_watchdog_time, () => { midi_for_light.deckBeatWatchdog(deck); });
     } else { // deck play stop
         engine.stopTimer(deck_beat_watchdog_timer[deck]);
         beat_watchdog[deck] = true;
@@ -508,7 +508,7 @@ midi_for_light.deckBeatOutputToMidi = function(value, group, control) { // send
     // reset deck beat watchdog
     engine.stopTimer(deck_beat_watchdog_timer[deck]);
     beat_watchdog[deck] = false;
-    deck_beat_watchdog_timer[deck] = engine.beginTimer(beat_watchdog_time, function() { midi_for_light.deckBeatWatchdog(deck); });
+    deck_beat_watchdog_timer[deck] = engine.beginTimer(beat_watchdog_time, () => { midi_for_light.deckBeatWatchdog(deck); });
 
     // fit deck bpm to midi range 0-127
     if (deck_bpm <= 0) deck_bpm = 0;
diff --git a/res/controllers/Nintendo-Wiimote.js b/res/controllers/Nintendo-Wiimote.js
index 5367e860967..9dfb9f576ff 100644
--- a/res/controllers/Nintendo-Wiimote.js
+++ b/res/controllers/Nintendo-Wiimote.js
@@ -408,7 +408,7 @@ Wiimote.init = function(id) {
             return;
         controller.timers[timer_id] = engine.beginTimer(
             interval,
-            "Wiimote.controller.autorepeatTimer()"
+            () => Wiimote.controller.autorepeatTimer() // FIXME: autorepeatTimer does not exist?
         )
     }
     controller.setOutput("state","rumble",0);
@@ -700,7 +700,7 @@ Wiimote.rumble = function(rumble,milliseconds) {
     if (milliseconds!=undefined && rumble) {
         controller.timers["rumble"] = engine.beginTimer(
             milliseconds,
-            "Wiimote.rumble(false)"
+            () => Wiimote.rumble(false)
         );
     } else if ("rumble" in controller.timers) {
         engine.stopTimer(controller.timers["rumble"]);
diff --git a/res/controllers/Novation-Dicer-scripts.js b/res/controllers/Novation-Dicer-scripts.js
index 450a7047225..67a260e5343 100644
--- a/res/controllers/Novation-Dicer-scripts.js
+++ b/res/controllers/Novation-Dicer-scripts.js
@@ -320,12 +320,12 @@ NovationDicer.transformer = function(channel, control, value, status, group)
         if(group == "[Channel1]")
         {
             NovationDicer.gainCH1 = engine.getValue(group, "pregain");
-            NovationDicer.timer1 = engine.beginTimer(((60000/engine.getValue(group,"bpm"))/8),"NovationDicer.stutter(\"[Channel1]\")");
+            NovationDicer.timer1 = engine.beginTimer(((60000/engine.getValue(group,"bpm"))/8), () => NovationDicer.stutter("[Channel1]"));
             midi.sendShortMsg(0x9c,0x3f,NovationDicer.orange);
         } else
         {
             NovationDicer.gainCH2 = engine.getValue(group, "pregain");
-            NovationDicer.timer2 = engine.beginTimer(((60000/engine.getValue(group,"bpm"))/8),"NovationDicer.stutter(\"[Channel2]\")");
+            NovationDicer.timer2 = engine.beginTimer(((60000/engine.getValue(group,"bpm"))/8), () => NovationDicer.stutter("[Channel2]"));
             midi.sendShortMsg(0x9f,0x3f,NovationDicer.orange);
         }
     } else
diff --git a/res/controllers/Novation-Launchpad MK2-scripts.js b/res/controllers/Novation-Launchpad MK2-scripts.js
index f9a65dd9356..5d38186a2d2 100644
--- a/res/controllers/Novation-Launchpad MK2-scripts.js	
+++ b/res/controllers/Novation-Launchpad MK2-scripts.js	
@@ -4903,7 +4903,7 @@ var NLMK2 = (function () {
 	  start(interval) {
 	    if (this._state == null) {
 	      const started = Date.now();
-	      const handle = engine.beginTimer(interval, this.task);
+	      const handle = engine.beginTimer(interval, this.task.bind(this));
 	      this._state = {
 	        handle,
 	        started
diff --git a/res/controllers/Novation-Launchpad Mini MK3-scripts.js b/res/controllers/Novation-Launchpad Mini MK3-scripts.js
index ce1fb372417..85311a7772c 100644
--- a/res/controllers/Novation-Launchpad Mini MK3-scripts.js	
+++ b/res/controllers/Novation-Launchpad Mini MK3-scripts.js	
@@ -4903,7 +4903,7 @@ var NLMMK3 = (function () {
 	  start(interval) {
 	    if (this._state == null) {
 	      const started = Date.now();
-	      const handle = engine.beginTimer(interval, this.task);
+	      const handle = engine.beginTimer(interval, this.task.bind(this));
 	      this._state = {
 	        handle,
 	        started
diff --git a/res/controllers/Novation-Launchpad-scripts.js b/res/controllers/Novation-Launchpad-scripts.js
index bc1d5643634..c1eb460e426 100644
--- a/res/controllers/Novation-Launchpad-scripts.js
+++ b/res/controllers/Novation-Launchpad-scripts.js
@@ -4902,7 +4902,7 @@ var NLMK1 = (function () {
 	  start(interval) {
 	    if (this._state == null) {
 	      const started = Date.now();
-	      const handle = engine.beginTimer(interval, this.task);
+	      const handle = engine.beginTimer(interval, this.task.bind(this));
 	      this._state = {
 	        handle,
 	        started
diff --git a/res/controllers/Numark-DJ2Go-scripts.js b/res/controllers/Numark-DJ2Go-scripts.js
index 115e3777767..ed21369ffae 100644
--- a/res/controllers/Numark-DJ2Go-scripts.js
+++ b/res/controllers/Numark-DJ2Go-scripts.js
@@ -114,7 +114,7 @@ NumarkDJ2Go.deck = function(deckNum) {
 		var beta = (alpha/30); //Adjust to suit.
 		engine.scratchEnable(this.deckNum, intervalsPerRev, rpm, alpha, beta);
 	};
-	this.scratchOff = function() {
+	this.scratchOff = () => {
 		engine.scratchDisable(this.deckNum);
 		this.scratchTimer= 0;
 	};
@@ -130,7 +130,7 @@ NumarkDJ2Go.deck = function(deckNum) {
 		var scrConst = 1;  //Adjust to suit.
 		var scrVal = (forwards)?scrConst:-scrConst;
 		engine.scratchTick(this.deckNum, scrVal);
-		this.scratchTimer = engine.beginTimer(playDelay,"NumarkDJ2Go.decks.D" + this.deckNum + ".scratchOff()", true);
+		this.scratchTimer = engine.beginTimer(playDelay, NumarkDJ2Go.decks["D" + this.deckNum].scratchOff, true);
 	};
 	//Pitchbend attribute. Required for pitchbend to be ramping (i.e speeds up/slows down the more the wheel is moved).
 	this.bendVal= 0;
@@ -150,12 +150,10 @@ NumarkDJ2Go.deck = function(deckNum) {
 		nVal = (nVal > 3.0)?3.0:nVal; //If gone over 3, keep at 3.
 		this.bendVal = (forwards)?nVal:-nVal; //Return to positive or minus number.
 		engine.setValue(this.group, "jog", this.bendVal);
-		this.pitchTimer = engine.beginTimer(20,"NumarkDJ2Go.decks.D" + this.deckNum + ".pitchBendOff()", true);
-	};
-	//Used by function above. Turns pitchbend off.
-	this.pitchBendOff = function() {
-		this.bendVal = 0;
-		this.pitchTimer= 0;
+		this.pitchTimer = engine.beginTimer(20, () => {
+			this.bendVal = 0;
+			this.pitchTimer= 0;
+		}, true);
 	};
 	//Controls for the deck--buttons, sliders, etc--are associated with the deck using this array.
 	this.control = [];
@@ -193,7 +191,6 @@ NumarkDJ2Go.control = function(key, midino, group) {
 //actually illuminate.
 NumarkDJ2Go.light = function(group, midino, deckID, controlID) {
 	this.midino = midino;
-	this.objStr= "NumarkDJ2Go.decks." + deckID + ".control." + controlID + ".light"
 	this.lit = false;
 	this.flashTimer= 0;
 	this.flashOnceTimer= 0;
@@ -201,15 +198,14 @@ NumarkDJ2Go.light = function(group, midino, deckID, controlID) {
 		midi.sendShortMsg(0x90, this.midino, value);
 		this.lit = value;
 	};
-	this.flashOnceOn = function() {
+	this.flashOnceOn = () => {
 		midi.sendShortMsg(0x90, this.midino,1);
-		this.flashOnceTimer = engine.beginTimer(150, this.objStr + ".flashOnceOff()", true);
-	};
-	this.flashOnceOff = function() {
-		midi.sendShortMsg(0x80, this.midino,1);
-		this.flashOnceTimer = 0;
+		this.flashOnceTimer = engine.beginTimer(150, () => {
+			midi.sendShortMsg(0x80, this.midino,1);
+			this.flashOnceTimer = 0;
+		}, true);
 	};
-	this.flashOff = function(relight) {
+	this.flashOff = relight => {
 		if (this.flashTimer !== 0)
 			{
 			engine.stopTimer(this.flashTimer);
@@ -233,10 +229,10 @@ NumarkDJ2Go.light = function(group, midino, deckID, controlID) {
 		var relight = this.lit;
 		this.flashOff();
 		this.flashOnceOn(); //This is because the timer take 600 milisecs before first flash.
-		this.flashTimer = engine.beginTimer(600, this.objStr + ".flashOnceOn()");
+		this.flashTimer = engine.beginTimer(600, this.flashOnceOn);
 		if (flashNo)
 			{
-			engine.beginTimer((flashNo * 600) -50, this.objStr + ".flashOff(" + relight + ")", true);
+			engine.beginTimer((flashNo * 600) -50, () => this.flashOff(relight), true);
 			};
 	};
 };
diff --git a/res/controllers/Numark-Mixtrack-2-scripts.js b/res/controllers/Numark-Mixtrack-2-scripts.js
index df15f6044c7..2d8a374ed9c 100644
--- a/res/controllers/Numark-Mixtrack-2-scripts.js
+++ b/res/controllers/Numark-Mixtrack-2-scripts.js
@@ -179,14 +179,14 @@ NumarkMixTrackII.jogWheel = function(channel, control, value, status, group) {
             if (NumarkMixTrackII.scratch_timer[deck - 1] != -1) {
                 engine.stopTimer(NumarkMixTrackII.scratch_timer[deck - 1]);
             }
-            NumarkMixTrackII.scratch_timer[deck - 1] = engine.beginTimer(20, "NumarkMixTrackII.jogWheelStopScratch(" + deck + ")", true);
+            NumarkMixTrackII.scratch_timer[deck - 1] = engine.beginTimer(20, () => NumarkMixTrackII.jogWheelStopScratch(deck), true);
         }
     } else {
         if (!NumarkMixTrackII.touch[deck - 1]) {
             if (NumarkMixTrackII.scratch_timer[deck - 1] != -1) {
                 engine.stopTimer(NumarkMixTrackII.scratch_timer[deck - 1]);
             }
-            NumarkMixTrackII.scratch_timer[deck - 1] = engine.beginTimer(20, "NumarkMixTrackII.jogWheelStopScratch(" + deck + ")", true);
+            NumarkMixTrackII.scratch_timer[deck - 1] = engine.beginTimer(20, () => NumarkMixTrackII.jogWheelStopScratch(deck), true);
         }
     }
 
@@ -221,7 +221,7 @@ NumarkMixTrackII.wheelTouch = function(channel, control, value, status, group){
             engine.stopTimer(NumarkMixTrackII.scratch_timer[deck - 1]);
         }
 
-        NumarkMixTrackII.scratch_timer[deck - 1] = engine.beginTimer(20, "NumarkMixTrackII.jogWheelStopScratch(" + deck + ")", true);
+        NumarkMixTrackII.scratch_timer[deck - 1] = engine.beginTimer(20, () => NumarkMixTrackII.jogWheelStopScratch(deck), true);
     } else {
         if (!NumarkMixTrackII.scratch_mode[deck - 1] && engine.getValue(group, "play")) {
             return;
diff --git a/res/controllers/Numark-Mixtrack-3-scripts.js b/res/controllers/Numark-Mixtrack-3-scripts.js
index ec98504c0ac..a658b0842f3 100644
--- a/res/controllers/Numark-Mixtrack-3-scripts.js
+++ b/res/controllers/Numark-Mixtrack-3-scripts.js
@@ -312,9 +312,7 @@ LED.prototype.flashOn = function(num_ms_on, value, num_ms_off, flashCount, relig
         // so we don't need this part  if flashcount == 1
 
         // permanent timer
-        this.flashTimer = engine.beginTimer(num_ms_on + num_ms_off, function() {
-            this.flashOnceOn(false);
-        });
+        this.flashTimer = engine.beginTimer(num_ms_on + num_ms_off, ()=>this.flashOnceOn(false));
     }
 
     if (flashCount > 1) {
@@ -322,9 +320,7 @@ LED.prototype.flashOn = function(num_ms_on, value, num_ms_off, flashCount, relig
         // so we don't need this part  if flashcount=1
         // temporary timer. The end of this timer stops the permanent flashing
 
-        this.flashTimer2 = engine.beginTimer(flashCount * (num_ms_on + num_ms_off) - num_ms_off, function() {
-            this.stopflash(relight);
-        }, true);
+        this.flashTimer2 = engine.beginTimer(flashCount * (num_ms_on + num_ms_off) - num_ms_off, ()=>this.stopflash(relight), true);
     }
 };
 
@@ -371,9 +367,7 @@ LED.prototype.flashOnceOn = function(relight) {
     sendShortMsg(this.control, this.midino, this.valueon);
     pauseScript(scriptpause);
     this.flashOnceDuration = this.num_ms_on;
-    this.flashOnceTimer = engine.beginTimer(this.num_ms_on - scriptpause, function() {
-        this.flashOnceOff(relight);
-    }, true);
+    this.flashOnceTimer = engine.beginTimer(this.num_ms_on - scriptpause, ()=>this.flashOnceOff(relight), true);
 };
 
 // private :call back function (called in flashOnceOn() )
diff --git a/res/controllers/Numark-Mixtrack-Platinum-scripts.js b/res/controllers/Numark-Mixtrack-Platinum-scripts.js
index 0e8ce011a19..c870c56973f 100644
--- a/res/controllers/Numark-Mixtrack-Platinum-scripts.js
+++ b/res/controllers/Numark-Mixtrack-Platinum-scripts.js
@@ -396,7 +396,7 @@ MixtrackPlatinum.EffectUnit = function (unitNumbers) {
             }
 
             var button = this;
-            this.flash_timer = engine.beginTimer(time, function() {
+            this.flash_timer = engine.beginTimer(time, () => {
                 if (button.flash_state) {
                     button.send(button.on);
                     button.flash_state = false;
@@ -405,7 +405,7 @@ MixtrackPlatinum.EffectUnit = function (unitNumbers) {
                     button.send(button.off);
                     button.flash_state = true;
                 }
-            }.bind(this));
+            });
         },
         stopFlash: function() {
             engine.stopTimer(this.flash_timer);
@@ -1190,7 +1190,7 @@ MixtrackPlatinum.startScratchTimer = function (deck) {
     if (MixtrackPlatinum.scratch_timer[deck]) return;
 
     MixtrackPlatinum.scratch_tick[deck] = 0;
-    MixtrackPlatinum.scratch_timer[deck] = engine.beginTimer(20, function() {
+    MixtrackPlatinum.scratch_timer[deck] = engine.beginTimer(20, () => {
         MixtrackPlatinum.scratchTimerCallback(deck);
     });
 };
diff --git a/res/controllers/Numark-Mixtrack-Pro-FX-scripts.js b/res/controllers/Numark-Mixtrack-Pro-FX-scripts.js
index f2a62577cfb..82036d1710c 100644
--- a/res/controllers/Numark-Mixtrack-Pro-FX-scripts.js
+++ b/res/controllers/Numark-Mixtrack-Pro-FX-scripts.js
@@ -536,7 +536,7 @@ MixtrackProFX.PadSection = function(deckNumber) {
     this.blinkLedOn = function(midi1, midi2) {
         this.blinkLedOff();
         this.blinkLedState = true;
-        this.blinkTimer = engine.beginTimer(MixtrackProFX.blinkDelay, function() {
+        this.blinkTimer = engine.beginTimer(MixtrackProFX.blinkDelay, () => {
             midi.sendShortMsg(midi1, midi2, this.blinkLedState ? 0x7F : 0x01);
             this.blinkLedState = !this.blinkLedState;
         });
diff --git a/res/controllers/Numark-Mixtrack-Pro-scripts.js b/res/controllers/Numark-Mixtrack-Pro-scripts.js
index d1d7df6307c..1bbf23d5ec7 100644
--- a/res/controllers/Numark-Mixtrack-Pro-scripts.js
+++ b/res/controllers/Numark-Mixtrack-Pro-scripts.js
@@ -220,8 +220,7 @@ NumarkMixTrackPro.setLED = function(value, status) {
 
 NumarkMixTrackPro.flashLED = function (led, veces){
 	var ndx = Math.random();
-	var func = "NumarkMixTrackPro.doFlash(" + ndx + ", " + veces + ")";
-	var id = engine.beginTimer(120, func);
+	var id = engine.beginTimer(120, NumarkMixTrackPro.doFlash(ndx, veces));
 	NumarkMixTrackPro.ledTimers[ndx] =  new NumarkMixTrackPro.LedTimer(id, led, 0, false);
 }
 
@@ -589,7 +588,7 @@ NumarkMixTrackPro.jogWheel = function(channel, control, value, status, group) {
 		if (NumarkMixTrackPro.scratchMode[deck-1] && posNeg == -1 && !NumarkMixTrackPro.touch[deck-1]) {
 
 			if (NumarkMixTrackPro.scratchTimer[deck-1] != -1) engine.stopTimer(NumarkMixTrackPro.scratchTimer[deck-1]);
-			NumarkMixTrackPro.scratchTimer[deck-1] = engine.beginTimer(20, "NumarkMixTrackPro.jogWheelStopScratch(" + deck + ")", true);
+			NumarkMixTrackPro.scratchTimer[deck-1] = engine.beginTimer(20, () => {NumarkMixTrackPro.jogWheelStopScratch(deck); }, true);
 		}
 
     } else { // stop scratching
@@ -597,7 +596,7 @@ NumarkMixTrackPro.jogWheel = function(channel, control, value, status, group) {
 		if (!NumarkMixTrackPro.touch[deck-1]){
 
 			if (NumarkMixTrackPro.scratchTimer[deck-1] != -1) engine.stopTimer(NumarkMixTrackPro.scratchTimer[deck-1]);
-			NumarkMixTrackPro.scratchTimer[deck-1] = engine.beginTimer(20, "NumarkMixTrackPro.jogWheelStopScratch(" + deck + ")", true);
+			NumarkMixTrackPro.scratchTimer[deck-1] = engine.beginTimer(20, () => { NumarkMixTrackPro.jogWheelStopScratch(); }, true);
 		}
 
 	}
@@ -635,7 +634,7 @@ NumarkMixTrackPro.wheelTouch = function(channel, control, value, status, group){
 
 		if (NumarkMixTrackPro.scratchTimer[deck-1] != -1) engine.stopTimer(NumarkMixTrackPro.scratchTimer[deck-1]);
 
-		NumarkMixTrackPro.scratchTimer[deck-1] = engine.beginTimer(20, "NumarkMixTrackPro.jogWheelStopScratch(" + deck + ")", true);
+		NumarkMixTrackPro.scratchTimer[deck-1] = engine.beginTimer(20, () => { NumarkMixTrackPro.jogWheelStopScratch(deck); }, true);
 
 	} else {
 
diff --git a/res/controllers/Numark-N4-scripts.js b/res/controllers/Numark-N4-scripts.js
index 80233aca9a2..ed65e51e0b5 100644
--- a/res/controllers/Numark-N4-scripts.js
+++ b/res/controllers/Numark-N4-scripts.js
@@ -228,10 +228,10 @@ NumarkN4.topContainer = function(channel) {
                     midi.sendShortMsg(0xB0+channel, 0x0B+i, (i-this.hotCuePage)?0x00:0x7F);
                 }
             }
-            this.timer = engine.beginTimer(1000, function() {
+            this.timer = engine.beginTimer(1000, () => {
                 theContainer.reconnectComponents();
                 this.timer = 0;
-            }.bind(this), true);
+            }, true);
         },
         shift: function() {
             this.group=theContainer.group;
@@ -492,9 +492,9 @@ NumarkN4.Deck = function(channel) {
                 if (this.inGetParameter()!==value) {
                     this.inSetParameter(value);
                 }
-                engine.beginTimer(100, function() {
+                engine.beginTimer(100, () => {
                     this.flickerSafetyTimeout=true;
-                }.bind(this), true);
+                }, true);
             }
         },
     });
@@ -564,7 +564,7 @@ NumarkN4.Deck = function(channel) {
         },
     });
 
-    this.manageChannelIndicator = function() {
+    this.manageChannelIndicator = () => {
         this.duration=engine.getParameter(theDeck.group, "duration");
         // checks if the playposition is in the warnTimeFrame
         if (engine.getParameter(theDeck.group, "playposition") * this.duration > (this.duration - NumarkN4.warnAfterTime)) {
@@ -586,7 +586,7 @@ NumarkN4.Deck = function(channel) {
         // spawned which conflicted with the old (still running) timers.
         if (!this.previouslyLoaded) {
             //timer is more efficient is this case than a callback because it would be called too often.
-            theDeck.blinkTimer=engine.beginTimer(NumarkN4.blinkInterval, theDeck.manageChannelIndicator.bind(this));
+            theDeck.blinkTimer=engine.beginTimer(NumarkN4.blinkInterval, theDeck.manageChannelIndicator);
         }
         this.previouslyLoaded=value;
     }.bind(this));
diff --git a/res/controllers/Numark-Omni-Control-scripts.js b/res/controllers/Numark-Omni-Control-scripts.js
index 556069a4bf1..5411520ffca 100644
--- a/res/controllers/Numark-Omni-Control-scripts.js
+++ b/res/controllers/Numark-Omni-Control-scripts.js
@@ -127,7 +127,7 @@ NumarkTotalControl.loopOut = function(channel, control, value, status, group) {
 						// Get current position by temporary setting loop start
 						NumarkTotalControl.oldLoopStart[deck-1] = start;
 						engine.setValue(group, "loop_in", 1);
-						engine.beginTimer(20, "NumarkTotalControl.loopExtendedAdjustment('" + group + "')", true);
+						engine.beginTimer(20, () => NumarkTotalControl.loopExtendedAdjustment(group), true);
 					}
 				} else {
 					engine.setValue(group, "loop_out", 1);
@@ -144,7 +144,7 @@ NumarkTotalControl.loopExtendedAdjustment = function(group) {
 	var start = engine.getValue(group, "loop_start_position");
 	if (start == NumarkTotalControl.oldLoopStart[deck-1]) {
 		// Still old loop start -> retry later
-		engine.beginTimer(20, "NumarkTotalControl.loopExtendedAdjustment('" + group + "')", true);
+		engine.beginTimer(20, () => NumarkTotalControl.loopExtendedAdjustment(group), true);
 		return;
 	}
 
@@ -208,7 +208,7 @@ NumarkTotalControl.loopExtendedChange = function(group, timerCall) {
 		NumarkTotalControl.extendedLoopingLEDState[deck-1] = engine.getValue(group, "loop_enabled");
 		// Start LED blink timer
 		NumarkTotalControl.loopLEDBlink(deck);
-		NumarkTotalControl.extendedLoopingLEDTimer[deck-1] = engine.beginTimer(333, "NumarkTotalControl.loopLEDBlink(" + deck + ")");
+		NumarkTotalControl.extendedLoopingLEDTimer[deck-1] = engine.beginTimer(333, () => NumarkTotalControl.loopLEDBlink(deck));
 	}
 }
 
@@ -260,7 +260,7 @@ NumarkTotalControl.extendedFunctionButton = function(normalFunction, extendedLoo
 				NumarkTotalControl.extendedLoopingChanged[deck-1] = false;
 				NumarkTotalControl.extendedLoopingJogCarryOver[deck-1] = 0;
 				// Start alternative function timer -> activated after button was 500msec pressed or jog wheel movement (see jogWheel function)
-				NumarkTotalControl.extendedLoopingLEDTimer[deck-1] = engine.beginTimer(500, "NumarkTotalControl.loopExtendedChange('" + group + "', true)", true);
+				NumarkTotalControl.extendedLoopingLEDTimer[deck-1] = engine.beginTimer(500, () => NumarkTotalControl.loopExtendedChange(group, true), true);
 			}
 		} else {
 			// Check if alternative function wasn't used
@@ -307,7 +307,7 @@ NumarkTotalControl.quantizeLED = function(value, group, key) {
 		NumarkTotalControl.setLED(NumarkTotalControl.leds[0]["quantize"], deck1);
 	} else if (NumarkTotalControl.quantizeLEDTimer == -1) {
 		NumarkTotalControl.quantizeLEDBlink();
-		NumarkTotalControl.quantizeLEDTimer = engine.beginTimer(333, "NumarkTotalControl.quantizeLEDBlink()");
+		NumarkTotalControl.quantizeLEDTimer = engine.beginTimer(333, () => NumarkTotalControl.quantizeLEDBlink());
 	}
 }
 
@@ -408,7 +408,7 @@ NumarkTotalControl.jogWheel = function(channel, control, value, status, group) {
 			engine.stopTimer(NumarkTotalControl.scratchTimer[deck-1]);
 		}
 		engine.scratchTick(deck, adjustedJog);
-		NumarkTotalControl.scratchTimer[deck-1] = engine.beginTimer(20, "NumarkTotalControl.jogWheelStopScratch(" + deck + ")", true);
+		NumarkTotalControl.scratchTimer[deck-1] = engine.beginTimer(20, () => NumarkTotalControl.jogWheelStopScratch(deck), true);
 	} else {
 		var gammaInputRange = 64;	// Max jog speed
 		var maxOutFraction = 0.5;	// Where on the curve it should peak; 0.5 is half-way
diff --git a/res/controllers/Numark-Party-Mix.scripts.js b/res/controllers/Numark-Party-Mix.scripts.js
index c1ece5ffc3b..e924596ff98 100644
--- a/res/controllers/Numark-Party-Mix.scripts.js
+++ b/res/controllers/Numark-Party-Mix.scripts.js
@@ -152,7 +152,7 @@ NumarkPartyMix.Deck = function(deckNumber) {
             }
 
             if (deck.scratchModeEnabled) {
-                this.touchTimer = engine.beginTimer(50, function() {
+                this.touchTimer = engine.beginTimer(50, () => {
                     engine.scratchDisable(deckNumber);
                 }, true);
 
@@ -354,7 +354,7 @@ NumarkPartyMix.Browse = function() {
             browse.knobpressed = this.isPress(channel, control, value, status);
             if (browse.knobpressed) {
                 this.isLongPressed = false;
-                this.longPressTimer = engine.beginTimer(this.longPressTimeout, function() {
+                this.longPressTimer = engine.beginTimer(this.longPressTimeout, () => {
                     this.isLongPressed = true;
                     this.longPressTimer = 0;
                 }, true);
diff --git a/res/controllers/Numark-Total-Control-scripts.js b/res/controllers/Numark-Total-Control-scripts.js
index 556069a4bf1..341c9a42432 100644
--- a/res/controllers/Numark-Total-Control-scripts.js
+++ b/res/controllers/Numark-Total-Control-scripts.js
@@ -127,7 +127,7 @@ NumarkTotalControl.loopOut = function(channel, control, value, status, group) {
 						// Get current position by temporary setting loop start
 						NumarkTotalControl.oldLoopStart[deck-1] = start;
 						engine.setValue(group, "loop_in", 1);
-						engine.beginTimer(20, "NumarkTotalControl.loopExtendedAdjustment('" + group + "')", true);
+						engine.beginTimer(20, () => NumarkTotalControl.loopExtendedAdjustment(group), true);
 					}
 				} else {
 					engine.setValue(group, "loop_out", 1);
@@ -144,7 +144,7 @@ NumarkTotalControl.loopExtendedAdjustment = function(group) {
 	var start = engine.getValue(group, "loop_start_position");
 	if (start == NumarkTotalControl.oldLoopStart[deck-1]) {
 		// Still old loop start -> retry later
-		engine.beginTimer(20, "NumarkTotalControl.loopExtendedAdjustment('" + group + "')", true);
+		engine.beginTimer(20, () => { NumarkTotalControl.loopExtendedAdjustment(group); }, true);
 		return;
 	}
 
@@ -208,7 +208,7 @@ NumarkTotalControl.loopExtendedChange = function(group, timerCall) {
 		NumarkTotalControl.extendedLoopingLEDState[deck-1] = engine.getValue(group, "loop_enabled");
 		// Start LED blink timer
 		NumarkTotalControl.loopLEDBlink(deck);
-		NumarkTotalControl.extendedLoopingLEDTimer[deck-1] = engine.beginTimer(333, "NumarkTotalControl.loopLEDBlink(" + deck + ")");
+		NumarkTotalControl.extendedLoopingLEDTimer[deck-1] = engine.beginTimer(333, () => { NumarkTotalControl.loopLEDBlink(deck); });
 	}
 }
 
@@ -260,7 +260,7 @@ NumarkTotalControl.extendedFunctionButton = function(normalFunction, extendedLoo
 				NumarkTotalControl.extendedLoopingChanged[deck-1] = false;
 				NumarkTotalControl.extendedLoopingJogCarryOver[deck-1] = 0;
 				// Start alternative function timer -> activated after button was 500msec pressed or jog wheel movement (see jogWheel function)
-				NumarkTotalControl.extendedLoopingLEDTimer[deck-1] = engine.beginTimer(500, "NumarkTotalControl.loopExtendedChange('" + group + "', true)", true);
+				NumarkTotalControl.extendedLoopingLEDTimer[deck-1] = engine.beginTimer(500, () => {NumarkTotalControl.loopExtendedChange(group, true); }, true);
 			}
 		} else {
 			// Check if alternative function wasn't used
@@ -307,7 +307,7 @@ NumarkTotalControl.quantizeLED = function(value, group, key) {
 		NumarkTotalControl.setLED(NumarkTotalControl.leds[0]["quantize"], deck1);
 	} else if (NumarkTotalControl.quantizeLEDTimer == -1) {
 		NumarkTotalControl.quantizeLEDBlink();
-		NumarkTotalControl.quantizeLEDTimer = engine.beginTimer(333, "NumarkTotalControl.quantizeLEDBlink()");
+		NumarkTotalControl.quantizeLEDTimer = engine.beginTimer(333, NumarkTotalControl.quantizeLEDBlink);
 	}
 }
 
@@ -408,7 +408,7 @@ NumarkTotalControl.jogWheel = function(channel, control, value, status, group) {
 			engine.stopTimer(NumarkTotalControl.scratchTimer[deck-1]);
 		}
 		engine.scratchTick(deck, adjustedJog);
-		NumarkTotalControl.scratchTimer[deck-1] = engine.beginTimer(20, "NumarkTotalControl.jogWheelStopScratch(" + deck + ")", true);
+		NumarkTotalControl.scratchTimer[deck-1] = engine.beginTimer(20, () => { NumarkTotalControl.jogWheelStopScratch(deck); }, true);
 	} else {
 		var gammaInputRange = 64;	// Max jog speed
 		var maxOutFraction = 0.5;	// Where on the curve it should peak; 0.5 is half-way
diff --git a/res/controllers/Numark-V7-scripts.js b/res/controllers/Numark-V7-scripts.js
index aaab51bf482..ab8ceb1fc48 100644
--- a/res/controllers/Numark-V7-scripts.js
+++ b/res/controllers/Numark-V7-scripts.js
@@ -64,7 +64,7 @@ NumarkV7.RPM = 33+1/3; //Motor-Scratch rpm
 NumarkV7.init = function () {
     //flash LED's
     NumarkV7.FlashAllLED(1000);
-    engine.beginTimer(3500, "NumarkV7.init2()", true);
+    engine.beginTimer(3500, NumarkV7.init2, true);
 }
 NumarkV7.init2 = function () {
     //Tap Light
@@ -176,36 +176,36 @@ NumarkV7.shutdown = function () {
 
 NumarkV7.FlashAllLED = function (sustain) {
     midi.sendShortMsg(0xB0,0x39,0x01);
-    engine.beginTimer(sustain, "NumarkV7.OffAllLED()", true);
-    engine.beginTimer(sustain, "NumarkV7.RunLED()", true);
+    engine.beginTimer(sustain, NumarkV7.OffAllLED, true);
+    engine.beginTimer(sustain, NumarkV7.RunLED, true );
 }
 NumarkV7.OffAllLED = function () {
     midi.sendShortMsg(0xB0,0x39,0x00);
 }
 NumarkV7.RunLED = function () {
     NumarkV7.RunLED1()
-    engine.beginTimer(100, "NumarkV7.RunLED2()", true);
-    engine.beginTimer(200, "NumarkV7.RunLED3()", true);
-    engine.beginTimer(300, "NumarkV7.RunLED4()", true);
-    engine.beginTimer(400, "NumarkV7.RunLED5()", true);
-    engine.beginTimer(500, "NumarkV7.RunLED6()", true);
-    engine.beginTimer(600, "NumarkV7.RunLED7()", true);
-    engine.beginTimer(700, "NumarkV7.RunLED8()", true);
-    engine.beginTimer(800, "NumarkV7.RunLED9()", true);
-    engine.beginTimer(900, "NumarkV7.RunLED10()", true);
-    engine.beginTimer(1000, "NumarkV7.RunLED11()", true);
-    engine.beginTimer(1100, "NumarkV7.RunLED12()", true);
-    engine.beginTimer(1200, "NumarkV7.RunLED11()", true);
-    engine.beginTimer(1300, "NumarkV7.RunLED10()", true);
-    engine.beginTimer(1400, "NumarkV7.RunLED9()", true);
-    engine.beginTimer(1500, "NumarkV7.RunLED8()", true);
-    engine.beginTimer(1600, "NumarkV7.RunLED7()", true);
-    engine.beginTimer(1700, "NumarkV7.RunLED6()", true);
-    engine.beginTimer(1800, "NumarkV7.RunLED5()", true);
-    engine.beginTimer(1900, "NumarkV7.RunLED4()", true);
-    engine.beginTimer(2000, "NumarkV7.RunLED3()", true);
-    engine.beginTimer(2100, "NumarkV7.RunLED2()", true);
-    engine.beginTimer(2200, "NumarkV7.RunLED13()", true);
+    engine.beginTimer(100, NumarkV7.RunLED2 , true);
+    engine.beginTimer(200, NumarkV7.RunLED3 , true);
+    engine.beginTimer(300, NumarkV7.RunLED4 , true);
+    engine.beginTimer(400, NumarkV7.RunLED5 , true);
+    engine.beginTimer(500, NumarkV7.RunLED6 , true);
+    engine.beginTimer(600, NumarkV7.RunLED7 , true);
+    engine.beginTimer(700, NumarkV7.RunLED8 , true);
+    engine.beginTimer(800, NumarkV7.RunLED9 , true);
+    engine.beginTimer(900, NumarkV7.RunLED10 , true);
+    engine.beginTimer(1000, NumarkV7.RunLED11 , true);
+    engine.beginTimer(1100, NumarkV7.RunLED12 , true);
+    engine.beginTimer(1200, NumarkV7.RunLED11 , true);
+    engine.beginTimer(1300, NumarkV7.RunLED10 , true);
+    engine.beginTimer(1400, NumarkV7.RunLED9 , true);
+    engine.beginTimer(1500, NumarkV7.RunLED8 , true);
+    engine.beginTimer(1600, NumarkV7.RunLED7 , true);
+    engine.beginTimer(1700, NumarkV7.RunLED6 , true);
+    engine.beginTimer(1800, NumarkV7.RunLED5 , true);
+    engine.beginTimer(1900, NumarkV7.RunLED4 , true);
+    engine.beginTimer(2000, NumarkV7.RunLED3 , true);
+    engine.beginTimer(2100, NumarkV7.RunLED2 , true);
+    engine.beginTimer(2200, NumarkV7.RunLED13 , true);
 }
 NumarkV7.RunLED1 = function () {
     midi.sendShortMsg(0xB0,0x34,0x01);
@@ -1030,7 +1030,7 @@ NumarkV7.PitchA = function () {
 		engine.scratchDisable(1, false);
 		NumarkV7.PitchAPause = 2;
 		if (!NumarkV7.PitchAPauseOn) {
-			NumarkV7.timer1 = engine.beginTimer(100, "NumarkV7.PitchScratchEnableA");
+			NumarkV7.timer1 = engine.beginTimer(100, NumarkV7.PitchScratchEnableA);
 		}
 	}
     engine.setValue("[Channel1]","rate", (currentvalue * 1));
@@ -1075,7 +1075,7 @@ NumarkV7.PitchB = function () {
 		engine.scratchDisable(2, false);
 		NumarkV7.PitchBPause = 2;
 		if (!NumarkV7.PitchBPauseOn) {
-			NumarkV7.timer2 = engine.beginTimer(100, "NumarkV7.PitchScratchEnableB");
+			NumarkV7.timer2 = engine.beginTimer(100, NumarkV7.PitchScratchEnableB);
 		}
 	}
     engine.setValue("[Channel2]","rate", (currentvalue * 1));
diff --git a/res/controllers/Pioneer-DDJ-200-scripts.js b/res/controllers/Pioneer-DDJ-200-scripts.js
index e1f03a234a2..6514982d87c 100644
--- a/res/controllers/Pioneer-DDJ-200-scripts.js
+++ b/res/controllers/Pioneer-DDJ-200-scripts.js
@@ -56,7 +56,7 @@ DDJ200.init = function() {
     DDJ200.LEDsOff();
 
     // start with focus on library for selecting tracks (delay seems required)
-    engine.beginTimer(500, function() {
+    engine.beginTimer(500, () => {
         engine.setValue("[Library]", "MoveFocus", 1);
     }, true);
 
@@ -152,11 +152,11 @@ DDJ200.touch = function(channel, control, value, status, group) {
         var alpha = 1.0 / 8;
         engine.scratchEnable(vDeckNo, 128, 33 + 1 / 3, alpha, alpha / 32);
         // disable jog not to prevent track alignment
-        DDJ200.vDeck[vDeckNo]["jogEnabled"] = false;
+        DDJ200.vDeck[vDeckNo].jogEnabled = false;
     } else {
         // enable jog after 900 ms again
-        engine.beginTimer(900, function() {
-            DDJ200.vDeck[vDeckNo]["jogEnabled"] = true;
+        engine.beginTimer(900, () => {
+            DDJ200.vDeck[vDeckNo].jogEnabled = true;
         }, true);
         // disable scratch
         engine.scratchDisable(vDeckNo);
diff --git a/res/controllers/Pioneer-DDJ-400-script.js b/res/controllers/Pioneer-DDJ-400-script.js
index aa7ac851f28..a818f1703ec 100644
--- a/res/controllers/Pioneer-DDJ-400-script.js
+++ b/res/controllers/Pioneer-DDJ-400-script.js
@@ -352,7 +352,7 @@ PioneerDDJ400.startLoopLightsBlink = function(channel, control, status, group) {
 
     PioneerDDJ400.stopLoopLightsBlink(group, control, status);
 
-    PioneerDDJ400.timers[group][control] = engine.beginTimer(500, function() {
+    PioneerDDJ400.timers[group][control] = engine.beginTimer(500, () => {
         blink = 0x7F - blink;
 
         // When adjusting the loop out position, turn the loop in light off
@@ -606,7 +606,7 @@ PioneerDDJ400.startSamplerBlink = function(channel, control, group) {
     let val = 0x7f;
 
     PioneerDDJ400.stopSamplerBlink(channel, control);
-    PioneerDDJ400.timers[channel][control] = engine.beginTimer(250, function() {
+    PioneerDDJ400.timers[channel][control] = engine.beginTimer(250, () => {
         val = 0x7f - val;
 
         // blink the appropriate pad
diff --git a/res/controllers/Pioneer-DDJ-FLX4-script.js b/res/controllers/Pioneer-DDJ-FLX4-script.js
index 7c9ea88d5b5..1b9012a267d 100644
--- a/res/controllers/Pioneer-DDJ-FLX4-script.js
+++ b/res/controllers/Pioneer-DDJ-FLX4-script.js
@@ -423,7 +423,7 @@ PioneerDDJFLX4.startLoopLightsBlink = function(channel, control, status, group)
 
     PioneerDDJFLX4.stopLoopLightsBlink(group, control, status);
 
-    PioneerDDJFLX4.timers[group][control] = engine.beginTimer(500, function() {
+    PioneerDDJFLX4.timers[group][control] = engine.beginTimer(500, () => {
         blink = 0x7F - blink;
 
         // When adjusting the loop out position, turn the loop in light off
@@ -718,7 +718,7 @@ PioneerDDJFLX4.startSamplerBlink = function(channel, control, group) {
     let val = 0x7f;
 
     PioneerDDJFLX4.stopSamplerBlink(channel, control);
-    PioneerDDJFLX4.timers[channel][control] = engine.beginTimer(250, function() {
+    PioneerDDJFLX4.timers[channel][control] = engine.beginTimer(250, () => {
         val = 0x7f - val;
 
         // blink the appropriate pad
diff --git a/res/controllers/Pioneer-DDJ-SB2-scripts.js b/res/controllers/Pioneer-DDJ-SB2-scripts.js
index 5aecfb954e0..8c18d6cb2fe 100644
--- a/res/controllers/Pioneer-DDJ-SB2-scripts.js
+++ b/res/controllers/Pioneer-DDJ-SB2-scripts.js
@@ -180,7 +180,7 @@ PioneerDDJSB2.init = function(_id) {
     PioneerDDJSB2.initDeck("[Channel4]");
 
     if (PioneerDDJSB2.twinkleVumeterAutodjOn) {
-        PioneerDDJSB2.vuMeterTimer = engine.beginTimer(100, "PioneerDDJSB2.vuMeterTwinkle()");
+        PioneerDDJSB2.vuMeterTimer = engine.beginTimer(100, PioneerDDJSB2.vuMeterTwinkle);
     }
 
     // request the positions of the knobs and faders from the controller
@@ -702,7 +702,7 @@ PioneerDDJSB2.shiftKeyLockButton = function(channel, control, value, status, gro
     var deck = status - 0x90;
     if (value) {
         engine.stopTimer(PioneerDDJSB2.speedRateToNormalTimer[deck]);
-        PioneerDDJSB2.speedRateToNormalTimer[deck] = engine.beginTimer(PioneerDDJSB2.speedRateToNormalTime, "PioneerDDJSB2.speedRateToNormal('" + group + "', " + deck + ")");
+        PioneerDDJSB2.speedRateToNormalTimer[deck] = engine.beginTimer(PioneerDDJSB2.speedRateToNormalTime, () => { PioneerDDJSB2.speedRateToNormal(group, deck); }, true);
     }
 };
 
@@ -1130,7 +1130,7 @@ PioneerDDJSB2.EffectUnit = function(unitNumber) {
         input: function(channel, control, value, status) {
             if (this.isPress(channel, control, value, status)) {
                 this.isLongPressed = false;
-                this.longPressTimer = engine.beginTimer(this.longPressTimeout, function() {
+                this.longPressTimer = engine.beginTimer(this.longPressTimeout, () => {
                     var effectGroup = "[EffectRack1_EffectUnit" + unitNumber + "_Effect" + this.buttonNumber + "]";
                     script.toggleControl(effectGroup, "enabled");
                     this.isLongPressed = true;
diff --git a/res/controllers/Pioneer-DDJ-SB3-scripts.js b/res/controllers/Pioneer-DDJ-SB3-scripts.js
index ba5d2441790..f9cc01e9c53 100755
--- a/res/controllers/Pioneer-DDJ-SB3-scripts.js
+++ b/res/controllers/Pioneer-DDJ-SB3-scripts.js
@@ -140,7 +140,7 @@ PioneerDDJSB3.flasher.functions = [];
 PioneerDDJSB3.flasher.init = function() {
     var flag = true;
 
-    PioneerDDJSB3.flasher.timer = engine.beginTimer(500, function() {
+    PioneerDDJSB3.flasher.timer = engine.beginTimer(500, () => {
         flag = !flag;
 
         for (var i = 0; i < PioneerDDJSB3.flasher.functions.length; i++) {
@@ -277,7 +277,7 @@ PioneerDDJSB3.init = function() {
     PioneerDDJSB3.initDeck("[Channel4]");
 
     if (PioneerDDJSB3.twinkleVumeterAutodjOn) {
-        PioneerDDJSB3.vuMeterTimer = engine.beginTimer(100, PioneerDDJSB3.vuMeterTwinkle());
+        PioneerDDJSB3.vuMeterTimer = engine.beginTimer(100, PioneerDDJSB3.vuMeterTwinkle);
     }
 
     // request the positions of the knobs and faders from the controller
@@ -1209,7 +1209,7 @@ PioneerDDJSB3.jogTouch = function(channel, control, value, status, group) {
             if (engine.getValue(group, "slipEnabled")) {
                 engine.setValue(group, "slipEnabled", false);
 
-                engine.beginTimer(250, function() {
+                engine.beginTimer(250, () => {
                     engine.setValue(group, "slipEnabled", true);
                 }, true);
             }
diff --git a/res/controllers/Pioneer-DDJ-SX-scripts.js b/res/controllers/Pioneer-DDJ-SX-scripts.js
index 292ccd9be96..caefea27723 100644
--- a/res/controllers/Pioneer-DDJ-SX-scripts.js
+++ b/res/controllers/Pioneer-DDJ-SX-scripts.js
@@ -396,7 +396,7 @@ PioneerDDJSX.init = function(id) {
 
     // activate vu meter timer for Auto DJ:
     if (PioneerDDJSX.twinkleVumeterAutodjOn) {
-        PioneerDDJSX.vuMeterTimer = engine.beginTimer(200, "PioneerDDJSX.vuMeterTwinkle()");
+        PioneerDDJSX.vuMeterTimer = engine.beginTimer(200, PioneerDDJSX.vuMeterTwinkle);
     }
 
     // initiate control status request:
@@ -483,7 +483,7 @@ PioneerDDJSX.autoDJToggleSyncKey = function(channel, control, value, status, gro
 
 PioneerDDJSX.autoDJTimer = function(value, group, control) {
     if (value) {
-        PioneerDDJSX.autoDJTickTimer = engine.beginTimer(PioneerDDJSX.autoDJTickInterval, "PioneerDDJSX.autoDJControl()");
+        PioneerDDJSX.autoDJTickTimer = engine.beginTimer(PioneerDDJSX.autoDJTickInterval, PioneerDDJSX.autoDJControl);
     } else if (PioneerDDJSX.autoDJTickTimer) {
         engine.stopTimer(PioneerDDJSX.autoDJTickTimer);
         PioneerDDJSX.autoDJTickTimer = 0;
diff --git a/res/controllers/Reloop Terminal Mix 2-4.js b/res/controllers/Reloop Terminal Mix 2-4.js
index cf745315ec8..8889594e2f1 100644
--- a/res/controllers/Reloop Terminal Mix 2-4.js	
+++ b/res/controllers/Reloop Terminal Mix 2-4.js	
@@ -104,8 +104,8 @@ TerminalMix.init = function (id,debug) {
     engine.connectControl("[Channel2]","beat_active","TerminalMix.tapLEDR");
 
     TerminalMix.timers["fstartflash"] = -1;
-//     TerminalMix.timers["qtrSec"] = engine.beginTimer(250,"TerminalMix.qtrSec");
-    TerminalMix.timers["halfSec"] = engine.beginTimer(500,"TerminalMix.halfSec");
+//     TerminalMix.timers["qtrSec"] = engine.beginTimer(250, TerminalMix.qtrSec);
+    TerminalMix.timers["halfSec"] = engine.beginTimer(500, TerminalMix.halfSec);
 
     if (TerminalMix.traxKnobMode == "tracks") {
         midi.sendShortMsg(0x90,0x37,0x7F);  // light Back button
diff --git a/res/controllers/Reloop-Beatmix-2-4-scripts.js b/res/controllers/Reloop-Beatmix-2-4-scripts.js
index 92dd6782f1a..a22493507e0 100644
--- a/res/controllers/Reloop-Beatmix-2-4-scripts.js
+++ b/res/controllers/Reloop-Beatmix-2-4-scripts.js
@@ -329,7 +329,7 @@ ReloopBeatmix24.LoadButton = function(channel, control, value, status, group) {
     if (value === DOWN) {
         loadButtonLongPressed[group] = false;
         loadButtonTimers[group] = engine.beginTimer(1000,
-            "ReloopBeatmix24.LoadButtonEject(\"" + group + "\")", true);
+            () => {RegloopBeatmix24.LoadButtonEject(group); }, true);
     } else { // UP
         if (!loadButtonLongPressed[group]) { // Short press
             engine.stopTimer(loadButtonTimers[group]);
@@ -546,7 +546,7 @@ ReloopBeatmix24.JogLed = function(value, group, _control) {
             jogWheelTimers[group] = engine.beginTimer(
                 timeLeft <= JogFlashCriticalTime ?
                     JogFlashCriticalInterval : JogFlashWarningInterval,
-                "ReloopBeatmix24.jogLedFlash(\"" + group + "\", " + ON + ")",
+                () => {ReloopBeatmix24.jogLedFlash(group, ON); },
                 true);
             JogBlinking[group] = true;
         }
@@ -584,8 +584,8 @@ ReloopBeatmix24.jogLedFlash = function(group, state) {
         const nextTime = (timeleft < JogFlashCriticalTime ?
             JogFlashCriticalInterval : JogFlashWarningInterval);
         jogWheelTimers[group] = engine.beginTimer(nextTime,
-            "ReloopBeatmix24.jogLedFlash(\"" + group + "\", " +
-            (state ? OFF : ON) + ")", true);
+            () => {ReloopBeatmix24.jogLedFlash(group, state ? OFF : ON); },
+             true);
     } else { // Back in time ?
         // shut off all jog leds
         ReloopBeatmix24.AllJogLEDsToggle(0x90 + chan, OFF);
@@ -622,8 +622,7 @@ ReloopBeatmix24.FxModeLedFlash = function(step, mode) {
             midi.sendShortMsg(i, 0x26 - mode, ledValue);
             midi.sendShortMsg(i, 0x26 + SHIFT - mode, ledValue);
         }
-        engine.beginTimer(150, "ReloopBeatmix24.FxModeLedFlash(" + (step + 1) +
-            ", " + mode + ")", true);
+        engine.beginTimer(150, () => { ReloopBeatmix24.FxModeLedFlash(step + 1, mode); }, true);
     }
 };
 
@@ -636,7 +635,7 @@ ReloopBeatmix24.FxModeCallback = function(group, mode) {
         midi.sendShortMsg(i, 0x26 - mode, OFF);
         midi.sendShortMsg(i, 0x26 + SHIFT - mode, OFF);
     }
-    engine.beginTimer(150, "ReloopBeatmix24.FxModeLedFlash(1, " + mode + ")",
+    engine.beginTimer(150, () => { ReloopBeatmix24.FxModeLedFlash(1, mode); },
         true);
 };
 
@@ -653,8 +652,7 @@ ReloopBeatmix24.ActivateFx = function(channel, control, value, status, group) {
         }
         FxModeLongPressed[group] = false;
         FxModeTimers[group] = engine.beginTimer(1000,
-            "ReloopBeatmix24.FxModeCallback(\"" + group + "\", " + FxNum + ")",
-            true);
+            () => {ReloopBeatmix24.FxModeCallback(group, FxNum); }, true);
     } else { // UP
         if (FxModeLongPressed[group]) { // long press
             // Nothing to do, this has already been done in callback function
@@ -726,8 +724,7 @@ ReloopBeatmix24.ShiftFxKnobOnOff = function(channel, control, value, status, gro
         if (value === UP) {
             engine.setValue(group, "clear", 1);
             engine.beginTimer(100,
-                "ReloopBeatmix24.EffectClearTimerCallBack(\"" + group +
-                "\")", true);
+                () => {ReloopBeatmix24.EffectClearTimerCallBack(group); }, true);
         }
     }
     // Nothing in single-effect mode
diff --git a/res/controllers/Reloop-Beatpad-scripts.js b/res/controllers/Reloop-Beatpad-scripts.js
index c3e5023a157..fed35acf311 100644
--- a/res/controllers/Reloop-Beatpad-scripts.js
+++ b/res/controllers/Reloop-Beatpad-scripts.js
@@ -381,7 +381,6 @@ LED.prototype.onOff = function(value) {
 //           if not set, it considers it as a switch off (default=false)
 // valueoff : like "value". That permits for instance with two colors (once red(on), once blue(off), once red(on), etc...)
 LED.prototype.flashOn = function(num_ms_on, value, num_ms_off, flashCount, relight, valueoff) {
-    var myself = this;
 
     // stop pending timers
     this.flashOff();
@@ -406,14 +405,14 @@ LED.prototype.flashOn = function(num_ms_on, value, num_ms_off, flashCount, relig
         // so we don't need this part  if flashcount=1
         // permanent timer
 
-        this.flashTimer = engine.beginTimer( num_ms_on + num_ms_off, function(){ myself.flashOnceOn(false); } );
+        this.flashTimer = engine.beginTimer( num_ms_on + num_ms_off, () => { this.flashOnceOn(false); } );
     }
     if (flashCount > 1) {
         // flashcount>0 , means temporary flash, first flash already done,
         // so we don't need this part  if flashcount=1
         // temporary timer. The end of this timer stops the permanent flashing
 
-        this.flashTimer2 = engine.beginTimer(flashCount * (num_ms_on + num_ms_off) - num_ms_off, function(){ myself.Stopflash(relight); }, true);
+        this.flashTimer2 = engine.beginTimer(flashCount * (num_ms_on + num_ms_off) - num_ms_off, () =>  { this.Stopflash(relight); }, true);
     }
 };
 
@@ -423,7 +422,7 @@ LED.prototype.getFlashDuration = function() {
 };
 
 LED.prototype.checkOn = function() {
-        return this.lit;
+    return this.lit;
 };
 
 // private : relight=true : restore light state before it was flashing
@@ -464,11 +463,10 @@ LED.prototype.Stopflash = function(relight) {
 
 // private : call back function (called in flashon() )
 LED.prototype.flashOnceOn = function(relight) {
-    var myself = this;
     midi.sendShortMsg(this.control, this.midino, this.valueon);
     pauseScript(scriptpause);
     this.flashOnceDuration = this.num_ms_on;
-    this.flashOnceTimer = engine.beginTimer(this.num_ms_on - scriptpause, function(){ myself.flashOnceOff(relight); }, true);
+    this.flashOnceTimer = engine.beginTimer(this.num_ms_on - scriptpause, () => { this.flashOnceOff(relight); }, true);
 };
 
 // private :call back function (called in flashOnceOn() )
@@ -521,7 +519,6 @@ var SingleDoubleBtn = function(Callback, DoublePressTimeOut) {
 
 // Button pressed
 SingleDoubleBtn.prototype.ButtonDown = function(channel, control, value, status, group) {
-    var myself = this;
     this.channel = channel;
     this.control = control;
     this.value = value;
@@ -530,8 +527,7 @@ SingleDoubleBtn.prototype.ButtonDown = function(channel, control, value, status,
     if (this.ButtonTimer === 0) { // first press
 
         this.ButtonTimer =
-            engine.beginTimer(this.DoublePressTimeOut,
-                              function(){ myself.ButtonDecide(); }, true);
+            engine.beginTimer(this.DoublePressTimeOut, this.ButtonDecide, true);
         this.ButtonCount = 1;
     } else { // 2nd press (before timer's out)
         engine.stopTimer(this.ButtonTimer);
@@ -597,14 +593,13 @@ LongShortBtn.prototype.ButtonAssertLongPress = function() {
 };
 
 LongShortBtn.prototype.ButtonDown = function(channel, control, value, status, group) {
-    var myself = this;
     this.channel = channel;
     this.control = control;
     this.value = value;
     this.status = status;
     this.group = group;
     this.ButtonLongPress = false;
-    this.ButtonLongPressTimer = engine.beginTimer(this.LongPressThreshold, function(){ myself.ButtonAssertLongPress(); }, true);
+    this.ButtonLongPressTimer = engine.beginTimer(this.LongPressThreshold, this.ButtonAssertLongPress, true);
 };
 
 LongShortBtn.prototype.ButtonUp = function() {
@@ -689,7 +684,6 @@ LongShortDoubleBtn.prototype.ButtonAssert1Press = function() {
 
 // Button pressed (function called by mapper's code)
 LongShortDoubleBtn.prototype.ButtonDown = function(channel, control, value, status, group) {
-    var myself = this;
     this.channel = channel;
     this.control = control;
     this.value = value;
@@ -702,13 +696,10 @@ LongShortDoubleBtn.prototype.ButtonDown = function(channel, control, value, stat
         // and short press
         this.ButtonLongPress = false;
         this.ButtonLongPressTimer =
-            engine.beginTimer(this.LongPressThreshold,
-                              function(){ myself.ButtonAssertLongPress(); },
+            engine.beginTimer(this.LongPressThreshold, this.ButtonAssertLongPress,
                               true);
         this.ButtonTimer =
-            engine.beginTimer(this.DoublePressTimeOut,
-                              function(){ myself.ButtonAssert1Press(); },
-                              true);
+            engine.beginTimer(this.DoublePressTimeOut, this.ButtonAssert1Press, true);
     } else if (this.ButtonCount == 1) { // 2nd press (before short timer's out)
         // stop timers...
         if (this.ButtonLongPressTimer !== 0) {
@@ -852,7 +843,6 @@ var Jogger = function (group, deckNum, model) {
 };
 
 Jogger.prototype.finishWheelTouch = function() {
-    var myself = this;
     this.wheelTouchInertiaTimer = 0;
     var play = engine.getValue(this.group, "play");
     if (play !== 0) {
@@ -872,15 +862,12 @@ Jogger.prototype.finishWheelTouch = function() {
         } else {
             // Check again soon.
             this.wheelTouchInertiaTimer =
-                engine.beginTimer(100,
-                                function(){ myself.finishWheelTouch(); },
-                                true);
+                engine.beginTimer(100, this.finishWheelTouch, true);
         }
     }
 };
 
 Jogger.prototype.onWheelTouch = function(value,Do_iCut) {
-    var myself = this;
     if (Do_iCut) {
         this.iCUT.On();
     } else {
@@ -906,9 +893,7 @@ Jogger.prototype.onWheelTouch = function(value,Do_iCut) {
             this.finishWheelTouch();
         } else { // If button up
             this.wheelTouchInertiaTimer =
-                engine.beginTimer(inertiaTime,
-                                function(){ myself.finishWheelTouch(); },
-                                true);
+                engine.beginTimer(inertiaTime, this.finishWheelTouch, true);
         }
     }
 };
@@ -1091,7 +1076,6 @@ ReloopBeatpad.rgbLEDs.prototype.onOff = function(showname, value) {
 
 // public : make a rgb light flashing
 ReloopBeatpad.rgbLEDs.prototype.flashOn = function(num_ms_on, RGBColor, num_ms_off, flashCount) {
-    var myself = this;
     this.setshow("show6", RGBColor);
 
     // stop pending timers
@@ -1111,14 +1095,14 @@ ReloopBeatpad.rgbLEDs.prototype.flashOn = function(num_ms_on, RGBColor, num_ms_o
         // so we don't need this part  if flashcount=1
         // permanent timer
         this.flashTimer = engine.beginTimer( num_ms_on + num_ms_off,
-                                    function(){ myself.flashOnceOn(true); } );
+                                    () => { this.flashOnceOn(true); });
     }
     if (flashCount > 1) {
         // flashcount>0 , means temporary flash, first flash already done,
         // so we don't need this part  if flashcount=1
         // temporary timer. The end of this timer stops the permanent flashing
 
-        this.flashTimer2 = engine.beginTimer(flashCount * (num_ms_on + num_ms_off) - num_ms_off, function(){ myself.Stopflash(); }, true);
+        this.flashTimer2 = engine.beginTimer(flashCount * (num_ms_on + num_ms_off) - num_ms_off, this.Stopflash, true);
     }
 };
 
@@ -1161,11 +1145,10 @@ ReloopBeatpad.rgbLEDs.prototype.getFlashDuration = function() {
 
 // private : call back function (called in flashon() )
 ReloopBeatpad.rgbLEDs.prototype.flashOnceOn = function(relight) {
-    var myself = this;
     this.layers.show5.activate = true;
     var pausecount = this.activateshow("show6", true);
     this.flashOnceDuration = this.num_ms_on;
-    this.flashOnceTimer = engine.beginTimer(this.flashDuration - scriptpause * pausecount,  function(){ myself.flashOnceOff(relight); }, true);
+    this.flashOnceTimer = engine.beginTimer(this.flashDuration - scriptpause * pausecount,  () => { this.flashOnceOff(relight); }, true);
 };
 
 // private :call back function (called in flashOnceOn() )
diff --git a/res/controllers/Reloop-Jockey-3-ME-scripts.js b/res/controllers/Reloop-Jockey-3-ME-scripts.js
index 529af30685f..347a044f8df 100644
--- a/res/controllers/Reloop-Jockey-3-ME-scripts.js
+++ b/res/controllers/Reloop-Jockey-3-ME-scripts.js
@@ -67,12 +67,12 @@ Jockey3ME.LedMeterShow = function() {
   if (Jockey3ME.LedMeterShowValueTwo && Jockey3ME.LedMeterShowValue < 0) {
     engine.stopTimer(Jockey3ME.LedMeterShowTimer);
     Jockey3ME.LedMeterShowTimer = 0;
-    Jockey3ME.EffectLedMeter = engine.beginTimer(20,"Jockey3ME.EffectLedMeterShow()");
+    Jockey3ME.EffectLedMeter = engine.beginTimer(20,Jockey3ME.EffectLedMeterShow);
   };
 }
 
 Jockey3ME.LedShowBegin = function () {
-  Jockey3ME.LedMeterShowTimer = engine.beginTimer(40,"Jockey3ME.LedMeterShow()");
+  Jockey3ME.LedMeterShowTimer = engine.beginTimer(40,Jockey3ME.LedMeterShow);
 }
 
 // Init Script at Program start
@@ -89,7 +89,7 @@ Jockey3ME.init = function () {
     midi.sendShortMsg(0x92,j,0x00);
     midi.sendShortMsg(0x93,j,0x00);
   };
-  Jockey3ME.LedShowBeginTimer = engine.beginTimer(2000,"Jockey3ME.LedShowBegin()",1); // LedShow Script Starts Here after 500ms
+  Jockey3ME.LedShowBeginTimer = engine.beginTimer(2000,Jockey3ME.LedShowBegin,true); // LedShow Script Starts Here after 500ms
 	for (var i = 1; i <= 4; i++) {
 		for (var j = 1; j <= 3; j++) {
 			engine.connectControl("[EffectRack1_EffectUnit" + i + "_Effect1]","parameter" + j,"Jockey3ME.FX_Param_Led");
@@ -239,7 +239,7 @@ Jockey3ME.effectSelect = function (channel, control, value, status, group) {
 	if (fxChainSelectKnob) {
 		engine.setValue("[EffectRack1_EffectUnit" + currentDeck + "]", "chain_selector", (value-64));
 		// Set Leds
-		// Jockey3ME.effectSelectTimer = engine.beginTimer(100, "Jockey3ME.effectSelectLedSet(" + status + "," + currentDeck + ")",1);
+		// Jockey3ME.effectSelectTimer = engine.beginTimer(100, () => { Jockey3ME.effectSelectLedSet(status, currentDeck); },true);
 		var num_parameters = engine.getValue("[EffectRack1_EffectUnit" + currentDeck + "_Effect1]", "num_parameters");
 		if (num_parameters > 3) {
 			num_parameters = 3;
@@ -332,8 +332,8 @@ Jockey3ME.effectSelectPush = function (channel, control, value, status, group) {
 						continue;
 					}
 					if (Jockey3ME.fxSelectKnobPushIterator[r]) {
-						engine.beginTimer(400,"midi.sendShortMsg(" + status + "," + control + ",0x7F)",1);
-						engine.beginTimer(600,"midi.sendShortMsg(" + status + "," + control + ",0x00)",1);
+						engine.beginTimer(400,() => { midi.sendShortMsg(status, control, 0x7F); }, true);
+						engine.beginTimer(600,() => { midi.sendShortMsg(status, control, 0x00); }, true);
 						break fxSelectKnobPushBreak;
 					}
 				}
@@ -355,21 +355,21 @@ Jockey3ME.effectSelectPush = function (channel, control, value, status, group) {
 					if (engine.getValue("[EffectRack1_EffectUnit" + currentDeck + "_Effect" + Jockey3ME.fxSelectKnobPush[currentDeck-1] + "]","parameter" + Jockey3ME.fxSelectKnobParamChose + "_loaded")) {
 						engine.setValue("[EffectRack1_EffectUnit" + currentDeck + "_Effect" + Jockey3ME.fxSelectKnobPush[currentDeck-1] + "]","parameter" + Jockey3ME.fxSelectKnobParamChose + "_link_type",Jockey3ME.fxSelectKnobParamLinkChose);
 						engine.setValue("[EffectRack1_EffectUnit" + currentDeck + "_Effect" + Jockey3ME.fxSelectKnobPush[currentDeck-1] + "]","parameter" + Jockey3ME.fxSelectKnobParamChose + "_link_inverse",Jockey3ME.fxSelectKnobParamLinkInverseChose);
-						engine.beginTimer(400,"midi.sendShortMsg(" + status + "," + control + ",0x7F)",1);
-						engine.beginTimer(600,"midi.sendShortMsg(" + status + "," + control + ",0x00)",1);
-						engine.beginTimer(800,"midi.sendShortMsg(" + status + "," + control + ",0x7F)",1);
-						engine.beginTimer(1000,"midi.sendShortMsg(" + status + "," + control + ",0x00)",1);
+						engine.beginTimer(400, () => { midi.sendShortMsg(status, control, 0x7F); }, true);
+						engine.beginTimer(600, () => { midi.sendShortMsg(status, control, 0x00); }, true);
+						engine.beginTimer(800, () => { midi.sendShortMsg(status, control, 0x7F); }, true);
+						engine.beginTimer(1000, () => { midi.sendShortMsg(status, control, 0x00); }, true);
 					}
 				}
 			}
 			Jockey3ME.fxSelectKnobPush[currentDeck-1] = 0;
 		} else {
 			Jockey3ME.fxSelectKnobPush[currentDeck-1] = 0;
-			engine.beginTimer(400,"midi.sendShortMsg(" + status + "," + control + ",0x7F)",1);
-			engine.beginTimer(600,"midi.sendShortMsg(" + status + "," + control + ",0x00)",1);
+			engine.beginTimer(400,() => { midi.sendShortMsg(status, control, 0x7F); }, true);
+			engine.beginTimer(600,() => { midi.sendShortMsg(status, control, 0x00); }, true);
 		}
 		midi.sendShortMsg(status,control,0x7F);
-		engine.beginTimer(200,"midi.sendShortMsg(" + status + "," + control + ",0x00)",1);
+		engine.beginTimer(200, () => {midi.sendShortMsg(status, control, 0x00); }, true);
 	}
 }
 
diff --git a/res/controllers/Roland_DJ-505-scripts.js b/res/controllers/Roland_DJ-505-scripts.js
index 59b14c42040..995758c98fe 100644
--- a/res/controllers/Roland_DJ-505-scripts.js
+++ b/res/controllers/Roland_DJ-505-scripts.js
@@ -172,7 +172,7 @@ DJ505.init = function() {
     midi.sendSysexMsg([0xF0, 0x00, 0x20, 0x7F, 0x01, 0xF7], 6);
 
     // Send "keep-alive" message to keep controller in Serato mode
-    engine.beginTimer(500, function() {
+    engine.beginTimer(500, () => {
         midi.sendShortMsg(0xBF, 0x64, 0x00);
     });
 
@@ -220,7 +220,7 @@ DJ505.browseEncoder = new components.Encoder({
                 this.isLongPressed = false;
                 this.longPressTimer = engine.beginTimer(
                     this.longPressTimeout,
-                    function() { this.isLongPressed = true; }.bind(this),
+                    () => { this.isLongPressed = true; },
                     true
                 );
 
@@ -621,10 +621,10 @@ DJ505.Deck = function(deckNumbers, offset) {
         },
         input: function(channel, control, value, _status, _group) {
             if (value) {
-                this.longPressTimer = engine.beginTimer(this.longPressTimeout, function() {
+                this.longPressTimer = engine.beginTimer(this.longPressTimeout, () => {
                     this.onLongPress();
                     this.longPressTimer = 0;
-                }.bind(this), true);
+                }, true);
             } else if (this.longPressTimer !== 0) {
                 // Button released after short press
                 engine.stopTimer(this.longPressTimer);
@@ -693,10 +693,10 @@ DJ505.Deck = function(deckNumbers, offset) {
         group: "[Channel" + deckNumbers + "]",
         input: function(_channel, _control, value, _status, group) {
             if (value) {
-                this.longPressTimer = engine.beginTimer(this.longPressTimeout, function() {
+                this.longPressTimer = engine.beginTimer(this.longPressTimeout, () => {
                     this.onLongPress(group);
                     this.longPressTimer = 0;
-                }.bind(this), true);
+                }, true);
             } else if (this.longPressTimer !== 0) {
                 // Button released after short press
                 engine.stopTimer(this.longPressTimer);
@@ -749,7 +749,7 @@ DJ505.DeckToggleButton.prototype.input = function(channel, control, value, statu
         // Button was pressed
         this.longPressTimer = engine.beginTimer(
             this.longPressTimeout,
-            function() { this.isLongPressed = true; }.bind(this),
+            () => { this.isLongPressed = true; },
             true
         );
         this.secondaryDeck = !this.secondaryDeck;
@@ -880,10 +880,10 @@ DJ505.Sampler = function() {
     this.startStopButtonPressed = function(channel, control, value, status, _group) {
         if (status === 0xFA) {
             this.playbackCounter = 1;
-            this.playbackTimer = engine.beginTimer(500, function() {
+            this.playbackTimer = engine.beginTimer(500, () => {
                 midi.sendShortMsg(0xBA, 0x02, this.playbackCounter);
                 this.playbackCounter = (this.playbackCounter % 4) + 1;
-            }.bind(this));
+            });
         } else if (status === 0xFC) {
             if (this.playbackTimer) {
                 engine.stopTimer(this.playbackTimer);
@@ -961,10 +961,10 @@ DJ505.SlipModeButton.prototype.unshift = function() {
 
         this.doubleTapTimer = engine.beginTimer(
             this.doubleTapTimeout,
-            function() {
+            () => {
                 this.doubleTapped = false;
                 this.doubleTapTimer = null;
-            }.bind(this),
+            },
             true
         );
     };
@@ -1618,9 +1618,9 @@ DJ505.SavedLoopMode = function(deck, offset) {
 
                 if (value) {
                     this.longPressTimer = engine.beginTimer(
-                        this.longPressTimeout, function() {
+                        this.longPressTimeout, () => {
                             engine.setValue(this.group, "hotcue_" + this.number + "_clear", 1);
-                        }.bind(this));
+                        });
                 } else {
                     if (this.longPressTimer !== 0) {
                         engine.stopTimer(this.longPressTimer);
diff --git a/res/controllers/Sony-SixxAxis.js b/res/controllers/Sony-SixxAxis.js
index b712f5be88c..d27931fc81d 100644
--- a/res/controllers/Sony-SixxAxis.js
+++ b/res/controllers/Sony-SixxAxis.js
@@ -112,7 +112,7 @@ SonySixxAxis.init = function(id) {
             return;
         controller.timers[timer_id] = engine.beginTimer(
             interval,
-            "SonySixxAxis.controller.autorepeatTimer()"
+            SonySixxAxis.controller.autorepeatTimer // FIXME: autorepeatTimer is not defined?
         )
     }
     HIDDebug("Sony SixxAxis controller initialized: " + SonySixxAxis.id);
diff --git a/res/controllers/Soundless_joyMIDI_scripts.js b/res/controllers/Soundless_joyMIDI_scripts.js
index 0b6f47e263c..5ebc62b4a17 100644
--- a/res/controllers/Soundless_joyMIDI_scripts.js
+++ b/res/controllers/Soundless_joyMIDI_scripts.js
@@ -135,7 +135,7 @@ joyMIDI.syncButton = function(channel, control, value, status, group) {
                     }
                     joyMIDI[group].syncLongPress = 0;
                     joyMIDI[group].syncTimerID =
-                        engine.beginTimer(1000, function() { joyMIDI.syncTimerHandler(group); }, true);
+                        engine.beginTimer(1000, () => { joyMIDI.syncTimerHandler(group); }, true);
                 }
             } else {
                 engine.setValue(group, "rate", 0);
@@ -535,7 +535,7 @@ joyMIDI.wheelScratch = function(channel, control, value, status, group) {
     engine.scratchTick(deck, newValue);
 
     joyMIDI[group].scratchTimerID =
-        engine.beginTimer(scratchDisableTime, function() { joyMIDI.ScratchTimerHandler(deck, group); }, true);
+        engine.beginTimer(scratchDisableTime, () => { joyMIDI.ScratchTimerHandler(deck, group); }, true);
 };
 
 joyMIDI.ScratchTimerHandler = function(deck, group) {
@@ -649,7 +649,7 @@ joyMIDI.joystick = function(channel, control, _value, _status, _group) {
     if (joystickDelay === false) {
         /* Delay a while */
         joystickDelay = true;
-        engine.beginTimer(300, function() { joystickDelay = false; }, true);
+        engine.beginTimer(300, () => { joystickDelay = false; }, true);
 
         if (!joyMIDI["[Channel1]"].btnShift) {
             /* Joystick only */
@@ -678,7 +678,7 @@ joyMIDI.fsr = function(_channel, _control, _value, _status, _group) {
     if (fsrDelay === false) {
         /* Delay a while */
         fsrDelay = true;
-        engine.beginTimer(300, function() { fsrDelay = false; }, true);
+        engine.beginTimer(300, () => { fsrDelay = false; }, true);
 
         var isShift = joyMIDI["[Channel1]"].btnShift === true || joyMIDI["[Channel2]"].btnShift === true;
         if (! isShift) {
diff --git a/res/controllers/Stanton-SCS1d-scripts.js b/res/controllers/Stanton-SCS1d-scripts.js
index cf8ac3fcfd2..de561e7ff5d 100644
--- a/res/controllers/Stanton-SCS1d-scripts.js
+++ b/res/controllers/Stanton-SCS1d-scripts.js
@@ -832,7 +832,7 @@ StantonSCS1d.DeckChange = function (channel, control, value, status) {
         if (!StantonSCS1d.fastDeckChange) {
             if (StantonSCS1d.timer["deckChange"] != -1) engine.stopTimer(StantonSCS1d.timer["deckChange"]);
             StantonSCS1d.state["flashes"] = 0;  // initialize number of flashes
-            StantonSCS1d.timer["deckChange"] = engine.beginTimer(60,"StantonSCS1d.deckChangeFlash("+channel+","+value+")");
+            StantonSCS1d.timer["deckChange"] = engine.beginTimer(60, () => { StantonSCS1d.deckChangeFlash(channel, value); }); 
             return;
         }
         // No flashy lights
@@ -1698,7 +1698,7 @@ StantonSCS1d.loopEnabled = function (value) {
     if (value>0 && StantonSCS1d.timer["loop"]==-1) {
         if (!StantonSCS1d.loopActive[StantonSCS1d.deck] ||
             StantonSCS1d.loopActive[StantonSCS1d.deck]==-1) StantonSCS1d.activateLoop(1);
-        StantonSCS1d.timer["loop"] = engine.beginTimer(500,"StantonSCS1d.loopFlash()");
+        StantonSCS1d.timer["loop"] = engine.beginTimer(500, StantonSCS1d.loopFlash);
     }
 
     if (value<=0 && StantonSCS1d.timer["loop"]!=-1) {
@@ -2041,7 +2041,7 @@ StantonSCS1d.circleBars = function (value) {
         if (trackTimeRemaining<=30 && trackTimeRemaining>15) {   // If <30s left, flash slowly
             if (StantonSCS1d.timer["30s-d"+deck] == -1) {
                 // Start timer
-                StantonSCS1d.timer["30s-d"+deck] = engine.beginTimer(500,"StantonSCS1d.circleFlash("+deck+")");
+                StantonSCS1d.timer["30s-d"+deck] = engine.beginTimer(500, () => { StantonSCS1d.circleFlash(deck); });
                 if (StantonSCS1d.timer["15s-d"+deck] != -1) {
                     // Stop the 15s timer if it was running
                     engine.stopTimer(StantonSCS1d.timer["15s-d"+deck]);
@@ -2051,7 +2051,7 @@ StantonSCS1d.circleBars = function (value) {
         } else if (trackTimeRemaining<=15 && trackTimeRemaining>0) { // If <15s left, flash quickly
             if (StantonSCS1d.timer["15s-d"+deck] == -1) {
                 // Start timer
-                StantonSCS1d.timer["15s-d"+deck] = engine.beginTimer(125,"StantonSCS1d.circleFlash("+deck+")");
+                StantonSCS1d.timer["15s-d"+deck] = engine.beginTimer(125, () => { StantonSCS1d.circleFlash(deck); });
                 if (StantonSCS1d.timer["30s-d"+deck] != -1) {
                     // Stop the 30s timer if it was running
                     engine.stopTimer(StantonSCS1d.timer["30s-d"+deck]);
diff --git a/res/controllers/Stanton-SCS1m-scripts.js b/res/controllers/Stanton-SCS1m-scripts.js
index a8a11293b0a..b46fcc1c959 100644
--- a/res/controllers/Stanton-SCS1m-scripts.js
+++ b/res/controllers/Stanton-SCS1m-scripts.js
@@ -745,7 +745,7 @@ StantonSCS1m.positionUpdates = function (value,deck) {
         if (trackTimeRemaining<=30 && trackTimeRemaining>15) {   // If <30s left, flash slowly
             if (StantonSCS1m.timer["30s-d"+deck] == -1) {
                 // Start timer
-                StantonSCS1m.timer["30s-d"+deck] = engine.beginTimer(500,"StantonSCS1m.displayFlash("+deck+")");
+                StantonSCS1m.timer["30s-d"+deck] = engine.beginTimer(500, () => { StantonSCS1m.displayFlash(deck); });
                 if (StantonSCS1m.timer["15s-d"+deck] != -1) {
                     // Stop the 15s timer if it was running
                     engine.stopTimer(StantonSCS1m.timer["15s-d"+deck]);
@@ -755,7 +755,7 @@ StantonSCS1m.positionUpdates = function (value,deck) {
         } else if (trackTimeRemaining<=15 && trackTimeRemaining>0) { // If <15s left, flash quickly
             if (StantonSCS1m.timer["15s-d"+deck] == -1) {
                 // Start timer
-                StantonSCS1m.timer["15s-d"+deck] = engine.beginTimer(125,"StantonSCS1m.displayFlash("+deck+")");
+                StantonSCS1m.timer["15s-d"+deck] = engine.beginTimer(125,() => { StantonSCS1m.displayFlash(deck); });
                 if (StantonSCS1m.timer["30s-d"+deck] != -1) {
                     // Stop the 30s timer if it was running
                     engine.stopTimer(StantonSCS1m.timer["30s-d"+deck]);
diff --git a/res/controllers/Stanton-SCS3d-scripts.js b/res/controllers/Stanton-SCS3d-scripts.js
index c8f92e7a65d..a17fa3ca83a 100644
--- a/res/controllers/Stanton-SCS3d-scripts.js
+++ b/res/controllers/Stanton-SCS3d-scripts.js
@@ -1199,7 +1199,7 @@ StantonSCS3d.DeckChangeP1 = function (channel, control, value, status) {
                 // If in the middle of flashing lights from a previous change, abort that one
                 if (StantonSCS3d.timer[0] != -1) engine.stopTimer(StantonSCS3d.timer[0]);
                 StantonSCS3d.state["flashes"] = 0;  // initialize number of flashes
-                StantonSCS3d.timer[0] = engine.beginTimer(60,"StantonSCS3d.deckChangeFlash("+channel+","+value+",\"right\")");
+                StantonSCS3d.timer[0] = engine.beginTimer(60, () => { StantonSCS3d.deckChangeFlash(channel, value, "right"); });
                 return;
             }
         }
@@ -1209,7 +1209,7 @@ StantonSCS3d.DeckChangeP1 = function (channel, control, value, status) {
             if (!StantonSCS3d.fastDeckChange) {
                 if (StantonSCS3d.timer[0] != -1) engine.stopTimer(StantonSCS3d.timer[0]);
                 StantonSCS3d.state["flashes"] = 0;  // initialize number of flashes
-                StantonSCS3d.timer[0] = engine.beginTimer(60,"StantonSCS3d.deckChangeFlash("+channel+","+value+",\"left\")");
+                StantonSCS3d.timer[0] = engine.beginTimer(60, () => { StantonSCS3d.deckChangeFlash(channel, value, "left"); });
                 return;
             }
         }
@@ -1938,7 +1938,7 @@ StantonSCS3d.ActiveLoop = function (value) {
     if (value>0) {
         if (StantonSCS3d.timer[timerName] == -1) {
             // Start timer
-            StantonSCS3d.timer[timerName] = engine.beginTimer(500,"StantonSCS3d.activeLoopLEDs("+StantonSCS3d.deck+",false)");
+            StantonSCS3d.timer[timerName] = engine.beginTimer(500, () => { StantonSCS3d.activeLoopLEDs(StantonSCS3d.deck,false); });
         }
     }
     else {
@@ -2215,7 +2215,7 @@ StantonSCS3d.circleLEDs = function (value) {
         if (trackTimeRemaining<=30 && trackTimeRemaining>15) {   // If <30s left, flash slowly
             if (StantonSCS3d.timer["30s-d"+deck] == -1) {
                 // Start timer
-                StantonSCS3d.timer["30s-d"+deck] = engine.beginTimer(500,"StantonSCS3d.circleFlash("+deck+")");
+                StantonSCS3d.timer["30s-d"+deck] = engine.beginTimer(500, () => { StantonSCS3d.circleFlash(deck); });
                 if (StantonSCS3d.timer["15s-d"+deck] != -1) {
                     // Stop the 15s timer if it was running
                     engine.stopTimer(StantonSCS3d.timer["15s-d"+deck]);
@@ -2225,7 +2225,7 @@ StantonSCS3d.circleLEDs = function (value) {
         } else if (trackTimeRemaining<=15 && trackTimeRemaining>0) { // If <15s left, flash quickly
             if (StantonSCS3d.timer["15s-d"+deck] == -1) {
                 // Start timer
-                StantonSCS3d.timer["15s-d"+deck] = engine.beginTimer(125,"StantonSCS3d.circleFlash("+deck+")");
+                StantonSCS3d.timer["15s-d"+deck] = engine.beginTimer(125, () => { StantonSCS3d.circleFlash(deck); });
                 if (StantonSCS3d.timer["30s-d"+deck] != -1) {
                     // Stop the 30s timer if it was running
                     engine.stopTimer(StantonSCS3d.timer["30s-d"+deck]);
diff --git a/res/controllers/Stanton-SCS3m-scripts.js b/res/controllers/Stanton-SCS3m-scripts.js
index db6c10b7f22..494b014de79 100644
--- a/res/controllers/Stanton-SCS3m-scripts.js
+++ b/res/controllers/Stanton-SCS3m-scripts.js
@@ -405,7 +405,7 @@ SCS3M.Agent = function(device) {
         }
     }
 
-    var flushModeset = function() {
+    var flushModeset = () => {
         var message;
 
         // Now we can flush the rest of the messages.
@@ -576,7 +576,7 @@ SCS3M.Agent = function(device) {
         sw.hold = function(onHeld) {
             return function() {
                 heldBegin = true;
-                var switchExpire = engine.beginTimer(200, function() {
+                var switchExpire = engine.beginTimer(200, () => {
                     engine.stopTimer(switchExpire);
                     if (heldBegin) {
                         heldBegin = false;
diff --git a/res/controllers/TrakProDJ-iPad-scripts.js b/res/controllers/TrakProDJ-iPad-scripts.js
index 0d0d6628f13..13cb1af7705 100644
--- a/res/controllers/TrakProDJ-iPad-scripts.js
+++ b/res/controllers/TrakProDJ-iPad-scripts.js
@@ -188,10 +188,10 @@ TrakProDJ.jog_enable = function(deck) {
     if (!ctrl.timer) {
         if (TrakProDJ.use_scratch) {
             print(group + ' enable scratch');
-            ctrl.timer = engine.beginTimer(20,"TrakProDJ.jog_scratch_timer(deck)");
+            ctrl.timer = engine.beginTimer(20, () => { TrakProDJ.jog_scratch_timer(deck); });
         } else {
             print(group + ' enable rate bend');
-            ctrl.timer = engine.beginTimer(20,"TrakProDJ.jog_rate_timer(deck)");
+            ctrl.timer = engine.beginTimer(20, () => { TrakProDJ.jog_rate_timer(deck); });
         }
     }
     if (TrakProDJ.use_scratch) {
diff --git a/res/controllers/Traktor-Kontrol-F1-scripts.js b/res/controllers/Traktor-Kontrol-F1-scripts.js
index 303b571e8d0..c02d2ca2172 100644
--- a/res/controllers/Traktor-Kontrol-F1-scripts.js
+++ b/res/controllers/Traktor-Kontrol-F1-scripts.js
@@ -351,7 +351,7 @@ KontrolF1.init = function (id) {
     KontrolF1.testUpdateInterval = 20;
     KontrolF1.testTimer = engine.beginTimer(
         KontrolF1.testUpdateInterval,
-        "KontrolF1.testSegments()"
+        KontrolF1.testSegments
     );
 
     KontrolF1.updateLEDs();
diff --git a/res/controllers/Traktor-Kontrol-S2-MK1-hid-scripts.js b/res/controllers/Traktor-Kontrol-S2-MK1-hid-scripts.js
index 40a3adbe1bc..d201bdbdb4a 100644
--- a/res/controllers/Traktor-Kontrol-S2-MK1-hid-scripts.js
+++ b/res/controllers/Traktor-Kontrol-S2-MK1-hid-scripts.js
@@ -416,8 +416,8 @@ class DeckClass {
             } else {
                 this.wheelTouchInertiaTimer = engine.beginTimer(
                     inertiaTime,
-                    this.finishJogPress.bind(this)
-                    , true);
+                    this.finishJogPress, 
+                    true);
             }
         }
     }
@@ -530,7 +530,7 @@ class DeckClass {
                 engine.scratchDisable(this.number, true);
             } else {
             // Check again soon.
-                this.wheelPressInertiaTimer = engine.beginTimer(20, this.finishJogPress.bind(this), true);
+                this.wheelPressInertiaTimer = engine.beginTimer(20, finishJogPress, true);
             }
         }
     }
@@ -795,10 +795,10 @@ class EffectUnit {
                 engine.setValue(this.group, "loaded_chain_preset", 1);
                 return;
             }
-            this.effectFocusLongPressTimer = engine.beginTimer(longPressTimeoutMilliseconds, function() {
+            this.effectFocusLongPressTimer = engine.beginTimer(longPressTimeoutMilliseconds, () => {
                 this.effectFocusChooseModeActive = true;
                 this.connectEffectButtonLedsFocused();
-            }.bind(this));
+            });
             if (!showParameters) {
                 engine.setValue(this.group, "show_parameters", 1);
                 this.effectFocusButtonPressedWhenParametersHidden = true;
@@ -930,10 +930,10 @@ class EffectParameter {
                 } else {
                     this.toggle();
                     this.longPressTimer = engine.beginTimer(longPressTimeoutMilliseconds,
-                        function() {
+                        () => {
                             this.isLongPressed = true;
                             this.longPressTimer= 0;
-                        }.bind(this),
+                        },
                         true
                     );
                 }
diff --git a/res/controllers/Traktor-Kontrol-S2-MK2-hid-scripts.js b/res/controllers/Traktor-Kontrol-S2-MK2-hid-scripts.js
index b6f28b7bfaf..654f04b1d45 100644
--- a/res/controllers/Traktor-Kontrol-S2-MK2-hid-scripts.js
+++ b/res/controllers/Traktor-Kontrol-S2-MK2-hid-scripts.js
@@ -661,7 +661,7 @@ TraktorS2MK2.jogTouch = function(field) {
             TraktorS2MK2.finishJogTouch(field.group);
         } else {
             TraktorS2MK2.wheelTouchInertiaTimer[field.group] = engine.beginTimer(
-                inertiaTime, function() {
+                inertiaTime, () => {
                     TraktorS2MK2.finishJogTouch(field.group);
                 }, true);
         }
@@ -685,7 +685,8 @@ TraktorS2MK2.finishJogTouch = function(group) {
         } else {
             // Check again soon.
             TraktorS2MK2.wheelTouchInertiaTimer[group] = engine.beginTimer(
-                1, function() {
+                // FIXME: 1ms is too short, what is appropriate?
+                1, () => { 
                     TraktorS2MK2.finishJogTouch(group);
                 }, true);
         }
@@ -1020,9 +1021,9 @@ TraktorS2MK2.effectFocusButton = function(field) {
             engine.setValue(field.group, "loaded_chain_preset", 1);
             return;
         }
-        TraktorS2MK2.effectFocusLongPressTimer[field.group] = engine.beginTimer(TraktorS2MK2.longPressTimeoutMilliseconds, function() {
+        TraktorS2MK2.effectFocusLongPressTimer[field.group] = engine.beginTimer(TraktorS2MK2.longPressTimeoutMilliseconds, () => {
             TraktorS2MK2.effectFocusChooseModeActive[field.group] = true;
-            TraktorS2MK2.effectButtonLEDconnections[field.group].forEach(function(connection) {
+            TraktorS2MK2.effectButtonLEDconnections[field.group].forEach(connection => {
                 connection.disconnect();
             });
             var makeButtonLEDcallback = function(buttonNumber) {
@@ -1112,7 +1113,7 @@ TraktorS2MK2.effectButton = function(field) {
                 toggle();
                 TraktorS2MK2.effectButtonLongPressTimer[effectUnitGroup][buttonNumber] =
           engine.beginTimer(TraktorS2MK2.longPressTimeoutMilliseconds,
-              function() {
+              () => {
                   TraktorS2MK2.effectButtonIsLongPressed[effectUnitGroup][buttonNumber] = true;
                   TraktorS2MK2.effectButtonLongPressTimer[effectUnitGroup][buttonNumber] = 0;
               },
diff --git a/res/controllers/Traktor-Kontrol-S2-MK3-hid-scripts.js b/res/controllers/Traktor-Kontrol-S2-MK3-hid-scripts.js
index 40858c1fe6a..469dd9dc5f9 100644
--- a/res/controllers/Traktor-Kontrol-S2-MK3-hid-scripts.js
+++ b/res/controllers/Traktor-Kontrol-S2-MK3-hid-scripts.js
@@ -285,7 +285,7 @@ TraktorS2MK3.syncHandler = function(field) {
             if (engine.getValue(field.group, "sync_enabled") === 0) {
                 script.triggerControl(field.group, "beatsync");
                 // Start timer to measure how long button is pressed
-                TraktorS2MK3.syncPressedTimer[field.group] = engine.beginTimer(300, function() {
+                TraktorS2MK3.syncPressedTimer[field.group] = engine.beginTimer(300, () => {
                     engine.setValue(field.group, "sync_enabled", 1);
                     // Reset sync button timer state if active
                     if (TraktorS2MK3.syncPressedTimer[field.group] !== 0) {
@@ -578,7 +578,7 @@ TraktorS2MK3.microphoneHandler = function(field) {
     if (field.value) {
         if (TraktorS2MK3.microphonePressedTimer === 0) {
             // Start timer to measure how long button is pressed
-            TraktorS2MK3.microphonePressedTimer = engine.beginTimer(300, function() {
+            TraktorS2MK3.microphonePressedTimer = engine.beginTimer(300, () => {
                 // Reset microphone button timer status if active
                 if (TraktorS2MK3.microphonePressedTimer !== 0) {
                     TraktorS2MK3.microphonePressedTimer = 0;
diff --git a/res/controllers/Traktor-Kontrol-S3-hid-scripts.js b/res/controllers/Traktor-Kontrol-S3-hid-scripts.js
index 40f90428e0d..2c96eac20b8 100644
--- a/res/controllers/Traktor-Kontrol-S3-hid-scripts.js
+++ b/res/controllers/Traktor-Kontrol-S3-hid-scripts.js
@@ -974,13 +974,13 @@ TraktorS3.Deck = class {
             if (engine.getValue(this.activeChannel, "sync_enabled") === 0) {
                 script.triggerControl(this.activeChannel, "beatsync");
                 // Start timer to measure how long button is pressed
-                this.syncPressedTimer = engine.beginTimer(300, function() {
+                this.syncPressedTimer = engine.beginTimer(300, () => {
                     engine.setValue(this.activeChannel, "sync_enabled", 1);
                     // Reset sync button timer state if active
                     if (this.syncPressedTimer !== 0) {
                         this.syncPressedTimer = 0;
                     }
-                }.bind(this), this, true);
+                }, this, true);
 
                 // Light corresponding LED when button is pressed
                 this.colorOutput(1, "sync_enabled");
@@ -1660,7 +1660,7 @@ TraktorS3.Channel = class {
             }
             return;
         }
-        this.endOfTrackTimer = engine.beginTimer(400, function() {
+        this.endOfTrackTimer = engine.beginTimer(400, () => {
             this.endOfTrackBlinkState = !this.endOfTrackBlinkState;
         }, false);
     }
@@ -1956,7 +1956,7 @@ TraktorS3.FXControl = class {
         case this.STATE_EFFECT:
             break;
         case this.STATE_FOCUS:
-            this.focusBlinkTimer = engine.beginTimer(150, function() {
+            this.focusBlinkTimer = engine.beginTimer(150, () => {
                 TraktorS3.kontrol.fxController.focusBlinkState = !TraktorS3.kontrol.fxController.focusBlinkState;
                 TraktorS3.kontrol.fxController.lightFx();
             }, false);
diff --git a/res/controllers/Traktor-Kontrol-S4-MK2-hid-scripts.js b/res/controllers/Traktor-Kontrol-S4-MK2-hid-scripts.js
index 7af1452068c..09e7ca6b48e 100644
--- a/res/controllers/Traktor-Kontrol-S4-MK2-hid-scripts.js
+++ b/res/controllers/Traktor-Kontrol-S4-MK2-hid-scripts.js
@@ -1060,7 +1060,7 @@ TraktorS4MK2.jogTouchHandler = function(field) {
             TraktorS4MK2.finishJogTouch(field.group);
         } else {
             TraktorS4MK2.controller.wheelTouchInertiaTimer[field.group] = engine.beginTimer(
-                inertiaTime, "TraktorS4MK2.finishJogTouch(\"" + field.group + "\")", true);
+                inertiaTime, () => { TraktorS4MK2.finishJogTouch(field.group); }, true);
         }
     }
 };
@@ -1092,7 +1092,7 @@ TraktorS4MK2.finishJogTouch = function(group) {
         } else {
             // Check again soon.
             TraktorS4MK2.controller.wheelTouchInertiaTimer[group] = engine.beginTimer(
-                100, "TraktorS4MK2.finishJogTouch(\"" + group + "\")", true);
+                100, () => { TraktorS4MK2.finishJogTouch(group); }, true);
         }
     }
 };
diff --git a/res/controllers/Traktor-Kontrol-S4-MK3.js b/res/controllers/Traktor-Kontrol-S4-MK3.js
index b8fbd1f1960..8c581ba78ca 100644
--- a/res/controllers/Traktor-Kontrol-S4-MK3.js
+++ b/res/controllers/Traktor-Kontrol-S4-MK3.js
@@ -444,7 +444,7 @@ class Deck extends ComponentContainer {
             this.moveMode = this.secondDeckModes.moveMode;
 
             if (this.wheelMode === wheelModes.motor) {
-                engine.beginTimer(MotorWindUpMilliseconds, function() {
+                engine.beginTimer(MotorWindUpMilliseconds, () => {
                     engine.setValue(newGroup, "scratch2_enable", true);
                 }, true);
             }
@@ -537,7 +537,7 @@ class Button extends Component {
     indicator(on) {
         if (on && this.indicatorTimer === 0) {
             this.outDisconnect();
-            this.indicatorTimer = engine.beginTimer(this.indicatorIntervalMillis, this.indicatorCallback.bind(this));
+            this.indicatorTimer = engine.beginTimer(this.indicatorIntervalMillis, this.indicatorCallback);
         } else if (!on && this.indicatorTimer !== 0) {
             engine.stopTimer(this.indicatorTimer);
             this.indicatorTimer = 0;
@@ -657,7 +657,7 @@ class CueButton extends PushButton {
             engine.setValue(this.group, this.inKey, pressed);
             if (this.deck.wheelMode === wheelModes.motor) {
                 engine.setValue(this.group, "scratch2_enable", false);
-                engine.beginTimer(MotorWindDownMilliseconds, function() {
+                engine.beginTimer(MotorWindDownMilliseconds, () => {
                     engine.setValue(this.group, "scratch2_enable", true);
                 }, true);
             }
@@ -2313,7 +2313,7 @@ class S4Mk3Deck extends Deck {
                     } else {
                         this.deck.wheelMode = wheelModes.motor;
                         const group = this.group;
-                        engine.beginTimer(MotorWindUpMilliseconds, function() {
+                        engine.beginTimer(MotorWindUpMilliseconds, () => {
                             engine.setValue(group, "scratch2_enable", true);
                         }, true);
                     }
@@ -2380,7 +2380,7 @@ class S4Mk3Deck extends Deck {
                 } else if (engine.getValue(this.group, "scratch2") === 0) {
                     engine.setValue(this.group, "scratch2_enable", false);
                 } else {
-                    engine.beginTimer(100, this.stopScratchWhenOver.bind(this), true);
+                    engine.beginTimer(100, this.stopScratchWhenOver, true);
                 }
             }
         });
@@ -2922,7 +2922,7 @@ class S4MK3 {
             controller.sendOutputReport(129, deckMeters.buffer);
         });
         if (UseMotors) {
-            engine.beginTimer(20, this.motorCallback.bind(this));
+            engine.beginTimer(20, this.motorCallback);
             this.leftVelocityFactor = wheelAbsoluteMax * baseRevolutionsPerSecond * 2;
             this.rightVelocityFactor = wheelAbsoluteMax * baseRevolutionsPerSecond * 2;
 
diff --git a/res/controllers/Vestax-Spin-scripts.js b/res/controllers/Vestax-Spin-scripts.js
index e8f18e4eae7..ce3a91eecb8 100644
--- a/res/controllers/Vestax-Spin-scripts.js
+++ b/res/controllers/Vestax-Spin-scripts.js
@@ -335,7 +335,7 @@ VestaxSpin.Button.prototype.handleWheelTouch = function() {
             }
         }
         this.timer = engine.beginTimer(VestaxSpin.SCRATCH_TIMER_PERIOD,
-            "VestaxSpin.GetDeck(\"" + this.group + "\").buttons[\"wheeltouch\"].callback()");
+            () => VestaxSpin.GetDeck(this.group).buttons.wheeltouch.callback());
    }
 }
 
diff --git a/res/controllers/Vestax-VCI-100-3DEX-scripts.js b/res/controllers/Vestax-VCI-100-3DEX-scripts.js
index 2e56c695fc1..60159312190 100644
--- a/res/controllers/Vestax-VCI-100-3DEX-scripts.js
+++ b/res/controllers/Vestax-VCI-100-3DEX-scripts.js
@@ -39,7 +39,7 @@ midi.sendShortMsg(0x80,0x64,0x7F);// reloop/exit button led off
 
 }
 
-engine.beginTimer(150, "VestaxVCI1003DEX.loopLeds()",false)
+engine.beginTimer(150, VestaxVCI1003DEX.loopLeds,false)
 //timer for loop leds end
 
 
diff --git a/res/controllers/Vestax-VCI-100MKII-scripts.js b/res/controllers/Vestax-VCI-100MKII-scripts.js
index b8c44ff9b72..9fd2b540949 100644
--- a/res/controllers/Vestax-VCI-100MKII-scripts.js
+++ b/res/controllers/Vestax-VCI-100MKII-scripts.js
@@ -48,7 +48,7 @@ VCI102.selectTimer = 0;
 VCI102.selectIter = function(select) {
     if (select) {
         select();
-        VCI102.selectTimer = engine.beginTimer(500, function() {
+        VCI102.selectTimer = engine.beginTimer(500, () => {
             VCI102.selectTimer = engine.beginTimer(40, select);
         }, true);
     } else {
@@ -98,7 +98,7 @@ VCI102.slip = function(value, group, key) {
     if (engine.getValue(group, "slip_enabled") && !VCI102.slipSrc[ch]) {
         VCI102.slipReady[ch] = false;
         engine.setValue(group, "slip_enabled", 0);
-        engine.beginTimer(60, function() {
+        engine.beginTimer(60, () => {
             engine.setValue(group, "slip_enabled", 1);
             VCI102.slipReady[ch] = true;
         }, true);
@@ -124,7 +124,7 @@ VCI102.scratchEnable = function(ch, midino, value, status, group) {
             VCI102.slip(value, group);
         }
     } else if (engine.isScratching(deck)) {
-        VCI102.scratchTimer[ch] = engine.beginTimer(20, function() {
+        VCI102.scratchTimer[ch] = engine.beginTimer(20, () => {
             var vel = Math.abs(engine.getValue(group, "scratch2"));
             if (vel < 1 && (vel < 1 / 64 || engine.getValue(group, "play"))) {
                 if (VCI102.scratchTimer[ch]) {
diff --git a/res/controllers/Vestax-VCI-300-scripts.js b/res/controllers/Vestax-VCI-300-scripts.js
index e3abc304ac8..15ea0a23334 100644
--- a/res/controllers/Vestax-VCI-300-scripts.js
+++ b/res/controllers/Vestax-VCI-300-scripts.js
@@ -402,11 +402,9 @@ VestaxVCI300.Deck.prototype.disableScratching = function() {
     if ((!this.isPlaying() && (VestaxVCI300.JOG_SCRATCH2_ABS_MIN < Math.abs(scratch2))) ||
         (scratch2 < VestaxVCI300.JOG_SCRATCH2_PLAY_MIN) ||
         (scratch2 > VestaxVCI300.JOG_SCRATCH2_PLAY_MAX)) {
-        var timeoutCallback =
-            "VestaxVCI300.onScratchingTimeoutDeck" + this.number + "()";
         this.scratchTimer = engine.beginTimer(
             VestaxVCI300.JOG_SCRATCH_TIMEOUT,
-            timeoutCallback,
+            VestaxVCI300["onScratchingTimeoutDeck" + this.number],
             true);
     }
     if (0 === this.scratchTimer) {
diff --git a/res/controllers/Vestax-VCI-400-scripts.js b/res/controllers/Vestax-VCI-400-scripts.js
index 804baf6d15a..815b8d463ff 100644
--- a/res/controllers/Vestax-VCI-400-scripts.js
+++ b/res/controllers/Vestax-VCI-400-scripts.js
@@ -621,7 +621,7 @@ VestaxVCI400.Deck.prototype.onWheelTouch = function(value) {
             this.finishWheelTouch();
         } else {
             this.wheelTouchInertiaTimer = engine.beginTimer(
-                    inertiaTime, "VestaxVCI400.Decks." + this.deckIdentifier + ".finishWheelTouch()", true);
+                    inertiaTime, () => { VestaxVCI400.Decks[this.deckIdentifier].finishWheelTouch(); }, true);
         }
     }
 };
@@ -631,7 +631,7 @@ VestaxVCI400.Deck.prototype.finishWheelTouch = function() {
     if (this.vinylActive) {
         // Vinyl button still being pressed, don't disable scratch mode yet.
         this.wheelTouchInertiaTimer = engine.beginTimer(
-                100, "VestaxVCI400.Decks." + this.deckIdentifier + ".finishWheelTouch()", true);
+                100, () => { VestaxVCI400.Decks[this.deckIdentifier].finishWheelTouch(); }, true);
         return;
     }
     var play = engine.getValue(this.group, "play");
@@ -648,7 +648,7 @@ VestaxVCI400.Deck.prototype.finishWheelTouch = function() {
         } else {
             // Check again soon.
             this.wheelTouchInertiaTimer = engine.beginTimer(
-                    100, "VestaxVCI400.Decks." + this.deckIdentifier + ".finishWheelTouch()", true);
+                    100, () => { VestaxVCI400.Decks[this.deckIdentifier].finishWheelTouch(); }, true);
         }
     }
 };
diff --git a/res/controllers/Yaeltex-MiniMixxx-scripts.js b/res/controllers/Yaeltex-MiniMixxx-scripts.js
index 65550567a7e..20e55ee7869 100644
--- a/res/controllers/Yaeltex-MiniMixxx-scripts.js
+++ b/res/controllers/Yaeltex-MiniMixxx-scripts.js
@@ -297,10 +297,10 @@ MiniMixxx.EncoderModeGain = class extends MiniMixxx.Mode {
             engine.stopTimer(this.idleTimer);
         }
         this.showGain = true;
-        this.idleTimer = engine.beginTimer(1000, function() {
+        this.idleTimer = engine.beginTimer(1000, () => {
             this.showGain = false;
             this.vuIndicator(engine.getValue(this.channel, "vu_meter"));
-        }.bind(this), true);
+        }, true);
         midi.sendShortMsg(0xBF, this.idx, this.color);
         midi.sendShortMsg(0xB0, this.idx, script.absoluteNonLinInverse(value, 0, 1.0, 4.0));
     }
@@ -966,13 +966,13 @@ MiniMixxx.ButtonModeSync = class extends MiniMixxx.ButtonMode {
             if (engine.getValue(this.channel, "sync_enabled") === 0) {
                 engine.setValue(this.channel, "sync_enabled", 1);
                 // Start timer to measure how long button is pressed
-                this.syncPressedTimer = engine.beginTimer(300, function() {
+                this.syncPressedTimer = engine.beginTimer(300, () => {
                     engine.setValue(this.channel, "sync_enabled", 1);
                     // Reset sync button timer state if active
                     if (this.syncPressedTimer !== 0) {
                         this.syncPressedTimer = 0;
                     }
-                }.bind(this), true);
+                }, true);
             } else {
                 // Deactivate sync lock
                 // LED is turned off by the callback handler for sync_enabled
diff --git a/res/controllers/common-controller-scripts.js b/res/controllers/common-controller-scripts.js
index 68eed589541..3a963c6f85d 100644
--- a/res/controllers/common-controller-scripts.js
+++ b/res/controllers/common-controller-scripts.js
@@ -243,9 +243,7 @@ script.triggerControl = function(group, control, delay) {
         delay = 200;
     }
     engine.setValue(group, control, 1);
-    engine.beginTimer(delay, function() {
-        engine.setValue(group, control, 0);
-    }, true);
+    engine.beginTimer(delay, () => engine.setValue(group, control, 0) , true);
 };
 
 /* -------- ------------------------------------------------------
diff --git a/res/controllers/midi-components-0.0.js b/res/controllers/midi-components-0.0.js
index e0cc0d7bcff..ab5c11ed7c5 100644
--- a/res/controllers/midi-components-0.0.js
+++ b/res/controllers/midi-components-0.0.js
@@ -190,10 +190,10 @@
                 if (this.isPress(channel, control, value, status)) {
                     this.inToggle();
                     this.isLongPressed = false;
-                    this.longPressTimer = engine.beginTimer(this.longPressTimeout, function() {
+                    this.longPressTimer = engine.beginTimer(this.longPressTimeout, () => {
                         this.isLongPressed = true;
                         this.longPressTimer = 0;
-                    }.bind(this), true);
+                    }, true);
                 } else {
                     if (this.isLongPressed) {
                         this.inToggle();
@@ -255,10 +255,10 @@
                 if (this.isPress(channel, control, value, status)) {
                     if (engine.getValue(this.group, "sync_enabled") === 0) {
                         engine.setValue(this.group, "beatsync", 1);
-                        this.longPressTimer = engine.beginTimer(this.longPressTimeout, function() {
+                        this.longPressTimer = engine.beginTimer(this.longPressTimeout, () => {
                             engine.setValue(this.group, "sync_enabled", 1);
                             this.longPressTimer = 0;
-                        }.bind(this), true);
+                        }, true);
                     } else {
                         engine.setValue(this.group, "sync_enabled", 0);
                     }

From cfc642bf91e9e97d562828ba7d21a64ce7ac3695 Mon Sep 17 00:00:00 2001
From: Joerg <JoergAtGithub@worldwartweb.com>
Date: Wed, 6 Dec 2023 23:44:27 +0100
Subject: [PATCH 348/388] Append .bind(this) to all the callback functions

---
 res/controllers/Traktor-Kontrol-Z1-scripts.js | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/res/controllers/Traktor-Kontrol-Z1-scripts.js b/res/controllers/Traktor-Kontrol-Z1-scripts.js
index bde7fca988a..e27905a2c0d 100644
--- a/res/controllers/Traktor-Kontrol-Z1-scripts.js
+++ b/res/controllers/Traktor-Kontrol-Z1-scripts.js
@@ -26,44 +26,44 @@ class TraktorZ1Class {
     }
 
     registerInputPackets() {
-        const message = new HIDPacket("message", 0x1, this.messageCallback);
+        const message = new HIDPacket("message", 0x1, this.messageCallback.bind(this));
 
         // Mode button
-        this.registerInputButton(message, "[ControlX]", "!mode", 0x1D, 0x2, this.modeHandler);
+        this.registerInputButton(message, "[ControlX]", "!mode", 0x1D, 0x2, this.modeHandler.bind(this));
 
         // Headphone buttons
-        this.registerInputButton(message, "[Channel1]", "!pfl", 0x1D, 0x10, this.headphoneHandler);
-        this.registerInputButton(message, "[Channel2]", "!pfl", 0x1D, 0x1, this.headphoneHandler);
+        this.registerInputButton(message, "[Channel1]", "!pfl", 0x1D, 0x10, this.headphoneHandler.bind(this));
+        this.registerInputButton(message, "[Channel2]", "!pfl", 0x1D, 0x1, this.headphoneHandler.bind(this));
 
         // FX buttons
-        this.registerInputButton(message, "[Channel1]", "!fx", 0x1D, 0x4, this.fxHandler);
-        this.registerInputButton(message, "[Channel2]", "!fx", 0x1D, 0x8, this.fxHandler);
+        this.registerInputButton(message, "[Channel1]", "!fx", 0x1D, 0x4, this.fxHandler.bind(this));
+        this.registerInputButton(message, "[Channel2]", "!fx", 0x1D, 0x8, this.fxHandler.bind(this));
 
         // EQ knobs
-        this.registerInputScaler(message, "[EqualizerRack1_[Channel1]_Effect1]", "parameter3", 0x3, 0xFFFF, this.parameterHandler);
-        this.registerInputScaler(message, "[EqualizerRack1_[Channel1]_Effect1]", "parameter2", 0x5, 0xFFFF, this.parameterHandler);
-        this.registerInputScaler(message, "[EqualizerRack1_[Channel1]_Effect1]", "parameter1", 0x7, 0xFFFF, this.parameterHandler);
-        this.registerInputScaler(message, "[EqualizerRack1_[Channel2]_Effect1]", "parameter3", 0xD, 0xFFFF, this.parameterHandler);
-        this.registerInputScaler(message, "[EqualizerRack1_[Channel2]_Effect1]", "parameter2", 0xF, 0xFFFF, this.parameterHandler);
-        this.registerInputScaler(message, "[EqualizerRack1_[Channel2]_Effect1]", "parameter1", 0x11, 0xFFFF, this.parameterHandler);
+        this.registerInputScaler(message, "[EqualizerRack1_[Channel1]_Effect1]", "parameter3", 0x3, 0xFFFF, this.parameterHandler.bind(this));
+        this.registerInputScaler(message, "[EqualizerRack1_[Channel1]_Effect1]", "parameter2", 0x5, 0xFFFF, this.parameterHandler.bind(this));
+        this.registerInputScaler(message, "[EqualizerRack1_[Channel1]_Effect1]", "parameter1", 0x7, 0xFFFF, this.parameterHandler.bind(this));
+        this.registerInputScaler(message, "[EqualizerRack1_[Channel2]_Effect1]", "parameter3", 0xD, 0xFFFF, this.parameterHandler.bind(this));
+        this.registerInputScaler(message, "[EqualizerRack1_[Channel2]_Effect1]", "parameter2", 0xF, 0xFFFF, this.parameterHandler.bind(this));
+        this.registerInputScaler(message, "[EqualizerRack1_[Channel2]_Effect1]", "parameter1", 0x11, 0xFFFF, this.parameterHandler.bind(this));
 
         // FX knobs
-        this.registerInputScaler(message, "[QuickEffectRack1_[Channel1]]", "super1", 0x9, 0xFFFF, this.parameterHandler);
-        this.registerInputScaler(message, "[QuickEffectRack1_[Channel2]]", "super1", 0x13, 0xFFFF, this.parameterHandler);
+        this.registerInputScaler(message, "[QuickEffectRack1_[Channel1]]", "super1", 0x9, 0xFFFF, this.parameterHandler.bind(this));
+        this.registerInputScaler(message, "[QuickEffectRack1_[Channel2]]", "super1", 0x13, 0xFFFF, this.parameterHandler.bind(this));
 
         // Gain knobs
-        this.registerInputScaler(message, "[Channel1]", "pregain", 0x1, 0xFFFF, this.parameterHandler);
-        this.registerInputScaler(message, "[Channel2]", "pregain", 0xB, 0xFFFF, this.parameterHandler);
+        this.registerInputScaler(message, "[Channel1]", "pregain", 0x1, 0xFFFF, this.parameterHandler.bind(this));
+        this.registerInputScaler(message, "[Channel2]", "pregain", 0xB, 0xFFFF, this.parameterHandler.bind(this));
 
         // Headphone mix
-        this.registerInputScaler(message, "[Master]", "headMix", 0x15, 0xFFFF, this.parameterHandler);
+        this.registerInputScaler(message, "[Master]", "headMix", 0x15, 0xFFFF, this.parameterHandler.bind(this));
 
         // Volume faders
-        this.registerInputScaler(message, "[Channel1]", "volume", 0x17, 0xFFFF, this.parameterHandler);
-        this.registerInputScaler(message, "[Channel2]", "volume", 0x19, 0xFFFF, this.parameterHandler);
+        this.registerInputScaler(message, "[Channel1]", "volume", 0x17, 0xFFFF, this.parameterHandler.bind(this));
+        this.registerInputScaler(message, "[Channel2]", "volume", 0x19, 0xFFFF, this.parameterHandler.bind(this));
 
         // Crossfader
-        this.registerInputScaler(message, "[Master]", "crossfader", 0x1B, 0xFFFF, this.parameterHandler);
+        this.registerInputScaler(message, "[Master]", "crossfader", 0x1B, 0xFFFF, this.parameterHandler.bind(this));
 
         this.controller.registerInputPacket(message);
 
@@ -132,14 +132,14 @@ class TraktorZ1Class {
 
         this.controller.registerOutputPacket(output);
 
-        engine.makeConnection("[QuickEffectRack1_[Channel1]]", "enabled", this.outputHandler);
-        engine.makeConnection("[QuickEffectRack1_[Channel2]]", "enabled", this.outputHandler);
+        engine.makeConnection("[QuickEffectRack1_[Channel1]]", "enabled", this.outputHandler.bind(this));
+        engine.makeConnection("[QuickEffectRack1_[Channel2]]", "enabled", this.outputHandler.bind(this));
 
-        engine.makeConnection("[Channel1]", "pfl", this.outputHandler);
-        engine.makeConnection("[Channel2]", "pfl", this.outputHandler);
+        engine.makeConnection("[Channel1]", "pfl", this.outputHandler.bind(this));
+        engine.makeConnection("[Channel2]", "pfl", this.outputHandler.bind(this));
 
-        this.vuLeftConnection = engine.makeUnbufferedConnection("[Channel1]", "vu_meter", this.vuMeterHandler);
-        this.vuRightConnection = engine.makeUnbufferedConnection("[Channel2]", "vu_meter", this.vuMeterHandler);
+        this.vuLeftConnection = engine.makeUnbufferedConnection("[Channel1]", "vu_meter", this.vuMeterHandler.bind(this));
+        this.vuRightConnection = engine.makeUnbufferedConnection("[Channel2]", "vu_meter", this.vuMeterHandler.bind(this));
 
         this.lightDeck(false);
     }

From adc0c5f1df832307a092ba77a88001f524f01e5c Mon Sep 17 00:00:00 2001
From: Joerg <JoergAtGithub@worldwartweb.com>
Date: Thu, 7 Dec 2023 17:46:12 +0100
Subject: [PATCH 349/388] This restores the old behavior of getActiveFieldGroup
 without altering the behavior of resolveGroup And adds warnings at various
 callers, for the case that resolveGroup returns undefined

---
 res/controllers/common-hid-packet-parser.js | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/res/controllers/common-hid-packet-parser.js b/res/controllers/common-hid-packet-parser.js
index 5284a5f0d38..1e3f730c7d1 100644
--- a/res/controllers/common-hid-packet-parser.js
+++ b/res/controllers/common-hid-packet-parser.js
@@ -1711,10 +1711,8 @@ class HIDController {
             return this.resolveGroup(field.mapped_group);
         }
         const group = field.group;
-        if (group === undefined) {
-            if (this.activeDeck !== undefined) {
-                return `[Channel${this.activeDeck}]`;
-            }
+        if (group === "deck" || group === "deck1" || group === "deck2") {
+            return group;
         }
         return this.resolveGroup(group);
     }
@@ -2077,6 +2075,9 @@ class HIDController {
                                 continue;
                             }
                             const bitControlGroup = this.resolveGroup(bit.mapped_group);
+                            if (bitControlGroup === undefined) {
+                                console.warn("HIDController.switchDeck: resolvedGroup(bit.mapped_group) returned undefined");
+                            }
                             engine.connectControl(
                                 bitControlGroup, bit.mapped_name, bit.mapped_callback, true);
                             engine.connectControl(new_group, bit.mapped_name, bit.mapped_callback);
@@ -2100,6 +2101,9 @@ class HIDController {
                         continue;
                     }
                     const fieldControlGroup = this.resolveGroup(field.mapped_group);
+                    if (fieldControlGroup === undefined) {
+                        console.warn("HIDController.switchDeck: resolvedGroup(field.mapped_group) returned undefined");
+                    }
                     engine.connectControl(
                         fieldControlGroup, field.mapped_name, field.mapped_callback, true);
                     engine.connectControl(new_group, field.mapped_name, field.mapped_callback);
@@ -2142,6 +2146,9 @@ class HIDController {
             return;
         }
         const controlgroup = this.resolveGroup(m_group);
+        if (controlgroup === undefined) {
+            console.warn("HIDController.linkOutput: resolvedGroup(m_group) returned undefined");
+        }
         field.mapped_group = m_group;
         field.mapped_name = m_name;
         field.mapped_callback = callback;
@@ -2169,6 +2176,9 @@ class HIDController {
             return;
         }
         const controlgroup = this.resolveGroup(field.mapped_group);
+        if (controlgroup === undefined) {
+            console.warn("HIDController.unlinkOutput: resolvedGroup(field.mapped_group) returned undefined");
+        }
         engine.connectControl(controlgroup, field.mapped_name, callback, true);
         field.mapped_group = undefined;
         field.mapped_name = undefined;

From 5b52cb323f7b3510b8a7cdf100dda7bea163d861 Mon Sep 17 00:00:00 2001
From: djantti <djantti@proton.me>
Date: Thu, 7 Dec 2023 21:21:41 +0200
Subject: [PATCH 350/388] Change function prefix to TraktorZ1

---
 res/controllers/Traktor Kontrol Z1.hid.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/controllers/Traktor Kontrol Z1.hid.xml b/res/controllers/Traktor Kontrol Z1.hid.xml
index a4a6a2b6736..843adc9fd65 100644
--- a/res/controllers/Traktor Kontrol Z1.hid.xml	
+++ b/res/controllers/Traktor Kontrol Z1.hid.xml	
@@ -13,7 +13,7 @@
     <controller id="Traktor">
         <scriptfiles>
             <file filename="common-hid-packet-parser.js" functionprefix="" />
-            <file filename="Traktor-Kontrol-Z1-scripts.js" functionprefix="KontrolZ1" />
+            <file filename="Traktor-Kontrol-Z1-scripts.js" functionprefix="TraktorZ1" />
         </scriptfiles>
     </controller>
 </MixxxControllerPreset>

From ce8b3c8f00ac44388c95cd7d6d86272ca9bb3985 Mon Sep 17 00:00:00 2001
From: djantti <djantti@proton.me>
Date: Thu, 7 Dec 2023 21:23:28 +0200
Subject: [PATCH 351/388] Remove empty line

---
 res/controllers/Traktor-Kontrol-Z1-scripts.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/res/controllers/Traktor-Kontrol-Z1-scripts.js b/res/controllers/Traktor-Kontrol-Z1-scripts.js
index e27905a2c0d..c5adc62ef5b 100644
--- a/res/controllers/Traktor-Kontrol-Z1-scripts.js
+++ b/res/controllers/Traktor-Kontrol-Z1-scripts.js
@@ -191,7 +191,6 @@ class TraktorZ1Class {
         }
     }
 
-
     parameterHandler(field) {
         engine.setParameter(field.group, field.name, field.value / 4095);
     }

From 6cfb632f36d3e74db68313b74ec7b8019572f423 Mon Sep 17 00:00:00 2001
From: djantti <djantti@proton.me>
Date: Fri, 8 Dec 2023 01:00:52 +0200
Subject: [PATCH 352/388] Always use two digits for 7-bit hex values

---
 res/controllers/Traktor-Kontrol-Z1-scripts.js | 66 +++++++++----------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/res/controllers/Traktor-Kontrol-Z1-scripts.js b/res/controllers/Traktor-Kontrol-Z1-scripts.js
index c5adc62ef5b..922b5f898a5 100644
--- a/res/controllers/Traktor-Kontrol-Z1-scripts.js
+++ b/res/controllers/Traktor-Kontrol-Z1-scripts.js
@@ -26,34 +26,34 @@ class TraktorZ1Class {
     }
 
     registerInputPackets() {
-        const message = new HIDPacket("message", 0x1, this.messageCallback.bind(this));
+        const message = new HIDPacket("message", 0x01, this.messageCallback.bind(this));
 
         // Mode button
-        this.registerInputButton(message, "[ControlX]", "!mode", 0x1D, 0x2, this.modeHandler.bind(this));
+        this.registerInputButton(message, "[ControlX]", "!mode", 0x1D, 0x02, this.modeHandler.bind(this));
 
         // Headphone buttons
         this.registerInputButton(message, "[Channel1]", "!pfl", 0x1D, 0x10, this.headphoneHandler.bind(this));
-        this.registerInputButton(message, "[Channel2]", "!pfl", 0x1D, 0x1, this.headphoneHandler.bind(this));
+        this.registerInputButton(message, "[Channel2]", "!pfl", 0x1D, 0x01, this.headphoneHandler.bind(this));
 
         // FX buttons
-        this.registerInputButton(message, "[Channel1]", "!fx", 0x1D, 0x4, this.fxHandler.bind(this));
-        this.registerInputButton(message, "[Channel2]", "!fx", 0x1D, 0x8, this.fxHandler.bind(this));
+        this.registerInputButton(message, "[Channel1]", "!fx", 0x1D, 0x04, this.fxHandler.bind(this));
+        this.registerInputButton(message, "[Channel2]", "!fx", 0x1D, 0x08, this.fxHandler.bind(this));
 
         // EQ knobs
-        this.registerInputScaler(message, "[EqualizerRack1_[Channel1]_Effect1]", "parameter3", 0x3, 0xFFFF, this.parameterHandler.bind(this));
-        this.registerInputScaler(message, "[EqualizerRack1_[Channel1]_Effect1]", "parameter2", 0x5, 0xFFFF, this.parameterHandler.bind(this));
-        this.registerInputScaler(message, "[EqualizerRack1_[Channel1]_Effect1]", "parameter1", 0x7, 0xFFFF, this.parameterHandler.bind(this));
-        this.registerInputScaler(message, "[EqualizerRack1_[Channel2]_Effect1]", "parameter3", 0xD, 0xFFFF, this.parameterHandler.bind(this));
-        this.registerInputScaler(message, "[EqualizerRack1_[Channel2]_Effect1]", "parameter2", 0xF, 0xFFFF, this.parameterHandler.bind(this));
+        this.registerInputScaler(message, "[EqualizerRack1_[Channel1]_Effect1]", "parameter3", 0x03, 0xFFFF, this.parameterHandler.bind(this));
+        this.registerInputScaler(message, "[EqualizerRack1_[Channel1]_Effect1]", "parameter2", 0x05, 0xFFFF, this.parameterHandler.bind(this));
+        this.registerInputScaler(message, "[EqualizerRack1_[Channel1]_Effect1]", "parameter1", 0x07, 0xFFFF, this.parameterHandler.bind(this));
+        this.registerInputScaler(message, "[EqualizerRack1_[Channel2]_Effect1]", "parameter3", 0x0D, 0xFFFF, this.parameterHandler.bind(this));
+        this.registerInputScaler(message, "[EqualizerRack1_[Channel2]_Effect1]", "parameter2", 0x0F, 0xFFFF, this.parameterHandler.bind(this));
         this.registerInputScaler(message, "[EqualizerRack1_[Channel2]_Effect1]", "parameter1", 0x11, 0xFFFF, this.parameterHandler.bind(this));
 
         // FX knobs
-        this.registerInputScaler(message, "[QuickEffectRack1_[Channel1]]", "super1", 0x9, 0xFFFF, this.parameterHandler.bind(this));
+        this.registerInputScaler(message, "[QuickEffectRack1_[Channel1]]", "super1", 0x09, 0xFFFF, this.parameterHandler.bind(this));
         this.registerInputScaler(message, "[QuickEffectRack1_[Channel2]]", "super1", 0x13, 0xFFFF, this.parameterHandler.bind(this));
 
         // Gain knobs
-        this.registerInputScaler(message, "[Channel1]", "pregain", 0x1, 0xFFFF, this.parameterHandler.bind(this));
-        this.registerInputScaler(message, "[Channel2]", "pregain", 0xB, 0xFFFF, this.parameterHandler.bind(this));
+        this.registerInputScaler(message, "[Channel1]", "pregain", 0x01, 0xFFFF, this.parameterHandler.bind(this));
+        this.registerInputScaler(message, "[Channel2]", "pregain", 0x0B, 0xFFFF, this.parameterHandler.bind(this));
 
         // Headphone mix
         this.registerInputScaler(message, "[Master]", "headMix", 0x15, 0xFFFF, this.parameterHandler.bind(this));
@@ -105,7 +105,7 @@ class TraktorZ1Class {
 
         output.addOutput("[ControlX]", "mode", 0x13, "B");
 
-        output.addOutput("[Channel1]", "pfl", 0xF, "B");
+        output.addOutput("[Channel1]", "pfl", 0x0F, "B");
         output.addOutput("[Channel2]", "pfl", 0x10, "B");
 
         output.addOutput("[Channel1]", "play_indicator", 0x11, "B");
@@ -114,21 +114,21 @@ class TraktorZ1Class {
         output.addOutput("[QuickEffectRack1_[Channel1]]", "enabled", 0x12, "B");
         output.addOutput("[QuickEffectRack1_[Channel2]]", "enabled", 0x15, "B");
 
-        output.addOutput("[Channel1]", "vu-30", 0x1, "B");
-        output.addOutput("[Channel1]", "vu-15", 0x2, "B");
-        output.addOutput("[Channel1]", "vu-6", 0x3, "B");
-        output.addOutput("[Channel1]", "vu-3", 0x4, "B");
-        output.addOutput("[Channel1]", "vu0", 0x5, "B");
-        output.addOutput("[Channel1]", "vu3", 0x6, "B");
-        output.addOutput("[Channel1]", "vu6", 0x7, "B");
-
-        output.addOutput("[Channel2]", "vu-30", 0x8, "B");
-        output.addOutput("[Channel2]", "vu-15", 0x9, "B");
-        output.addOutput("[Channel2]", "vu-6", 0xA, "B");
-        output.addOutput("[Channel2]", "vu-3", 0xB, "B");
-        output.addOutput("[Channel2]", "vu0", 0xC, "B");
-        output.addOutput("[Channel2]", "vu3", 0xD, "B");
-        output.addOutput("[Channel2]", "vu6", 0xE, "B");
+        output.addOutput("[Channel1]", "vu-30", 0x01, "B");
+        output.addOutput("[Channel1]", "vu-15", 0x02, "B");
+        output.addOutput("[Channel1]", "vu-6", 0x03, "B");
+        output.addOutput("[Channel1]", "vu-3", 0x04, "B");
+        output.addOutput("[Channel1]", "vu0", 0x05, "B");
+        output.addOutput("[Channel1]", "vu3", 0x06, "B");
+        output.addOutput("[Channel1]", "vu6", 0x07, "B");
+
+        output.addOutput("[Channel2]", "vu-30", 0x08, "B");
+        output.addOutput("[Channel2]", "vu-15", 0x09, "B");
+        output.addOutput("[Channel2]", "vu-6", 0x0A, "B");
+        output.addOutput("[Channel2]", "vu-3", 0x0B, "B");
+        output.addOutput("[Channel2]", "vu0", 0x0C, "B");
+        output.addOutput("[Channel2]", "vu3", 0x0D, "B");
+        output.addOutput("[Channel2]", "vu6", 0x0E, "B");
 
         this.controller.registerOutputPacket(output);
 
@@ -164,13 +164,13 @@ class TraktorZ1Class {
     fxHandler(field) {
         if (field.value === 0) {
             // Always clear play indicator on button release
-            this.controller.setOutput(field.group, "play_indicator", 0x0, true);
+            this.controller.setOutput(field.group, "play_indicator", 0x00, true);
             return;
         }
         // Control playback when modifier is active
         if (this.modePressed) {
             // Match play indicator (red led) brightness to fx indicator (blue led)
-            const current = engine.getValue("[QuickEffectRack1_" + field.group + "]", "enabled") ? 0x7F : 0xA;
+            const current = engine.getValue("[QuickEffectRack1_" + field.group + "]", "enabled") ? 0x7F : 0x0A;
             this.controller.setOutput(field.group, "play_indicator", current, true);
             script.toggleControl(field.group, "play");
         } else {
@@ -199,7 +199,7 @@ class TraktorZ1Class {
         let ledValue;
         if (value === 0 || value === false) {
             // Off value (dimmed)
-            ledValue = 0xA;
+            ledValue = 0x0A;
         } else if (value === 1 || value === true) {
             // On value
             ledValue = 0x7F;
@@ -208,7 +208,7 @@ class TraktorZ1Class {
     }
 
     lightDeck(switchOff) {
-        let softLight = 0xA;
+        let softLight = 0x0A;
         let fullLight = 0x7F;
         let current;
 

From fea0b755d550db6b56f88977828624da13ac8bae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sun, 3 Dec 2023 23:19:43 +0100
Subject: [PATCH 353/388] Fix "possible loss of data" warnings with MSVC

---
 lib/reverb/Reverb.h    | 10 +++++-----
 lib/reverb/dsp/Delay.h | 11 ++++-------
 lib/reverb/dsp/IIR1.h  |  2 +-
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/lib/reverb/Reverb.h b/lib/reverb/Reverb.h
index 8900d0bfd6e..c0d428dc642 100644
--- a/lib/reverb/Reverb.h
+++ b/lib/reverb/Reverb.h
@@ -61,7 +61,7 @@ class Lattice
 : public DSP::Delay
 {
 	public:
-		sample_t process (sample_t x, double d)
+		sample_t process (sample_t x, sample_t d)
 			{
 				sample_t y = get();
 				x -= d*y;
@@ -126,8 +126,8 @@ class ModLattice
 
 		void init (int n, int w)
 			{
-				n0 = n;
-				width = w;
+				n0 = static_cast<float>(n);
+				width = static_cast<float>(w);
 				delay.init (n + w);
 			}
 
@@ -137,9 +137,9 @@ class ModLattice
 			}
 
 		inline sample_t
-		process (sample_t x, double d)
+		process (sample_t x, sample_t d)
 			{
-				sample_t y = delay.get_linear (n0 + width * lfo.get());
+				sample_t y = delay.get_linear (n0 + width * static_cast<float>(lfo.get()));
 				x += d * y;
 				delay.put (x);
 				return y - d * x; /* note sign */
diff --git a/lib/reverb/dsp/Delay.h b/lib/reverb/dsp/Delay.h
index c7e77ce79f3..d530fee58a1 100644
--- a/lib/reverb/dsp/Delay.h
+++ b/lib/reverb/dsp/Delay.h
@@ -104,12 +104,9 @@ class Delay
 				sample_t x2 = (*this) [n + 2];
 
 				/* sample_t (32bit) quicker than double here */
-				sample_t a =
-						(3 * (x0 - x1) - x_1 + x2) * .5;
-				sample_t b =
-						2 * x1 + x_1 - (5 * x0 + x2) * .5;
-				sample_t c =
-						(x1 - x_1) * .5;
+				sample_t a = (3 * (x0 - x1) - x_1 + x2) * .5f;
+				sample_t b = 2 * x1 + x_1 - (5 * x0 + x2) * .5f;
+				sample_t c = (x1 - x_1) * .5f;
 
 				return x0 + (((a * f) + b) * f + c) * f;
 			}
@@ -124,7 +121,7 @@ class MovingAverage
 		void init (uint n)
 			{
 				this->Delay::init (n);
-				over_n = 1. / n;
+				over_n = 1.f / n;
 				/* adjust write pointer so we have a full history of zeros */
 				write = (write + size + 1) & size;
 				state = 0;
diff --git a/lib/reverb/dsp/IIR1.h b/lib/reverb/dsp/IIR1.h
index 0d945b3ffc6..5df8391f70b 100644
--- a/lib/reverb/dsp/IIR1.h
+++ b/lib/reverb/dsp/IIR1.h
@@ -36,7 +36,7 @@ class LP1
 	public:
 		T a0, b1, y1;
 
-		LP1 (double d = 1.)
+		LP1 (T d = 1.)
 			{
 				set (d);
 				y1 = 0.;

From ced594f9eadab7feb0dc7c5258aced407cac73a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Wed, 6 Dec 2023 12:00:11 +0100
Subject: [PATCH 354/388] Taglib: Disable missing dll-interface warning

---
 src/track/taglib/trackmetadata_file.cpp | 13 +++++++++++++
 src/track/taglib/trackmetadata_mp4.cpp  | 13 +++++++++++++
 src/track/taglib/trackmetadata_xiph.cpp | 13 +++++++++++++
 3 files changed, 39 insertions(+)

diff --git a/src/track/taglib/trackmetadata_file.cpp b/src/track/taglib/trackmetadata_file.cpp
index a085a4dfcbe..53519771807 100644
--- a/src/track/taglib/trackmetadata_file.cpp
+++ b/src/track/taglib/trackmetadata_file.cpp
@@ -1,3 +1,12 @@
+#if defined(_MSC_VER)
+#pragma warning(push)
+// https://github.com/taglib/taglib/issues/1185
+// warning C4251: 'TagLib::FileName::m_wname': class
+// 'std::basic_string<wchar_t,std::char_traits<wchar_t>,std::allocator<wchar_t>>'
+// needs to have dll-interface to be used by clients of class 'TagLib::FileName'
+#pragma warning(disable : 4251)
+#endif
+
 #include "track/taglib/trackmetadata_file.h"
 
 #include <taglib/tfile.h>
@@ -151,3 +160,7 @@ bool readAudioPropertiesFromFile(
 } // namespace taglib
 
 } // namespace mixxx
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
diff --git a/src/track/taglib/trackmetadata_mp4.cpp b/src/track/taglib/trackmetadata_mp4.cpp
index 8ffa4fabb23..993d5d0273f 100644
--- a/src/track/taglib/trackmetadata_mp4.cpp
+++ b/src/track/taglib/trackmetadata_mp4.cpp
@@ -1,3 +1,12 @@
+#if defined(_MSC_VER)
+#pragma warning(push)
+// https://github.com/taglib/taglib/issues/1185
+// warning C4251: 'TagLib::FileName::m_wname': class
+// 'std::basic_string<wchar_t,std::char_traits<wchar_t>,std::allocator<wchar_t>>'
+// needs to have dll-interface to be used by clients of class 'TagLib::FileName'
+#pragma warning(disable : 4251)
+#endif
+
 #include "track/taglib/trackmetadata_mp4.h"
 
 #include "track/taglib/trackmetadata_common.h"
@@ -508,3 +517,7 @@ bool exportTrackMetadataIntoTag(
 } // namespace taglib
 
 } // namespace mixxx
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
diff --git a/src/track/taglib/trackmetadata_xiph.cpp b/src/track/taglib/trackmetadata_xiph.cpp
index bb7f4a43c17..0e5bffb2689 100644
--- a/src/track/taglib/trackmetadata_xiph.cpp
+++ b/src/track/taglib/trackmetadata_xiph.cpp
@@ -1,3 +1,12 @@
+#if defined(_MSC_VER)
+#pragma warning(push)
+// https://github.com/taglib/taglib/issues/1185
+// warning C4251: 'TagLib::FileName::m_wname': class
+// 'std::basic_string<wchar_t,std::char_traits<wchar_t>,std::allocator<wchar_t>>'
+// needs to have dll-interface to be used by clients of class 'TagLib::FileName'
+#pragma warning(disable : 4251)
+#endif
+
 #include "track/taglib/trackmetadata_xiph.h"
 
 #include <taglib/flacpicture.h>
@@ -635,3 +644,7 @@ bool exportTrackMetadataIntoTag(
 } // namespace taglib
 
 } // namespace mixxx
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif

From 41a2898789f48c85bfa885695d41fae06e2fac79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Thu, 7 Dec 2023 10:00:34 +0100
Subject: [PATCH 355/388] Improve NativeEventHandlerWin to avoid header
 conflict

---
 src/main.cpp                  |  2 +-
 src/nativeeventhandlerwin.cpp | 20 +++++++++++---------
 src/nativeeventhandlerwin.h   | 14 ++++++--------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 9f78fa0061a..478af0d057b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -59,7 +59,7 @@ int runMixxx(MixxxApplication* pApp, const CmdlineArgs& args) {
         pApp->installEventFilter(&mainWindow);
 
 #if defined(__WINDOWS__)
-        WindowsEventHandler winEventHandler(pApp);
+        WindowsEventHandler winEventHandler;
         pApp->installNativeEventFilter(&winEventHandler);
 #endif
 
diff --git a/src/nativeeventhandlerwin.cpp b/src/nativeeventhandlerwin.cpp
index a8db4c62c64..dcd99a7ca5f 100644
--- a/src/nativeeventhandlerwin.cpp
+++ b/src/nativeeventhandlerwin.cpp
@@ -1,18 +1,19 @@
-#include "nativeeventhandlerwin.h"
 #if defined(__WINDOWS__)
-#include <commctrl.h>
-#include <windows.h>
-#include <winuser.h>
 
-#include "moc_nativeeventhandlerwin.cpp"
+#include "nativeeventhandlerwin.h"
 
-WindowsEventHandler::WindowsEventHandler(MixxxApplication* pApp)
-        : m_pApp(pApp) {
-}
+// clang-format off
+#include <windows.h>  // needs to be included first
+#include <commctrl.h> // for DefSubclassProc
+#include <winuser.h>  // for MSG, RedrawWindow PostMessageW
+// clang-format on
+
+#include "moc_nativeeventhandlerwin.cpp"
 
 bool WindowsEventHandler::nativeEventFilter(
         const QByteArray& eventType, void* message, long* result) {
-    MSG* msg = (MSG*)message;
+    Q_UNUSED(eventType);
+    MSG* msg = reinterpret_cast<MSG*>(message);
     if (msg && msg->message == WM_NCLBUTTONDOWN) {
         // Trigger the modal loop to prevent 500ms wait in Event Loop
         // when Windows setting "Show window contents while dragging" is enabled
@@ -38,4 +39,5 @@ bool WindowsEventHandler::nativeEventFilter(
     // so other recipients will also receive this message subsequently
     return false;
 }
+
 #endif
diff --git a/src/nativeeventhandlerwin.h b/src/nativeeventhandlerwin.h
index 3f1f4f0016c..0d0a924b3d0 100644
--- a/src/nativeeventhandlerwin.h
+++ b/src/nativeeventhandlerwin.h
@@ -1,15 +1,13 @@
-#include <QAbstractNativeEventFilter>
-
 #if defined(__WINDOWS__)
-#include "mixxxapplication.h"
+
+#include <QAbstractNativeEventFilter>
 
 class WindowsEventHandler : public QAbstractNativeEventFilter {
   public:
-    WindowsEventHandler(MixxxApplication* pApp);
-
-    bool nativeEventFilter(const QByteArray& eventType, void* message, long* result);
+    WindowsEventHandler() = default;
+    ~WindowsEventHandler() override = default;
 
-  private:
-    MixxxApplication* m_pApp;
+    bool nativeEventFilter(const QByteArray& eventType, void* message, long* result) override;
 };
+
 #endif

From 326357d8eededccd7a8d24def0f936bac60d9f15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Wed, 6 Dec 2023 16:05:46 +0100
Subject: [PATCH 356/388] Add missing include

---
 src/controllers/hid/hidioglobaloutputreportfifo.h            | 3 +--
 src/util/console.cpp                                         | 2 ++
 src/util/safelywritablefile.cpp                              | 2 ++
 src/waveform/renderers/allshader/waveformrendererpreroll.cpp | 1 +
 src/widget/wspinnyglsl.cpp                                   | 1 +
 src/widget/wvumeterglsl.cpp                                  | 1 +
 6 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/controllers/hid/hidioglobaloutputreportfifo.h b/src/controllers/hid/hidioglobaloutputreportfifo.h
index 2feb5aa80ba..634a03ae43a 100644
--- a/src/controllers/hid/hidioglobaloutputreportfifo.h
+++ b/src/controllers/hid/hidioglobaloutputreportfifo.h
@@ -1,12 +1,11 @@
 #pragma once
 
-#include <QtGlobal>
+#include <QByteArray>
 
 #include "rigtorp/SPSCQueue.h"
 
 struct RuntimeLoggingCategory;
 class QMutex;
-class QByteArray;
 
 typedef struct hid_device_ hid_device;
 
diff --git a/src/util/console.cpp b/src/util/console.cpp
index 9c3f5a85059..60e1e895a34 100644
--- a/src/util/console.cpp
+++ b/src/util/console.cpp
@@ -6,6 +6,8 @@
 #include <string.h>
 #include <strsafe.h>
 
+#include <QDebug>
+
 #include "util/versionstore.h"
 
 typedef BOOL(WINAPI* pfGetCurrentConsoleFontEx)(HANDLE, BOOL, PCONSOLE_FONT_INFOEX);
diff --git a/src/util/safelywritablefile.cpp b/src/util/safelywritablefile.cpp
index 25fdbbe06ab..dcfa952469c 100644
--- a/src/util/safelywritablefile.cpp
+++ b/src/util/safelywritablefile.cpp
@@ -7,6 +7,8 @@
 
 #if defined(__WINDOWS__)
 #include <Windows.h>
+
+#include <QThread>
 #endif
 
 namespace mixxx {
diff --git a/src/waveform/renderers/allshader/waveformrendererpreroll.cpp b/src/waveform/renderers/allshader/waveformrendererpreroll.cpp
index d9cc49a4ec1..a54f4828285 100644
--- a/src/waveform/renderers/allshader/waveformrendererpreroll.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererpreroll.cpp
@@ -3,6 +3,7 @@
 #include <QDomNode>
 #include <QOpenGLTexture>
 #include <QPainterPath>
+#include <array>
 
 #include "skin/legacy/skincontext.h"
 #include "util/texture.h"
diff --git a/src/widget/wspinnyglsl.cpp b/src/widget/wspinnyglsl.cpp
index 71f84f31a2a..17f20ef70e0 100644
--- a/src/widget/wspinnyglsl.cpp
+++ b/src/widget/wspinnyglsl.cpp
@@ -1,6 +1,7 @@
 #include "widget/wspinnyglsl.h"
 
 #include <QOpenGLTexture>
+#include <array>
 
 #include "moc_wspinnyglsl.cpp"
 #include "util/texture.h"
diff --git a/src/widget/wvumeterglsl.cpp b/src/widget/wvumeterglsl.cpp
index 1a2f90f46ea..cd1ff511eef 100644
--- a/src/widget/wvumeterglsl.cpp
+++ b/src/widget/wvumeterglsl.cpp
@@ -1,6 +1,7 @@
 #include "widget/wvumeterglsl.h"
 
 #include <QOpenGLTexture>
+#include <array>
 
 #include "moc_wvumeterglsl.cpp"
 #include "util/duration.h"

From 38ae1cc38b9a2cb649fd12ba1ec8415251d79b65 Mon Sep 17 00:00:00 2001
From: djantti <djantti@proton.me>
Date: Fri, 8 Dec 2023 01:05:57 +0200
Subject: [PATCH 357/388] Use a more descriptive naming scheme for variables
 and functions

---
 res/controllers/Traktor-Kontrol-Z1-scripts.js | 124 +++++++++---------
 1 file changed, 62 insertions(+), 62 deletions(-)

diff --git a/res/controllers/Traktor-Kontrol-Z1-scripts.js b/res/controllers/Traktor-Kontrol-Z1-scripts.js
index 922b5f898a5..a18ad0b7af8 100644
--- a/res/controllers/Traktor-Kontrol-Z1-scripts.js
+++ b/res/controllers/Traktor-Kontrol-Z1-scripts.js
@@ -26,46 +26,46 @@ class TraktorZ1Class {
     }
 
     registerInputPackets() {
-        const message = new HIDPacket("message", 0x01, this.messageCallback.bind(this));
+        const InputReport0x01 = new HIDPacket("InputReport0x01", 0x01, this.inputReportCallback.bind(this));
 
         // Mode button
-        this.registerInputButton(message, "[ControlX]", "!mode", 0x1D, 0x02, this.modeHandler.bind(this));
+        this.registerInputButton(InputReport0x01, "[ControlX]", "!mode", 0x1D, 0x02, this.modeHandler.bind(this));
 
         // Headphone buttons
-        this.registerInputButton(message, "[Channel1]", "!pfl", 0x1D, 0x10, this.headphoneHandler.bind(this));
-        this.registerInputButton(message, "[Channel2]", "!pfl", 0x1D, 0x01, this.headphoneHandler.bind(this));
+        this.registerInputButton(InputReport0x01, "[Channel1]", "!pfl", 0x1D, 0x10, this.headphoneHandler.bind(this));
+        this.registerInputButton(InputReport0x01, "[Channel2]", "!pfl", 0x1D, 0x01, this.headphoneHandler.bind(this));
 
         // FX buttons
-        this.registerInputButton(message, "[Channel1]", "!fx", 0x1D, 0x04, this.fxHandler.bind(this));
-        this.registerInputButton(message, "[Channel2]", "!fx", 0x1D, 0x08, this.fxHandler.bind(this));
+        this.registerInputButton(InputReport0x01, "[Channel1]", "!fx", 0x1D, 0x04, this.fxHandler.bind(this));
+        this.registerInputButton(InputReport0x01, "[Channel2]", "!fx", 0x1D, 0x08, this.fxHandler.bind(this));
 
         // EQ knobs
-        this.registerInputScaler(message, "[EqualizerRack1_[Channel1]_Effect1]", "parameter3", 0x03, 0xFFFF, this.parameterHandler.bind(this));
-        this.registerInputScaler(message, "[EqualizerRack1_[Channel1]_Effect1]", "parameter2", 0x05, 0xFFFF, this.parameterHandler.bind(this));
-        this.registerInputScaler(message, "[EqualizerRack1_[Channel1]_Effect1]", "parameter1", 0x07, 0xFFFF, this.parameterHandler.bind(this));
-        this.registerInputScaler(message, "[EqualizerRack1_[Channel2]_Effect1]", "parameter3", 0x0D, 0xFFFF, this.parameterHandler.bind(this));
-        this.registerInputScaler(message, "[EqualizerRack1_[Channel2]_Effect1]", "parameter2", 0x0F, 0xFFFF, this.parameterHandler.bind(this));
-        this.registerInputScaler(message, "[EqualizerRack1_[Channel2]_Effect1]", "parameter1", 0x11, 0xFFFF, this.parameterHandler.bind(this));
+        this.registerInputScaler(InputReport0x01, "[EqualizerRack1_[Channel1]_Effect1]", "parameter3", 0x03, 0xFFFF, this.parameterHandler.bind(this));
+        this.registerInputScaler(InputReport0x01, "[EqualizerRack1_[Channel1]_Effect1]", "parameter2", 0x05, 0xFFFF, this.parameterHandler.bind(this));
+        this.registerInputScaler(InputReport0x01, "[EqualizerRack1_[Channel1]_Effect1]", "parameter1", 0x07, 0xFFFF, this.parameterHandler.bind(this));
+        this.registerInputScaler(InputReport0x01, "[EqualizerRack1_[Channel2]_Effect1]", "parameter3", 0x0D, 0xFFFF, this.parameterHandler.bind(this));
+        this.registerInputScaler(InputReport0x01, "[EqualizerRack1_[Channel2]_Effect1]", "parameter2", 0x0F, 0xFFFF, this.parameterHandler.bind(this));
+        this.registerInputScaler(InputReport0x01, "[EqualizerRack1_[Channel2]_Effect1]", "parameter1", 0x11, 0xFFFF, this.parameterHandler.bind(this));
 
         // FX knobs
-        this.registerInputScaler(message, "[QuickEffectRack1_[Channel1]]", "super1", 0x09, 0xFFFF, this.parameterHandler.bind(this));
-        this.registerInputScaler(message, "[QuickEffectRack1_[Channel2]]", "super1", 0x13, 0xFFFF, this.parameterHandler.bind(this));
+        this.registerInputScaler(InputReport0x01, "[QuickEffectRack1_[Channel1]]", "super1", 0x09, 0xFFFF, this.parameterHandler.bind(this));
+        this.registerInputScaler(InputReport0x01, "[QuickEffectRack1_[Channel2]]", "super1", 0x13, 0xFFFF, this.parameterHandler.bind(this));
 
         // Gain knobs
-        this.registerInputScaler(message, "[Channel1]", "pregain", 0x01, 0xFFFF, this.parameterHandler.bind(this));
-        this.registerInputScaler(message, "[Channel2]", "pregain", 0x0B, 0xFFFF, this.parameterHandler.bind(this));
+        this.registerInputScaler(InputReport0x01, "[Channel1]", "pregain", 0x01, 0xFFFF, this.parameterHandler.bind(this));
+        this.registerInputScaler(InputReport0x01, "[Channel2]", "pregain", 0x0B, 0xFFFF, this.parameterHandler.bind(this));
 
         // Headphone mix
-        this.registerInputScaler(message, "[Master]", "headMix", 0x15, 0xFFFF, this.parameterHandler.bind(this));
+        this.registerInputScaler(InputReport0x01, "[Master]", "headMix", 0x15, 0xFFFF, this.parameterHandler.bind(this));
 
         // Volume faders
-        this.registerInputScaler(message, "[Channel1]", "volume", 0x17, 0xFFFF, this.parameterHandler.bind(this));
-        this.registerInputScaler(message, "[Channel2]", "volume", 0x19, 0xFFFF, this.parameterHandler.bind(this));
+        this.registerInputScaler(InputReport0x01, "[Channel1]", "volume", 0x17, 0xFFFF, this.parameterHandler.bind(this));
+        this.registerInputScaler(InputReport0x01, "[Channel2]", "volume", 0x19, 0xFFFF, this.parameterHandler.bind(this));
 
         // Crossfader
-        this.registerInputScaler(message, "[Master]", "crossfader", 0x1B, 0xFFFF, this.parameterHandler.bind(this));
+        this.registerInputScaler(InputReport0x01, "[Master]", "crossfader", 0x1B, 0xFFFF, this.parameterHandler.bind(this));
 
-        this.controller.registerInputPacket(message);
+        this.controller.registerInputPacket(InputReport0x01);
 
         // Soft takeover for all knobs and faders
         engine.softTakeover("[EqualizerRack1_[Channel1]_Effect1]", "parameter3", true);
@@ -90,47 +90,47 @@ class TraktorZ1Class {
         engine.softTakeover("[Master]", "crossfader", true);
     }
 
-    registerInputButton(message, group, name, offset, bitmask, callback) {
-        message.addControl(group, name, offset, "B", bitmask);
-        message.setCallback(group, name, callback);
+    registerInputButton(inputReport, group, name, offset, bitmask, callback) {
+        inputReport.addControl(group, name, offset, "B", bitmask);
+        inputReport.setCallback(group, name, callback);
     }
 
-    registerInputScaler(message, group, name, offset, bitmask, callback) {
-        message.addControl(group, name, offset, "H", bitmask);
-        message.setCallback(group, name, callback);
+    registerInputScaler(inputReport, group, name, offset, bitmask, callback) {
+        inputReport.addControl(group, name, offset, "H", bitmask);
+        inputReport.setCallback(group, name, callback);
     }
 
     registerOutputPackets() {
-        const output = new HIDPacket("output", 0x80);
+        const OutputReport0x80 = new HIDPacket("OutputReport0x80", 0x80);
 
-        output.addOutput("[ControlX]", "mode", 0x13, "B");
+        OutputReport0x80.addOutput("[ControlX]", "mode", 0x13, "B");
 
-        output.addOutput("[Channel1]", "pfl", 0x0F, "B");
-        output.addOutput("[Channel2]", "pfl", 0x10, "B");
+        OutputReport0x80.addOutput("[Channel1]", "pfl", 0x0F, "B");
+        OutputReport0x80.addOutput("[Channel2]", "pfl", 0x10, "B");
 
-        output.addOutput("[Channel1]", "play_indicator", 0x11, "B");
-        output.addOutput("[Channel2]", "play_indicator", 0x14, "B");
+        OutputReport0x80.addOutput("[Channel1]", "play_indicator", 0x11, "B");
+        OutputReport0x80.addOutput("[Channel2]", "play_indicator", 0x14, "B");
 
-        output.addOutput("[QuickEffectRack1_[Channel1]]", "enabled", 0x12, "B");
-        output.addOutput("[QuickEffectRack1_[Channel2]]", "enabled", 0x15, "B");
+        OutputReport0x80.addOutput("[QuickEffectRack1_[Channel1]]", "enabled", 0x12, "B");
+        OutputReport0x80.addOutput("[QuickEffectRack1_[Channel2]]", "enabled", 0x15, "B");
 
-        output.addOutput("[Channel1]", "vu-30", 0x01, "B");
-        output.addOutput("[Channel1]", "vu-15", 0x02, "B");
-        output.addOutput("[Channel1]", "vu-6", 0x03, "B");
-        output.addOutput("[Channel1]", "vu-3", 0x04, "B");
-        output.addOutput("[Channel1]", "vu0", 0x05, "B");
-        output.addOutput("[Channel1]", "vu3", 0x06, "B");
-        output.addOutput("[Channel1]", "vu6", 0x07, "B");
+        OutputReport0x80.addOutput("[Channel1]", "vu-30", 0x01, "B");
+        OutputReport0x80.addOutput("[Channel1]", "vu-15", 0x02, "B");
+        OutputReport0x80.addOutput("[Channel1]", "vu-6", 0x03, "B");
+        OutputReport0x80.addOutput("[Channel1]", "vu-3", 0x04, "B");
+        OutputReport0x80.addOutput("[Channel1]", "vu0", 0x05, "B");
+        OutputReport0x80.addOutput("[Channel1]", "vu3", 0x06, "B");
+        OutputReport0x80.addOutput("[Channel1]", "vu6", 0x07, "B");
 
-        output.addOutput("[Channel2]", "vu-30", 0x08, "B");
-        output.addOutput("[Channel2]", "vu-15", 0x09, "B");
-        output.addOutput("[Channel2]", "vu-6", 0x0A, "B");
-        output.addOutput("[Channel2]", "vu-3", 0x0B, "B");
-        output.addOutput("[Channel2]", "vu0", 0x0C, "B");
-        output.addOutput("[Channel2]", "vu3", 0x0D, "B");
-        output.addOutput("[Channel2]", "vu6", 0x0E, "B");
+        OutputReport0x80.addOutput("[Channel2]", "vu-30", 0x08, "B");
+        OutputReport0x80.addOutput("[Channel2]", "vu-15", 0x09, "B");
+        OutputReport0x80.addOutput("[Channel2]", "vu-6", 0x0A, "B");
+        OutputReport0x80.addOutput("[Channel2]", "vu-3", 0x0B, "B");
+        OutputReport0x80.addOutput("[Channel2]", "vu0", 0x0C, "B");
+        OutputReport0x80.addOutput("[Channel2]", "vu3", 0x0D, "B");
+        OutputReport0x80.addOutput("[Channel2]", "vu6", 0x0E, "B");
 
-        this.controller.registerOutputPacket(output);
+        this.controller.registerOutputPacket(OutputReport0x80);
 
         engine.makeConnection("[QuickEffectRack1_[Channel1]]", "enabled", this.outputHandler.bind(this));
         engine.makeConnection("[QuickEffectRack1_[Channel2]]", "enabled", this.outputHandler.bind(this));
@@ -170,8 +170,8 @@ class TraktorZ1Class {
         // Control playback when modifier is active
         if (this.modePressed) {
             // Match play indicator (red led) brightness to fx indicator (blue led)
-            const current = engine.getValue("[QuickEffectRack1_" + field.group + "]", "enabled") ? 0x7F : 0x0A;
-            this.controller.setOutput(field.group, "play_indicator", current, true);
+            const ledBrightness = engine.getValue("[QuickEffectRack1_" + field.group + "]", "enabled") ? 0x7F : 0x0A;
+            this.controller.setOutput(field.group, "play_indicator", ledBrightness, true);
             script.toggleControl(field.group, "play");
         } else {
             script.toggleControl("[QuickEffectRack1_" + field.group + "]", "enabled");
@@ -210,7 +210,7 @@ class TraktorZ1Class {
     lightDeck(switchOff) {
         let softLight = 0x0A;
         let fullLight = 0x7F;
-        let current;
+        let ledBrightness;
 
         if (switchOff) {
             softLight = 0x00;
@@ -219,18 +219,18 @@ class TraktorZ1Class {
 
         this.controller.setOutput("[ControlX]", "mode", softLight, true);
 
-        current = engine.getValue("[QuickEffectRack1_[Channel1]]", "enabled") ? fullLight : softLight;
-        this.controller.setOutput("[QuickEffectRack1_[Channel1]]", "enabled", current, true);
-        current = engine.getValue("[QuickEffectRack1_[Channel2]]", "enabled") ? fullLight : softLight;
-        this.controller.setOutput("[QuickEffectRack1_[Channel2]]", "enabled", current, true);
+        ledBrightness = engine.getValue("[QuickEffectRack1_[Channel1]]", "enabled") ? fullLight : softLight;
+        this.controller.setOutput("[QuickEffectRack1_[Channel1]]", "enabled", ledBrightness, true);
+        ledBrightness = engine.getValue("[QuickEffectRack1_[Channel2]]", "enabled") ? fullLight : softLight;
+        this.controller.setOutput("[QuickEffectRack1_[Channel2]]", "enabled", ledBrightness, true);
 
-        current = engine.getValue("[Channel1]", "pfl") ? fullLight : softLight;
-        this.controller.setOutput("[Channel1]", "pfl", current, true);
-        current = engine.getValue("[Channel2]", "pfl") ? fullLight : softLight;
-        this.controller.setOutput("[Channel2]", "pfl", current, true);
+        ledBrightness = engine.getValue("[Channel1]", "pfl") ? fullLight : softLight;
+        this.controller.setOutput("[Channel1]", "pfl", ledBrightness, true);
+        ledBrightness = engine.getValue("[Channel2]", "pfl") ? fullLight : softLight;
+        this.controller.setOutput("[Channel2]", "pfl", ledBrightness, true);
     }
 
-    messageCallback(packet, data) {
+    inputReportCallback(packet, data) {
         for (const name in data) {
             if (Object.hasOwnProperty.call(data, name)) {
                 this.controller.processButton(data[name]);

From f69e0db8198c40c779866c8980bfa92ac9699557 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Fri, 8 Dec 2023 01:13:00 +0100
Subject: [PATCH 358/388] Revert "DEBUG (Remove!): add pitch_adjust slider to
 LateNight"

This reverts commit 4138858a492158257383562a729f435c4574164c.
---
 .../controls/button_2state_isEqual.xml        |  37 -----
 res/skins/LateNight/decks/rate_controls.xml   |  90 +----------
 .../decks/row_5_transportLoopJump.xml         | 152 +++++++++++++-----
 res/skins/LateNight/style_palemoon.qss        |   6 +-
 4 files changed, 116 insertions(+), 169 deletions(-)
 delete mode 100644 res/skins/LateNight/controls/button_2state_isEqual.xml

diff --git a/res/skins/LateNight/controls/button_2state_isEqual.xml b/res/skins/LateNight/controls/button_2state_isEqual.xml
deleted file mode 100644
index 63b38626288..00000000000
--- a/res/skins/LateNight/controls/button_2state_isEqual.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
-Description:
-  A button that has click or display controls.
-Variables:
-  ObjectName        : object name
-  ToolTipID         : standard Tooltip from mixxx db
-    see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/TooltipIds.cpp
-  Size              : button size
-  state_X_text      : label text for state X
-  state_X_pressed   : background graphic for pressed state X
-  state_X_unpressed : background graphic for unpressed state X
-  Align             : alignment of text
-  ConfigKey         : left-click control
--->
-<Template>
-  <PushButton>
-    <TooltipId><Variable name="TooltipId"/></TooltipId>
-    <ObjectName><Variable name="ObjectName"/></ObjectName>
-    <Size><Variable name="Size"/></Size>
-    <NumberStates>2</NumberStates>
-    <State>
-      <Number>0</Number>
-      <Text><Variable name="text"/></Text>
-      <Alignment><Variable name="Align"/></Alignment>
-    </State>
-    <State>
-      <Number>1</Number>
-      <Text><Variable name="text"/></Text>
-      <Alignment><Variable name="Align"/></Alignment>
-    </State>
-    <Connection>
-      <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
-      <Transform><IsEqual><Variable name="IsEqual"/></IsEqual></Transform>
-      <ButtonState>LeftButton</ButtonState>
-    </Connection>
-  </PushButton>
-</Template>
diff --git a/res/skins/LateNight/decks/rate_controls.xml b/res/skins/LateNight/decks/rate_controls.xml
index 33258d8a2e8..5312212b48f 100644
--- a/res/skins/LateNight/decks/rate_controls.xml
+++ b/res/skins/LateNight/decks/rate_controls.xml
@@ -17,16 +17,15 @@
       <WidgetGroup>
         <ObjectName>RateContainer</ObjectName>
         <Layout>vertical</Layout>
-        <SizePolicy>max,me</SizePolicy>
+        <SizePolicy>min,me</SizePolicy>
         <Children>
 
           <WidgetGroup><!-- BPM + rate + Tap overlay-->
             <ObjectName>BpmRateTapContainer</ObjectName>
-            <Layout>horizontal</Layout>
+            <Layout>vertical</Layout>
             <SizePolicy>min,me</SizePolicy>
             <MaximumSize>,46</MaximumSize>
             <Children>
-              <WidgetGroup><Size>0me,0min</Size></WidgetGroup>
               <WidgetGroup>
                 <ObjectName>BpmTapContainer</ObjectName>
                 <Layout>stacked</Layout>
@@ -75,7 +74,6 @@
             <Layout>horizontal</Layout>
             <SizePolicy>min,min</SizePolicy>
             <Children>
-              <WidgetGroup><Size>0me,0min</Size></WidgetGroup>
               <PushButton>
                 <TooltipId>sync_enabled</TooltipId>
                 <ObjectName>SyncDeck</ObjectName>
@@ -112,90 +110,6 @@
             <SizePolicy>min,min</SizePolicy>
             <Children>
 
-              <!-- pitch_adjust slider + center indicator -->
-              <WidgetGroup>
-                <ObjectName>RateSliderBox</ObjectName>
-                <Layout>stacked</Layout>
-                <SizePolicy>max,me</SizePolicy>
-                <Children>
-
-                  <WidgetGroup>
-                    <Size>34f,121f</Size>
-                    <Children>
-                      <Label>
-                        <ObjectName>RateCenter</ObjectName>
-                        <Size>5f,5f</Size>
-                        <Pos>2,59</Pos>
-                        <Connection>
-                          <ConfigKey><Variable name="Group"/>,pitch_adjust_set_default</ConfigKey>
-                          <BindProperty>highlight</BindProperty>
-                        </Connection>
-                      </Label>
-                      <SliderComposed>
-                        <ObjectName>RateSlider</ObjectName>
-                        <Size>20f,119f</Size>
-                        <Pos>5,2</Pos>
-                        <TooltipId>pitch_adjust</TooltipId>
-                        <Handle scalemode="STRETCH">skin:/<Variable name="SliderScheme"/>/sliders/knob_pitch_deck.svg</Handle>
-                        <Slider scalemode="STRETCH">skin:/<Variable name="SliderScheme"/>/sliders/slider_pitch_deck.svg</Slider>
-                        <Horizontal>false</Horizontal>
-                        <BarWidth><Variable name="BarWidth"/></BarWidth>
-                        <BarMargins><Variable name="BarMarginPitch"/></BarMargins>
-                        <BarColor><Variable name="BarColorPitch"/></BarColor>
-                        <BarRoundCaps>true</BarRoundCaps>
-                        <BarAxisPos>10.0</BarAxisPos>
-                        <BarUnipolar>false</BarUnipolar>
-                        <Connection>
-                          <ConfigKey><Variable name="Group"/>,pitch_adjust</ConfigKey>
-                        </Connection>
-                      </SliderComposed>
-                    </Children>
-                  </WidgetGroup><!-- Rate slider + center indicator -->
-                </Children>
-              </WidgetGroup>
-
-              <!-- pitch slider + center indicator -->
-              <WidgetGroup>
-                <ObjectName>RateSliderBox</ObjectName>
-                <Layout>stacked</Layout>
-                <SizePolicy>max,me</SizePolicy>
-                <Children>
-
-                  <WidgetGroup>
-                    <Size>34f,121f</Size>
-                    <Children>
-                      <Label>
-                        <ObjectName>RateCenter</ObjectName>
-                        <Size>5f,5f</Size>
-                        <Pos>2,59</Pos>
-                        <Connection>
-                          <ConfigKey><Variable name="Group"/>,pitch_set_default</ConfigKey>
-                          <BindProperty>highlight</BindProperty>
-                        </Connection>
-                      </Label>
-                      <SliderComposed>
-                        <ObjectName>RateSlider</ObjectName>
-                        <Size>20f,119f</Size>
-                        <Pos>5,2</Pos>
-                        <TooltipId>pitch_adjust</TooltipId>
-                        <Handle scalemode="STRETCH">skin:/<Variable name="SliderScheme"/>/sliders/knob_pitch_deck.svg</Handle>
-                        <Slider scalemode="STRETCH">skin:/<Variable name="SliderScheme"/>/sliders/slider_pitch_deck.svg</Slider>
-                        <Horizontal>false</Horizontal>
-                        <BarWidth><Variable name="BarWidth"/></BarWidth>
-                        <BarMargins><Variable name="BarMarginPitch"/></BarMargins>
-                        <BarColor><Variable name="BarColorPitch"/></BarColor>
-                        <BarRoundCaps>true</BarRoundCaps>
-                        <BarAxisPos>10.0</BarAxisPos>
-                        <BarUnipolar>false</BarUnipolar>
-                        <Connection>
-                          <ConfigKey><Variable name="Group"/>,pitch</ConfigKey>
-                        </Connection>
-                      </SliderComposed>
-                    </Children>
-                  </WidgetGroup><!-- Rate slider + center indicator -->
-                </Children>
-              </WidgetGroup>
-
               <WidgetGroup><!-- Rate slider + range displays -->
                 <ObjectName>RateSliderBox</ObjectName>
                 <Layout>stacked</Layout>
diff --git a/res/skins/LateNight/decks/row_5_transportLoopJump.xml b/res/skins/LateNight/decks/row_5_transportLoopJump.xml
index f7ded27c21a..3ef81e60f83 100644
--- a/res/skins/LateNight/decks/row_5_transportLoopJump.xml
+++ b/res/skins/LateNight/decks/row_5_transportLoopJump.xml
@@ -222,64 +222,73 @@
             </Connection>
           </WidgetGroup><!-- / Intro + Outro -->
 
-          <WidgetGroup><SizePolicy>me,min</SizePolicy></WidgetGroup>
+          <WidgetGroup><Size>2f,0min</Size></WidgetGroup><!--  = 2-8px wide -->
+          <WidgetGroup><SizePolicy>i,min</SizePolicy><MaximumSize>80,</MaximumSize></WidgetGroup>
 
-          <!-- Keylock/unlock controls -->
-          <WidgetGroup>
+          <WidgetGroup><!-- Loop buttons + beatloop size spinbox -->
             <ObjectName>LoopControls</ObjectName>
             <Layout>vertical</Layout>
             <SizePolicy>min,min</SizePolicy>
+            <MinimumSize>78,52</MinimumSize>
+            <MaximumSize>86,52</MaximumSize>
             <Children>
-              <WidgetGroup><!-- Keylock mode -->
+              <WidgetGroup><!-- loop enable + beatloop size -->
                 <ObjectName>AlignLeftTop</ObjectName>
                 <Layout>horizontal</Layout>
                 <SizePolicy>min,max</SizePolicy>
                 <Children>
-                  <Label>
-                    <ObjectName>KeylockLabel</ObjectName>
-                    <Size>21f,18f</Size>
-                  </Label>
-                  <Template src="skin:../LateNight/controls/button_2state_isEqual.xml">
-                    <SetVariable name="ObjectName">PassthroughButton</SetVariable>
-                    <SetVariable name="Size">40f,26f</SetVariable>
-                    <SetVariable name="text">Reset</SetVariable>
-                    <SetVariable name="IsEqual">0</SetVariable>
-                    <SetVariable name="ConfigKey"><Variable name="Group"/>,keylockMode</SetVariable>
-                  </Template>
-                  <Template src="skin:../LateNight/controls/button_2state_isEqual.xml">
-                    <SetVariable name="ObjectName">PassthroughButton</SetVariable>
-                    <SetVariable name="Size">40f,26f</SetVariable>
-                    <SetVariable name="text">Keep</SetVariable>
-                    <SetVariable name="IsEqual">1</SetVariable>
-                    <SetVariable name="ConfigKey"><Variable name="Group"/>,keylockMode</SetVariable>
+                  <Template src="skin:../LateNight/controls/button_2state_right_display.xml">
+                    <SetVariable name="TooltipId">beatloop_activate</SetVariable>
+                    <SetVariable name="ObjectName">LoopActivate</SetVariable>
+                    <SetVariable name="Size">26f,26f</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="Group"/>,beatloop_activate</SetVariable>
+                    <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,beatlooproll_activate</SetVariable>
+                    <SetVariable name="ConfigKeyDisp"><Variable name="Group"/>,loop_enabled</SetVariable>
                   </Template>
+
+                  <BeatSpinBox>
+                    <TooltipId>beatloop_size</TooltipId>
+                    <ObjectName>Spinbox_<Variable name="BtnType"/></ObjectName>
+                    <SizePolicy>me,min</SizePolicy>
+                    <MinimumSize>46,26</MinimumSize>
+                    <MaximumSize>72,26</MaximumSize>
+                    <Value><Variable name="Group"/>,beatloop_size</Value>
+                    <!-- disabled until 'highlight' property has been added to WBeatSpinBox / wbasewidget.
+                    <Connection>
+                      <ConfigKey><Variable name="Group"/>,track_loaded</ConfigKey>
+                      <BindProperty>highlight</BindProperty>
+                    </Connection> -->
+                  </BeatSpinBox>
                 </Children>
               </WidgetGroup>
 
-              <WidgetGroup><!-- Keyunlock mode -->
+              <WidgetGroup>
                 <ObjectName>AlignLeftTop</ObjectName>
                 <Layout>horizontal</Layout>
                 <SizePolicy>min,max</SizePolicy>
                 <Children>
-                  <Label>
-                    <ObjectName>KeyunlockLabel</ObjectName>
-                    <Size>21f,18f</Size>
-                  </Label>
-                  <Template src="skin:../LateNight/controls/button_2state_isEqual.xml">
-                    <SetVariable name="TooltipId">beatloop_activate</SetVariable>
-                    <SetVariable name="ObjectName">PassthroughButton</SetVariable>
-                    <SetVariable name="Size">40f,26f</SetVariable>
-                    <SetVariable name="text">Reset</SetVariable>
-                    <SetVariable name="IsEqual">0</SetVariable>
-                    <SetVariable name="ConfigKey"><Variable name="Group"/>,keyunlockMode</SetVariable>
+                  <Template src="skin:../LateNight/controls/button_2state_right.xml">
+                    <SetVariable name="TooltipId">reloop_toggle</SetVariable>
+                    <SetVariable name="ObjectName">Reloop</SetVariable>
+                    <SetVariable name="Size">26f,26f</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="Group"/>,reloop_toggle</SetVariable>
+                    <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,reloop_andstop</SetVariable>
                   </Template>
-                  <Template src="skin:../LateNight/controls/button_2state_isEqual.xml">
-                    <SetVariable name="TooltipId">beatloop_activate</SetVariable>
-                    <SetVariable name="ObjectName">PassthroughButton</SetVariable>
-                    <SetVariable name="Size">40f,26f</SetVariable>
-                    <SetVariable name="text">Keep</SetVariable>
-                    <SetVariable name="IsEqual">1</SetVariable>
-                    <SetVariable name="ConfigKey"><Variable name="Group"/>,keyunlockMode</SetVariable>
+
+                  <Template src="skin:../LateNight/controls/button_1state_right.xml">
+                    <SetVariable name="TooltipId">loop_in</SetVariable>
+                    <SetVariable name="ObjectName">LoopIn</SetVariable>
+                    <SetVariable name="Size">26f,26f</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="Group"/>,loop_in</SetVariable>
+                    <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,loop_in_goto</SetVariable>
+                  </Template>
+
+                  <Template src="skin:../LateNight/controls/button_1state_right.xml">
+                    <SetVariable name="TooltipId">loop_out</SetVariable>
+                    <SetVariable name="ObjectName">LoopOut</SetVariable>
+                    <SetVariable name="Size">26f,26f</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="Group"/>,loop_out</SetVariable>
+                    <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,loop_out_goto</SetVariable>
                   </Template>
                 </Children>
               </WidgetGroup>
@@ -290,7 +299,70 @@
             </Connection>
           </WidgetGroup><!-- /Loop buttons + beatloop size spinbox -->
 
+          <WidgetGroup><Size>2f,0min</Size></WidgetGroup><!--  = 2-80px wide -->
+          <WidgetGroup><SizePolicy>i,min</SizePolicy><MaximumSize>80,</MaximumSize></WidgetGroup>
+
+          <WidgetGroup><!-- Jump buttons + beatjump size spinbox -->
+            <ObjectName>BeatjumpControls</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <MinimumSize>52,52</MinimumSize>
+            <MaximumSize>60,52</MaximumSize>
+            <Children>
+              <WidgetGroup><!-- beatjump size -->
+                <ObjectName>AlignLeftTop</ObjectName>
+                <Layout>horizontal</Layout>
+                <SizePolicy>0min,26f</SizePolicy>
+                <Children>
+                  <!-- put this spacer here so BeatSpinBox expands with HiDPI scaling
+                  <WidgetGroup><Size>0f,26f</Size></WidgetGroup> -->
+                  <BeatSpinBox>
+                    <TooltipId>beatjump_size</TooltipId>
+                    <ObjectName>Spinbox_<Variable name="BtnType"/></ObjectName>
+                    <SizePolicy>me,min</SizePolicy>
+                    <MinimumSize>46,26</MinimumSize>
+                    <MaximumSize>72,26</MaximumSize>
+                    <Value><Variable name="Group"/>,beatjump_size</Value>
+                    <!-- disabled until 'highlight' property has been added to WBeatSpinBox / wbasewidget.
+                    <Connection>
+                      <ConfigKey><Variable name="Group"/>,track_loaded</ConfigKey>
+                      <BindProperty>highlight</BindProperty>
+                    </Connection> -->
+                  </BeatSpinBox>
+                </Children>
+              </WidgetGroup>
+              <WidgetGroup>
+                <ObjectName>AlignLeftTop</ObjectName>
+                <Layout>horizontal</Layout>
+                <SizePolicy>min,max</SizePolicy>
+                <Children>
+
+                  <Template src="skin:../LateNight/controls/button_1state_right.xml">
+                    <SetVariable name="TooltipId">beatjump_backward</SetVariable>
+                    <SetVariable name="ObjectName">JumpBack</SetVariable>
+                    <SetVariable name="Size">26f,26f</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="Group"/>,beatjump_backward</SetVariable>
+                    <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,beatjump_1_backward</SetVariable>
+                  </Template>
+
+                  <Template src="skin:../LateNight/controls/button_1state_right.xml">
+                    <SetVariable name="TooltipId">beatjump_forward</SetVariable>
+                    <SetVariable name="ObjectName">JumpForward</SetVariable>
+                    <SetVariable name="Size">26f,26f</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="Group"/>,beatjump_forward</SetVariable>
+                    <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,beatjump_1_forward</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+            </Children>
+            <Connection>
+              <ConfigKey>[Skin],show_beatjump_controls</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup><!-- /Jump buttons + beatjump size spinbox -->
+
           <WidgetGroup><Size>2f,0min</Size></WidgetGroup>
+          <WidgetGroup><SizePolicy>i,min</SizePolicy></WidgetGroup>
         </Children>
       </WidgetGroup><!-- DeckRow_5_LoopCuesTransport -->
     </Children>
diff --git a/res/skins/LateNight/style_palemoon.qss b/res/skins/LateNight/style_palemoon.qss
index 6e46ef44e8d..c0d775092a1 100644
--- a/res/skins/LateNight/style_palemoon.qss
+++ b/res/skins/LateNight/style_palemoon.qss
@@ -2302,12 +2302,10 @@ WPushButton#PlayDeck[value="0"] {
       image: url(skin:../LateNight/palemoon/buttons/btn__slip_active_34.svg) no-repeat center center;
     }
 
-  #KeylockButton12[displayValue="0"], #KeylockButton34[displayValue="0"],
-  #KeyunlockLabel {
+  #KeylockButton12[displayValue="0"], #KeylockButton34[displayValue="0"] {
     image: url(skin:../LateNight/palemoon/buttons/btn__keylock.svg) no-repeat center center;
     }
-    #KeylockButton12[displayValue="1"],
-    #KeylockLabel {
+    #KeylockButton12[displayValue="1"] {
       image: url(skin:../LateNight/palemoon/buttons/btn__keylock_active_12.svg) no-repeat center center;
     }
     #KeylockButton34[displayValue="1"] {

From 21c187a73479d8f214fd24d90967d7b1129f9ac4 Mon Sep 17 00:00:00 2001
From: Owen Williams <owilliams@mixxx.org>
Date: Thu, 7 Dec 2023 22:22:37 -0500
Subject: [PATCH 359/388] Traktor S3: fixes and updates

Fixes main vu meter output connections
Update to use non-deprecated makeConnection function
---
 .../Traktor-Kontrol-S3-hid-scripts.js         | 54 +++++++++----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/res/controllers/Traktor-Kontrol-S3-hid-scripts.js b/res/controllers/Traktor-Kontrol-S3-hid-scripts.js
index 40f90428e0d..0af5c7fa44f 100644
--- a/res/controllers/Traktor-Kontrol-S3-hid-scripts.js
+++ b/res/controllers/Traktor-Kontrol-S3-hid-scripts.js
@@ -132,12 +132,12 @@ TraktorS3.Controller = class {
         this.fxButtonState = {1: false, 2: false, 3: false, 4: false, 5: false};
 
         this.masterVuMeter = {
-            "VuMeterL": {
+            "vu_meter_left": {
                 connection: null,
                 updated: false,
                 value: 0
             },
-            "VuMeterR": {
+            "vu_meter_right": {
                 connection: null,
                 updated: false,
                 value: 0
@@ -281,9 +281,9 @@ TraktorS3.Controller = class {
             const chanob = this.Channels[ch];
             engine.makeConnection(ch, "playposition",
                 TraktorS3.Channel.prototype.playpositionChanged.bind(chanob));
-            engine.connectControl(ch, "track_loaded",
+            engine.makeConnection(ch, "track_loaded",
                 TraktorS3.Channel.prototype.trackLoadedHandler.bind(chanob));
-            engine.connectControl(ch, "end_of_track",
+            engine.makeConnection(ch, "end_of_track",
                 TraktorS3.Channel.prototype.endOfTrackHandler.bind(chanob));
         }
 
@@ -496,17 +496,17 @@ TraktorS3.Controller = class {
         };
         for (const ch in VuOffsets) {
             for (let i = 0; i < 14; i++) {
-                outputB.addOutput(ch, "!" + "VuMeter" + i, VuOffsets[ch] + i, "B");
+                outputB.addOutput(ch, "!" + "vu_meter" + i, VuOffsets[ch] + i, "B");
             }
         }
 
         const MasterVuOffsets = {
-            "VuMeterL": 0x3D,
-            "VuMeterR": 0x46
+            "vu_meter_left": 0x3D,
+            "vu_meter_right": 0x46
         };
         for (let i = 0; i < 8; i++) {
-            outputB.addOutput("[Master]", "!" + "VuMeterL" + i, MasterVuOffsets.VuMeterL + i, "B");
-            outputB.addOutput("[Master]", "!" + "VuMeterR" + i, MasterVuOffsets.VuMeterR + i, "B");
+            outputB.addOutput("[Main]", "!" + "vu_meter_left" + i, MasterVuOffsets.vu_meter_left + i, "B");
+            outputB.addOutput("[Main]", "!" + "vu_meter_right" + i, MasterVuOffsets.vu_meter_right + i, "B");
         }
 
         outputB.addOutput("[Main]", "peak_indicator_left", 0x45, "B");
@@ -527,13 +527,13 @@ TraktorS3.Controller = class {
             this.Channels[idx].linkOutputs();
         }
 
-        engine.connectControl("[Microphone]", "pfl", this.pflOutput);
+        engine.makeConnection("[Microphone]", "pfl", this.pflOutput);
 
-        engine.connectControl("[Skin]", "show_maximized_library", TraktorS3.Controller.prototype.maximizeLibraryOutput.bind(this));
+        engine.makeConnection("[Skin]", "show_maximized_library", TraktorS3.Controller.prototype.maximizeLibraryOutput.bind(this));
 
         // Master VuMeters
-        this.masterVuMeter.VuMeterL.connection = engine.makeConnection("[Main]", "vu_meter_left", TraktorS3.Controller.prototype.masterVuMeterHandler.bind(this));
-        this.masterVuMeter.VuMeterR.connection = engine.makeConnection("[Main]", "vu_meter_right", TraktorS3.Controller.prototype.masterVuMeterHandler.bind(this));
+        this.masterVuMeter.vu_meter_left.connection = engine.makeConnection("[Main]", "vu_meter_left", TraktorS3.Controller.prototype.masterVuMeterHandler.bind(this));
+        this.masterVuMeter.vu_meter_right.connection = engine.makeConnection("[Main]", "vu_meter_right", TraktorS3.Controller.prototype.masterVuMeterHandler.bind(this));
         this.linkChannelOutput("[Main]", "peak_indicator_left", TraktorS3.Controller.prototype.peakOutput.bind(this));
         this.linkChannelOutput("[Main]", "peak_indicator_right", TraktorS3.Controller.prototype.peakOutput.bind(this));
         this.guiTickConnection = engine.makeConnection("[App]", "gui_tick_50ms_period_s", TraktorS3.Controller.prototype.guiTickHandler.bind(this));
@@ -764,7 +764,7 @@ TraktorS3.Controller = class {
 
         for (const vu in this.masterVuMeter) {
             if (this.masterVuMeter[vu].updated) {
-                this.vuMeterOutput(this.masterVuMeter[vu].value, "[Master]", vu, 8);
+                this.vuMeterOutput(this.masterVuMeter[vu].value, "[Main]", vu, 8);
                 this.masterVuMeter[vu].updated = false;
                 gotUpdate = true;
             }
@@ -772,7 +772,7 @@ TraktorS3.Controller = class {
         for (let ch = 1; ch <= 4; ch++) {
             const chan = this.Channels["[Channel" + ch + "]"];
             if (chan.vuMeterUpdated) {
-                this.vuMeterOutput(chan.vuMeterValue, chan.group, "VuMeter", 14);
+                this.vuMeterOutput(chan.vuMeterValue, chan.group, "vu_meter", 14);
                 chan.vuMeterUpdated = false;
                 gotUpdate = true;
             }
@@ -1449,11 +1449,11 @@ TraktorS3.Deck = class {
         switch (this.deckNumber) {
         case 1:
             this.controller.hid.linkOutput("deck1", key, "[Channel1]", key, callback);
-            engine.connectControl("[Channel3]", key, callback);
+            engine.makeConnection("[Channel3]", key, callback);
             break;
         case 2:
             this.controller.hid.linkOutput("deck2", key, "[Channel2]", key, callback);
-            engine.connectControl("[Channel4]", key, callback);
+            engine.makeConnection("[Channel4]", key, callback);
             break;
         }
     }
@@ -1516,7 +1516,7 @@ TraktorS3.Deck = class {
     }
 
     lightHotcue(number) {
-        const loaded = engine.getValue(this.activeChannel, "hotcue_" + number + "_enabled");
+        const loaded = engine.getValue(this.activeChannel, "hotcue_" + number + "_status");
         const active = engine.getValue(this.activeChannel, "hotcue_" + number + "_activate");
         let ledValue = this.controller.hid.LEDColors.WHITE;
         if (loaded) {
@@ -1695,7 +1695,7 @@ TraktorS3.Channel = class {
         this.clipConnection = engine.makeConnection(this.group, "peak_indicator", TraktorS3.Controller.prototype.peakOutput.bind(this.controller));
         this.controller.linkChannelOutput(this.group, "pfl", TraktorS3.Controller.prototype.pflOutput.bind(this.controller));
         for (let j = 1; j <= 8; j++) {
-            this.hotcueCallbacks.push(engine.makeConnection(this.group, "hotcue_" + j + "_enabled",
+            this.hotcueCallbacks.push(engine.makeConnection(this.group, "hotcue_" + j + "_status",
                 TraktorS3.Channel.prototype.hotcuesOutput.bind(this)));
             this.hotcueCallbacks.push(engine.makeConnection(this.group, "hotcue_" + j + "_activate",
                 TraktorS3.Channel.prototype.hotcuesOutput.bind(this)));
@@ -2402,17 +2402,17 @@ TraktorS3.QuickFxControl = class {
 
         // This changes the lighting of the five FX Select buttons and maybe
         // also the FX Enable buttons
-        engine.connectControl("[QuickEffectRack1_[Channel1]]", "loaded_chain_preset", this.quickEffectChainLoadHandler.bind(this));
-        engine.connectControl("[QuickEffectRack1_[Channel2]]", "loaded_chain_preset", this.quickEffectChainLoadHandler.bind(this));
-        engine.connectControl("[QuickEffectRack1_[Channel3]]", "loaded_chain_preset", this.quickEffectChainLoadHandler.bind(this));
-        engine.connectControl("[QuickEffectRack1_[Channel4]]", "loaded_chain_preset", this.quickEffectChainLoadHandler.bind(this));
+        engine.makeConnection("[QuickEffectRack1_[Channel1]]", "loaded_chain_preset", this.quickEffectChainLoadHandler.bind(this));
+        engine.makeConnection("[QuickEffectRack1_[Channel2]]", "loaded_chain_preset", this.quickEffectChainLoadHandler.bind(this));
+        engine.makeConnection("[QuickEffectRack1_[Channel3]]", "loaded_chain_preset", this.quickEffectChainLoadHandler.bind(this));
+        engine.makeConnection("[QuickEffectRack1_[Channel4]]", "loaded_chain_preset", this.quickEffectChainLoadHandler.bind(this));
 
         // The FX enable buttons can directly be bound to the quick effect chain
         // enabled status as their lighting doesn't depend on other factors
-        engine.connectControl("[QuickEffectRack1_[Channel1]]", "enabled", value => this.lightFxEnable(1, value === 1));
-        engine.connectControl("[QuickEffectRack1_[Channel2]]", "enabled", value => this.lightFxEnable(2, value === 1));
-        engine.connectControl("[QuickEffectRack1_[Channel3]]", "enabled", value => this.lightFxEnable(3, value === 1));
-        engine.connectControl("[QuickEffectRack1_[Channel4]]", "enabled", value => this.lightFxEnable(4, value === 1));
+        engine.makeConnection("[QuickEffectRack1_[Channel1]]", "enabled", value => this.lightFxEnable(1, value === 1));
+        engine.makeConnection("[QuickEffectRack1_[Channel2]]", "enabled", value => this.lightFxEnable(2, value === 1));
+        engine.makeConnection("[QuickEffectRack1_[Channel3]]", "enabled", value => this.lightFxEnable(3, value === 1));
+        engine.makeConnection("[QuickEffectRack1_[Channel4]]", "enabled", value => this.lightFxEnable(4, value === 1));
     }
 
     // Input handling

From 673c2d3e812baf8a6109bfe81f3b908fd56d511d Mon Sep 17 00:00:00 2001
From: Owen Williams <owilliams@mixxx.org>
Date: Thu, 7 Dec 2023 22:32:26 -0500
Subject: [PATCH 360/388] common hid: update uses of deprecated makeConnection

---
 res/controllers/common-hid-packet-parser.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/res/controllers/common-hid-packet-parser.js b/res/controllers/common-hid-packet-parser.js
index 5284a5f0d38..59e227a402b 100644
--- a/res/controllers/common-hid-packet-parser.js
+++ b/res/controllers/common-hid-packet-parser.js
@@ -2077,9 +2077,9 @@ class HIDController {
                                 continue;
                             }
                             const bitControlGroup = this.resolveGroup(bit.mapped_group);
-                            engine.connectControl(
+                            engine.makeConnection(
                                 bitControlGroup, bit.mapped_name, bit.mapped_callback, true);
-                            engine.connectControl(new_group, bit.mapped_name, bit.mapped_callback);
+                            engine.makeConnection(new_group, bit.mapped_name, bit.mapped_callback);
                             const value = engine.getValue(new_group, bit.mapped_name);
                             console.log(`Bit ${bit.group}.${bit.name} value ${value}`);
                             if (value) {
@@ -2100,9 +2100,9 @@ class HIDController {
                         continue;
                     }
                     const fieldControlGroup = this.resolveGroup(field.mapped_group);
-                    engine.connectControl(
+                    engine.makeConnection(
                         fieldControlGroup, field.mapped_name, field.mapped_callback, true);
-                    engine.connectControl(new_group, field.mapped_name, field.mapped_callback);
+                    engine.makeConnection(new_group, field.mapped_name, field.mapped_callback);
                     const value = engine.getValue(new_group, field.mapped_name);
                     if (value) {
                         this.setOutput(
@@ -2145,7 +2145,7 @@ class HIDController {
         field.mapped_group = m_group;
         field.mapped_name = m_name;
         field.mapped_callback = callback;
-        engine.connectControl(controlgroup, m_name, callback);
+        engine.makeConnection(controlgroup, m_name, callback);
         if (engine.getValue(controlgroup, m_name)) {
             this.setOutput(m_group, m_name, this.LEDColors.on);
         } else {
@@ -2169,7 +2169,7 @@ class HIDController {
             return;
         }
         const controlgroup = this.resolveGroup(field.mapped_group);
-        engine.connectControl(controlgroup, field.mapped_name, callback, true);
+        engine.makeConnection(controlgroup, field.mapped_name, callback, true);
         field.mapped_group = undefined;
         field.mapped_name = undefined;
         field.mapped_callback = undefined;

From e84bd66417746d33dd9d92a84e66f47f0fafc49f Mon Sep 17 00:00:00 2001
From: m0dB <m0dB@mixxx.org>
Date: Thu, 7 Dec 2023 23:07:36 +0100
Subject: [PATCH 361/388] edits from ronso0 from scaling-svg-for-retina

---
 res/skins/LateNight/style_palemoon.qss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/res/skins/LateNight/style_palemoon.qss b/res/skins/LateNight/style_palemoon.qss
index c0d775092a1..2966410dab3 100644
--- a/res/skins/LateNight/style_palemoon.qss
+++ b/res/skins/LateNight/style_palemoon.qss
@@ -830,6 +830,8 @@ WBeatSpinBox::down-button,
 
 WEffectChainPresetButton::menu-indicator {
   image: url(skin:../LateNight/palemoon/buttons/btn__fx_settings.svg) no-repeat center center;
+  width: 18px;
+  height: 18px;
 }
 
 #FxSlotsCollapsed {
@@ -909,6 +911,8 @@ WEffectSelector:!editable:on {
   /* Arrow size is set in C++ to match the library font size */
   WSearchLineEdit::down-arrow {
     image: url(skin:../LateNight/palemoon/buttons/btn__fx_selector_down.svg);
+    width: 16px;
+    height: 24px;
   }
 
 

From 3617f82c300fbd4e6e7c2c1067014c68396149c3 Mon Sep 17 00:00:00 2001
From: m0dB <m0dB@mixxx.org>
Date: Thu, 7 Dec 2023 22:54:48 +0100
Subject: [PATCH 362/388] width + height x2 and set viewBox w h + manually
 adjusted aux fx left mid right without viewBox

---
 res/skins/LateNight/classic/buttons/btn__.svg |  2 +-
 .../LateNight/classic/buttons/btn__1.svg      |  4 +-
 .../LateNight/classic/buttons/btn__2.svg      |  4 +-
 .../LateNight/classic/buttons/btn__3.svg      |  6 +-
 .../LateNight/classic/buttons/btn__4.svg      |  4 +-
 .../LateNight/classic/buttons/btn__5.svg      |  4 +-
 .../LateNight/classic/buttons/btn__6.svg      |  4 +-
 .../LateNight/classic/buttons/btn__7.svg      |  4 +-
 .../LateNight/classic/buttons/btn__8.svg      |  4 +-
 .../LateNight/classic/buttons/btn___.svg      |  2 +-
 .../classic/buttons/btn___active.svg          |  2 +-
 .../classic/buttons/btn___pressed.svg         |  2 +-
 .../classic/buttons/btn__arrow_left_down.svg  |  4 +-
 .../classic/buttons/btn__arrow_left_up.svg    |  4 +-
 .../classic/buttons/btn__arrow_right_down.svg |  4 +-
 .../classic/buttons/btn__arrow_right_up.svg   |  4 +-
 .../classic/buttons/btn__autodj_addrandom.svg |  2 +-
 .../buttons/btn__autodj_enable_off.svg        |  2 +-
 .../classic/buttons/btn__autodj_enable_on.svg |  2 +-
 .../classic/buttons/btn__autodj_fade.svg      |  2 +-
 .../buttons/btn__autodj_fade_disabled.svg     |  2 +-
 .../btn__autodj_repeat_playlist_off.svg       |  2 +-
 .../btn__autodj_repeat_playlist_on.svg        |  2 +-
 .../classic/buttons/btn__autodj_shuffle.svg   |  2 +-
 .../classic/buttons/btn__autodj_skip.svg      |  2 +-
 .../buttons/btn__autodj_skip_disabled.svg     |  2 +-
 .../classic/buttons/btn__aux_play.svg         |  2 +-
 .../classic/buttons/btn__beat_curpos.svg      |  2 +-
 .../buttons/btn__beat_curpos_active_12.svg    |  2 +-
 .../buttons/btn__beat_curpos_active_34.svg    |  2 +-
 .../buttons/btn__beat_curpos_large.svg        |  2 +-
 .../btn__beatgrid_controls_collapse.svg       |  6 +-
 .../buttons/btn__beatgrid_controls_expand.svg |  6 +-
 .../classic/buttons/btn__beatjump_left.svg    |  6 +-
 .../classic/buttons/btn__beatjump_right.svg   |  6 +-
 .../classic/buttons/btn__beats_earlier.svg    |  6 +-
 .../classic/buttons/btn__beats_faster.svg     |  6 +-
 .../buttons/btn__beats_hotcues_earlier.svg    |  6 +-
 .../buttons/btn__beats_hotcues_later.svg      |  6 +-
 .../classic/buttons/btn__beats_later.svg      |  6 +-
 .../classic/buttons/btn__beats_slower.svg     |  6 +-
 .../classic/buttons/btn__broadcast_off.svg    |  4 +-
 .../classic/buttons/btn__broadcast_on.svg     |  4 +-
 .../classic/buttons/btn__collapse.svg         |  6 +-
 .../classic/buttons/btn__collapse_dim.svg     |  6 +-
 .../classic/buttons/btn__cue_deck.svg         |  2 +-
 .../LateNight/classic/buttons/btn__delete.svg |  2 +-
 .../buttons/btn__effectselector_border.svg    |  2 +-
 .../LateNight/classic/buttons/btn__eject.svg  |  2 +-
 .../classic/buttons/btn__eject_active_12.svg  |  2 +-
 .../classic/buttons/btn__eject_active_34.svg  |  2 +-
 .../classic/buttons/btn__eq_kill_high.svg     |  6 +-
 .../classic/buttons/btn__eq_kill_low.svg      |  6 +-
 .../classic/buttons/btn__eq_kill_mid.svg      |  6 +-
 .../LateNight/classic/buttons/btn__expand.svg |  4 +-
 .../classic/buttons/btn__expand_dim.svg       |  6 +-
 .../LateNight/classic/buttons/btn__fx_2.svg   |  2 +-
 .../classic/buttons/btn__fx_2_active.svg      |  2 +-
 .../LateNight/classic/buttons/btn__fx_3.svg   |  2 +-
 .../classic/buttons/btn__fx_3_active.svg      |  2 +-
 .../LateNight/classic/buttons/btn__fx_4.svg   |  2 +-
 .../classic/buttons/btn__fx_4_active.svg      |  2 +-
 .../LateNight/classic/buttons/btn__fx_FX1.svg |  2 +-
 .../classic/buttons/btn__fx_FX1_active.svg    |  2 +-
 .../LateNight/classic/buttons/btn__fx_FX2.svg |  2 +-
 .../classic/buttons/btn__fx_FX2_active.svg    |  2 +-
 .../LateNight/classic/buttons/btn__fx_FX3.svg |  2 +-
 .../classic/buttons/btn__fx_FX3_active.svg    |  2 +-
 .../LateNight/classic/buttons/btn__fx_FX4.svg |  2 +-
 .../classic/buttons/btn__fx_FX4_active.svg    |  2 +-
 .../classic/buttons/btn__fx_focus.svg         |  4 +-
 .../classic/buttons/btn__fx_focus_active.svg  |  4 +-
 .../classic/buttons/btn__fx_mixmode_d+w.svg   |  4 +-
 .../classic/buttons/btn__fx_mixmode_d-w.svg   |  4 +-
 .../classic/buttons/btn__fx_selector_down.svg |  2 +-
 .../buttons/btn__fx_selector_down_pressed.svg |  2 +-
 .../classic/buttons/btn__fx_settings.svg      |  2 +-
 .../classic/buttons/btn__fx_toggle.svg        |  2 +-
 .../classic/buttons/btn__fx_toggle_active.svg |  2 +-
 .../classic/buttons/btn__intro_end.svg        |  2 +-
 .../classic/buttons/btn__intro_start.svg      |  2 +-
 .../classic/buttons/btn__key_down.svg         |  2 +-
 .../classic/buttons/btn__key_match.svg        |  2 +-
 .../LateNight/classic/buttons/btn__key_up.svg |  2 +-
 .../classic/buttons/btn__keylock.svg          |  2 +-
 .../buttons/btn__keylock_active_12.svg        |  2 +-
 .../buttons/btn__keylock_active_34.svg        |  2 +-
 .../classic/buttons/btn__leader_deck.svg      |  6 +-
 .../classic/buttons/btn__lib_bpm_down.svg     |  6 +-
 .../buttons/btn__lib_bpm_locked_orange.svg    |  2 +-
 .../buttons/btn__lib_bpm_unlocked_grey.svg    |  2 +-
 .../classic/buttons/btn__lib_bpm_up.svg       |  4 +-
 .../classic/buttons/btn__lib_checkbox.svg     |  2 +-
 .../buttons/btn__lib_checkbox_checked.svg     |  2 +-
 .../buttons/btn__lib_checkmark_grey.svg       |  2 +-
 .../btn__lib_checkmark_indeterminate_grey.svg |  2 +-
 ...tn__lib_checkmark_indeterminate_orange.svg |  2 +-
 .../buttons/btn__lib_checkmark_orange.svg     |  2 +-
 .../classic/buttons/btn__lib_clear_search.svg |  6 +-
 .../buttons/btn__lib_clear_search_focus.svg   |  6 +-
 .../buttons/btn__lib_preview_pause.svg        |  6 +-
 .../classic/buttons/btn__lib_preview_play.svg |  6 +-
 .../buttons/btn__lib_radio_button_gold_on.svg |  2 +-
 .../buttons/btn__lib_radio_button_off.svg     |  2 +-
 .../btn__lib_radio_button_on_yellow.svg       |  2 +-
 .../btn__lib_radio_button_yellow_on.svg       |  2 +-
 .../classic/buttons/btn__lib_sort_down.svg    |  2 +-
 .../classic/buttons/btn__lib_sort_up.svg      |  2 +-
 .../LateNight/classic/buttons/btn__loop.svg   |  2 +-
 .../classic/buttons/btn__loop_in.svg          |  6 +-
 .../classic/buttons/btn__loop_out.svg         |  6 +-
 .../classic/buttons/btn__menu_checkbox.svg    |  2 +-
 .../buttons/btn__menu_checkbox_checked.svg    |  2 +-
 .../classic/buttons/btn__mic_duck_auto.svg    |  2 +-
 .../classic/buttons/btn__mic_duck_manual.svg  |  2 +-
 .../classic/buttons/btn__mic_duck_off.svg     |  2 +-
 .../classic/buttons/btn__mic_talk.svg         |  2 +-
 .../LateNight/classic/buttons/btn__minus.svg  |  2 +-
 .../LateNight/classic/buttons/btn__next.svg   |  2 +-
 .../classic/buttons/btn__outro_end.svg        |  2 +-
 .../classic/buttons/btn__outro_start.svg      |  2 +-
 .../classic/buttons/btn__pause_deck_mini.svg  |  4 +-
 .../classic/buttons/btn__pause_preview.svg    |  2 +-
 .../classic/buttons/btn__pause_sampler.svg    |  4 +-
 .../LateNight/classic/buttons/btn__pfl.svg    |  2 +-
 .../classic/buttons/btn__play_deck.svg        |  2 +-
 .../classic/buttons/btn__play_deck_mini.svg   |  2 +-
 .../classic/buttons/btn__play_sampler.svg     |  2 +-
 .../LateNight/classic/buttons/btn__plus.svg   |  2 +-
 .../classic/buttons/btn__plus_flat.svg        |  2 +-
 .../LateNight/classic/buttons/btn__prev.svg   |  2 +-
 .../classic/buttons/btn__quantize.svg         |  2 +-
 .../buttons/btn__quantize_active_12.svg       |  2 +-
 .../buttons/btn__quantize_active_34.svg       |  2 +-
 .../classic/buttons/btn__rec_dot.svg          |  2 +-
 .../classic/buttons/btn__rec_dot_active.svg   |  2 +-
 .../LateNight/classic/buttons/btn__reloop.svg |  2 +-
 .../LateNight/classic/buttons/btn__repeat.svg |  2 +-
 .../classic/buttons/btn__repeat_active_12.svg |  2 +-
 .../classic/buttons/btn__repeat_active_34.svg |  2 +-
 .../classic/buttons/btn__reverse.svg          |  2 +-
 .../classic/buttons/btn__settings_close.svg   |  2 +-
 .../classic/buttons/btn__settings_off.svg     |  2 +-
 .../classic/buttons/btn__settings_on.svg      |  2 +-
 .../LateNight/classic/buttons/btn__slip.svg   |  2 +-
 .../classic/buttons/btn__slip_active_12.svg   |  2 +-
 .../classic/buttons/btn__slip_active_34.svg   |  2 +-
 .../LateNight/classic/buttons/btn__split.svg  |  2 +-
 .../classic/buttons/btn__split_active.svg     |  4 +-
 .../LateNight/classic/buttons/btn__star.svg   |  2 +-
 .../classic/buttons/btn__sync_deck.svg        |  2 +-
 .../classic/buttons/btn__sync_leader.svg      |  2 +-
 .../buttons/btn__sync_leader_active.svg       |  2 +-
 .../classic/buttons/btn__sync_sampler.svg     |  2 +-
 .../classic/buttons/btn__xfader_aux_left.svg  | 17 ++++-
 .../buttons/btn__xfader_aux_left_off.svg      | 17 ++++-
 .../classic/buttons/btn__xfader_aux_mid.svg   | 17 ++++-
 .../buttons/btn__xfader_aux_mid_off.svg       | 17 ++++-
 .../classic/buttons/btn__xfader_aux_right.svg | 17 ++++-
 .../buttons/btn__xfader_aux_right_off.svg     | 17 ++++-
 .../buttons/btn__xfader_deck_left_default.svg | 17 ++++-
 .../buttons/btn__xfader_deck_left_off.svg     | 17 ++++-
 .../buttons/btn__xfader_deck_left_warning.svg | 17 ++++-
 .../buttons/btn__xfader_deck_mid_off.svg      | 17 ++++-
 .../buttons/btn__xfader_deck_mid_warning.svg  | 19 +++---
 .../btn__xfader_deck_right_default.svg        | 17 ++++-
 .../buttons/btn__xfader_deck_right_off.svg    | 17 ++++-
 .../btn__xfader_deck_right_warning.svg        | 17 ++++-
 .../buttons/btn__xfader_sampler_left.svg      |  2 +-
 .../buttons/btn__xfader_sampler_main.svg      |  2 +-
 .../buttons/btn__xfader_sampler_right.svg     |  2 +-
 .../LateNight/palemoon/buttons/btn__.svg      |  2 +-
 .../LateNight/palemoon/buttons/btn__1.svg     |  2 +-
 .../palemoon/buttons/btn__1_active.svg        |  2 +-
 .../palemoon/buttons/btn__1_active_dark.svg   |  2 +-
 .../palemoon/buttons/btn__1_loop.svg          |  6 +-
 .../LateNight/palemoon/buttons/btn__2.svg     |  2 +-
 .../palemoon/buttons/btn__2_active.svg        |  2 +-
 .../palemoon/buttons/btn__2_active_dark.svg   |  2 +-
 .../palemoon/buttons/btn__2_loop.svg          |  6 +-
 .../LateNight/palemoon/buttons/btn__3.svg     |  2 +-
 .../palemoon/buttons/btn__3_active.svg        |  2 +-
 .../palemoon/buttons/btn__3_active_dark.svg   |  2 +-
 .../palemoon/buttons/btn__3_loop.svg          |  6 +-
 .../LateNight/palemoon/buttons/btn__4.svg     |  2 +-
 .../palemoon/buttons/btn__4_active.svg        |  2 +-
 .../palemoon/buttons/btn__4_active_dark.svg   |  2 +-
 .../palemoon/buttons/btn__4_loop.svg          |  6 +-
 .../LateNight/palemoon/buttons/btn__5.svg     |  2 +-
 .../palemoon/buttons/btn__5_active.svg        |  2 +-
 .../palemoon/buttons/btn__5_active_dark.svg   |  2 +-
 .../palemoon/buttons/btn__5_loop.svg          |  6 +-
 .../LateNight/palemoon/buttons/btn__6.svg     |  2 +-
 .../palemoon/buttons/btn__6_active.svg        |  2 +-
 .../palemoon/buttons/btn__6_active_dark.svg   |  2 +-
 .../palemoon/buttons/btn__6_loop.svg          |  6 +-
 .../LateNight/palemoon/buttons/btn__7.svg     |  2 +-
 .../palemoon/buttons/btn__7_active.svg        |  2 +-
 .../palemoon/buttons/btn__7_active_dark.svg   |  2 +-
 .../palemoon/buttons/btn__7_loop.svg          |  6 +-
 .../LateNight/palemoon/buttons/btn__8.svg     |  2 +-
 .../palemoon/buttons/btn__8_active.svg        |  2 +-
 .../palemoon/buttons/btn__8_active_dark.svg   |  2 +-
 .../palemoon/buttons/btn__8_loop.svg          |  6 +-
 .../palemoon/buttons/btn___active.svg         |  2 +-
 .../palemoon/buttons/btn___pressed.svg        |  2 +-
 .../palemoon/buttons/btn__active.svg          |  2 +-
 .../palemoon/buttons/btn__arrow_left_down.svg |  2 +-
 .../buttons/btn__arrow_left_down_active.svg   |  2 +-
 .../palemoon/buttons/btn__arrow_left_up.svg   |  2 +-
 .../buttons/btn__arrow_left_up_active.svg     |  2 +-
 .../buttons/btn__arrow_right_down.svg         |  2 +-
 .../buttons/btn__arrow_right_down_active.svg  |  2 +-
 .../palemoon/buttons/btn__arrow_right_up.svg  |  2 +-
 .../buttons/btn__arrow_right_up_active.svg    |  2 +-
 .../buttons/btn__autodj_addrandom.svg         |  2 +-
 .../buttons/btn__autodj_addrandom_pressed.svg |  2 +-
 .../buttons/btn__autodj_enable_off.svg        |  2 +-
 .../buttons/btn__autodj_enable_on.svg         |  2 +-
 .../palemoon/buttons/btn__autodj_fade.svg     |  2 +-
 .../buttons/btn__autodj_fade_disabled.svg     |  2 +-
 .../buttons/btn__autodj_fade_pressed.svg      |  2 +-
 .../btn__autodj_repeat_playlist_off.svg       |  2 +-
 .../btn__autodj_repeat_playlist_on.svg        |  2 +-
 .../palemoon/buttons/btn__autodj_shuffle.svg  |  2 +-
 .../buttons/btn__autodj_shuffle_pressed.svg   |  2 +-
 .../palemoon/buttons/btn__autodj_skip.svg     |  2 +-
 .../buttons/btn__autodj_skip_disabled.svg     |  2 +-
 .../buttons/btn__autodj_skip_pressed.svg      |  2 +-
 .../palemoon/buttons/btn__aux_play.svg        |  2 +-
 .../palemoon/buttons/btn__aux_play_active.svg |  2 +-
 .../palemoon/buttons/btn__beat_curpos.svg     |  2 +-
 .../buttons/btn__beat_curpos_active_12.svg    |  2 +-
 .../buttons/btn__beat_curpos_active_34.svg    |  2 +-
 .../buttons/btn__beat_curpos_large.svg        |  2 +-
 .../buttons/btn__beat_curpos_large_active.svg |  2 +-
 .../btn__beatgrid_controls_collapse.svg       |  2 +-
 .../buttons/btn__beatgrid_controls_expand.svg |  2 +-
 .../palemoon/buttons/btn__beatjump_left.svg   |  2 +-
 .../buttons/btn__beatjump_left_active.svg     |  2 +-
 .../palemoon/buttons/btn__beatjump_right.svg  |  2 +-
 .../buttons/btn__beatjump_right_active.svg    |  2 +-
 .../palemoon/buttons/btn__beats_earlier.svg   |  2 +-
 .../buttons/btn__beats_earlier_active.svg     |  2 +-
 .../palemoon/buttons/btn__beats_faster.svg    |  2 +-
 .../buttons/btn__beats_faster_active.svg      |  2 +-
 .../buttons/btn__beats_hotcues_earlier.svg    |  2 +-
 .../btn__beats_hotcues_earlier_active.svg     |  2 +-
 .../buttons/btn__beats_hotcues_later.svg      |  2 +-
 .../btn__beats_hotcues_later_active.svg       |  2 +-
 .../palemoon/buttons/btn__beats_later.svg     |  2 +-
 .../buttons/btn__beats_later_active.svg       |  2 +-
 .../palemoon/buttons/btn__beats_slower.svg    |  2 +-
 .../buttons/btn__beats_slower_active.svg      |  2 +-
 .../palemoon/buttons/btn__broadcast_off.svg   |  2 +-
 .../palemoon/buttons/btn__broadcast_on.svg    |  2 +-
 .../palemoon/buttons/btn__collapse_dim.svg    |  2 +-
 .../palemoon/buttons/btn__cue_deck.svg        |  2 +-
 .../palemoon/buttons/btn__cue_deck_active.svg |  2 +-
 .../palemoon/buttons/btn__delete.svg          |  2 +-
 .../palemoon/buttons/btn__effect_selected.svg |  2 +-
 .../LateNight/palemoon/buttons/btn__eject.svg |  2 +-
 .../palemoon/buttons/btn__eject_active_12.svg |  2 +-
 .../palemoon/buttons/btn__eject_active_34.svg |  2 +-
 .../buttons/btn__eq_kill_dot_active_green.svg |  2 +-
 .../buttons/btn__eq_kill_dot_active_red.svg   |  2 +-
 .../palemoon/buttons/btn__eq_kill_dot_off.svg |  2 +-
 .../palemoon/buttons/btn__eq_kill_high.svg    |  2 +-
 .../palemoon/buttons/btn__eq_kill_low.svg     |  2 +-
 .../palemoon/buttons/btn__eq_kill_mid.svg     |  2 +-
 .../palemoon/buttons/btn__expand_dim.svg      |  2 +-
 .../palemoon/buttons/btn__fx_focus.svg        |  2 +-
 .../palemoon/buttons/btn__fx_focus_active.svg |  2 +-
 .../palemoon/buttons/btn__fx_mixmode_d+w.svg  |  2 +-
 .../palemoon/buttons/btn__fx_mixmode_d-w.svg  |  2 +-
 .../buttons/btn__fx_selector_down.svg         | 26 +++++++-
 .../palemoon/buttons/btn__fx_settings.svg     |  2 +-
 .../palemoon/buttons/btn__fx_toggle.svg       |  2 +-
 .../buttons/btn__fx_toggle_active.svg         |  2 +-
 .../palemoon/buttons/btn__intro_end.svg       |  2 +-
 .../buttons/btn__intro_end_active.svg         |  2 +-
 .../palemoon/buttons/btn__intro_start.svg     |  2 +-
 .../buttons/btn__intro_start_active.svg       |  2 +-
 .../palemoon/buttons/btn__key_down.svg        |  2 +-
 .../palemoon/buttons/btn__key_down_active.svg |  2 +-
 .../palemoon/buttons/btn__key_match.svg       |  2 +-
 .../buttons/btn__key_match_active.svg         |  2 +-
 .../palemoon/buttons/btn__key_up.svg          |  2 +-
 .../palemoon/buttons/btn__key_up_active.svg   |  2 +-
 .../palemoon/buttons/btn__keylock.svg         |  2 +-
 .../buttons/btn__keylock_active_12.svg        |  2 +-
 .../buttons/btn__keylock_active_34.svg        |  2 +-
 .../buttons/btn__lib_bpm_locked_black.svg     |  2 +-
 .../buttons/btn__lib_bpm_locked_blue.svg      |  2 +-
 .../buttons/btn__lib_bpm_unlocked_grey.svg    |  2 +-
 .../palemoon/buttons/btn__lib_checkbox.svg    |  2 +-
 .../buttons/btn__lib_checkmark_blue.svg       |  2 +-
 .../buttons/btn__lib_checkmark_grey.svg       |  2 +-
 .../btn__lib_checkmark_indeterminate_blue.svg |  2 +-
 .../btn__lib_checkmark_indeterminate_grey.svg |  2 +-
 .../buttons/btn__lib_checkmark_ivory.svg      |  2 +-
 .../buttons/btn__lib_clear_search.svg         |  2 +-
 .../buttons/btn__lib_clear_search_focus.svg   |  2 +-
 .../buttons/btn__lib_preview_pause.svg        |  2 +-
 .../buttons/btn__lib_preview_play.svg         |  2 +-
 .../buttons/btn__lib_radio_button_off.svg     |  2 +-
 .../buttons/btn__lib_radio_button_on_blue.svg |  2 +-
 .../palemoon/buttons/btn__lib_sort_down.svg   |  2 +-
 .../palemoon/buttons/btn__lib_sort_up.svg     |  2 +-
 .../buttons/btn__lib_spinbox_down.svg         |  2 +-
 .../palemoon/buttons/btn__lib_spinbox_up.svg  |  2 +-
 .../LateNight/palemoon/buttons/btn__loop.svg  |  2 +-
 .../palemoon/buttons/btn__loop_active.svg     |  2 +-
 .../palemoon/buttons/btn__loop_in.svg         |  2 +-
 .../palemoon/buttons/btn__loop_in_active.svg  |  2 +-
 .../palemoon/buttons/btn__loop_out.svg        |  2 +-
 .../palemoon/buttons/btn__loop_out_active.svg |  2 +-
 .../palemoon/buttons/btn__menu_checkbox.svg   |  2 +-
 .../buttons/btn__menu_checkbox_checked.svg    |  2 +-
 .../palemoon/buttons/btn__mic_duck_auto.svg   |  2 +-
 .../palemoon/buttons/btn__mic_duck_manual.svg |  2 +-
 .../palemoon/buttons/btn__mic_duck_off.svg    |  2 +-
 .../palemoon/buttons/btn__mic_talk.svg        |  2 +-
 .../palemoon/buttons/btn__mic_talk_active.svg |  2 +-
 .../LateNight/palemoon/buttons/btn__minus.svg |  2 +-
 .../palemoon/buttons/btn__minus_active.svg    |  2 +-
 .../palemoon/buttons/btn__outro_end.svg       |  2 +-
 .../buttons/btn__outro_end_active.svg         |  2 +-
 .../palemoon/buttons/btn__outro_start.svg     |  2 +-
 .../buttons/btn__outro_start_active.svg       |  2 +-
 .../palemoon/buttons/btn__pause_deck_mini.svg |  2 +-
 .../palemoon/buttons/btn__pause_sampler.svg   |  2 +-
 .../LateNight/palemoon/buttons/btn__pfl.svg   |  2 +-
 .../palemoon/buttons/btn__pfl_active.svg      |  2 +-
 .../palemoon/buttons/btn__play_deck.svg       |  2 +-
 .../buttons/btn__play_deck_active.svg         |  2 +-
 .../palemoon/buttons/btn__play_deck_mini.svg  |  2 +-
 .../palemoon/buttons/btn__play_sampler.svg    |  2 +-
 .../LateNight/palemoon/buttons/btn__plus.svg  |  2 +-
 .../palemoon/buttons/btn__plus_active.svg     |  2 +-
 .../palemoon/buttons/btn__plus_flat.svg       |  2 +-
 .../LateNight/palemoon/buttons/btn__prev.svg  |  2 +-
 .../palemoon/buttons/btn__quantize.svg        |  2 +-
 .../buttons/btn__quantize_active_12.svg       |  2 +-
 .../buttons/btn__quantize_active_34.svg       |  2 +-
 .../buttons/btn__rate_center_cyan.svg         |  2 +-
 .../palemoon/buttons/btn__rate_center_off.svg |  2 +-
 .../palemoon/buttons/btn__rec_dot.svg         |  2 +-
 .../palemoon/buttons/btn__rec_dot_active.svg  |  2 +-
 .../palemoon/buttons/btn__reloop.svg          |  2 +-
 .../palemoon/buttons/btn__reloop_active.svg   |  2 +-
 .../palemoon/buttons/btn__repeat.svg          |  2 +-
 .../buttons/btn__repeat_active_12.svg         |  2 +-
 .../buttons/btn__repeat_active_34.svg         |  2 +-
 .../palemoon/buttons/btn__reverse.svg         |  2 +-
 .../palemoon/buttons/btn__reverse_active.svg  |  2 +-
 .../palemoon/buttons/btn__settings_off.svg    |  2 +-
 .../palemoon/buttons/btn__settings_on.svg     |  2 +-
 .../LateNight/palemoon/buttons/btn__slip.svg  |  2 +-
 .../palemoon/buttons/btn__slip_active_12.svg  |  2 +-
 .../palemoon/buttons/btn__slip_active_34.svg  |  2 +-
 .../palemoon/buttons/btn__spinbox_down.svg    |  2 +-
 .../palemoon/buttons/btn__spinbox_up.svg      |  2 +-
 .../LateNight/palemoon/buttons/btn__split.svg |  2 +-
 .../palemoon/buttons/btn__split_active.svg    |  2 +-
 .../LateNight/palemoon/buttons/btn__star.svg  |  2 +-
 .../palemoon/buttons/btn__sync_deck.svg       |  2 +-
 .../buttons/btn__sync_deck_active.svg         |  2 +-
 .../palemoon/buttons/btn__sync_leader.svg     |  2 +-
 .../buttons/btn__sync_leader_explicit.svg     |  2 +-
 .../buttons/btn__sync_leader_implicit.svg     |  2 +-
 .../palemoon/buttons/btn__sync_sampler.svg    |  2 +-
 .../buttons/btn__sync_sampler_active.svg      |  2 +-
 .../palemoon/buttons/btn__xfader_aux_left.svg | 65 ++++++++++++++++---
 .../buttons/btn__xfader_aux_left_off.svg      | 22 ++++++-
 .../palemoon/buttons/btn__xfader_aux_mid.svg  | 65 ++++++++++++++++---
 .../buttons/btn__xfader_aux_mid_off.svg       | 22 ++++++-
 .../buttons/btn__xfader_aux_right.svg         | 65 ++++++++++++++++---
 .../buttons/btn__xfader_aux_right_off.svg     | 23 ++++++-
 .../buttons/btn__xfader_deck_left_default.svg | 65 ++++++++++++++++---
 .../buttons/btn__xfader_deck_left_off.svg     | 22 ++++++-
 .../buttons/btn__xfader_deck_left_warning.svg | 65 ++++++++++++++++---
 .../buttons/btn__xfader_deck_mid_off.svg      | 22 ++++++-
 .../buttons/btn__xfader_deck_mid_warning.svg  | 65 ++++++++++++++++---
 .../btn__xfader_deck_right_default.svg        | 65 ++++++++++++++++---
 .../buttons/btn__xfader_deck_right_off.svg    | 22 ++++++-
 .../btn__xfader_deck_right_warning.svg        | 65 ++++++++++++++++---
 .../buttons/btn__xfader_sampler_left.svg      |  2 +-
 .../buttons/btn__xfader_sampler_main.svg      |  2 +-
 .../buttons/btn__xfader_sampler_right.svg     |  2 +-
 res/skins/LateNight/style_classic.qss         |  4 ++
 391 files changed, 1270 insertions(+), 551 deletions(-)

diff --git a/res/skins/LateNight/classic/buttons/btn__.svg b/res/skins/LateNight/classic/buttons/btn__.svg
index fb66ea1ba22..96b4ec0260f 100644
--- a/res/skins/LateNight/classic/buttons/btn__.svg
+++ b/res/skins/LateNight/classic/buttons/btn__.svg
@@ -1 +1 @@
-<svg width="1" height="1" version="1.1" xmlns="http://www.w3.org/2000/svg"></svg>
+<svg width="2" height="2" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1 1"></svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__1.svg b/res/skins/LateNight/classic/buttons/btn__1.svg
index 365e088f60b..67c27b0200a 100644
--- a/res/skins/LateNight/classic/buttons/btn__1.svg
+++ b/res/skins/LateNight/classic/buttons/btn__1.svg
@@ -7,8 +7,8 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg6"
    version="1.1"
-   height="24"
-   width="20">
+   height="48"
+   width="40" viewBox="0 0 20 24">
   <metadata
      id="metadata12">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__2.svg b/res/skins/LateNight/classic/buttons/btn__2.svg
index a5944b6c2f6..71bc84c8e90 100644
--- a/res/skins/LateNight/classic/buttons/btn__2.svg
+++ b/res/skins/LateNight/classic/buttons/btn__2.svg
@@ -7,8 +7,8 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg18"
    version="1.1"
-   height="24"
-   width="20">
+   height="48"
+   width="40" viewBox="0 0 20 24">
   <metadata
      id="metadata24">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__3.svg b/res/skins/LateNight/classic/buttons/btn__3.svg
index 0543822b1bd..bccda28f095 100644
--- a/res/skins/LateNight/classic/buttons/btn__3.svg
+++ b/res/skins/LateNight/classic/buttons/btn__3.svg
@@ -5,10 +5,10 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   width="20"
-   height="24"
+   width="40"
+   height="48"
    version="1.1"
-   id="svg18">
+   id="svg18" viewBox="0 0 20 24">
   <metadata
      id="metadata24">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__4.svg b/res/skins/LateNight/classic/buttons/btn__4.svg
index a6f0aad608b..c42928864c9 100644
--- a/res/skins/LateNight/classic/buttons/btn__4.svg
+++ b/res/skins/LateNight/classic/buttons/btn__4.svg
@@ -7,8 +7,8 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg30"
    version="1.1"
-   height="24"
-   width="20">
+   height="48"
+   width="40" viewBox="0 0 20 24">
   <metadata
      id="metadata36">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__5.svg b/res/skins/LateNight/classic/buttons/btn__5.svg
index 626ab3a186b..95239978ceb 100644
--- a/res/skins/LateNight/classic/buttons/btn__5.svg
+++ b/res/skins/LateNight/classic/buttons/btn__5.svg
@@ -7,8 +7,8 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg42"
    version="1.1"
-   height="24"
-   width="20">
+   height="48"
+   width="40" viewBox="0 0 20 24">
   <metadata
      id="metadata48">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__6.svg b/res/skins/LateNight/classic/buttons/btn__6.svg
index 9a95353b4fb..4becb62d4dd 100644
--- a/res/skins/LateNight/classic/buttons/btn__6.svg
+++ b/res/skins/LateNight/classic/buttons/btn__6.svg
@@ -7,8 +7,8 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg54"
    version="1.1"
-   height="24"
-   width="20">
+   height="48"
+   width="40" viewBox="0 0 20 24">
   <metadata
      id="metadata60">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__7.svg b/res/skins/LateNight/classic/buttons/btn__7.svg
index 8aeaea2d1d2..78be668d8ab 100644
--- a/res/skins/LateNight/classic/buttons/btn__7.svg
+++ b/res/skins/LateNight/classic/buttons/btn__7.svg
@@ -7,8 +7,8 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg66"
    version="1.1"
-   height="24"
-   width="20">
+   height="48"
+   width="40" viewBox="0 0 20 24">
   <metadata
      id="metadata72">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__8.svg b/res/skins/LateNight/classic/buttons/btn__8.svg
index 01cdb08bee5..0d9ac1ffbc9 100644
--- a/res/skins/LateNight/classic/buttons/btn__8.svg
+++ b/res/skins/LateNight/classic/buttons/btn__8.svg
@@ -7,8 +7,8 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg78"
    version="1.1"
-   height="24"
-   width="20">
+   height="48"
+   width="40" viewBox="0 0 20 24">
   <metadata
      id="metadata84">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn___.svg b/res/skins/LateNight/classic/buttons/btn___.svg
index fb66ea1ba22..96b4ec0260f 100644
--- a/res/skins/LateNight/classic/buttons/btn___.svg
+++ b/res/skins/LateNight/classic/buttons/btn___.svg
@@ -1 +1 @@
-<svg width="1" height="1" version="1.1" xmlns="http://www.w3.org/2000/svg"></svg>
+<svg width="2" height="2" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1 1"></svg>
diff --git a/res/skins/LateNight/classic/buttons/btn___active.svg b/res/skins/LateNight/classic/buttons/btn___active.svg
index fb66ea1ba22..96b4ec0260f 100644
--- a/res/skins/LateNight/classic/buttons/btn___active.svg
+++ b/res/skins/LateNight/classic/buttons/btn___active.svg
@@ -1 +1 @@
-<svg width="1" height="1" version="1.1" xmlns="http://www.w3.org/2000/svg"></svg>
+<svg width="2" height="2" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1 1"></svg>
diff --git a/res/skins/LateNight/classic/buttons/btn___pressed.svg b/res/skins/LateNight/classic/buttons/btn___pressed.svg
index fb66ea1ba22..96b4ec0260f 100644
--- a/res/skins/LateNight/classic/buttons/btn___pressed.svg
+++ b/res/skins/LateNight/classic/buttons/btn___pressed.svg
@@ -1 +1 @@
-<svg width="1" height="1" version="1.1" xmlns="http://www.w3.org/2000/svg"></svg>
+<svg width="2" height="2" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1 1"></svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__arrow_left_down.svg b/res/skins/LateNight/classic/buttons/btn__arrow_left_down.svg
index fd5381fe36e..1f1aeedc09a 100644
--- a/res/skins/LateNight/classic/buttons/btn__arrow_left_down.svg
+++ b/res/skins/LateNight/classic/buttons/btn__arrow_left_down.svg
@@ -7,8 +7,8 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg6"
    version="1.1"
-   height="24"
-   width="24">
+   height="48"
+   width="48" viewBox="0 0 24 24">
   <metadata
      id="metadata12">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__arrow_left_up.svg b/res/skins/LateNight/classic/buttons/btn__arrow_left_up.svg
index 09a8d6866ea..9c3ee80cda4 100644
--- a/res/skins/LateNight/classic/buttons/btn__arrow_left_up.svg
+++ b/res/skins/LateNight/classic/buttons/btn__arrow_left_up.svg
@@ -7,8 +7,8 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg6"
    version="1.1"
-   height="24"
-   width="24">
+   height="48"
+   width="48" viewBox="0 0 24 24">
   <metadata
      id="metadata12">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__arrow_right_down.svg b/res/skins/LateNight/classic/buttons/btn__arrow_right_down.svg
index 5d08e4b10dd..7b1ebcf1c2b 100644
--- a/res/skins/LateNight/classic/buttons/btn__arrow_right_down.svg
+++ b/res/skins/LateNight/classic/buttons/btn__arrow_right_down.svg
@@ -7,8 +7,8 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg6"
    version="1.1"
-   height="24"
-   width="24">
+   height="48"
+   width="48" viewBox="0 0 24 24">
   <metadata
      id="metadata12">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__arrow_right_up.svg b/res/skins/LateNight/classic/buttons/btn__arrow_right_up.svg
index f881b330867..0de2a874776 100644
--- a/res/skins/LateNight/classic/buttons/btn__arrow_right_up.svg
+++ b/res/skins/LateNight/classic/buttons/btn__arrow_right_up.svg
@@ -7,8 +7,8 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg6"
    version="1.1"
-   height="24"
-   width="24">
+   height="48"
+   width="48" viewBox="0 0 24 24">
   <metadata
      id="metadata12">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__autodj_addrandom.svg b/res/skins/LateNight/classic/buttons/btn__autodj_addrandom.svg
index b1252b84084..57830987f72 100644
--- a/res/skins/LateNight/classic/buttons/btn__autodj_addrandom.svg
+++ b/res/skins/LateNight/classic/buttons/btn__autodj_addrandom.svg
@@ -1,4 +1,4 @@
-<svg width="32" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="64" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 20">
 	<defs>
 		<linearGradient id="d">
 			<stop stop-color="#888" offset="0"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__autodj_enable_off.svg b/res/skins/LateNight/classic/buttons/btn__autodj_enable_off.svg
index 7c6f1aa799b..a754b70bddf 100644
--- a/res/skins/LateNight/classic/buttons/btn__autodj_enable_off.svg
+++ b/res/skins/LateNight/classic/buttons/btn__autodj_enable_off.svg
@@ -1,4 +1,4 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="80" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 40 20">
 	<defs>
 		<linearGradient id="c" x1="2.8712108" x2="2.8712108" y1="19.047619" y2="1.025641" gradientUnits="userSpaceOnUse">
 			<stop stop-color="#888" offset="0"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__autodj_enable_on.svg b/res/skins/LateNight/classic/buttons/btn__autodj_enable_on.svg
index d5ad1aa5988..f4840bc96cb 100644
--- a/res/skins/LateNight/classic/buttons/btn__autodj_enable_on.svg
+++ b/res/skins/LateNight/classic/buttons/btn__autodj_enable_on.svg
@@ -1,4 +1,4 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="80" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 20">
 	<path d="m26 3c-.554 0-1 .446-1 1v3h8v-3c0-.554-.446-1-1-1zm1.25 1.5c.41421 0 .75.33579.75.75s-.33579.75-.75.75-.75-.33579-.75-.75.33579-.75.75-.75zm3.5 0c.41421 0 .75.33579.75.75s-.33579.75-.75.75-.75-.33579-.75-.75.33579-.75.75-.75z" color="#000001"/>
 	<rect x="26" y="14" width="2" height="3" rx="1" ry="1"/>
 	<rect x="30" y="14" width="2" height="3" rx="1" ry="1"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__autodj_fade.svg b/res/skins/LateNight/classic/buttons/btn__autodj_fade.svg
index 9e3a1e6be6d..64d21700d65 100644
--- a/res/skins/LateNight/classic/buttons/btn__autodj_fade.svg
+++ b/res/skins/LateNight/classic/buttons/btn__autodj_fade.svg
@@ -1,4 +1,4 @@
-<svg width="32" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="64" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 20">
 	<defs>
 		<linearGradient id="a">
 			<stop stop-color="#888" offset="0"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__autodj_fade_disabled.svg b/res/skins/LateNight/classic/buttons/btn__autodj_fade_disabled.svg
index c04b92a16c0..6b0ed8d828d 100644
--- a/res/skins/LateNight/classic/buttons/btn__autodj_fade_disabled.svg
+++ b/res/skins/LateNight/classic/buttons/btn__autodj_fade_disabled.svg
@@ -1,4 +1,4 @@
-<svg width="32" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 20">
 	<path d="m22.344 6.041c-8.5814 1.2349-13.813 4.3649-18.887 9.7031l1.0859 1.0332c4.9261-5.1827 9.694-8.0547 18.014-9.252zm-.57675-3.0402.97008 7.1903 6.7052-4.5652z" color="#000001" color-rendering="auto" dominant-baseline="auto" fill="#666" image-rendering="auto" shape-rendering="auto" solid-color="#000001" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000001;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
 	<path d="m3.7793 4.8281-.2168 1.4844c3.1686.4617 5.4587 1.0047 7.8706 1.9377.59438-.29785 1.1531-.62948 1.7832-.89062-2.853-1.264-5.6118-1.9741-9.437-2.5315zm13.878 4.8589c-.63968.19217-1.2426.38965-1.8359.61523 3.0203 1.6884 5.2014 3.6519 7.8405 6.4634l1.0938-1.0273c-2.3854-2.5411-4.385-4.3747-7.0983-6.0512z" color="#000001" color-rendering="auto" dominant-baseline="auto" fill="#666" image-rendering="auto" shape-rendering="auto" solid-color="#000001" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000001;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__autodj_repeat_playlist_off.svg b/res/skins/LateNight/classic/buttons/btn__autodj_repeat_playlist_off.svg
index 78105883d6e..fc8b637d0c5 100644
--- a/res/skins/LateNight/classic/buttons/btn__autodj_repeat_playlist_off.svg
+++ b/res/skins/LateNight/classic/buttons/btn__autodj_repeat_playlist_off.svg
@@ -1,4 +1,4 @@
-<svg width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="40" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 20 20">
 	<defs>
 		<linearGradient id="a" x1="4.7117639" x2="4.7117639" y1="19.047621" y2="1.025641" gradientUnits="userSpaceOnUse">
 			<stop stop-color="#888" offset="0"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__autodj_repeat_playlist_on.svg b/res/skins/LateNight/classic/buttons/btn__autodj_repeat_playlist_on.svg
index fb992a016f7..36f087d1f2a 100644
--- a/res/skins/LateNight/classic/buttons/btn__autodj_repeat_playlist_on.svg
+++ b/res/skins/LateNight/classic/buttons/btn__autodj_repeat_playlist_on.svg
@@ -1,4 +1,4 @@
-<svg width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
 	<path d="m8.0469 1.75-6 3 6 3v-2.25h6.9531c.71734 0 1.5.83133 1.5 1.5v4.6562l1.5 1.1562v-5.8125c0-1.6447-1.3553-3-3-3h-6.9531z" color="#000001"/>
 	<path d="m11.953 18.25 6-3-6-3v2.25h-6.9531c-.71734 0-1.5-.83133-1.5-1.5v-4.6563l-1.5-1.1562v5.8125c0 1.6447 1.3553 3 3 3h6.9531z" color="#000001"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__autodj_shuffle.svg b/res/skins/LateNight/classic/buttons/btn__autodj_shuffle.svg
index f8919cb86d7..f0ed9e00734 100644
--- a/res/skins/LateNight/classic/buttons/btn__autodj_shuffle.svg
+++ b/res/skins/LateNight/classic/buttons/btn__autodj_shuffle.svg
@@ -1,4 +1,4 @@
-<svg width="36" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="72" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 36 20">
 	<defs>
 		<linearGradient id="a" x1="4.7667475" x2="4.7667475" y1="19.047621" y2="1.025641" gradientUnits="userSpaceOnUse">
 			<stop stop-color="#888" offset="0"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__autodj_skip.svg b/res/skins/LateNight/classic/buttons/btn__autodj_skip.svg
index 32c65f92ee2..5628d91b1b4 100644
--- a/res/skins/LateNight/classic/buttons/btn__autodj_skip.svg
+++ b/res/skins/LateNight/classic/buttons/btn__autodj_skip.svg
@@ -1,4 +1,4 @@
-<svg width="32" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="64" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 20">
 	<defs>
 		<linearGradient id="a" x1="9.3150187" x2="9.3150187" y1="19.047621" y2="1.025641" gradientUnits="userSpaceOnUse">
 			<stop stop-color="#888" offset="0"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__autodj_skip_disabled.svg b/res/skins/LateNight/classic/buttons/btn__autodj_skip_disabled.svg
index 1de2abb0285..afe3f15e5dc 100644
--- a/res/skins/LateNight/classic/buttons/btn__autodj_skip_disabled.svg
+++ b/res/skins/LateNight/classic/buttons/btn__autodj_skip_disabled.svg
@@ -1,4 +1,4 @@
-<svg width="32" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 20">
 	<g fill="#666">
 		<rect x="1" y="7" width="8" height="6" rx="1" ry="1" style="paint-order:fill markers stroke"/>
 		<path d="m13 7c-.554 0-1 .446-1 1h1zm1 0v1h1v-1zm2 0v1h1v-1zm2 0v1h2c0-.554-.446-1-1-1zm-6 2v1h1v-1zm7 0v1h1v-1zm-7 2v1c0 .554.446 1 1 1v-2zm7 0c0 .554-.446 1-1 1v1h1c.554 0 1-.446 1-1v-1zm-5 1v1h1v-1zm2 0v1h1v-1z" style="paint-order:fill markers stroke"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__aux_play.svg b/res/skins/LateNight/classic/buttons/btn__aux_play.svg
index 22e5e1a18d2..027f9eb1e16 100644
--- a/res/skins/LateNight/classic/buttons/btn__aux_play.svg
+++ b/res/skins/LateNight/classic/buttons/btn__aux_play.svg
@@ -1,4 +1,4 @@
-<svg width="40" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="80" height="44" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 22">
 		<g fill="none" stroke="#000001">
 				<path d="m20 7v7h2v-3h3v3h2v-7zm2 1h3v2h-3z" stroke-width="1.6"/>
 				<path d="m12 7v7h7v-1h-5v-6z" stroke-width="1.60000002"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__beat_curpos.svg b/res/skins/LateNight/classic/buttons/btn__beat_curpos.svg
index b850982aed1..b247dee750a 100644
--- a/res/skins/LateNight/classic/buttons/btn__beat_curpos.svg
+++ b/res/skins/LateNight/classic/buttons/btn__beat_curpos.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
 	<g fill="#585858">
 		<path d="m2 4v6h2v-6z" stroke-width=".92581999"/>
 		<path d="m7 4v10h2v-10z"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__beat_curpos_active_12.svg b/res/skins/LateNight/classic/buttons/btn__beat_curpos_active_12.svg
index 36912c9573f..baab57db1cd 100644
--- a/res/skins/LateNight/classic/buttons/btn__beat_curpos_active_12.svg
+++ b/res/skins/LateNight/classic/buttons/btn__beat_curpos_active_12.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
 	<g fill="#f0bb2b">
 		<path d="m2 4v6h2v-6z" stroke-width=".70710999"/>
 		<g stroke-width=".91286999">
diff --git a/res/skins/LateNight/classic/buttons/btn__beat_curpos_active_34.svg b/res/skins/LateNight/classic/buttons/btn__beat_curpos_active_34.svg
index 3714e8e6b3f..618909aa246 100644
--- a/res/skins/LateNight/classic/buttons/btn__beat_curpos_active_34.svg
+++ b/res/skins/LateNight/classic/buttons/btn__beat_curpos_active_34.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
 	<g fill="#0bd9d1">
 		<path d="m2 4v6h2v-6z" stroke-width=".70710999"/>
 		<g stroke-width=".91286999">
diff --git a/res/skins/LateNight/classic/buttons/btn__beat_curpos_large.svg b/res/skins/LateNight/classic/buttons/btn__beat_curpos_large.svg
index 7549be191a8..140ecb1aa8b 100644
--- a/res/skins/LateNight/classic/buttons/btn__beat_curpos_large.svg
+++ b/res/skins/LateNight/classic/buttons/btn__beat_curpos_large.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" id="svg16" version="1.1" height="24" width="24">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" id="svg16" version="1.1" height="48" width="48" viewBox="0 0 24 24">
   <metadata id="metadata22">
     <rdf:RDF>
       <cc:Work rdf:about="">
diff --git a/res/skins/LateNight/classic/buttons/btn__beatgrid_controls_collapse.svg b/res/skins/LateNight/classic/buttons/btn__beatgrid_controls_collapse.svg
index 462694904e1..948724dd7a5 100644
--- a/res/skins/LateNight/classic/buttons/btn__beatgrid_controls_collapse.svg
+++ b/res/skins/LateNight/classic/buttons/btn__beatgrid_controls_collapse.svg
@@ -5,10 +5,10 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   width="26"
-   height="52"
+   width="52"
+   height="104"
    version="1.1"
-   id="svg16">
+   id="svg16" viewBox="0 0 26 52">
   <metadata
      id="metadata22">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__beatgrid_controls_expand.svg b/res/skins/LateNight/classic/buttons/btn__beatgrid_controls_expand.svg
index ab5630de104..37b54925d00 100644
--- a/res/skins/LateNight/classic/buttons/btn__beatgrid_controls_expand.svg
+++ b/res/skins/LateNight/classic/buttons/btn__beatgrid_controls_expand.svg
@@ -5,10 +5,10 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   width="26"
-   height="52"
+   width="52"
+   height="104"
    version="1.1"
-   id="svg16">
+   id="svg16" viewBox="0 0 26 52">
   <metadata
      id="metadata22">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__beatjump_left.svg b/res/skins/LateNight/classic/buttons/btn__beatjump_left.svg
index 97fbca88422..622a6e015d6 100644
--- a/res/skins/LateNight/classic/buttons/btn__beatjump_left.svg
+++ b/res/skins/LateNight/classic/buttons/btn__beatjump_left.svg
@@ -5,10 +5,10 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   width="24"
-   height="24"
+   width="48"
+   height="48"
    version="1.1"
-   id="svg14">
+   id="svg14" viewBox="0 0 24 24">
   <metadata
      id="metadata20">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__beatjump_right.svg b/res/skins/LateNight/classic/buttons/btn__beatjump_right.svg
index 328bcd1ad2a..cb83ddf1baf 100644
--- a/res/skins/LateNight/classic/buttons/btn__beatjump_right.svg
+++ b/res/skins/LateNight/classic/buttons/btn__beatjump_right.svg
@@ -5,10 +5,10 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   width="24"
-   height="24"
+   width="48"
+   height="48"
    version="1.1"
-   id="svg14">
+   id="svg14" viewBox="0 0 24 24">
   <metadata
      id="metadata20">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__beats_earlier.svg b/res/skins/LateNight/classic/buttons/btn__beats_earlier.svg
index e7e3cdac411..88822e160c5 100644
--- a/res/skins/LateNight/classic/buttons/btn__beats_earlier.svg
+++ b/res/skins/LateNight/classic/buttons/btn__beats_earlier.svg
@@ -5,10 +5,10 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   width="24"
-   height="24"
+   width="48"
+   height="48"
    version="1.1"
-   id="svg16">
+   id="svg16" viewBox="0 0 24 24">
   <metadata
      id="metadata22">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__beats_faster.svg b/res/skins/LateNight/classic/buttons/btn__beats_faster.svg
index ab98b314d79..8f892e772e5 100644
--- a/res/skins/LateNight/classic/buttons/btn__beats_faster.svg
+++ b/res/skins/LateNight/classic/buttons/btn__beats_faster.svg
@@ -5,10 +5,10 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   width="24"
-   height="24"
+   width="48"
+   height="48"
    version="1.1"
-   id="svg12">
+   id="svg12" viewBox="0 0 24 24">
   <metadata
      id="metadata18">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__beats_hotcues_earlier.svg b/res/skins/LateNight/classic/buttons/btn__beats_hotcues_earlier.svg
index c09b365644d..bf2ce561db5 100644
--- a/res/skins/LateNight/classic/buttons/btn__beats_hotcues_earlier.svg
+++ b/res/skins/LateNight/classic/buttons/btn__beats_hotcues_earlier.svg
@@ -5,10 +5,10 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   width="24"
-   height="24"
+   width="48"
+   height="48"
    version="1.1"
-   id="svg14">
+   id="svg14" viewBox="0 0 24 24">
   <metadata
      id="metadata20">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__beats_hotcues_later.svg b/res/skins/LateNight/classic/buttons/btn__beats_hotcues_later.svg
index 3d15769d019..18ad6d52b85 100644
--- a/res/skins/LateNight/classic/buttons/btn__beats_hotcues_later.svg
+++ b/res/skins/LateNight/classic/buttons/btn__beats_hotcues_later.svg
@@ -5,10 +5,10 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   width="24"
-   height="24"
+   width="48"
+   height="48"
    version="1.1"
-   id="svg14">
+   id="svg14" viewBox="0 0 24 24">
   <metadata
      id="metadata20">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__beats_later.svg b/res/skins/LateNight/classic/buttons/btn__beats_later.svg
index d6bf2ac3e2e..4facc987736 100644
--- a/res/skins/LateNight/classic/buttons/btn__beats_later.svg
+++ b/res/skins/LateNight/classic/buttons/btn__beats_later.svg
@@ -5,10 +5,10 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   width="24"
-   height="24"
+   width="48"
+   height="48"
    version="1.1"
-   id="svg18">
+   id="svg18" viewBox="0 0 24 24">
   <metadata
      id="metadata24">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__beats_slower.svg b/res/skins/LateNight/classic/buttons/btn__beats_slower.svg
index d437748a685..649f498882b 100644
--- a/res/skins/LateNight/classic/buttons/btn__beats_slower.svg
+++ b/res/skins/LateNight/classic/buttons/btn__beats_slower.svg
@@ -5,10 +5,10 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   width="24"
-   height="24"
+   width="48"
+   height="48"
    version="1.1"
-   id="svg12">
+   id="svg12" viewBox="0 0 24 24">
   <metadata
      id="metadata18">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__broadcast_off.svg b/res/skins/LateNight/classic/buttons/btn__broadcast_off.svg
index 03e40c901c6..726186412bd 100644
--- a/res/skins/LateNight/classic/buttons/btn__broadcast_off.svg
+++ b/res/skins/LateNight/classic/buttons/btn__broadcast_off.svg
@@ -7,8 +7,8 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg6"
    version="1.1"
-   height="16"
-   width="66">
+   height="32"
+   width="132" viewBox="0 0 66 16">
   <metadata
      id="metadata12">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__broadcast_on.svg b/res/skins/LateNight/classic/buttons/btn__broadcast_on.svg
index 5197fb5c058..e0a24ab2dbb 100644
--- a/res/skins/LateNight/classic/buttons/btn__broadcast_on.svg
+++ b/res/skins/LateNight/classic/buttons/btn__broadcast_on.svg
@@ -7,8 +7,8 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg6"
    version="1.1"
-   height="16"
-   width="66">
+   height="32"
+   width="132" viewBox="0 0 66 16">
   <metadata
      id="metadata12">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__collapse.svg b/res/skins/LateNight/classic/buttons/btn__collapse.svg
index 078444b9758..45c9f8fb96d 100644
--- a/res/skins/LateNight/classic/buttons/btn__collapse.svg
+++ b/res/skins/LateNight/classic/buttons/btn__collapse.svg
@@ -5,10 +5,10 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   width="14"
-   height="18"
+   width="28"
+   height="36"
    version="1.1"
-   id="svg10">
+   id="svg10" viewBox="0 0 14 18">
   <metadata
      id="metadata16">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__collapse_dim.svg b/res/skins/LateNight/classic/buttons/btn__collapse_dim.svg
index e803bd217c2..ef9eb801a1b 100644
--- a/res/skins/LateNight/classic/buttons/btn__collapse_dim.svg
+++ b/res/skins/LateNight/classic/buttons/btn__collapse_dim.svg
@@ -5,10 +5,10 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   width="14"
-   height="18"
+   width="28"
+   height="36"
    version="1.1"
-   id="svg10">
+   id="svg10" viewBox="0 0 14 18">
   <metadata
      id="metadata16">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__cue_deck.svg b/res/skins/LateNight/classic/buttons/btn__cue_deck.svg
index f06846a3544..da743b833d0 100644
--- a/res/skins/LateNight/classic/buttons/btn__cue_deck.svg
+++ b/res/skins/LateNight/classic/buttons/btn__cue_deck.svg
@@ -1,4 +1,4 @@
-<svg width="38" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="76" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 38 24">
 		<g transform="translate(-6)" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">
 				<path d="m20 8h-7v7h7v-1h-5v-5h5z"/>
 				<path d="m22 8v7h7v-7h-2v6h-3v-6z"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__delete.svg b/res/skins/LateNight/classic/buttons/btn__delete.svg
index 044b02548bc..8185e6f2fe6 100644
--- a/res/skins/LateNight/classic/buttons/btn__delete.svg
+++ b/res/skins/LateNight/classic/buttons/btn__delete.svg
@@ -1,4 +1,4 @@
-<svg width="512" height="512" version="1.1" viewBox="0 0 511.99998 512.00002" xmlns="http://www.w3.org/2000/svg">
+<svg width="1024" height="1024" version="1.1" viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg">
 	<g transform="translate(-23.64344,7e-5)" fill="#d2d2d1">
 		<path d="m279.64681 171.88159c-26.06575 0-52.13052.0299-71.90526.0877l-71.90864.20917 11.39635 144.28116c7.26636 91.9973 11.88509 146.21609 12.74582 149.6234 2.4022 9.50895 6.88437 16.93731 14.65702 24.28386 7.88017 7.44816 14.40588 11.12108 24.00553 13.51503 5.96413 1.48733 10.30426 1.57485 80.65663 1.61768 71.30357.0434 74.62708-.0215 81.02436-1.57888 9.85632-2.39955 16.34743-6.02487 24.29398-13.57238 7.85903-7.46439 12.32536-14.96921 14.6857-24.67522.90639-3.72716 5.40827-56.44582 12.77787-149.62509l11.37779-143.86956-71.90188-.20917c-19.77331-.0578-45.83951-.0877-71.90527-.0877zm79.20088 23.47248c1.92031.0545 3.91687.65563 5.89385 1.87747 4.29268 2.65302 5.9201 6.92117 5.75552 15.10065-.0764 3.80014-2.86136 62.8749-6.18904 131.27725-6.57263 135.10449-5.97739 128.11675-11.2479 131.76981-4.70407 3.26046-10.50992 2.49862-14.17796-1.86059-1.87869-2.2327-2.2317-3.50477-2.2317-8.05808 0-5.74085 8.32212-242.81518 8.888-253.19417.56337-10.33268 6.45099-17.10691 13.30923-16.91234zm-79.51126.22773c4.38547-.10444 8.72138 2.47334 10.99151 7.105 1.52928 3.12018 1.6007 6.17808 1.40345 60.44482-.11427 31.43731-.45063 90.79419-.74728 131.90475-.50093 69.42126-.6481 74.91225-2.06301 77.07039-.83789 1.27804-2.39249 2.86626-3.45466 3.52889-6.30109 3.93089-14.30324.80068-16.12627-6.30712-.65167-2.54075-2.5629-242.03828-2.06302-258.52124.18575-6.12512 2.35757-10.77695 6.23797-13.36153 1.82416-1.215 3.82792-1.8165 5.82131-1.86396zm-78.86857.007c5.49185.14786 11.05876 4.33427 12.51979 12.08289.48348 2.56393 2.8998 62.42091 5.37092 133.01639 4.87989 139.42323 4.88156 131.2626-.0304 134.68467-2.86392 1.99523-5.87605 2.50847-9.21188 1.56878-2.9698-.83662-6.927-4.95017-7.64816-7.95012-1.01291-4.21309-13.19116-261.60393-12.4928-264.03892 1.8586-6.48061 6.64675-9.49416 11.49249-9.36369z"/>
 		<path d="m197.35198 25.916155c5.91021-9.37875 14.10043-14.356319 23.66471-14.382207l5.25609-.01419 37.62836 20.407046 37.62843 20.407088 3.50577-4.104816c7.29902-8.546334 17.96939-13.649361 27.61485-13.206643l4.78273.219524 31.39991 17.283079c30.62399 16.855999 31.46538 17.371964 34.04955 20.880829 5.51991 7.495076 7.17444 22.573787 3.50975 31.986485l-1.49873 3.84943 37.42427 20.896 37.42427 20.89599 2.7998 4.44829c5.09476 8.0945 5.27082 17.67701.50871 27.6877l-2.88036 6.05495-143.19644-78.81791-143.19644-78.817918z"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__effectselector_border.svg b/res/skins/LateNight/classic/buttons/btn__effectselector_border.svg
index cc6c4645664..0364479a398 100644
--- a/res/skins/LateNight/classic/buttons/btn__effectselector_border.svg
+++ b/res/skins/LateNight/classic/buttons/btn__effectselector_border.svg
@@ -1,4 +1,4 @@
-<svg width="25" height="25" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="50" height="50" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25">
 	<defs>
 		<linearGradient id="b" x1="1.4220984" x2="24.143082" y1="19.699568" y2="19.699568" gradientTransform="translate(-.99996996 -25.00003)" gradientUnits="userSpaceOnUse">
 			<stop stop-color="#393939" offset="0"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__eject.svg b/res/skins/LateNight/classic/buttons/btn__eject.svg
index ca7d2b8883d..64a70472b33 100644
--- a/res/skins/LateNight/classic/buttons/btn__eject.svg
+++ b/res/skins/LateNight/classic/buttons/btn__eject.svg
@@ -1 +1 @@
-<svg id="svg2" width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg"><path id="path3936-0-8-9-7-1" d="m4.1778 11 6.3222-7 6.3221 7h-12.644" fill="#585858"/><rect id="rect4195" x="4" y="12" width="13" height="3" color="#000001" fill="#585858"/></svg>
+<svg id="svg2" width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg"><path id="path3936-0-8-9-7-1" d="m4.1778 11 6.3222-7 6.3221 7h-12.644" fill="#585858"/><rect id="rect4195" x="4" y="12" width="13" height="3" color="#000001" fill="#585858"/></svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__eject_active_12.svg b/res/skins/LateNight/classic/buttons/btn__eject_active_12.svg
index a5b1bdaf835..73c49a7492a 100644
--- a/res/skins/LateNight/classic/buttons/btn__eject_active_12.svg
+++ b/res/skins/LateNight/classic/buttons/btn__eject_active_12.svg
@@ -1 +1 @@
-<svg id="svg2" width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg"><path id="path3936-0-8-9-7-1" d="m4.1778 10 6.3222-7 6.3221 7h-12.644" fill="#f0bb2b"/><rect id="rect4195" x="4" y="12" width="13" height="3" color="#000001" fill="#f0bb2b"/></svg>
+<svg id="svg2" width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg"><path id="path3936-0-8-9-7-1" d="m4.1778 10 6.3222-7 6.3221 7h-12.644" fill="#f0bb2b"/><rect id="rect4195" x="4" y="12" width="13" height="3" color="#000001" fill="#f0bb2b"/></svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__eject_active_34.svg b/res/skins/LateNight/classic/buttons/btn__eject_active_34.svg
index 1b24b74135c..bdb1e3cb33a 100644
--- a/res/skins/LateNight/classic/buttons/btn__eject_active_34.svg
+++ b/res/skins/LateNight/classic/buttons/btn__eject_active_34.svg
@@ -1 +1 @@
-<svg id="svg2" width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg"><path id="path3936-0-8-9-7-1" d="m4.1778 10 6.3222-7 6.3221 7h-12.644" fill="#0bd9d1"/><rect id="rect4195" x="4" y="12" width="13" height="3" color="#000001" fill="#0bd9d1"/></svg>
+<svg id="svg2" width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg"><path id="path3936-0-8-9-7-1" d="m4.1778 10 6.3222-7 6.3221 7h-12.644" fill="#0bd9d1"/><rect id="rect4195" x="4" y="12" width="13" height="3" color="#000001" fill="#0bd9d1"/></svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__eq_kill_high.svg b/res/skins/LateNight/classic/buttons/btn__eq_kill_high.svg
index cc38e50b6c7..6613c281174 100644
--- a/res/skins/LateNight/classic/buttons/btn__eq_kill_high.svg
+++ b/res/skins/LateNight/classic/buttons/btn__eq_kill_high.svg
@@ -5,10 +5,10 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   width="18"
-   height="18"
+   width="36"
+   height="36"
    version="1.1"
-   id="svg17">
+   id="svg17" viewBox="0 0 18 18">
   <metadata
      id="metadata21">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__eq_kill_low.svg b/res/skins/LateNight/classic/buttons/btn__eq_kill_low.svg
index 84bc12f9080..21ac673f339 100644
--- a/res/skins/LateNight/classic/buttons/btn__eq_kill_low.svg
+++ b/res/skins/LateNight/classic/buttons/btn__eq_kill_low.svg
@@ -5,10 +5,10 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   width="18"
-   height="18"
+   width="36"
+   height="36"
    version="1.1"
-   id="svg17">
+   id="svg17" viewBox="0 0 18 18">
   <metadata
      id="metadata21">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__eq_kill_mid.svg b/res/skins/LateNight/classic/buttons/btn__eq_kill_mid.svg
index 305912dd65e..f9c12544135 100644
--- a/res/skins/LateNight/classic/buttons/btn__eq_kill_mid.svg
+++ b/res/skins/LateNight/classic/buttons/btn__eq_kill_mid.svg
@@ -5,10 +5,10 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   width="18"
-   height="18"
+   width="36"
+   height="36"
    version="1.1"
-   id="svg17">
+   id="svg17" viewBox="0 0 18 18">
   <metadata
      id="metadata21">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__expand.svg b/res/skins/LateNight/classic/buttons/btn__expand.svg
index 4aa24238a30..ff96038ea65 100644
--- a/res/skins/LateNight/classic/buttons/btn__expand.svg
+++ b/res/skins/LateNight/classic/buttons/btn__expand.svg
@@ -7,8 +7,8 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg16"
    version="1.1"
-   height="18"
-   width="14">
+   height="36"
+   width="28" viewBox="0 0 14 18">
   <metadata
      id="metadata22">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__expand_dim.svg b/res/skins/LateNight/classic/buttons/btn__expand_dim.svg
index d6bb246979e..bcd9c928bea 100644
--- a/res/skins/LateNight/classic/buttons/btn__expand_dim.svg
+++ b/res/skins/LateNight/classic/buttons/btn__expand_dim.svg
@@ -5,10 +5,10 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   width="14"
-   height="18"
+   width="28"
+   height="36"
    version="1.1"
-   id="svg16">
+   id="svg16" viewBox="0 0 14 18">
   <metadata
      id="metadata22">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_2.svg b/res/skins/LateNight/classic/buttons/btn__fx_2.svg
index 5868f1e3725..92883ba6b35 100644
--- a/res/skins/LateNight/classic/buttons/btn__fx_2.svg
+++ b/res/skins/LateNight/classic/buttons/btn__fx_2.svg
@@ -1,4 +1,4 @@
-<svg width="12" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="24" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 18">
 	<path d="m2 6h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="none" stroke="#000001" stroke-linecap="square" stroke-width="1.6"/>
 	<path d="m2 6h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#d2d2d1"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_2_active.svg b/res/skins/LateNight/classic/buttons/btn__fx_2_active.svg
index 8d693355e6c..7ea415781fd 100644
--- a/res/skins/LateNight/classic/buttons/btn__fx_2_active.svg
+++ b/res/skins/LateNight/classic/buttons/btn__fx_2_active.svg
@@ -1,3 +1,3 @@
-<svg width="12" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="24" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 18">
 	<path d="m2 6h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_3.svg b/res/skins/LateNight/classic/buttons/btn__fx_3.svg
index f85178c69ab..d3c444ba845 100644
--- a/res/skins/LateNight/classic/buttons/btn__fx_3.svg
+++ b/res/skins/LateNight/classic/buttons/btn__fx_3.svg
@@ -1,4 +1,4 @@
-<svg width="12" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="24" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 18">
 	<path d="m2 6h7v6h-7v-1h5v-1h-2v-1h2v-2h-5z" stroke="#000001" stroke-width="1.6"/>
 	<path d="m2 6h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#d2d2d1"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_3_active.svg b/res/skins/LateNight/classic/buttons/btn__fx_3_active.svg
index 43f3fb10c6e..251eca065cc 100644
--- a/res/skins/LateNight/classic/buttons/btn__fx_3_active.svg
+++ b/res/skins/LateNight/classic/buttons/btn__fx_3_active.svg
@@ -1,3 +1,3 @@
-<svg width="12" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="24" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 18">
 	<path d="m2 6h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_4.svg b/res/skins/LateNight/classic/buttons/btn__fx_4.svg
index b03b4e9dd4b..8942acdb021 100644
--- a/res/skins/LateNight/classic/buttons/btn__fx_4.svg
+++ b/res/skins/LateNight/classic/buttons/btn__fx_4.svg
@@ -1,4 +1,4 @@
-<svg width="12" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="24" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 18">
 	<path d="m2 7v3h5v2h2v-6h-2v3h-3v-2z" stroke="#000001" stroke-width="1.6"/>
 	<path d="m2 7v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#d2d2d1"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_4_active.svg b/res/skins/LateNight/classic/buttons/btn__fx_4_active.svg
index a039bce0d1d..55f4de29dd7 100644
--- a/res/skins/LateNight/classic/buttons/btn__fx_4_active.svg
+++ b/res/skins/LateNight/classic/buttons/btn__fx_4_active.svg
@@ -1,3 +1,3 @@
-<svg width="12" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="24" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 18">
 	<path d="m2 7v3h5v2h2v-6h-2v3h-3v-2h-2"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_FX1.svg b/res/skins/LateNight/classic/buttons/btn__fx_FX1.svg
index 72f260009df..470fd41f32a 100644
--- a/res/skins/LateNight/classic/buttons/btn__fx_FX1.svg
+++ b/res/skins/LateNight/classic/buttons/btn__fx_FX1.svg
@@ -1,4 +1,4 @@
-<svg width="23" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="46" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 23 18">
 	<g fill="none" stroke="#0a0a0a" stroke-linecap="square" stroke-width="1.6">
 		<path d="m19 6h3v6h-2v-5h-1v-1"/>
 		<path d="m1 6v6h2v-3h4v-1h-4v-1h5v-1h-7"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_FX1_active.svg b/res/skins/LateNight/classic/buttons/btn__fx_FX1_active.svg
index f0fb0fc9c8c..a44e3299016 100644
--- a/res/skins/LateNight/classic/buttons/btn__fx_FX1_active.svg
+++ b/res/skins/LateNight/classic/buttons/btn__fx_FX1_active.svg
@@ -1,4 +1,4 @@
-<svg width="23" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="46" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 23 18">
 	<g transform="translate(-5)" fill="#020201">
 		<path d="m24 6h3v6h-2v-5h-1v-1"/>
 		<path d="m6 6v6h2v-3h4v-1h-4v-1h5v-1h-7"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_FX2.svg b/res/skins/LateNight/classic/buttons/btn__fx_FX2.svg
index 24319417239..4f9eb4be624 100644
--- a/res/skins/LateNight/classic/buttons/btn__fx_FX2.svg
+++ b/res/skins/LateNight/classic/buttons/btn__fx_FX2.svg
@@ -1,4 +1,4 @@
-<svg width="27" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="54" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 27 18">
 	<g fill="none" stroke="#000001" stroke-linecap="square" stroke-width="1.6">
 		<path d="m1 6v6h2v-3h4v-1h-4v-1h5v-1h-7"/>
 		<path d="m16 11.5-2.25-2.25 2.25-2.25v-1h-1.5l-2 2-2-2h-1.5v.5l2.5 2.5-2.5 2.5v.5h2l1.75-1.75 1.75 1.75h1.5z"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_FX2_active.svg b/res/skins/LateNight/classic/buttons/btn__fx_FX2_active.svg
index b26ae578a38..a11f9781d2e 100644
--- a/res/skins/LateNight/classic/buttons/btn__fx_FX2_active.svg
+++ b/res/skins/LateNight/classic/buttons/btn__fx_FX2_active.svg
@@ -1,4 +1,4 @@
-<svg width="27" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="54" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 27 18">
 	<g transform="translate(-3)">
 		<path d="m4 6v6h2v-3h4v-1h-4v-1h5v-1h-7"/>
 		<path d="m19 11.5-2.25-2.25 2.25-2.25v-1h-1.5l-2 2-2-2h-1.5v.5l2.5 2.5-2.5 2.5v.5h2l1.75-1.75 1.75 1.75h1.5z"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_FX3.svg b/res/skins/LateNight/classic/buttons/btn__fx_FX3.svg
index 071ea2b965a..e82c998c5d8 100644
--- a/res/skins/LateNight/classic/buttons/btn__fx_FX3.svg
+++ b/res/skins/LateNight/classic/buttons/btn__fx_FX3.svg
@@ -1,4 +1,4 @@
-<svg width="27" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="54" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 27 18">
 	<g fill="none" stroke="#000001" stroke-linecap="square" stroke-width="1.6">
 		<path d="m1 6v6h2v-3h4v-1h-4v-1h5v-1h-7"/>
 		<path d="m16 11.5-2.25-2.25 2.25-2.25v-1h-1.5l-2 2-2-2h-1.5v.5l2.5 2.5-2.5 2.5v.5h2l1.75-1.75 1.75 1.75h1.5z"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_FX3_active.svg b/res/skins/LateNight/classic/buttons/btn__fx_FX3_active.svg
index eb026958dfb..619a2b7a2e7 100644
--- a/res/skins/LateNight/classic/buttons/btn__fx_FX3_active.svg
+++ b/res/skins/LateNight/classic/buttons/btn__fx_FX3_active.svg
@@ -1,4 +1,4 @@
-<svg width="27" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="54" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 27 18">
 	<g transform="translate(-3)">
 		<path d="m4 6v6h2v-3h4v-1h-4v-1h5v-1h-7"/>
 		<path d="m19 11.5-2.25-2.25 2.25-2.25v-1h-1.5l-2 2-2-2h-1.5v.5l2.5 2.5-2.5 2.5v.5h2l1.75-1.75 1.75 1.75h1.5z"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_FX4.svg b/res/skins/LateNight/classic/buttons/btn__fx_FX4.svg
index 6d42ce787ba..c153195817f 100644
--- a/res/skins/LateNight/classic/buttons/btn__fx_FX4.svg
+++ b/res/skins/LateNight/classic/buttons/btn__fx_FX4.svg
@@ -1,4 +1,4 @@
-<svg width="27" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="54" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 27 18">
 	<g stroke="#000001" stroke-width="1.6">
 		<path d="m1 6v6h2v-3h4v-1h-4v-1h5v-1h-7" fill="none" stroke-linecap="square"/>
 		<path d="m16 11.5-2.25-2.25 2.25-2.25v-1h-1.5l-2 2-2-2h-1.5v.5l2.5 2.5-2.5 2.5v.5h2l1.75-1.75 1.75 1.75h1.5z" fill="none" stroke-linecap="square"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_FX4_active.svg b/res/skins/LateNight/classic/buttons/btn__fx_FX4_active.svg
index 79cd7ec5d8c..e4f2529206a 100644
--- a/res/skins/LateNight/classic/buttons/btn__fx_FX4_active.svg
+++ b/res/skins/LateNight/classic/buttons/btn__fx_FX4_active.svg
@@ -1,4 +1,4 @@
-<svg width="27" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="54" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 27 18">
 	<g transform="translate(-3)" fill="#0c0c0b">
 		<path d="m4 6v6h2v-3h4v-1h-4v-1h5v-1h-7"/>
 		<path d="m19 11.5-2.25-2.25 2.25-2.25v-1h-1.5l-2 2-2-2h-1.5v.5l2.5 2.5-2.5 2.5v.5h2l1.75-1.75 1.75 1.75h1.5z"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_focus.svg b/res/skins/LateNight/classic/buttons/btn__fx_focus.svg
index 0277d12a656..edded1623cd 100644
--- a/res/skins/LateNight/classic/buttons/btn__fx_focus.svg
+++ b/res/skins/LateNight/classic/buttons/btn__fx_focus.svg
@@ -7,8 +7,8 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg22"
    version="1.1"
-   height="18"
-   width="18">
+   height="36"
+   width="36" viewBox="0 0 18 18">
   <metadata
      id="metadata28">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_focus_active.svg b/res/skins/LateNight/classic/buttons/btn__fx_focus_active.svg
index 718d6039755..1ece9ddd5f5 100644
--- a/res/skins/LateNight/classic/buttons/btn__fx_focus_active.svg
+++ b/res/skins/LateNight/classic/buttons/btn__fx_focus_active.svg
@@ -8,8 +8,8 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    id="svg32"
    version="1.1"
-   height="18"
-   width="18">
+   height="36"
+   width="36" viewBox="0 0 18 18">
   <metadata
      id="metadata38">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_mixmode_d+w.svg b/res/skins/LateNight/classic/buttons/btn__fx_mixmode_d+w.svg
index 1eb0567c00e..ad73eb9d10f 100644
--- a/res/skins/LateNight/classic/buttons/btn__fx_mixmode_d+w.svg
+++ b/res/skins/LateNight/classic/buttons/btn__fx_mixmode_d+w.svg
@@ -7,8 +7,8 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg12"
    version="1.1"
-   height="24"
-   width="28">
+   height="48"
+   width="56" viewBox="0 0 28 24">
   <metadata
      id="metadata18">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_mixmode_d-w.svg b/res/skins/LateNight/classic/buttons/btn__fx_mixmode_d-w.svg
index 2ec166c932a..8e9dc6a5f03 100644
--- a/res/skins/LateNight/classic/buttons/btn__fx_mixmode_d-w.svg
+++ b/res/skins/LateNight/classic/buttons/btn__fx_mixmode_d-w.svg
@@ -7,8 +7,8 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg12"
    version="1.1"
-   height="24"
-   width="28">
+   height="48"
+   width="56" viewBox="0 0 28 24">
   <metadata
      id="metadata18">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_selector_down.svg b/res/skins/LateNight/classic/buttons/btn__fx_selector_down.svg
index 23215c8710d..c2364b0196e 100644
--- a/res/skins/LateNight/classic/buttons/btn__fx_selector_down.svg
+++ b/res/skins/LateNight/classic/buttons/btn__fx_selector_down.svg
@@ -1,4 +1,4 @@
-<svg width="16" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 24">
 	<path d="m8 15.918 4.5715-7.9181h-9.143z" fill="none" stroke="#000001" stroke-width="1.6"/>
 	<path d="m8 15.918 4.5715-7.9181h-9.143z" fill="#888"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_selector_down_pressed.svg b/res/skins/LateNight/classic/buttons/btn__fx_selector_down_pressed.svg
index 1fb9b0abcb3..1bb566ea97e 100644
--- a/res/skins/LateNight/classic/buttons/btn__fx_selector_down_pressed.svg
+++ b/res/skins/LateNight/classic/buttons/btn__fx_selector_down_pressed.svg
@@ -1,4 +1,4 @@
-<svg width="16" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 24">
 	<path d="m8 15.918 4.5715-7.9181h-9.143z" fill="none" stroke="#000001" stroke-width="1.6"/>
 	<path d="m8 15.918 4.5715-7.9181h-9.143z" fill="#d2d2d1"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_settings.svg b/res/skins/LateNight/classic/buttons/btn__fx_settings.svg
index e5ea012bed0..137fa011b93 100644
--- a/res/skins/LateNight/classic/buttons/btn__fx_settings.svg
+++ b/res/skins/LateNight/classic/buttons/btn__fx_settings.svg
@@ -1,4 +1,4 @@
-<svg width="18" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="36" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18">
   <g transform="matrix(-.88128042 0 0 .99998333 17.814781 -.9999333)" fill="#a7a7a6" stroke-width=".77781">
     <path transform="matrix(1.1347,0,0,1,-34.251,6)" d="m37.625-5-0.1875 2.625c-0.66019 0.16435-1.2765 0.43313-1.8438 0.78125l-1.9688-1.75-1.9688 1.9688 1.75 1.9688c-0.34382 0.56314-0.61891 1.1878-0.78125 1.8438l-2.625 0.1875v2.75l2.625 0.1875c0.16385 0.66212 0.431 1.2793 0.78125 1.8438l-1.75 1.9688 1.9688 1.9688 2-1.75c0.55851 0.33599 1.1644 0.58862 1.8125 0.75l0.1875 2.6562h2.75l0.1875-2.625c0.66019-0.16435 1.2765-0.43313 1.8438-0.78125l1.9688 1.75 1.9688-1.9688-1.75-1.9688c0.34382-0.56314 0.61891-1.1878 0.78125-1.8438l2.625-0.1875v-2.75l-2.625-0.1875c-0.16435-0.66019-0.43313-1.2765-0.78125-1.8438l1.75-1.9688-1.9688-1.9688-1.9688 1.75c-0.56314-0.34382-1.1878-0.61891-1.8438-0.78125l-0.1875-2.625zm1.375 6c1.6505 0 3 1.3495 3 3s-1.3495 3-3 3-3-1.3495-3-3 1.3495-3 3-3z" color="#000001" fill="#a7a7a6" stroke-width=".646064"/>
   </g>
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_toggle.svg b/res/skins/LateNight/classic/buttons/btn__fx_toggle.svg
index 1f1524a6ca0..34e23206cf8 100644
--- a/res/skins/LateNight/classic/buttons/btn__fx_toggle.svg
+++ b/res/skins/LateNight/classic/buttons/btn__fx_toggle.svg
@@ -1,4 +1,4 @@
-<svg width="22" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="44" height="44" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
 	<g fill="none" stroke="#000001" stroke-width="1.6">
 		<path d="m13.730156 7.0804229c1.509333.923162 2.519954 2.5811933 2.519954 4.4799511 0 2.900587-2.349347 5.250022-5.250022 5.250022s-5.250022-2.349435-5.250022-5.250022c0-1.8987578 1.0106213-3.5567891 2.5199542-4.4799511l-1.2643765-1.2643765c-1.8156164 1.2643765-3.0056437 3.3642797-3.0056437 5.7443276 0 3.867479 3.1325213 6.999912 7 6.999912 3.867479 0 7-3.132433 7-6.999912 0-2.3800479-1.190027-4.4799511-3.005644-5.7443276z"/>
 		<path d="m11.999999 3h-1.9999998v6.0000003h1.9999998z"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_toggle_active.svg b/res/skins/LateNight/classic/buttons/btn__fx_toggle_active.svg
index 8760ce6f0b7..986d672f58b 100644
--- a/res/skins/LateNight/classic/buttons/btn__fx_toggle_active.svg
+++ b/res/skins/LateNight/classic/buttons/btn__fx_toggle_active.svg
@@ -1,4 +1,4 @@
-<svg width="22" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="44" height="44" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
 	<path d="m14.994532 5.8160464-1.264376 1.2643765c1.509333.923162 2.519954 2.5811933 2.519954 4.4799511 0 2.900587-2.349347 5.250022-5.250022 5.250022s-5.250022-2.349435-5.250022-5.250022c0-1.8987578 1.0106213-3.5567891 2.5199542-4.4799511l-1.2643765-1.2643765c-1.8156164 1.2643765-3.0056437 3.3642797-3.0056437 5.7443276 0 3.867479 3.1325213 6.999912 7 6.999912 3.867479 0 7-3.132433 7-6.999912 0-2.3800479-1.190027-4.4799511-3.005644-5.7443276z" fill="#0e0e0e"/>
 	<path d="m11.999999 3h-1.9999998v6.0000003h1.9999998z" fill="#0e0e0e" stroke-width=".99999994"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__intro_end.svg b/res/skins/LateNight/classic/buttons/btn__intro_end.svg
index ff3317eb727..0b46d96e8bb 100644
--- a/res/skins/LateNight/classic/buttons/btn__intro_end.svg
+++ b/res/skins/LateNight/classic/buttons/btn__intro_end.svg
@@ -1,4 +1,4 @@
-<svg width="18" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="36" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 24">
 	<g transform="translate(-2.99971)" fill="none" stroke="#000001" stroke-linecap="square" stroke-width="1.6">
 		<rect transform="scale(-1,1)" x="-18" y="7" width="2" height="10" style="paint-order:markers fill stroke"/>
 		<path d="m5 17 9-10v10z"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__intro_start.svg b/res/skins/LateNight/classic/buttons/btn__intro_start.svg
index b0ebbb8369d..95f1672558f 100644
--- a/res/skins/LateNight/classic/buttons/btn__intro_start.svg
+++ b/res/skins/LateNight/classic/buttons/btn__intro_start.svg
@@ -1,4 +1,4 @@
-<svg width="18" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="36" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 24">
 	<g transform="translate(-3)" fill="none" stroke="#000001" stroke-linecap="square" stroke-width="1.6">
 		<rect x="6" y="7" width="2" height="10" style="paint-order:markers fill stroke"/>
 		<path d="m9 17 9-10v10z"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__key_down.svg b/res/skins/LateNight/classic/buttons/btn__key_down.svg
index 753b2af4aea..e9a99cf5b23 100644
--- a/res/skins/LateNight/classic/buttons/btn__key_down.svg
+++ b/res/skins/LateNight/classic/buttons/btn__key_down.svg
@@ -1,4 +1,4 @@
-<svg width="10" height="9" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="20" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 9">
 		<path d="m5.0000515 8.00008-3.4641429-6h6.9281999z" fill="none" stroke="#000001" stroke-linejoin="round" stroke-width="1.60000002"/>
 		<path d="m5.0000515 8.00008-3.4641429-6h6.9281999z" fill="#bfbfbe" stroke-width=".85714287"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__key_match.svg b/res/skins/LateNight/classic/buttons/btn__key_match.svg
index 7f77bd675cd..8376c6a942e 100644
--- a/res/skins/LateNight/classic/buttons/btn__key_match.svg
+++ b/res/skins/LateNight/classic/buttons/btn__key_match.svg
@@ -1,4 +1,4 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
 	<g transform="matrix(.77463677 0 0 .77463677 19.507552 .20097752)" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.06548419" aria-label="♪">
 		<path d="m-14.623223 1.7718814h1.132812l.104167.091146v.5078125c.234375.4687499 1.10243.9765624 2.604166 1.5234374 2.0833332.6076389 3.1250002 1.5104167 3.1250002 2.7083333 0 1.2673611-.529514 2.3177083-1.588541 3.1510416h-.05208l-.390625-.4166667c.529514-.4253472.794271-1.0026041.794271-1.7317708 0-.6076388-.989583-1.219618-2.9687502-1.8359374-.798611-.3645833-1.306423-.6597222-1.523437-.8854167v11.2983524c0 1.328125-.972222 2.1875-2.916667 2.578125h-.742187c-2.100695 0-3.151042-.729167-3.151042-2.1875 0-1.137153.920139-1.805555 2.760417-2.005208h.299479c.833333 0 1.636285.277778 2.408854.833333v-13.5379358z" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.06548419"/>
 	</g>
diff --git a/res/skins/LateNight/classic/buttons/btn__key_up.svg b/res/skins/LateNight/classic/buttons/btn__key_up.svg
index 4821f68e91b..96dd7d097fa 100644
--- a/res/skins/LateNight/classic/buttons/btn__key_up.svg
+++ b/res/skins/LateNight/classic/buttons/btn__key_up.svg
@@ -1,4 +1,4 @@
-<svg width="10" height="9" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="20" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 9">
 		<path d="M 5.0000515,0.99999999 1.5359086,7 h 6.9281999 z" fill="none" stroke="#000001" stroke-linejoin="round" stroke-width="1.60000002"/>
 		<path d="M 5.0000515,0.99999999 1.5359086,7 h 6.9281999 z" fill="#bfbfbe" stroke-width=".85714287"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__keylock.svg b/res/skins/LateNight/classic/buttons/btn__keylock.svg
index f403f41b4dd..4df76d97127 100644
--- a/res/skins/LateNight/classic/buttons/btn__keylock.svg
+++ b/res/skins/LateNight/classic/buttons/btn__keylock.svg
@@ -1 +1 @@
-<svg id="svg2" width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg"><path id="rect4195" d="m10.5 3c-1.933 0-3.5 1.567-3.5 3.5v1.5h-2v7h11v-7h-2v-1.5c0-1.933-1.567-3.5-3.5-3.5zm0 2c0.82843 0 1.5 0.67157 1.5 1.5v1.5h-3v-1.5c0-0.82843 0.67157-1.5 1.5-1.5zm-0.5 5h1v3h-1z" color="#000001" fill="#585858"/></svg>
+<svg id="svg2" width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg"><path id="rect4195" d="m10.5 3c-1.933 0-3.5 1.567-3.5 3.5v1.5h-2v7h11v-7h-2v-1.5c0-1.933-1.567-3.5-3.5-3.5zm0 2c0.82843 0 1.5 0.67157 1.5 1.5v1.5h-3v-1.5c0-0.82843 0.67157-1.5 1.5-1.5zm-0.5 5h1v3h-1z" color="#000001" fill="#585858"/></svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__keylock_active_12.svg b/res/skins/LateNight/classic/buttons/btn__keylock_active_12.svg
index c75e8ce4206..c3102821e51 100644
--- a/res/skins/LateNight/classic/buttons/btn__keylock_active_12.svg
+++ b/res/skins/LateNight/classic/buttons/btn__keylock_active_12.svg
@@ -1 +1 @@
-<svg id="svg2" width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg"><path id="rect4195" d="m10.5 3c-1.933 0-3.5 1.567-3.5 3.5v1.5h-2v7h11v-7h-2v-1.5c0-1.933-1.567-3.5-3.5-3.5zm0 2c0.82843 0 1.5 0.67157 1.5 1.5v1.5h-3v-1.5c0-0.82843 0.67157-1.5 1.5-1.5zm-0.5 5h1v3h-1z" color="#000001" fill="#f0bb2b"/></svg>
+<svg id="svg2" width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg"><path id="rect4195" d="m10.5 3c-1.933 0-3.5 1.567-3.5 3.5v1.5h-2v7h11v-7h-2v-1.5c0-1.933-1.567-3.5-3.5-3.5zm0 2c0.82843 0 1.5 0.67157 1.5 1.5v1.5h-3v-1.5c0-0.82843 0.67157-1.5 1.5-1.5zm-0.5 5h1v3h-1z" color="#000001" fill="#f0bb2b"/></svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__keylock_active_34.svg b/res/skins/LateNight/classic/buttons/btn__keylock_active_34.svg
index 69fe30027bd..b3600ebd729 100644
--- a/res/skins/LateNight/classic/buttons/btn__keylock_active_34.svg
+++ b/res/skins/LateNight/classic/buttons/btn__keylock_active_34.svg
@@ -1 +1 @@
-<svg id="svg2" width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg"><path id="rect4195" d="m10.5 3c-1.933 0-3.5 1.567-3.5 3.5v1.5h-2v7h11v-7h-2v-1.5c0-1.933-1.567-3.5-3.5-3.5zm0 2c0.82843 0 1.5 0.67157 1.5 1.5v1.5h-3v-1.5c0-0.82843 0.67157-1.5 1.5-1.5zm-0.5 5h1v3h-1z" color="#000001" fill="#0bd9d1"/></svg>
+<svg id="svg2" width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg"><path id="rect4195" d="m10.5 3c-1.933 0-3.5 1.567-3.5 3.5v1.5h-2v7h11v-7h-2v-1.5c0-1.933-1.567-3.5-3.5-3.5zm0 2c0.82843 0 1.5 0.67157 1.5 1.5v1.5h-3v-1.5c0-0.82843 0.67157-1.5 1.5-1.5zm-0.5 5h1v3h-1z" color="#000001" fill="#0bd9d1"/></svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__leader_deck.svg b/res/skins/LateNight/classic/buttons/btn__leader_deck.svg
index 7f7de5bf879..c5b448e0186 100644
--- a/res/skins/LateNight/classic/buttons/btn__leader_deck.svg
+++ b/res/skins/LateNight/classic/buttons/btn__leader_deck.svg
@@ -7,12 +7,12 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="46"
-   height="20"
+   width="92"
+   height="40"
    version="1.1"
    id="svg32"
    sodipodi:docname="btn__leader_deck.svg"
-   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)" viewBox="0 0 46 20">
   <metadata
      id="metadata38">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__lib_bpm_down.svg b/res/skins/LateNight/classic/buttons/btn__lib_bpm_down.svg
index 10c4bc4a3f4..8e56ea31bd5 100644
--- a/res/skins/LateNight/classic/buttons/btn__lib_bpm_down.svg
+++ b/res/skins/LateNight/classic/buttons/btn__lib_bpm_down.svg
@@ -5,10 +5,10 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   width="12"
-   height="10"
+   width="24"
+   height="20"
    version="1.1"
-   id="svg4">
+   id="svg4" viewBox="0 0 12 10">
   <metadata
      id="metadata10">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__lib_bpm_locked_orange.svg b/res/skins/LateNight/classic/buttons/btn__lib_bpm_locked_orange.svg
index e19a86e209c..64836057958 100644
--- a/res/skins/LateNight/classic/buttons/btn__lib_bpm_locked_orange.svg
+++ b/res/skins/LateNight/classic/buttons/btn__lib_bpm_locked_orange.svg
@@ -1 +1 @@
-<svg id="svg2" width="10" height="12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:osb="http://www.openswatchbook.org/uri/2009/osb" xmlns:xlink="http://www.w3.org/1999/xlink"><g id="ic_library_crates" transform="translate(0,-20)"><g id="g867"><path id="path8889-9" d="m2.25 26.25s0.00538-2.2 0-2.8599c-0.00538-0.66018 0.22449-2.6227 2.7312-2.6399 2.4906-0.01712 2.767 1.9798 2.7688 3.0799 0.00108 0.65999 0 2.42 0 2.42" fill="none" stroke="#ff6600" stroke-width="1.5"/><path id="rect8885-1" transform="translate(0,20)" d="m0.83398 6c-0.41667 0-0.83398 0.41498-0.83398 0.83008v4.3398c0 0.4151 0.41732 0.83008 0.83398 0.83008h8.332c0.41667 0 0.83398-0.41498 0.83398-0.83008v-4.3398c0-0.4151-0.41732-0.83008-0.83398-0.83008h-8.332zm1.166 2h6c0.277 0 0.5 0.223 0.5 0.5s-0.223 0.5-0.5 0.5h-6c-0.277 0-0.5-0.223-0.5-0.5s0.223-0.5 0.5-0.5zm0 2h6c0.277 0 0.5 0.223 0.5 0.5s-0.223 0.5-0.5 0.5h-6c-0.277 0-0.5-0.223-0.5-0.5s0.223-0.5 0.5-0.5z" color="#000001" fill="#ff6600" style="text-decoration-line:none;text-indent:0;text-transform:none"/></g></g></svg>
+<svg id="svg2" width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:osb="http://www.openswatchbook.org/uri/2009/osb" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 10 12"><g id="ic_library_crates" transform="translate(0,-20)"><g id="g867"><path id="path8889-9" d="m2.25 26.25s0.00538-2.2 0-2.8599c-0.00538-0.66018 0.22449-2.6227 2.7312-2.6399 2.4906-0.01712 2.767 1.9798 2.7688 3.0799 0.00108 0.65999 0 2.42 0 2.42" fill="none" stroke="#ff6600" stroke-width="1.5"/><path id="rect8885-1" transform="translate(0,20)" d="m0.83398 6c-0.41667 0-0.83398 0.41498-0.83398 0.83008v4.3398c0 0.4151 0.41732 0.83008 0.83398 0.83008h8.332c0.41667 0 0.83398-0.41498 0.83398-0.83008v-4.3398c0-0.4151-0.41732-0.83008-0.83398-0.83008h-8.332zm1.166 2h6c0.277 0 0.5 0.223 0.5 0.5s-0.223 0.5-0.5 0.5h-6c-0.277 0-0.5-0.223-0.5-0.5s0.223-0.5 0.5-0.5zm0 2h6c0.277 0 0.5 0.223 0.5 0.5s-0.223 0.5-0.5 0.5h-6c-0.277 0-0.5-0.223-0.5-0.5s0.223-0.5 0.5-0.5z" color="#000001" fill="#ff6600" style="text-decoration-line:none;text-indent:0;text-transform:none"/></g></g></svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__lib_bpm_unlocked_grey.svg b/res/skins/LateNight/classic/buttons/btn__lib_bpm_unlocked_grey.svg
index ba6ce426894..cb256e4ed35 100644
--- a/res/skins/LateNight/classic/buttons/btn__lib_bpm_unlocked_grey.svg
+++ b/res/skins/LateNight/classic/buttons/btn__lib_bpm_unlocked_grey.svg
@@ -1,4 +1,4 @@
-<svg width="10" height="12" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 12">
 	<g transform="translate(0,-20)">
 		<path transform="translate(0,20)" d="m4.9766 0c-1.4489.01-2.4418.65947-2.9336 1.4238l1.26172.81059c.2485-.38625.62385-.7271 1.6816-.73438 1.0447-.00718 1.407.31941 1.6699.75781.26297.4384.34296 1.0862.34375 1.5742.0009639.58906.0001684 1.8689 0 2.168h-6.166c-.41667 0-.83398.41498-.83398.83008v4.3398c0 .4151.41732.83008.83398.83008h8.332c.41667 0 .83398-.41498.83398-.83008v-4.3398c0-.4151-.41732-.83008-.83398-.83008h-.66602c.000169-.29836.0009685-1.5773 0-2.1719-.0009966-.61214-.060246-1.5129-.55859-2.3438-.49835-.83081-1.5189-1.4943-2.9648-1.4844zm-2.9766 8h6c.277 0 .5.223.5.5s-.223.5-.5.5h-6c-.277 0-.5-.223-.5-.5s.223-.5.5-.5zm0 2h6c.277 0 .5.223.5.5s-.223.5-.5.5h-6c-.277 0-.5-.223-.5-.5s.223-.5.5-.5z" color="#000001" color-rendering="auto" dominant-baseline="auto" fill="#979797" fill-opacity=".50196007" image-rendering="auto" shape-rendering="auto" solid-color="#000001" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000001;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
 	</g>
diff --git a/res/skins/LateNight/classic/buttons/btn__lib_bpm_up.svg b/res/skins/LateNight/classic/buttons/btn__lib_bpm_up.svg
index 30e180f6184..83c7b134248 100644
--- a/res/skins/LateNight/classic/buttons/btn__lib_bpm_up.svg
+++ b/res/skins/LateNight/classic/buttons/btn__lib_bpm_up.svg
@@ -7,8 +7,8 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg4"
    version="1.1"
-   height="10"
-   width="12">
+   height="20"
+   width="24" viewBox="0 0 12 10">
   <metadata
      id="metadata10">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__lib_checkbox.svg b/res/skins/LateNight/classic/buttons/btn__lib_checkbox.svg
index 9ff5e37a358..2b9201dcc17 100644
--- a/res/skins/LateNight/classic/buttons/btn__lib_checkbox.svg
+++ b/res/skins/LateNight/classic/buttons/btn__lib_checkbox.svg
@@ -1,3 +1,3 @@
-<svg width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
   <rect x=".5" y=".5" width="19" height="19" rx="1.0000001" ry="1.0000001" stroke="#4d4d4d" stroke-linecap="square" stroke-linejoin="round" style="paint-order:markers fill stroke"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__lib_checkbox_checked.svg b/res/skins/LateNight/classic/buttons/btn__lib_checkbox_checked.svg
index a051362dbb3..3b70ebc96d2 100644
--- a/res/skins/LateNight/classic/buttons/btn__lib_checkbox_checked.svg
+++ b/res/skins/LateNight/classic/buttons/btn__lib_checkbox_checked.svg
@@ -1,4 +1,4 @@
-<svg width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
   <rect x=".5" y=".5" width="19" height="19" stroke="#f60" stroke-linecap="square" style="paint-order:markers fill stroke"/>
   <path d="m4.3659 11.878 3.7560375 3.75605 7.5121625-11.2679" fill="none" stroke="#f60" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.3412"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__lib_checkmark_grey.svg b/res/skins/LateNight/classic/buttons/btn__lib_checkmark_grey.svg
index 2aa0d5f5c3f..acb520632b1 100644
--- a/res/skins/LateNight/classic/buttons/btn__lib_checkmark_grey.svg
+++ b/res/skins/LateNight/classic/buttons/btn__lib_checkmark_grey.svg
@@ -1,4 +1,4 @@
-<svg width="10" height="10" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
   <g transform="translate(0,-22)" stroke="#8c8c8c">
     <g transform="matrix(.4151 0 0 .4151 -1.6604 19.547)" stroke="#8c8c8c">
       <path d="m8.8184 20.364 4.8181 4.8181 9.6363-14.454" fill="none" stroke="#8c8c8c" stroke-linecap="round" stroke-linejoin="round" stroke-width="4.8181"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__lib_checkmark_indeterminate_grey.svg b/res/skins/LateNight/classic/buttons/btn__lib_checkmark_indeterminate_grey.svg
index d26efbc781a..f5d6a37ad42 100644
--- a/res/skins/LateNight/classic/buttons/btn__lib_checkmark_indeterminate_grey.svg
+++ b/res/skins/LateNight/classic/buttons/btn__lib_checkmark_indeterminate_grey.svg
@@ -1,3 +1,3 @@
-<svg width="10" height="10" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
   <rect x="3" y="3" width="4" height="4" fill="#8c8c8c" style="paint-order:stroke markers fill"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__lib_checkmark_indeterminate_orange.svg b/res/skins/LateNight/classic/buttons/btn__lib_checkmark_indeterminate_orange.svg
index 10b911e5625..54142da559c 100644
--- a/res/skins/LateNight/classic/buttons/btn__lib_checkmark_indeterminate_orange.svg
+++ b/res/skins/LateNight/classic/buttons/btn__lib_checkmark_indeterminate_orange.svg
@@ -1,3 +1,3 @@
-<svg width="10" height="10" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
   <rect x="3" y="3" width="4" height="4" fill="#f60" style="paint-order:stroke markers fill"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__lib_checkmark_orange.svg b/res/skins/LateNight/classic/buttons/btn__lib_checkmark_orange.svg
index 2e08031d36f..c6b18d61871 100644
--- a/res/skins/LateNight/classic/buttons/btn__lib_checkmark_orange.svg
+++ b/res/skins/LateNight/classic/buttons/btn__lib_checkmark_orange.svg
@@ -1,4 +1,4 @@
-<svg width="10" height="10" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
 	<defs>
 		<linearGradient id="a" x1="28" x2="28" y1="24" y2="34" gradientTransform="matrix(2.4091 0 0 2.4091 -17.681 3.5004)" gradientUnits="userSpaceOnUse">
 			<stop stop-color="#f60" offset="0"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__lib_clear_search.svg b/res/skins/LateNight/classic/buttons/btn__lib_clear_search.svg
index 5cd52352522..83ec06eae2a 100644
--- a/res/skins/LateNight/classic/buttons/btn__lib_clear_search.svg
+++ b/res/skins/LateNight/classic/buttons/btn__lib_clear_search.svg
@@ -5,10 +5,10 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   width="19"
-   height="19"
+   width="38"
+   height="38"
    version="1.1"
-   id="svg10">
+   id="svg10" viewBox="0 0 19 19">
   <metadata
      id="metadata16">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__lib_clear_search_focus.svg b/res/skins/LateNight/classic/buttons/btn__lib_clear_search_focus.svg
index e68471951a0..381e72a0d99 100644
--- a/res/skins/LateNight/classic/buttons/btn__lib_clear_search_focus.svg
+++ b/res/skins/LateNight/classic/buttons/btn__lib_clear_search_focus.svg
@@ -5,10 +5,10 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   width="19"
-   height="19"
+   width="38"
+   height="38"
    version="1.1"
-   id="svg10">
+   id="svg10" viewBox="0 0 19 19">
   <metadata
      id="metadata16">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__lib_preview_pause.svg b/res/skins/LateNight/classic/buttons/btn__lib_preview_pause.svg
index ecd76912ea0..b8ffdc6fd3a 100644
--- a/res/skins/LateNight/classic/buttons/btn__lib_preview_pause.svg
+++ b/res/skins/LateNight/classic/buttons/btn__lib_preview_pause.svg
@@ -6,9 +6,9 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   height="18"
-   width="30"
-   id="svg2">
+   height="36"
+   width="60"
+   id="svg2" viewBox="0 0 30 18">
   <metadata
      id="metadata12">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__lib_preview_play.svg b/res/skins/LateNight/classic/buttons/btn__lib_preview_play.svg
index 7bb79b163b0..8426e82e2ff 100644
--- a/res/skins/LateNight/classic/buttons/btn__lib_preview_play.svg
+++ b/res/skins/LateNight/classic/buttons/btn__lib_preview_play.svg
@@ -5,10 +5,10 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   width="30"
-   height="18"
+   width="60"
+   height="36"
    version="1.1"
-   id="svg10">
+   id="svg10" viewBox="0 0 30 18">
   <metadata
      id="metadata16">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__lib_radio_button_gold_on.svg b/res/skins/LateNight/classic/buttons/btn__lib_radio_button_gold_on.svg
index 271857a10b7..af13df7919d 100644
--- a/res/skins/LateNight/classic/buttons/btn__lib_radio_button_gold_on.svg
+++ b/res/skins/LateNight/classic/buttons/btn__lib_radio_button_gold_on.svg
@@ -1,4 +1,4 @@
-<svg id="svg2" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
+<svg id="svg2" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg" width="36" height="36">
   <path id="path2987" d="m9 5.1042c-2.1505 0-3.8958 1.7453-3.8958 3.8958s1.7453 3.8958 3.8958 3.8958 3.8958-1.7453 3.8958-3.8958-1.7453-3.8958-3.8958-3.8958z" fill="#cab32c"/>
   <path id="path2985" d="m9 2c-3.8675 0-7 3.1325-7 7s3.1325 7 7 7 7-3.1325 7-7-3.132-7-7-7zm0 1.4062c3.094 0 5.5938 2.4998 5.5938 5.5938s-2.4998 5.5938-5.5938 5.5938-5.5938-2.4998-5.5938-5.5938 2.4998-5.5938 5.5938-5.5938z" fill="#d2d2d1"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__lib_radio_button_off.svg b/res/skins/LateNight/classic/buttons/btn__lib_radio_button_off.svg
index 680fb2316fd..9dd7477ba9d 100644
--- a/res/skins/LateNight/classic/buttons/btn__lib_radio_button_off.svg
+++ b/res/skins/LateNight/classic/buttons/btn__lib_radio_button_off.svg
@@ -1 +1 @@
-<svg id="svg2" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg"><path id="path4" d="m9 2c-3.8677 0-7 3.1323-7 7s3.1323 7 7 7 7-3.1323 7-7-3.132-7-7-7zm0 12.6c-3.094 0-5.6-2.506-5.6-5.6s2.506-5.6 5.6-5.6 5.6 2.506 5.6 5.6-2.506 5.6-5.6 5.6z" fill="#d2d2d1"/></svg>
+<svg id="svg2" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg" width="36" height="36"><path id="path4" d="m9 2c-3.8677 0-7 3.1323-7 7s3.1323 7 7 7 7-3.1323 7-7-3.132-7-7-7zm0 12.6c-3.094 0-5.6-2.506-5.6-5.6s2.506-5.6 5.6-5.6 5.6 2.506 5.6 5.6-2.506 5.6-5.6 5.6z" fill="#d2d2d1"/></svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__lib_radio_button_on_yellow.svg b/res/skins/LateNight/classic/buttons/btn__lib_radio_button_on_yellow.svg
index b077114da82..3da9361ae39 100644
--- a/res/skins/LateNight/classic/buttons/btn__lib_radio_button_on_yellow.svg
+++ b/res/skins/LateNight/classic/buttons/btn__lib_radio_button_on_yellow.svg
@@ -1,4 +1,4 @@
-<svg version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
+<svg version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg" width="36" height="36">
 	<path d="m9 5.1042c-2.1505 0-3.8958 1.7453-3.8958 3.8958s1.7453 3.8958 3.8958 3.8958 3.8958-1.7453 3.8958-3.8958-1.7453-3.8958-3.8958-3.8958z" fill="#ecb82b"/>
 	<path d="m9 2c-3.8675 0-7 3.1325-7 7s3.1325 7 7 7 7-3.1325 7-7-3.132-7-7-7zm0 1.4062c3.094 0 5.5938 2.4998 5.5938 5.5938s-2.4998 5.5938-5.5938 5.5938-5.5938-2.4998-5.5938-5.5938 2.4998-5.5938 5.5938-5.5938z" fill="#d2d2d1"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__lib_radio_button_yellow_on.svg b/res/skins/LateNight/classic/buttons/btn__lib_radio_button_yellow_on.svg
index 8f8cccef434..5207747fc87 100644
--- a/res/skins/LateNight/classic/buttons/btn__lib_radio_button_yellow_on.svg
+++ b/res/skins/LateNight/classic/buttons/btn__lib_radio_button_yellow_on.svg
@@ -1 +1 @@
-<svg id="svg2" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg"><path id="path2987" d="m9 5.1042c-2.1505 0-3.8958 1.7453-3.8958 3.8958s1.7453 3.8958 3.8958 3.8958 3.8958-1.7453 3.8958-3.8958-1.7453-3.8958-3.8958-3.8958z" fill="#cab32c"/><path id="path2985" d="m9 2c-3.8675 0-7 3.1325-7 7s3.1325 7 7 7 7-3.1325 7-7-3.132-7-7-7zm0 1.4062c3.094 0 5.5938 2.4998 5.5938 5.5938s-2.4998 5.5938-5.5938 5.5938-5.5938-2.4998-5.5938-5.5938 2.4998-5.5938 5.5938-5.5938z" fill="#d2d2d1"/></svg>
+<svg id="svg2" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg" width="36" height="36"><path id="path2987" d="m9 5.1042c-2.1505 0-3.8958 1.7453-3.8958 3.8958s1.7453 3.8958 3.8958 3.8958 3.8958-1.7453 3.8958-3.8958-1.7453-3.8958-3.8958-3.8958z" fill="#cab32c"/><path id="path2985" d="m9 2c-3.8675 0-7 3.1325-7 7s3.1325 7 7 7 7-3.1325 7-7-3.132-7-7-7zm0 1.4062c3.094 0 5.5938 2.4998 5.5938 5.5938s-2.4998 5.5938-5.5938 5.5938-5.5938-2.4998-5.5938-5.5938 2.4998-5.5938 5.5938-5.5938z" fill="#d2d2d1"/></svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__lib_sort_down.svg b/res/skins/LateNight/classic/buttons/btn__lib_sort_down.svg
index 4b8f3c5ad26..43880e91cf7 100644
--- a/res/skins/LateNight/classic/buttons/btn__lib_sort_down.svg
+++ b/res/skins/LateNight/classic/buttons/btn__lib_sort_down.svg
@@ -1,4 +1,4 @@
-<svg width="12" height="12" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 12">
 	<path d="m6 9.5590477 4.5715-7.9181h-9.143z" fill="none" stroke="#000001" stroke-width="1.6"/>
 	<path d="m6 9.5590477 4.5715-7.9181h-9.143z" fill="#fa0"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__lib_sort_up.svg b/res/skins/LateNight/classic/buttons/btn__lib_sort_up.svg
index b24794ca5e3..de784152567 100644
--- a/res/skins/LateNight/classic/buttons/btn__lib_sort_up.svg
+++ b/res/skins/LateNight/classic/buttons/btn__lib_sort_up.svg
@@ -1,4 +1,4 @@
-<svg width="12" height="12" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 12">
 	<path d="m6 2.4409522 4.5715 7.9180998h-9.143z" fill="none" stroke="#000001" stroke-width="1.6"/>
 	<path d="m6 2.4409522 4.5715 7.9180998h-9.143z" fill="#fa0"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__loop.svg b/res/skins/LateNight/classic/buttons/btn__loop.svg
index b8fe8a743f9..7940b7a3ad1 100644
--- a/res/skins/LateNight/classic/buttons/btn__loop.svg
+++ b/res/skins/LateNight/classic/buttons/btn__loop.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 		<g fill="none" stroke="#000001" stroke-width="1.6">
 				<path d="m20 18v-12h-5v-3l-7 3.75 7 3.75-1e-4-2.9999 3.5001-1e-4v9l-1.5-1e-4v1.5001z" color="#000001"/>
 				<path d="m4 6v12h5v3l7-3.75-7-3.75 1e-4 2.9999-3.5001 1e-4v-9l1.5 1e-4v-1.5001z" color="#000001"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__loop_in.svg b/res/skins/LateNight/classic/buttons/btn__loop_in.svg
index 55ab1b8bdb9..92f1d059f3d 100644
--- a/res/skins/LateNight/classic/buttons/btn__loop_in.svg
+++ b/res/skins/LateNight/classic/buttons/btn__loop_in.svg
@@ -5,10 +5,10 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   width="24"
-   height="24"
+   width="48"
+   height="48"
    version="1.1"
-   id="svg6">
+   id="svg6" viewBox="0 0 24 24">
   <metadata
      id="metadata12">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__loop_out.svg b/res/skins/LateNight/classic/buttons/btn__loop_out.svg
index 57d0290bb7d..5dff3a82d8a 100644
--- a/res/skins/LateNight/classic/buttons/btn__loop_out.svg
+++ b/res/skins/LateNight/classic/buttons/btn__loop_out.svg
@@ -5,10 +5,10 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   width="24"
-   height="24"
+   width="48"
+   height="48"
    version="1.1"
-   id="svg6">
+   id="svg6" viewBox="0 0 24 24">
   <metadata
      id="metadata12">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__menu_checkbox.svg b/res/skins/LateNight/classic/buttons/btn__menu_checkbox.svg
index ed1487b5277..3758d8632c1 100644
--- a/res/skins/LateNight/classic/buttons/btn__menu_checkbox.svg
+++ b/res/skins/LateNight/classic/buttons/btn__menu_checkbox.svg
@@ -1,3 +1,3 @@
-<svg width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
   <rect x="2.5" y="2.5" width="15" height="15" rx="1" ry="1" stroke="#4d4d4d" stroke-linecap="square" stroke-linejoin="round" style="paint-order:markers fill stroke"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__menu_checkbox_checked.svg b/res/skins/LateNight/classic/buttons/btn__menu_checkbox_checked.svg
index 1df19e8eb7a..1210160d3b7 100644
--- a/res/skins/LateNight/classic/buttons/btn__menu_checkbox_checked.svg
+++ b/res/skins/LateNight/classic/buttons/btn__menu_checkbox_checked.svg
@@ -1,4 +1,4 @@
-<svg width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
   <rect x="2.5" y="2.5" width="15" height="15" rx="1" ry="1" stroke="#4d4d4d" stroke-linecap="square" stroke-linejoin="round" style="paint-order:markers fill stroke"/>
   <path d="m5.49272 11.5024 3.00483 3.00484 6.00973-9.01432" fill="none" stroke="#f60" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.67296"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__mic_duck_auto.svg b/res/skins/LateNight/classic/buttons/btn__mic_duck_auto.svg
index f0d8e622b54..c7173fc225b 100644
--- a/res/skins/LateNight/classic/buttons/btn__mic_duck_auto.svg
+++ b/res/skins/LateNight/classic/buttons/btn__mic_duck_auto.svg
@@ -1,4 +1,4 @@
-<svg width="40" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="80" height="44" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 22">
 		<g transform="translate(-16,-2)" fill="#0e0e0e">
 				<path d="m21 9v7h2v-3h3v3h2v-7zm2 1h3v2h-3z"/>
 				<path d="m29 9v7h7v-7h-2v6h-3v-6h-2"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__mic_duck_manual.svg b/res/skins/LateNight/classic/buttons/btn__mic_duck_manual.svg
index d5d6e4eb629..6ff64686458 100644
--- a/res/skins/LateNight/classic/buttons/btn__mic_duck_manual.svg
+++ b/res/skins/LateNight/classic/buttons/btn__mic_duck_manual.svg
@@ -1,4 +1,4 @@
-<svg width="40" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="80" height="44" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 22">
 		<g transform="translate(-2)" fill="#0e0e0e">
 				<path d="m20 7v7h2v-3h3v3h2v-7zm2 1h3v2h-3z"/>
 				<path d="m9 7v7h2v-6h3v6h2v-6h2v6h1v-7h-5z"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__mic_duck_off.svg b/res/skins/LateNight/classic/buttons/btn__mic_duck_off.svg
index e45bffdbe48..e441959f0b9 100644
--- a/res/skins/LateNight/classic/buttons/btn__mic_duck_off.svg
+++ b/res/skins/LateNight/classic/buttons/btn__mic_duck_off.svg
@@ -1,4 +1,4 @@
-<svg width="40" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="80" height="44" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 22">
 		<g fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">
 				<path d="m28 7h-7v7h7v-1h-5v-5h5z"/>
 				<path d="m13 7v7h7v-7h-2v6h-3v-6z"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__mic_talk.svg b/res/skins/LateNight/classic/buttons/btn__mic_talk.svg
index 3637edf35d7..15ed412d187 100644
--- a/res/skins/LateNight/classic/buttons/btn__mic_talk.svg
+++ b/res/skins/LateNight/classic/buttons/btn__mic_talk.svg
@@ -1,4 +1,4 @@
-<svg width="40" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="80" height="44" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 22">
 		<g transform="translate(2,1)" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">
 				<path d="m2 6h8v1h-3v6h-2v-6h-3z"/>
 				<path d="m11 6v7h2v-3h3v3h2v-7zm2 1h3v2h-3z"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__minus.svg b/res/skins/LateNight/classic/buttons/btn__minus.svg
index 54ce8b52532..d6eee38c09d 100644
--- a/res/skins/LateNight/classic/buttons/btn__minus.svg
+++ b/res/skins/LateNight/classic/buttons/btn__minus.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 		<path d="m8 10h9v3h-9v-3" fill="none" stroke="#000001" stroke-linecap="square" stroke-width="1.6"/>
 		<path d="m8 10h9v3h-9v-3" fill="#d2d2d1"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__next.svg b/res/skins/LateNight/classic/buttons/btn__next.svg
index b846e1a0f5f..c7397b7c067 100644
--- a/res/skins/LateNight/classic/buttons/btn__next.svg
+++ b/res/skins/LateNight/classic/buttons/btn__next.svg
@@ -1 +1 @@
-<svg id="svg7815" width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path3936-0-8-9-7-1" d="m5 6.3331 7 4.667-7 4.6669v-9.3339" fill="#d2d2d1"/></svg>
+<svg id="svg7815" width="32" height="44" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 22"><path id="path3936-0-8-9-7-1" d="m5 6.3331 7 4.667-7 4.6669v-9.3339" fill="#d2d2d1"/></svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__outro_end.svg b/res/skins/LateNight/classic/buttons/btn__outro_end.svg
index d276b287863..1f1a770a9ee 100644
--- a/res/skins/LateNight/classic/buttons/btn__outro_end.svg
+++ b/res/skins/LateNight/classic/buttons/btn__outro_end.svg
@@ -1,4 +1,4 @@
-<svg width="18" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="36" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 24">
 	<g transform="translate(-3)" fill="none" stroke="#000001" stroke-linecap="square" stroke-width="1.6">
 		<rect transform="scale(-1,1)" x="-18" y="7" width="2" height="10" style="paint-order:markers fill stroke"/>
 		<path d="m15 17-9-10v10z"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__outro_start.svg b/res/skins/LateNight/classic/buttons/btn__outro_start.svg
index 39516432b61..9d7a8f612fb 100644
--- a/res/skins/LateNight/classic/buttons/btn__outro_start.svg
+++ b/res/skins/LateNight/classic/buttons/btn__outro_start.svg
@@ -1,4 +1,4 @@
-<svg width="18" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="36" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 24">
 	<g transform="translate(-3)" fill="none" stroke="#000001" stroke-linecap="square" stroke-width="1.6">
 		<rect x="6" y="7" width="2" height="10" style="paint-order:markers fill stroke"/>
 		<path d="m19 17-9-10v10z"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__pause_deck_mini.svg b/res/skins/LateNight/classic/buttons/btn__pause_deck_mini.svg
index c7acab40926..796eea7a262 100644
--- a/res/skins/LateNight/classic/buttons/btn__pause_deck_mini.svg
+++ b/res/skins/LateNight/classic/buttons/btn__pause_deck_mini.svg
@@ -7,8 +7,8 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg8"
    version="1.1"
-   height="24"
-   width="40">
+   height="48"
+   width="80" viewBox="0 0 40 24">
   <metadata
      id="metadata14">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__pause_preview.svg b/res/skins/LateNight/classic/buttons/btn__pause_preview.svg
index 2e54f342047..6bbac27ed3d 100644
--- a/res/skins/LateNight/classic/buttons/btn__pause_preview.svg
+++ b/res/skins/LateNight/classic/buttons/btn__pause_preview.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 	<g fill="none" stroke="#000001" stroke-linecap="square" stroke-width="1.6">
 		<path d="m7 6h4v12h-4v-12"/>
 		<path d="m13 6v12h4v-12h-4"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__pause_sampler.svg b/res/skins/LateNight/classic/buttons/btn__pause_sampler.svg
index 61f9760d196..0871f0704e1 100644
--- a/res/skins/LateNight/classic/buttons/btn__pause_sampler.svg
+++ b/res/skins/LateNight/classic/buttons/btn__pause_sampler.svg
@@ -7,8 +7,8 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg43"
    version="1.1"
-   height="32"
-   width="32">
+   height="64"
+   width="64" viewBox="0 0 32 32">
   <metadata
      id="metadata49">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__pfl.svg b/res/skins/LateNight/classic/buttons/btn__pfl.svg
index 12d464e989b..d371a3c9e09 100644
--- a/res/skins/LateNight/classic/buttons/btn__pfl.svg
+++ b/res/skins/LateNight/classic/buttons/btn__pfl.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 	<path d="m11.999999 5.5116282c-3.7340627 0-6.766423 3.0324992-6.766423 6.7667318 0 .03993-.0009388.07686 0 .12531v.219292c-.7599946.643612-1.2530413 1.588929-1.2530413 2.662785 0 1.937792 1.0139653 3.50893 4.0194653 3.50893v-7.017354c-.242208 0-1.0030538.01567-1.2314482.06241.2161847-2.709799 2.465384-4.8244286 5.2314982-4.8244286 2.759698 0 5.00605 2.1235516 5.231498 4.8244286-.228394-.04674-.98933-.06241-1.231548-.06241v7.017354c3.513974 0 4.019565-1.571135 4.019565-3.508927 0-1.089995-.504605-2.050571-1.284317-2.694162.0061-.105852.03132-.203573.03132-.313275 0-3.7342327-3.03236-6.7667319-6.766424-6.7667319z" color="#000001" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6" style="text-indent:0;text-transform:none"/>
 	<path d="m11.999999 5.5116282c-3.7340627 0-6.766423 3.0324992-6.766423 6.7667318 0 .03993-.0009388.07686 0 .12531v.219292c-.7599946.643612-1.2530413 1.588929-1.2530413 2.662785 0 1.937792.6326094 3.50893 4.0194653 3.50893v-7.017354c-.242208 0-1.0030538.01567-1.2314482.06241.2161847-2.709799 2.465384-4.8244286 5.2314982-4.8244286 2.759698 0 5.00605 2.1235516 5.231498 4.8244286-.228394-.04674-.98933-.06241-1.231548-.06241v7.017354c3.539398 0 4.019565-1.571135 4.019565-3.508927 0-1.089995-.504605-2.050571-1.284317-2.694162.0061-.105852.03132-.203573.03132-.313275 0-3.7342327-3.03236-6.7667319-6.766424-6.7667319z" color="#000001" fill="#d2d2d1" style="text-indent:0;text-transform:none"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__play_deck.svg b/res/skins/LateNight/classic/buttons/btn__play_deck.svg
index fd2caec629e..46d8ca801f2 100644
--- a/res/skins/LateNight/classic/buttons/btn__play_deck.svg
+++ b/res/skins/LateNight/classic/buttons/btn__play_deck.svg
@@ -1,4 +1,4 @@
-<svg width="50" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="100" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 24">
 		<g transform="translate(0,2)" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">
 				<path d="m28.000494 4h4v12h-4v-12"/>
 				<path d="m35.000888 4v12h4v-12h-4"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__play_deck_mini.svg b/res/skins/LateNight/classic/buttons/btn__play_deck_mini.svg
index bf29e05c60c..3763d9c539d 100644
--- a/res/skins/LateNight/classic/buttons/btn__play_deck_mini.svg
+++ b/res/skins/LateNight/classic/buttons/btn__play_deck_mini.svg
@@ -1,4 +1,4 @@
-<svg width="40" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="80" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 24">
 		<g transform="translate(0,2)" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">
 				<path d="m16.000494 4 8.9995 6-8.9995 6v-12"/>
 		</g>
diff --git a/res/skins/LateNight/classic/buttons/btn__play_sampler.svg b/res/skins/LateNight/classic/buttons/btn__play_sampler.svg
index f88d8c36b68..f88ebee61cc 100644
--- a/res/skins/LateNight/classic/buttons/btn__play_sampler.svg
+++ b/res/skins/LateNight/classic/buttons/btn__play_sampler.svg
@@ -1,4 +1,4 @@
-<svg width="32" height="32" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
 		<path d="m11 7.3661 12.95 8.634-12.95 8.6339z" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6"/>
 		<path d="m11 7.3661 12.95 8.634-12.95 8.6339z" fill="#d2d2d1"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__plus.svg b/res/skins/LateNight/classic/buttons/btn__plus.svg
index 7ab60a0937c..0bf8c32a1fb 100644
--- a/res/skins/LateNight/classic/buttons/btn__plus.svg
+++ b/res/skins/LateNight/classic/buttons/btn__plus.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 		<path d="m8 10h3v-3h3v3h3v3h-3v3h-3v-3h-3v-3" fill="none" stroke="#000001" stroke-linecap="square" stroke-width="1.6"/>
 		<path d="m8 10h3v-3h3v3h3v3h-3v3h-3v-3h-3v-3" fill="#d2d2d1"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__plus_flat.svg b/res/skins/LateNight/classic/buttons/btn__plus_flat.svg
index ba62d28cb4d..8f19a05f601 100644
--- a/res/skins/LateNight/classic/buttons/btn__plus_flat.svg
+++ b/res/skins/LateNight/classic/buttons/btn__plus_flat.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 		<path d="m8 10h3v-3h3v3h3v3h-3v3h-3v-3h-3v-3" fill="#d2d2d1" opacity=".59898478"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__prev.svg b/res/skins/LateNight/classic/buttons/btn__prev.svg
index e021190ad2d..9de5a1354c0 100644
--- a/res/skins/LateNight/classic/buttons/btn__prev.svg
+++ b/res/skins/LateNight/classic/buttons/btn__prev.svg
@@ -1 +1 @@
-<svg id="svg7815" width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path3936-0-8-9-7-1" d="m11 6.3331-7 4.667 7 4.6669v-9.3339" fill="#d2d2d1"/></svg>
+<svg id="svg7815" width="32" height="44" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 22"><path id="path3936-0-8-9-7-1" d="m11 6.3331-7 4.667 7 4.6669v-9.3339" fill="#d2d2d1"/></svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__quantize.svg b/res/skins/LateNight/classic/buttons/btn__quantize.svg
index a9d18e0cfae..0178edb5e0e 100644
--- a/res/skins/LateNight/classic/buttons/btn__quantize.svg
+++ b/res/skins/LateNight/classic/buttons/btn__quantize.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
 	<g fill="#585858">
 		<path d="m9.156 4c-2.7614 0-5 2.2386-5 5s2.2386 5 5 5h3.8438v-3h-3.9688c-1.1046 0-2-.89543-2-2 0-1.1046.89543-2 2-2h3.9688v-3z"/>
 		<path d="m17 11h-3v3h3z"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__quantize_active_12.svg b/res/skins/LateNight/classic/buttons/btn__quantize_active_12.svg
index 3c3cf124c08..79ed14327b2 100644
--- a/res/skins/LateNight/classic/buttons/btn__quantize_active_12.svg
+++ b/res/skins/LateNight/classic/buttons/btn__quantize_active_12.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
 		<path d="m9.156 4c-2.7614 0-5 2.2386-5 5s2.2386 5 5 5h3.8438v-3h-3.9688c-1.1046 0-2-.89543-2-2 0-1.1046.89543-2 2-2h3.9688v-3z" fill="#f0bb2b"/>
 		<path d="m17 11h-3v3h3z" fill="#fff"/>
 		<path d="m17 4h-2.9896v3h2.9896z" fill="#fff"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__quantize_active_34.svg b/res/skins/LateNight/classic/buttons/btn__quantize_active_34.svg
index a6fc4019847..a2ecb4efc6f 100644
--- a/res/skins/LateNight/classic/buttons/btn__quantize_active_34.svg
+++ b/res/skins/LateNight/classic/buttons/btn__quantize_active_34.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
 		<path d="m9.156 4c-2.7614 0-5 2.2386-5 5s2.2386 5 5 5h3.8438v-3h-3.9688c-1.1046 0-2-.89543-2-2 0-1.1046.89543-2 2-2h3.9688v-3z" fill="#0bd9d1"/>
 		<path d="m17 11h-3v3h3z" fill="#fff"/>
 		<path d="m17 4h-2.9896v3h2.9896z" fill="#fff"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__rec_dot.svg b/res/skins/LateNight/classic/buttons/btn__rec_dot.svg
index cf444682da6..3b2cc683768 100644
--- a/res/skins/LateNight/classic/buttons/btn__rec_dot.svg
+++ b/res/skins/LateNight/classic/buttons/btn__rec_dot.svg
@@ -1,3 +1,3 @@
-<svg id="svg2" version="1.1" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg">
+<svg id="svg2" version="1.1" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" width="30" height="30">
 <path id="path2987" d="m13.477 7.5a3.9775 3.9775 0 1 1-7.955 0 3.9775 3.9775 0 1 1 7.955 0z" color="#000001" fill="#bfbfbe"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__rec_dot_active.svg b/res/skins/LateNight/classic/buttons/btn__rec_dot_active.svg
index a226d0000d6..406552fa84e 100644
--- a/res/skins/LateNight/classic/buttons/btn__rec_dot_active.svg
+++ b/res/skins/LateNight/classic/buttons/btn__rec_dot_active.svg
@@ -1,3 +1,3 @@
-<svg id="svg2" version="1.1" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg">
+<svg id="svg2" version="1.1" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" width="30" height="30">
 <path id="path2987" d="m13.477 7.5a3.9775 3.9775 0 1 1-7.955 0 3.9775 3.9775 0 1 1 7.955 0z" color="#000001" fill="#000001"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__reloop.svg b/res/skins/LateNight/classic/buttons/btn__reloop.svg
index 93d5fb4cdc0..c17a181d1b4 100644
--- a/res/skins/LateNight/classic/buttons/btn__reloop.svg
+++ b/res/skins/LateNight/classic/buttons/btn__reloop.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 		<g fill="none" stroke="#000001" stroke-width="1.6">
 				<path d="m11 3h2v6h-2z" color="#000001"/>
 				<path d="m20 5v13h-3l5e-4-1.5001 1.4995 1e-4v-10l-3.4999.000149.000125-1.5001z" color="#000001"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__repeat.svg b/res/skins/LateNight/classic/buttons/btn__repeat.svg
index ab2853625d5..5c3f701c69d 100644
--- a/res/skins/LateNight/classic/buttons/btn__repeat.svg
+++ b/res/skins/LateNight/classic/buttons/btn__repeat.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
 		<path d="M 13,1.4492188 V 4 H 6.9003906 C 4.1893262,4 2,6.2607148 2,9 2,9.3724736 2.0482349,9.7336886 2.125,10.083984 L 4,9 C 4,7.3072852 5.2902549,6 6.9003906,6 H 13 v 3 l 6.541016,-3.7753906 z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#585858" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
 		<path d="M 18.876953,7.9179688 17,9 c 0,1.692715 -1.290255,3 -2.900391,3 H 8 V 9 L 1.4589844,12.775391 8,16.552734 V 14 h 6.099609 C 16.810674,14 19,11.739285 19,9 19,8.6283798 18.953376,8.2675235 18.876953,7.9179688 Z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#585858" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__repeat_active_12.svg b/res/skins/LateNight/classic/buttons/btn__repeat_active_12.svg
index 6df9c3d0216..1f5de7166ea 100644
--- a/res/skins/LateNight/classic/buttons/btn__repeat_active_12.svg
+++ b/res/skins/LateNight/classic/buttons/btn__repeat_active_12.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
 		<g fill="#f0bb2b" shape-rendering="auto">
 				<path d="M 13,1.4492188 V 4 H 6.9003906 C 4.1893262,4 2,6.2607148 2,9 2,9.3724736 2.0482349,9.7336886 2.125,10.083984 L 4,9 C 4,7.3072852 5.2902549,6 6.9003906,6 H 13 v 3 l 6.541016,-3.7753906 z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
 				<path d="M 18.876953,7.9179688 17,9 c 0,1.692715 -1.290255,3 -2.900391,3 H 8 V 9 L 1.4589844,12.775391 8,16.552734 V 14 h 6.099609 C 16.810674,14 19,11.739285 19,9 19,8.6283798 18.953376,8.2675235 18.876953,7.9179688 Z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__repeat_active_34.svg b/res/skins/LateNight/classic/buttons/btn__repeat_active_34.svg
index 1e1d7221487..d6670f9a01a 100644
--- a/res/skins/LateNight/classic/buttons/btn__repeat_active_34.svg
+++ b/res/skins/LateNight/classic/buttons/btn__repeat_active_34.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
 		<g fill="#0bd9d1" shape-rendering="auto">
 				<path d="M 13,1.4492188 V 4 H 6.9003906 C 4.1893262,4 2,6.2607148 2,9 2,9.3724736 2.0482349,9.7336886 2.125,10.083984 L 4,9 C 4,7.3072852 5.2902549,6 6.9003906,6 H 13 v 3 l 6.541016,-3.7753906 z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
 				<path d="M 18.876953,7.9179688 17,9 c 0,1.692715 -1.290255,3 -2.900391,3 H 8 V 9 L 1.4589844,12.775391 8,16.552734 V 14 h 6.099609 C 16.810674,14 19,11.739285 19,9 19,8.6283798 18.953376,8.2675235 18.876953,7.9179688 Z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__reverse.svg b/res/skins/LateNight/classic/buttons/btn__reverse.svg
index 9c31255cf64..1bda081f8b8 100644
--- a/res/skins/LateNight/classic/buttons/btn__reverse.svg
+++ b/res/skins/LateNight/classic/buttons/btn__reverse.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 	<path d="m16.000506 6.0058019-8.9995702 5.9999991 8.9995702 6v-11.9999991" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5999999"/>
 	<path d="m16.000506 6.0000702-8.9995702 5.9999988 8.9995702 6v-11.9999988" fill="#d2d2d1" stroke-width=".99999994"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__settings_close.svg b/res/skins/LateNight/classic/buttons/btn__settings_close.svg
index f04edc298ed..21532dc3cc1 100644
--- a/res/skins/LateNight/classic/buttons/btn__settings_close.svg
+++ b/res/skins/LateNight/classic/buttons/btn__settings_close.svg
@@ -1 +1 @@
-<svg id="svg3505" width="20" height="20" version="1.1" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path id="path3507" d="m5.5287 4.7729c-0.20064-0.0065044-0.39701 0.061142-0.5458 0.20992-0.29757 0.29757-0.27542 0.79518 0.041984 1.1126l3.9045 3.9045-3.9045 3.9045c-0.31741 0.3174-0.33955 0.81502-0.041984 1.1126 0.29757 0.29757 0.79518 0.27542 1.1126-0.04198l3.9045-3.9046 3.9045 3.9045c0.3174 0.31741 0.81502 0.33955 1.1126 0.04198 0.29757-0.29757 0.27542-0.79518-0.04198-1.1126l-3.9046-3.9045 3.9045-3.9045c0.31741-0.31741 0.33955-0.81502 0.041982-1.1126-0.29757-0.29757-0.79518-0.27542-1.1126 0.041982l-3.9045 3.9046-3.9045-3.9045c-0.1587-0.1587-0.36615-0.24543-0.56679-0.25191z" fill="#eee"/></svg>
+<svg id="svg3505" width="40" height="40" version="1.1" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path id="path3507" d="m5.5287 4.7729c-0.20064-0.0065044-0.39701 0.061142-0.5458 0.20992-0.29757 0.29757-0.27542 0.79518 0.041984 1.1126l3.9045 3.9045-3.9045 3.9045c-0.31741 0.3174-0.33955 0.81502-0.041984 1.1126 0.29757 0.29757 0.79518 0.27542 1.1126-0.04198l3.9045-3.9046 3.9045 3.9045c0.3174 0.31741 0.81502 0.33955 1.1126 0.04198 0.29757-0.29757 0.27542-0.79518-0.04198-1.1126l-3.9046-3.9045 3.9045-3.9045c0.31741-0.31741 0.33955-0.81502 0.041982-1.1126-0.29757-0.29757-0.79518-0.27542-1.1126 0.041982l-3.9045 3.9046-3.9045-3.9045c-0.1587-0.1587-0.36615-0.24543-0.56679-0.25191z" fill="#eee"/></svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__settings_off.svg b/res/skins/LateNight/classic/buttons/btn__settings_off.svg
index 965cddfdcf3..fddb4a68c94 100644
--- a/res/skins/LateNight/classic/buttons/btn__settings_off.svg
+++ b/res/skins/LateNight/classic/buttons/btn__settings_off.svg
@@ -1,4 +1,4 @@
-<svg width="76" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="152" height="32" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 76 16">
 	<g transform="matrix(-.60802 0 0 .68989 14.4115 1.101031)" fill="#d2d2d1" stroke-width="1.12740004">
 		<path transform="matrix(1.1347,0,0,1,-34.251,6)" d="m37.625-5-.1875 2.625c-.66019.16435-1.2765.43313-1.8438.78125l-1.9688-1.75-1.9688 1.9688 1.75 1.9688c-.34382.56314-.61891 1.1878-.78125 1.8438l-2.625.1875v2.75l2.625.1875c.16385.66212.431 1.2793.78125 1.8438l-1.75 1.9688 1.9688 1.9688 2-1.75c.55851.33599 1.1644.58862 1.8125.75l.1875 2.6562h2.75l.1875-2.625c.66019-.16435 1.2765-.43313 1.8438-.78125l1.9688 1.75 1.9688-1.9688-1.75-1.9688c.34382-.56314.61891-1.1878.78125-1.8438l2.625-.1875v-2.75l-2.625-.1875c-.16435-.66019-.43313-1.2765-.78125-1.8438l1.75-1.9688-1.9688-1.9688-1.9688 1.75c-.56314-.34382-1.1878-.61891-1.8438-.78125l-.1875-2.625zm1.375 6c1.6505 0 3 1.3495 3 3s-1.3495 3-3 3-3-1.3495-3-3 1.3495-3 3-3z" color="#000001" fill="#d2d2d1"/>
 	</g>
diff --git a/res/skins/LateNight/classic/buttons/btn__settings_on.svg b/res/skins/LateNight/classic/buttons/btn__settings_on.svg
index 2ed1e10a1be..e0c37b0ae6a 100644
--- a/res/skins/LateNight/classic/buttons/btn__settings_on.svg
+++ b/res/skins/LateNight/classic/buttons/btn__settings_on.svg
@@ -1,4 +1,4 @@
-<svg width="76" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="152" height="32" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 76 16">
 	<g transform="matrix(-.60803453 0 0 .68993295 14.356316 1.1006015)" stroke-width="1.12734854">
 		<path transform="matrix(1.1347,0,0,1,-34.251,6)" d="m37.625-5-.1875 2.625c-.66019.16435-1.2765.43313-1.8438.78125l-1.9688-1.75-1.9688 1.9688 1.75 1.9688c-.34382.56314-.61891 1.1878-.78125 1.8438l-2.625.1875v2.75l2.625.1875c.16385.66212.431 1.2793.78125 1.8438l-1.75 1.9688 1.9688 1.9688 2-1.75c.55851.33599 1.1644.58862 1.8125.75l.1875 2.6562h2.75l.1875-2.625c.66019-.16435 1.2765-.43313 1.8438-.78125l1.9688 1.75 1.9688-1.9688-1.75-1.9688c.34382-.56314.61891-1.1878.78125-1.8438l2.625-.1875v-2.75l-2.625-.1875c-.16435-.66019-.43313-1.2765-.78125-1.8438l1.75-1.9688-1.9688-1.9688-1.9688 1.75c-.56314-.34382-1.1878-.61891-1.8438-.78125l-.1875-2.625zm1.375 6c1.6505 0 3 1.3495 3 3s-1.3495 3-3 3-3-1.3495-3-3 1.3495-3 3-3z" color="#000001" stroke-width="1.12734854"/>
 	</g>
diff --git a/res/skins/LateNight/classic/buttons/btn__slip.svg b/res/skins/LateNight/classic/buttons/btn__slip.svg
index 656eb3c5bde..5d1294a3a0d 100644
--- a/res/skins/LateNight/classic/buttons/btn__slip.svg
+++ b/res/skins/LateNight/classic/buttons/btn__slip.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
 	<path d="m7.33344 14.96998-6.3333447-10.96968 12.6663237-3e-7z" color="#000001" fill="#585858" stroke-width=".91413999"/>
 	<path d="m7.3333 4.0003 6.3333 10.965 6.3333-10.965h-12.667zm2.9292 1.7021h6.8083l-3.4042 5.8979-3.4042-5.8979z" color="#000001" fill="#585858"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__slip_active_12.svg b/res/skins/LateNight/classic/buttons/btn__slip_active_12.svg
index 2c568c3dfea..b612c0dd35e 100644
--- a/res/skins/LateNight/classic/buttons/btn__slip_active_12.svg
+++ b/res/skins/LateNight/classic/buttons/btn__slip_active_12.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
 		<path d="m7.3333 4.0003 6.3333 10.965 6.3333-10.965h-12.667zm2.9292 1.7021h6.8083l-3.4042 5.8979-3.4042-5.8979z" color="#000001" fill="#fff"/>
 		<path d="m7.33344 14.96998-6.3333447-10.96968 12.6663237-3e-7z" color="#000001" fill="#f0bb2b" stroke-width=".91413999"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__slip_active_34.svg b/res/skins/LateNight/classic/buttons/btn__slip_active_34.svg
index 780e23dd36e..7afebf023d2 100644
--- a/res/skins/LateNight/classic/buttons/btn__slip_active_34.svg
+++ b/res/skins/LateNight/classic/buttons/btn__slip_active_34.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
 		<path d="m7.3333 4.0003 6.3333 10.965 6.3333-10.965h-12.667zm2.9292 1.7021h6.8083l-3.4042 5.8979-3.4042-5.8979z" color="#000001" fill="#fff"/>
 		<path d="m7.33344 14.96998-6.3333447-10.96968 12.6663237-3e-7z" color="#000001" fill="#0bd9d1" stroke-width=".91413999"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__split.svg b/res/skins/LateNight/classic/buttons/btn__split.svg
index 075321bbb2f..487d9109f69 100644
--- a/res/skins/LateNight/classic/buttons/btn__split.svg
+++ b/res/skins/LateNight/classic/buttons/btn__split.svg
@@ -1,4 +1,4 @@
-<svg width="46" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="92" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 46 20">
 		<g transform="translate(4)" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">
 				<path d="m10 6h-7v4h5v2h-5v1h7v-4h-5v-2h5z"/>
 				<path d="m18 6v7h6v-1h-4v-6z"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__split_active.svg b/res/skins/LateNight/classic/buttons/btn__split_active.svg
index ebda1269253..ee752d77527 100644
--- a/res/skins/LateNight/classic/buttons/btn__split_active.svg
+++ b/res/skins/LateNight/classic/buttons/btn__split_active.svg
@@ -7,8 +7,8 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg26"
    version="1.1"
-   height="20"
-   width="46">
+   height="40"
+   width="92" viewBox="0 0 46 20">
   <metadata
      id="metadata32">
     <rdf:RDF>
diff --git a/res/skins/LateNight/classic/buttons/btn__star.svg b/res/skins/LateNight/classic/buttons/btn__star.svg
index 3d03d7bd085..ebe935df2a8 100644
--- a/res/skins/LateNight/classic/buttons/btn__star.svg
+++ b/res/skins/LateNight/classic/buttons/btn__star.svg
@@ -1,3 +1,3 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
 	<path d="m8.0000001 5.9262617.4700968 1.4036761 1.4802433.013329-1.1897075.8808484.4447438 1.4119139-1.2053765-.8592819-1.2053766.8592819.4447439-1.4119139-1.1897074-.8808485 1.4802432-.0133288z" stroke="#aaa" stroke-linecap="round" stroke-width="2.65781951" style="paint-order:fill markers stroke"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__sync_deck.svg b/res/skins/LateNight/classic/buttons/btn__sync_deck.svg
index 0313aa59456..a74c4d3f008 100644
--- a/res/skins/LateNight/classic/buttons/btn__sync_deck.svg
+++ b/res/skins/LateNight/classic/buttons/btn__sync_deck.svg
@@ -1,4 +1,4 @@
-<svg width="36" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="72" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 18">
   <g transform="translate(-7,-2)" fill="none">
     <path d="m16 8h-7v4h5v2h-5v1h7v-4h-5v-2h5v-1"/>
     <path d="m26 8v7h2v-6h3v6h2v-7h-7"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__sync_leader.svg b/res/skins/LateNight/classic/buttons/btn__sync_leader.svg
index ac9b702f82e..d331de533db 100644
--- a/res/skins/LateNight/classic/buttons/btn__sync_leader.svg
+++ b/res/skins/LateNight/classic/buttons/btn__sync_leader.svg
@@ -1,4 +1,4 @@
-<svg width="19" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="38" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 18">
   <g transform="translate(-14,-3)" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">
     <path d="m18 15v-7l2.5 2.5 3-3 3 3 2.5-2.5v7z" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6"/>
   </g>
diff --git a/res/skins/LateNight/classic/buttons/btn__sync_leader_active.svg b/res/skins/LateNight/classic/buttons/btn__sync_leader_active.svg
index aceaeebc372..83e1e3a6b57 100644
--- a/res/skins/LateNight/classic/buttons/btn__sync_leader_active.svg
+++ b/res/skins/LateNight/classic/buttons/btn__sync_leader_active.svg
@@ -1,4 +1,4 @@
-<svg width="19" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="38" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 18">
   <g transform="translate(-34,-3)" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">
     <path d="m18 15v-7l2.5 2.5 3-3 3 3 2.5-2.5v7z" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6"/>
   </g>
diff --git a/res/skins/LateNight/classic/buttons/btn__sync_sampler.svg b/res/skins/LateNight/classic/buttons/btn__sync_sampler.svg
index 2071e7bb779..943bf5d2b95 100644
--- a/res/skins/LateNight/classic/buttons/btn__sync_sampler.svg
+++ b/res/skins/LateNight/classic/buttons/btn__sync_sampler.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 		<g fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">
 				<path d="m5 7.3636 6.955 4.6367-6.955 4.6367z"/>
 				<path d="M 19,7.3633 12.045,12 19,16.6367 Z"/>
diff --git a/res/skins/LateNight/classic/buttons/btn__xfader_aux_left.svg b/res/skins/LateNight/classic/buttons/btn__xfader_aux_left.svg
index da5b928d80c..303cadfb228 100644
--- a/res/skins/LateNight/classic/buttons/btn__xfader_aux_left.svg
+++ b/res/skins/LateNight/classic/buttons/btn__xfader_aux_left.svg
@@ -1 +1,16 @@
-<svg width="11" height="13" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v9h7v-2h-5v-7h-2" fill="#888"/></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="22"
+   height="26"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <path
+     d="M 4,4 V 22 H 18 V 18 H 8 V 4 H 4"
+     fill="#888888"
+     id="path1"
+     style="stroke-width:2" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__xfader_aux_left_off.svg b/res/skins/LateNight/classic/buttons/btn__xfader_aux_left_off.svg
index c15d77c4bc0..f74e549e67a 100644
--- a/res/skins/LateNight/classic/buttons/btn__xfader_aux_left_off.svg
+++ b/res/skins/LateNight/classic/buttons/btn__xfader_aux_left_off.svg
@@ -1 +1,16 @@
-<svg width="11" height="13" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v9h7v-2h-5v-7h-2" fill="#555"/></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="22"
+   height="26"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <path
+     d="M 4,4 V 22 H 18 V 18 H 8 V 4 H 4"
+     fill="#555555"
+     id="path1"
+     style="stroke-width:2" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__xfader_aux_mid.svg b/res/skins/LateNight/classic/buttons/btn__xfader_aux_mid.svg
index 71a9f048785..1c7ce783c9e 100644
--- a/res/skins/LateNight/classic/buttons/btn__xfader_aux_mid.svg
+++ b/res/skins/LateNight/classic/buttons/btn__xfader_aux_mid.svg
@@ -1 +1,16 @@
-<svg width="11" height="13" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m1 11v-9h1.5l3 3.5 3-3.5h1.5v9h-2v-6l-2.5 3-2.5-3v6z" fill="#888"/></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="22"
+   height="26"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <path
+     d="M 2,22 V 4 h 3 l 6,7 6,-7 h 3 V 22 H 16 V 10 l -5,6 -5,-6 v 12 z"
+     fill="#888888"
+     id="path1"
+     style="stroke-width:2" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__xfader_aux_mid_off.svg b/res/skins/LateNight/classic/buttons/btn__xfader_aux_mid_off.svg
index e8c9e7490b1..0628dd98375 100644
--- a/res/skins/LateNight/classic/buttons/btn__xfader_aux_mid_off.svg
+++ b/res/skins/LateNight/classic/buttons/btn__xfader_aux_mid_off.svg
@@ -1 +1,16 @@
-<svg width="11" height="13" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m1 11v-9h1.5l3 3.5 3-3.5h1.5v9h-2v-6l-2.5 3-2.5-3v6z" fill="#555"/></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="22"
+   height="26"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <path
+     d="M 2,22 V 4 h 3 l 6,7 6,-7 h 3 V 22 H 16 V 10 l -5,6 -5,-6 v 12 z"
+     fill="#555555"
+     id="path1"
+     style="stroke-width:2" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__xfader_aux_right.svg b/res/skins/LateNight/classic/buttons/btn__xfader_aux_right.svg
index 1c91063e788..7d819f1920d 100644
--- a/res/skins/LateNight/classic/buttons/btn__xfader_aux_right.svg
+++ b/res/skins/LateNight/classic/buttons/btn__xfader_aux_right.svg
@@ -1 +1,16 @@
-<svg width="11" height="13" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v9h2v-3h1.5l3 3h1.5v-1.5l-2-2 1-1v-3l-1.5-1.5zm2 2h3v2h-3z" fill="#888"/></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="22"
+   height="26"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <path
+     d="m 4,4 v 18 h 4 v -6 h 3 l 6,6 h 3 v -3 l -4,-4 2,-2 V 7 L 15,4 Z m 4,4 h 6 v 4 H 8 Z"
+     fill="#888888"
+     id="path1"
+     style="stroke-width:2" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__xfader_aux_right_off.svg b/res/skins/LateNight/classic/buttons/btn__xfader_aux_right_off.svg
index b8b6290eee5..9cf88146bbd 100644
--- a/res/skins/LateNight/classic/buttons/btn__xfader_aux_right_off.svg
+++ b/res/skins/LateNight/classic/buttons/btn__xfader_aux_right_off.svg
@@ -1 +1,16 @@
-<svg width="11" height="13" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v9h2v-3h1.5l3 3h1.5v-1.5l-2-2 1-1v-3l-1.5-1.5zm2 2h3v2h-3z" fill="#555"/></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="22"
+   height="26"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <path
+     d="m 4,4 v 18 h 4 v -6 h 3 l 6,6 h 3 v -3 l -4,-4 2,-2 V 7 L 15,4 Z m 4,4 h 6 v 4 H 8 Z"
+     fill="#555555"
+     id="path1"
+     style="stroke-width:2" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__xfader_deck_left_default.svg b/res/skins/LateNight/classic/buttons/btn__xfader_deck_left_default.svg
index 97c1a08df78..77fc719aa04 100644
--- a/res/skins/LateNight/classic/buttons/btn__xfader_deck_left_default.svg
+++ b/res/skins/LateNight/classic/buttons/btn__xfader_deck_left_default.svg
@@ -1 +1,16 @@
-<svg width="11" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m2 3v9h7v-2h-5v-7h-2" fill="#888"/></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="22"
+   height="30"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <path
+     d="M 4,6 V 24 H 18 V 20 H 8 V 6 H 4"
+     fill="#888888"
+     id="path1"
+     style="stroke-width:2" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__xfader_deck_left_off.svg b/res/skins/LateNight/classic/buttons/btn__xfader_deck_left_off.svg
index 71a6d97b866..78700921622 100644
--- a/res/skins/LateNight/classic/buttons/btn__xfader_deck_left_off.svg
+++ b/res/skins/LateNight/classic/buttons/btn__xfader_deck_left_off.svg
@@ -1 +1,16 @@
-<svg width="11" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m2 3v9h7v-2h-5v-7h-2" fill="#555"/></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="22"
+   height="30"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <path
+     d="M 4,6 V 24 H 18 V 20 H 8 V 6 H 4"
+     fill="#555555"
+     id="path1"
+     style="stroke-width:2" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__xfader_deck_left_warning.svg b/res/skins/LateNight/classic/buttons/btn__xfader_deck_left_warning.svg
index 52a1e3225b6..b352df7579e 100644
--- a/res/skins/LateNight/classic/buttons/btn__xfader_deck_left_warning.svg
+++ b/res/skins/LateNight/classic/buttons/btn__xfader_deck_left_warning.svg
@@ -1 +1,16 @@
-<svg width="11" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m2 3v9h7v-2h-5v-7h-2" fill="#f856e7"/></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="22"
+   height="30"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <path
+     d="M 4,6 V 24 H 18 V 20 H 8 V 6 H 4"
+     fill="#f856e7"
+     id="path1"
+     style="stroke-width:2" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__xfader_deck_mid_off.svg b/res/skins/LateNight/classic/buttons/btn__xfader_deck_mid_off.svg
index ec87f75be5e..f5e7ea01d03 100644
--- a/res/skins/LateNight/classic/buttons/btn__xfader_deck_mid_off.svg
+++ b/res/skins/LateNight/classic/buttons/btn__xfader_deck_mid_off.svg
@@ -1 +1,16 @@
-<svg width="11" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m1 12v-9h1.5l3 3.5 3-3.5h1.5v9h-2v-6l-2.5 3-2.5-3v6z" fill="#555"/></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="22"
+   height="30"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <path
+     d="M 2,24 V 6 h 3 l 6,7 6,-7 h 3 V 24 H 16 V 12 l -5,6 -5,-6 v 12 z"
+     fill="#555555"
+     id="path1"
+     style="stroke-width:2" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__xfader_deck_mid_warning.svg b/res/skins/LateNight/classic/buttons/btn__xfader_deck_mid_warning.svg
index eb0d70aafa3..c08f1d78291 100644
--- a/res/skins/LateNight/classic/buttons/btn__xfader_deck_mid_warning.svg
+++ b/res/skins/LateNight/classic/buttons/btn__xfader_deck_mid_warning.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
    id="svg4"
    version="1.1"
-   height="15"
-   width="11">
+   height="30"
+   width="22"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <metadata
      id="metadata10">
     <rdf:RDF>
@@ -17,7 +17,6 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -25,6 +24,6 @@
      id="defs8" />
   <path
      id="path820"
-     d="M 1,12 V 3 h 1.5 l 3,3.5 3,-3.5 H 10 v 9 H 8 V 6 L 5.5,9 3,6 v 6 z"
-     style="fill:#f0bb2b;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+     d="M 2,24 V 6 h 3 l 6,7 6,-7 h 3 V 24 H 16 V 12 l -5,6 -5,-6 v 12 z"
+     style="fill:#f0bb2b;fill-opacity:1;stroke:none;stroke-width:2px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__xfader_deck_right_default.svg b/res/skins/LateNight/classic/buttons/btn__xfader_deck_right_default.svg
index d590c5ab6b6..f19ceab70cd 100644
--- a/res/skins/LateNight/classic/buttons/btn__xfader_deck_right_default.svg
+++ b/res/skins/LateNight/classic/buttons/btn__xfader_deck_right_default.svg
@@ -1 +1,16 @@
-<svg width="11" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m2 3v9h2v-3h1.5l3 3h1.5v-1.5l-2-2 1-1v-3l-1.5-1.5zm2 2h3v2h-3z" fill="#888"/></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="22"
+   height="30"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <path
+     d="m 4,6 v 18 h 4 v -6 h 3 l 6,6 h 3 v -3 l -4,-4 2,-2 V 9 L 15,6 Z m 4,4 h 6 v 4 H 8 Z"
+     fill="#888888"
+     id="path1"
+     style="stroke-width:2" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__xfader_deck_right_off.svg b/res/skins/LateNight/classic/buttons/btn__xfader_deck_right_off.svg
index 6224588d3d2..85f70c6f2fd 100644
--- a/res/skins/LateNight/classic/buttons/btn__xfader_deck_right_off.svg
+++ b/res/skins/LateNight/classic/buttons/btn__xfader_deck_right_off.svg
@@ -1 +1,16 @@
-<svg width="11" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m2 3v9h2v-3h1.5l3 3h1.5v-1.5l-2-2 1-1v-3l-1.5-1.5zm2 2h3v2h-3z" fill="#555"/></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="22"
+   height="30"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <path
+     d="m 4,6 v 18 h 4 v -6 h 3 l 6,6 h 3 v -3 l -4,-4 2,-2 V 9 L 15,6 Z m 4,4 h 6 v 4 H 8 Z"
+     fill="#555555"
+     id="path1"
+     style="stroke-width:2" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__xfader_deck_right_warning.svg b/res/skins/LateNight/classic/buttons/btn__xfader_deck_right_warning.svg
index dedd1075ff2..4868fadf050 100644
--- a/res/skins/LateNight/classic/buttons/btn__xfader_deck_right_warning.svg
+++ b/res/skins/LateNight/classic/buttons/btn__xfader_deck_right_warning.svg
@@ -1 +1,16 @@
-<svg width="11" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m2 3v9h2v-3h1.5l3 3h1.5v-1.5l-2-2 1-1v-3l-1.5-1.5h-5.5zm2 2h3v2h-3v-2z" fill="#f856e7"/></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="22"
+   height="30"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <path
+     d="m 4,6 v 18 h 4 v -6 h 3 l 6,6 h 3 v -3 l -4,-4 2,-2 V 9 L 15,6 Z m 4,4 h 6 v 4 H 8 Z"
+     fill="#f856e7"
+     id="path1"
+     style="stroke-width:2" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__xfader_sampler_left.svg b/res/skins/LateNight/classic/buttons/btn__xfader_sampler_left.svg
index 7dd52debae5..747619b726c 100644
--- a/res/skins/LateNight/classic/buttons/btn__xfader_sampler_left.svg
+++ b/res/skins/LateNight/classic/buttons/btn__xfader_sampler_left.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 18">
 	<g transform="translate(-2,-1034.4)">
 		<path d="m8 1039.4v9h8v-2h-6v-7h-2" fill="#f856e7"/>
 	</g>
diff --git a/res/skins/LateNight/classic/buttons/btn__xfader_sampler_main.svg b/res/skins/LateNight/classic/buttons/btn__xfader_sampler_main.svg
index 6eb53f82c3a..67fe5425c08 100644
--- a/res/skins/LateNight/classic/buttons/btn__xfader_sampler_main.svg
+++ b/res/skins/LateNight/classic/buttons/btn__xfader_sampler_main.svg
@@ -1,3 +1,3 @@
-<svg width="21" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 18">
 	<path d="m6 14v-9h2l3 3 3-3h2v9h-2v-6l-3 3-3-3v6z" fill="#585858"/>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__xfader_sampler_right.svg b/res/skins/LateNight/classic/buttons/btn__xfader_sampler_right.svg
index 2a67bf6a43f..9964c16d623 100644
--- a/res/skins/LateNight/classic/buttons/btn__xfader_sampler_right.svg
+++ b/res/skins/LateNight/classic/buttons/btn__xfader_sampler_right.svg
@@ -1,3 +1,3 @@
-<svg width="21" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 18">
 	<path d="m6.0252 5v9h2v-3h2.4998l3 3h1.5v-1.5l-2-2 1-1v-3l-1.5-1.5zm2 2h3.9998v2h-3.9998z" fill="#f856e7"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__.svg b/res/skins/LateNight/palemoon/buttons/btn__.svg
index ddb49a7888e..2f4614ce9a8 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__.svg
@@ -1 +1 @@
-<svg width="1" height="1" version="1.1" xmlns="http://www.w3.org/2000/svg"/>
+<svg width="2" height="2" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1 1"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__1.svg b/res/skins/LateNight/palemoon/buttons/btn__1.svg
index f54cb88b4a4..b5ef3800afc 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__1.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__1.svg
@@ -1,4 +1,4 @@
-<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 24">
   <g fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6" aria-label="1">
     <path d="m11.8842 17.235h-2.2129v-6.05861l0.0214844-0.995445 0.0358074-1.08854q-0.551434 0.551434-0.766278 0.723309l-1.20313 0.9668-1.06706-1.33203 3.37305-2.68555h1.81901z" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6"/>
   </g>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__1_active.svg b/res/skins/LateNight/palemoon/buttons/btn__1_active.svg
index 9e477118e15..0c90b0d2576 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__1_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__1_active.svg
@@ -1,4 +1,4 @@
-<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 24">
   <g aria-label="1">
     <path d="m11.8842 17.235h-2.2129v-6.05861l0.0214844-0.995445 0.0358074-1.08854q-0.551434 0.551434-0.766278 0.723309l-1.20313 0.9668-1.06706-1.33203 3.37305-2.68555h1.81901z"/>
   </g>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__1_active_dark.svg b/res/skins/LateNight/palemoon/buttons/btn__1_active_dark.svg
index 90cf767e7ee..190861b8da1 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__1_active_dark.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__1_active_dark.svg
@@ -1,4 +1,4 @@
-<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 24">
   <g fill="#e0d9d1" aria-label="1">
     <path d="m11.8842 17.235h-2.2129v-6.05861l0.0214844-0.995445 0.0358074-1.08854q-0.551434 0.551434-0.766278 0.723309l-1.20313 0.9668-1.06706-1.33203 3.37305-2.68555h1.81901z" fill="#e0d9d1"/>
   </g>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__1_loop.svg b/res/skins/LateNight/palemoon/buttons/btn__1_loop.svg
index f4a66fb01a9..6743ed61852 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__1_loop.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__1_loop.svg
@@ -9,10 +9,10 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    id="svg6"
    version="1.1"
-   height="24"
-   width="20"
+   height="48"
+   width="40"
    sodipodi:docname="btn__1_loop.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)" viewBox="0 0 20 24">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
diff --git a/res/skins/LateNight/palemoon/buttons/btn__2.svg b/res/skins/LateNight/palemoon/buttons/btn__2.svg
index c34934d5be6..fe8aecc57ea 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__2.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__2.svg
@@ -1,4 +1,4 @@
-<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 24">
   <text x="5.8255696" y="17.235025" fill="#918273" font-family="sans-serif" font-size="40px" letter-spacing="0px" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.8255696" y="17.235025" fill="#918273" font-family="'Open Sans'" font-size="14.6667px" font-weight="bold" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">2</tspan></text>
   <text x="5.8255696" y="17.235025" fill="#918273" font-family="sans-serif" font-size="40px" letter-spacing="0px" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.8255696" y="17.235025" fill="#918273" font-family="'Open Sans'" font-size="14.6667px" font-weight="bold">2</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__2_active.svg b/res/skins/LateNight/palemoon/buttons/btn__2_active.svg
index 604876266cb..00ebff60b8b 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__2_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__2_active.svg
@@ -1,3 +1,3 @@
-<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 24">
   <text x="5.8255696" y="17.235025" fill="#000000" font-family="sans-serif" font-size="40px" letter-spacing="0px" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.8255696" y="17.235025" fill="#000000" font-family="'Open Sans'" font-size="14.6667px" font-weight="bold">2</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__2_active_dark.svg b/res/skins/LateNight/palemoon/buttons/btn__2_active_dark.svg
index 249a8eea04f..5f02195980a 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__2_active_dark.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__2_active_dark.svg
@@ -1,3 +1,3 @@
-<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 24">
   <text x="5.8255696" y="17.235025" fill="#e0d9d1" font-family="sans-serif" font-size="40px" letter-spacing="0px" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.8255696" y="17.235025" fill="#e0d9d1" font-family="'Open Sans'" font-size="14.6667px" font-weight="bold">2</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__2_loop.svg b/res/skins/LateNight/palemoon/buttons/btn__2_loop.svg
index 501235396fd..6ef47fe481b 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__2_loop.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__2_loop.svg
@@ -9,10 +9,10 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    id="svg6"
    version="1.1"
-   height="24"
-   width="20"
+   height="48"
+   width="40"
    sodipodi:docname="btn__2_loop.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)" viewBox="0 0 20 24">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
diff --git a/res/skins/LateNight/palemoon/buttons/btn__3.svg b/res/skins/LateNight/palemoon/buttons/btn__3.svg
index 6e08d7ef8c8..b76024e1dc7 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__3.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__3.svg
@@ -1,4 +1,4 @@
-<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 24">
   <text x="5.8255696" y="17.235025" fill="#918273" font-family="sans-serif" font-size="40px" letter-spacing="0px" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.8255696" y="17.235025" fill="#918273" font-family="'Open Sans'" font-size="14.6667px" font-weight="bold" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">3</tspan></text>
   <text x="5.8255696" y="17.235025" fill="#918273" font-family="sans-serif" font-size="40px" letter-spacing="0px" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.8255696" y="17.235025" fill="#918273" font-family="'Open Sans'" font-size="14.6667px" font-weight="bold">3</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__3_active.svg b/res/skins/LateNight/palemoon/buttons/btn__3_active.svg
index 73b901f9a7e..66a41a81a3a 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__3_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__3_active.svg
@@ -1,3 +1,3 @@
-<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 24">
   <text x="5.8255696" y="17.235025" fill="#000000" font-family="sans-serif" font-size="40px" letter-spacing="0px" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.8255696" y="17.235025" fill="#000000" font-family="'Open Sans'" font-size="14.6667px" font-weight="bold">3</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__3_active_dark.svg b/res/skins/LateNight/palemoon/buttons/btn__3_active_dark.svg
index 28d2b214f22..ac6b5181f53 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__3_active_dark.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__3_active_dark.svg
@@ -1,3 +1,3 @@
-<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 24">
   <text x="5.8255696" y="17.235025" fill="#e0d9d1" font-family="sans-serif" font-size="40px" letter-spacing="0px" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.8255696" y="17.235025" fill="#e0d9d1" font-family="'Open Sans'" font-size="14.6667px" font-weight="bold">3</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__3_loop.svg b/res/skins/LateNight/palemoon/buttons/btn__3_loop.svg
index e5327ba2c1b..3afc32bfccc 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__3_loop.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__3_loop.svg
@@ -9,10 +9,10 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    id="svg6"
    version="1.1"
-   height="24"
-   width="20"
+   height="48"
+   width="40"
    sodipodi:docname="btn__3_loop.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)" viewBox="0 0 20 24">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
diff --git a/res/skins/LateNight/palemoon/buttons/btn__4.svg b/res/skins/LateNight/palemoon/buttons/btn__4.svg
index 220117d9966..16253490a13 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__4.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__4.svg
@@ -1,4 +1,4 @@
-<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 24">
   <text x="5.8255696" y="17.235025" fill="#918273" font-family="sans-serif" font-size="40px" letter-spacing="0px" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.8255696" y="17.235025" fill="#918273" font-family="'Open Sans'" font-size="14.6667px" font-weight="bold" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">4</tspan></text>
   <text x="5.8255696" y="17.235025" fill="#918273" font-family="sans-serif" font-size="40px" letter-spacing="0px" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.8255696" y="17.235025" fill="#918273" font-family="'Open Sans'" font-size="14.6667px" font-weight="bold">4</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__4_active.svg b/res/skins/LateNight/palemoon/buttons/btn__4_active.svg
index 516a3595faa..a6ac9c4e314 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__4_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__4_active.svg
@@ -1,3 +1,3 @@
-<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 24">
   <text x="5.8255696" y="17.235025" fill="#000000" font-family="sans-serif" font-size="40px" letter-spacing="0px" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.8255696" y="17.235025" fill="#000000" font-family="'Open Sans'" font-size="14.6667px" font-weight="bold">4</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__4_active_dark.svg b/res/skins/LateNight/palemoon/buttons/btn__4_active_dark.svg
index dea940a1b4b..c8852da4f6f 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__4_active_dark.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__4_active_dark.svg
@@ -1,3 +1,3 @@
-<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 24">
   <text x="5.8255696" y="17.235025" fill="#e0d9d1" font-family="sans-serif" font-size="40px" letter-spacing="0px" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.8255696" y="17.235025" fill="#e0d9d1" font-family="'Open Sans'" font-size="14.6667px" font-weight="bold">4</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__4_loop.svg b/res/skins/LateNight/palemoon/buttons/btn__4_loop.svg
index 2c2ce420c77..940e6943a6a 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__4_loop.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__4_loop.svg
@@ -9,10 +9,10 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    id="svg6"
    version="1.1"
-   height="24"
-   width="20"
+   height="48"
+   width="40"
    sodipodi:docname="btn__4_loop.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)" viewBox="0 0 20 24">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
diff --git a/res/skins/LateNight/palemoon/buttons/btn__5.svg b/res/skins/LateNight/palemoon/buttons/btn__5.svg
index 29935d81e80..3c844eb1c23 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__5.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__5.svg
@@ -1,4 +1,4 @@
-<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 24">
   <text x="5.8255696" y="17.235025" fill="#918273" font-family="sans-serif" font-size="40px" letter-spacing="0px" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.8255696" y="17.235025" fill="#918273" font-family="'Open Sans'" font-size="14.6667px" font-weight="bold" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">5</tspan></text>
   <text x="5.8255696" y="17.235025" fill="#918273" font-family="sans-serif" font-size="40px" letter-spacing="0px" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.8255696" y="17.235025" fill="#918273" font-family="'Open Sans'" font-size="14.6667px" font-weight="bold">5</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__5_active.svg b/res/skins/LateNight/palemoon/buttons/btn__5_active.svg
index f9e9e185d9e..669b33adc9e 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__5_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__5_active.svg
@@ -1,3 +1,3 @@
-<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 24">
   <text x="5.8255696" y="17.235025" fill="#000000" font-family="sans-serif" font-size="40px" letter-spacing="0px" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.8255696" y="17.235025" fill="#000000" font-family="'Open Sans'" font-size="14.6667px" font-weight="bold">5</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__5_active_dark.svg b/res/skins/LateNight/palemoon/buttons/btn__5_active_dark.svg
index 54dfe49e647..d9a1b9adb47 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__5_active_dark.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__5_active_dark.svg
@@ -1,3 +1,3 @@
-<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 24">
   <text x="5.8255696" y="17.235025" fill="#e0d9d1" font-family="sans-serif" font-size="40px" letter-spacing="0px" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.8255696" y="17.235025" fill="#e0d9d1" font-family="'Open Sans'" font-size="14.6667px" font-weight="bold">5</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__5_loop.svg b/res/skins/LateNight/palemoon/buttons/btn__5_loop.svg
index 7757dcc9ac7..77c256f8f37 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__5_loop.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__5_loop.svg
@@ -9,10 +9,10 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    id="svg6"
    version="1.1"
-   height="24"
-   width="20"
+   height="48"
+   width="40"
    sodipodi:docname="btn__5_loop.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)" viewBox="0 0 20 24">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
diff --git a/res/skins/LateNight/palemoon/buttons/btn__6.svg b/res/skins/LateNight/palemoon/buttons/btn__6.svg
index 49d4cd0a056..7b1c710823a 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__6.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__6.svg
@@ -1,4 +1,4 @@
-<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 24">
   <text x="5.8255696" y="17.235025" fill="#918273" font-family="sans-serif" font-size="40px" letter-spacing="0px" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.8255696" y="17.235025" fill="#918273" font-family="'Open Sans'" font-size="14.6667px" font-weight="bold" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">6</tspan></text>
   <text x="5.8255696" y="17.235025" fill="#918273" font-family="sans-serif" font-size="40px" letter-spacing="0px" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.8255696" y="17.235025" fill="#918273" font-family="'Open Sans'" font-size="14.6667px" font-weight="bold">6</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__6_active.svg b/res/skins/LateNight/palemoon/buttons/btn__6_active.svg
index 91ffcc87b0e..fba77beb9d2 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__6_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__6_active.svg
@@ -1,3 +1,3 @@
-<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 24">
   <text x="5.8255696" y="17.235025" fill="#000000" font-family="sans-serif" font-size="40px" letter-spacing="0px" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.8255696" y="17.235025" fill="#000000" font-family="'Open Sans'" font-size="14.6667px" font-weight="bold">6</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__6_active_dark.svg b/res/skins/LateNight/palemoon/buttons/btn__6_active_dark.svg
index 913f98a4cd3..9b6c733e552 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__6_active_dark.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__6_active_dark.svg
@@ -1,3 +1,3 @@
-<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 24">
   <text x="5.8255696" y="17.235025" fill="#e0d9d1" font-family="sans-serif" font-size="40px" letter-spacing="0px" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.8255696" y="17.235025" fill="#e0d9d1" font-family="'Open Sans'" font-size="14.6667px" font-weight="bold">6</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__6_loop.svg b/res/skins/LateNight/palemoon/buttons/btn__6_loop.svg
index e284a940e41..95ea51c78e7 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__6_loop.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__6_loop.svg
@@ -9,10 +9,10 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    id="svg6"
    version="1.1"
-   height="24"
-   width="20"
+   height="48"
+   width="40"
    sodipodi:docname="btn__6_loop.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)" viewBox="0 0 20 24">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
diff --git a/res/skins/LateNight/palemoon/buttons/btn__7.svg b/res/skins/LateNight/palemoon/buttons/btn__7.svg
index 9b4e6273a4c..7f1155dfe05 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__7.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__7.svg
@@ -1,4 +1,4 @@
-<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 24">
   <text x="5.8255696" y="17.235025" fill="#918273" font-family="sans-serif" font-size="40px" letter-spacing="0px" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.8255696" y="17.235025" fill="#918273" font-family="'Open Sans'" font-size="14.6667px" font-weight="bold" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">7</tspan></text>
   <text x="5.8255696" y="17.235025" fill="#918273" font-family="sans-serif" font-size="40px" letter-spacing="0px" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.8255696" y="17.235025" fill="#918273" font-family="'Open Sans'" font-size="14.6667px" font-weight="bold">7</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__7_active.svg b/res/skins/LateNight/palemoon/buttons/btn__7_active.svg
index 7710af32c00..00703f14c62 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__7_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__7_active.svg
@@ -1,3 +1,3 @@
-<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 24">
   <text x="5.8255696" y="17.235025" fill="#000000" font-family="sans-serif" font-size="40px" letter-spacing="0px" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.8255696" y="17.235025" fill="#000000" font-family="'Open Sans'" font-size="14.6667px" font-weight="bold">7</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__7_active_dark.svg b/res/skins/LateNight/palemoon/buttons/btn__7_active_dark.svg
index 63e10038686..7532101302f 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__7_active_dark.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__7_active_dark.svg
@@ -1,3 +1,3 @@
-<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 24">
   <text x="5.8255696" y="17.235025" fill="#e0d9d1" font-family="sans-serif" font-size="40px" letter-spacing="0px" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.8255696" y="17.235025" fill="#e0d9d1" font-family="'Open Sans'" font-size="14.6667px" font-weight="bold">7</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__7_loop.svg b/res/skins/LateNight/palemoon/buttons/btn__7_loop.svg
index 03f4ac0c1b4..d4d3d9ff4d7 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__7_loop.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__7_loop.svg
@@ -9,10 +9,10 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    id="svg6"
    version="1.1"
-   height="24"
-   width="20"
+   height="48"
+   width="40"
    sodipodi:docname="btn__7_loop.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)" viewBox="0 0 20 24">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
diff --git a/res/skins/LateNight/palemoon/buttons/btn__8.svg b/res/skins/LateNight/palemoon/buttons/btn__8.svg
index 1eec8aa1daf..b1fbd1b5367 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__8.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__8.svg
@@ -1,4 +1,4 @@
-<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 24">
   <text x="5.8255696" y="17.235025" fill="#918273" font-family="sans-serif" font-size="40px" letter-spacing="0px" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.8255696" y="17.235025" fill="#918273" font-family="'Open Sans'" font-size="14.6667px" font-weight="bold" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">8</tspan></text>
   <text x="5.8255696" y="17.235025" fill="#918273" font-family="sans-serif" font-size="40px" letter-spacing="0px" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.8255696" y="17.235025" fill="#918273" font-family="'Open Sans'" font-size="14.6667px" font-weight="bold">8</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__8_active.svg b/res/skins/LateNight/palemoon/buttons/btn__8_active.svg
index cea9732ef8f..4bd3739d6bd 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__8_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__8_active.svg
@@ -1,3 +1,3 @@
-<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 24">
   <text x="5.8255696" y="17.235025" fill="#000000" font-family="sans-serif" font-size="40px" letter-spacing="0px" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.8255696" y="17.235025" fill="#000000" font-family="'Open Sans'" font-size="14.6667px" font-weight="bold">8</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__8_active_dark.svg b/res/skins/LateNight/palemoon/buttons/btn__8_active_dark.svg
index bf82f40944e..f95c9092e30 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__8_active_dark.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__8_active_dark.svg
@@ -1,3 +1,3 @@
-<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 24">
   <text x="5.8255696" y="17.235025" fill="#e0d9d1" font-family="sans-serif" font-size="40px" letter-spacing="0px" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.8255696" y="17.235025" fill="#e0d9d1" font-family="'Open Sans'" font-size="14.6667px" font-weight="bold">8</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__8_loop.svg b/res/skins/LateNight/palemoon/buttons/btn__8_loop.svg
index db05c078bdf..08c64611541 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__8_loop.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__8_loop.svg
@@ -7,12 +7,12 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="20"
-   height="24"
+   width="40"
+   height="48"
    version="1.1"
    id="svg6"
    sodipodi:docname="btn__8_loop.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)" viewBox="0 0 20 24">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
diff --git a/res/skins/LateNight/palemoon/buttons/btn___active.svg b/res/skins/LateNight/palemoon/buttons/btn___active.svg
index ddb49a7888e..2f4614ce9a8 100644
--- a/res/skins/LateNight/palemoon/buttons/btn___active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn___active.svg
@@ -1 +1 @@
-<svg width="1" height="1" version="1.1" xmlns="http://www.w3.org/2000/svg"/>
+<svg width="2" height="2" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1 1"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn___pressed.svg b/res/skins/LateNight/palemoon/buttons/btn___pressed.svg
index ddb49a7888e..2f4614ce9a8 100644
--- a/res/skins/LateNight/palemoon/buttons/btn___pressed.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn___pressed.svg
@@ -1 +1 @@
-<svg width="1" height="1" version="1.1" xmlns="http://www.w3.org/2000/svg"/>
+<svg width="2" height="2" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1 1"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__active.svg b/res/skins/LateNight/palemoon/buttons/btn__active.svg
index ddb49a7888e..2f4614ce9a8 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__active.svg
@@ -1 +1 @@
-<svg width="1" height="1" version="1.1" xmlns="http://www.w3.org/2000/svg"/>
+<svg width="2" height="2" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1 1"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__arrow_left_down.svg b/res/skins/LateNight/palemoon/buttons/btn__arrow_left_down.svg
index 488db135ffa..650f129d878 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__arrow_left_down.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__arrow_left_down.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <path d="m11.5 11.5-3.5-3.5v9h9l-3.5-3.5 3.5-3.5-2-2z" fill="none" stroke="#000001" stroke-linejoin="round" stroke-width="1.6"/>
   <path d="m11.5 11.5-3.5-3.5v9h9l-3.5-3.5 3.5-3.5-2-2z" fill="#8e8276"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__arrow_left_down_active.svg b/res/skins/LateNight/palemoon/buttons/btn__arrow_left_down_active.svg
index be93c1c5d49..3ca9a61e8d6 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__arrow_left_down_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__arrow_left_down_active.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <path d="m11.5 11.5-3.5-3.5v9h9l-3.5-3.5 3.5-3.5-2-2z" fill="#000001"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__arrow_left_up.svg b/res/skins/LateNight/palemoon/buttons/btn__arrow_left_up.svg
index c6e5359420f..b5bf18b4dc5 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__arrow_left_up.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__arrow_left_up.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <path d="m11.5 12.5-3.5 3.5v-9h9l-3.5 3.5 3.5 3.5-2 2z" fill="none" stroke="#000001" stroke-linejoin="round" stroke-width="1.6"/>
   <path d="m11.5 12.5-3.5 3.5v-9h9l-3.5 3.5 3.5 3.5-2 2z" fill="#8e8276"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__arrow_left_up_active.svg b/res/skins/LateNight/palemoon/buttons/btn__arrow_left_up_active.svg
index 1aa0dd1e9e0..eeeb80a6d75 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__arrow_left_up_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__arrow_left_up_active.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <path d="m11.5 12.5-3.5 3.5v-9h9l-3.5 3.5 3.5 3.5-2 2z" fill="#000001"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__arrow_right_down.svg b/res/skins/LateNight/palemoon/buttons/btn__arrow_right_down.svg
index 452ed7181e7..23c2434764d 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__arrow_right_down.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__arrow_right_down.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <path d="m12.5 11.5 3.5-3.5v9h-9l3.5-3.5-3.5-3.5 2-2z" fill="none" stroke="#000001" stroke-linejoin="round" stroke-width="1.6"/>
   <path d="m12.5 11.5 3.5-3.5v9h-9l3.5-3.5-3.5-3.5 2-2z" fill="#8e8276"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__arrow_right_down_active.svg b/res/skins/LateNight/palemoon/buttons/btn__arrow_right_down_active.svg
index e8cd16a3c5e..b2ecd6a74aa 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__arrow_right_down_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__arrow_right_down_active.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <path d="m12.5 11.5 3.5-3.5v9h-9l3.5-3.5-3.5-3.5 2-2z" fill="#000001"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__arrow_right_up.svg b/res/skins/LateNight/palemoon/buttons/btn__arrow_right_up.svg
index e2be35f2a93..75f8eee4c7c 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__arrow_right_up.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__arrow_right_up.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <path d="m12.5 12.5 3.5 3.5v-9h-9l3.5 3.5-3.5 3.5 2 2z" fill="none" stroke="#000001" stroke-linejoin="round" stroke-width="1.6"/>
   <path d="m12.5 12.5 3.5 3.5v-9h-9l3.5 3.5-3.5 3.5 2 2z" fill="#8e8276"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__arrow_right_up_active.svg b/res/skins/LateNight/palemoon/buttons/btn__arrow_right_up_active.svg
index 0eb3bbab921..3c02087053d 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__arrow_right_up_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__arrow_right_up_active.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <path d="m12.5 12.5 3.5 3.5v-9h-9l3.5 3.5-3.5 3.5 2 2z" fill="#000001"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__autodj_addrandom.svg b/res/skins/LateNight/palemoon/buttons/btn__autodj_addrandom.svg
index 7a556c46da9..f448a625fc1 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__autodj_addrandom.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__autodj_addrandom.svg
@@ -1,4 +1,4 @@
-<svg width="32" height="20" version="1.1" viewBox="0 0 8.4667 5.2917" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="64" height="40" version="1.1" viewBox="0 0 8.4667 5.2917" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
   <defs>
     <linearGradient id="a" x1="9.315" x2="9.315" y1="19.048" y2="1.0256" gradientUnits="userSpaceOnUse">
       <stop stop-color="#80766b" offset="0"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__autodj_addrandom_pressed.svg b/res/skins/LateNight/palemoon/buttons/btn__autodj_addrandom_pressed.svg
index cb44f864ffa..65b323e117b 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__autodj_addrandom_pressed.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__autodj_addrandom_pressed.svg
@@ -1,4 +1,4 @@
-<svg width="32" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="64" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 20">
   <g fill="#000001">
     <g transform="matrix(.68451 0 0 .68268 12.4313 -.032504)" aria-label="?">
       <path d="m17.145 12.382q0 .59245-.20964 1.0846-.20052.49219-.59245.92969-.38281.42838-1.7682 1.431-1.2122.875-1.2578 1.8411h-2.4336q.05469-.9388.53776-1.6771.48307-.7474 1.3672-1.3581 1.0299-.70182 1.4036-1.1484.3737-.45573.3737-.99349 0-.70182-.55599-1.1211-.55599-.42838-1.4583-.42838-.92057 0-1.5495.53776-.61979.53776-.72917 1.4219l-2.5977-.10938q.24609-1.8503 1.5221-2.8802 1.276-1.0299 3.3177-1.0299 2.1146 0 3.3724.94792t1.2578 2.5521zm-6.3346 8.987v-2.4609h2.6341v2.4609z" fill="#000001" stroke-width="1.4629"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__autodj_enable_off.svg b/res/skins/LateNight/palemoon/buttons/btn__autodj_enable_off.svg
index dbd6ce4c778..61b99615585 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__autodj_enable_off.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__autodj_enable_off.svg
@@ -1,4 +1,4 @@
-<svg width="40" height="20" version="1.1" viewBox="0 0 10.583 5.2917" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="80" height="40" version="1.1" viewBox="0 0 10.583 5.2917" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
   <defs>
     <linearGradient id="a" x1="2.8712" x2="2.8712" y1="19.048" y2="1.0256" gradientTransform="matrix(.26458 0 0 .26458 -2.7083e-8 -2e-5)" gradientUnits="userSpaceOnUse">
       <stop stop-color="#80766b" offset="0"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__autodj_enable_on.svg b/res/skins/LateNight/palemoon/buttons/btn__autodj_enable_on.svg
index 6c6e430a2bf..c65344fbdfc 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__autodj_enable_on.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__autodj_enable_on.svg
@@ -1,4 +1,4 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="80" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 20">
   <path d="m26 3c-.554 0-1 .446-1 1v3h8v-3c0-.554-.446-1-1-1zm1.25 1.5c.41421 0 .75.33579.75.75s-.33579.75-.75.75-.75-.33579-.75-.75.33579-.75.75-.75zm3.5 0c.41421 0 .75.33579.75.75s-.33579.75-.75.75-.75-.33579-.75-.75.33579-.75.75-.75z" color="#000001"/>
   <rect x="26" y="14" width="2" height="3" rx="1" ry="1"/>
   <rect x="30" y="14" width="2" height="3" rx="1" ry="1"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__autodj_fade.svg b/res/skins/LateNight/palemoon/buttons/btn__autodj_fade.svg
index f0152c7ba08..855616c51a2 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__autodj_fade.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__autodj_fade.svg
@@ -1,4 +1,4 @@
-<svg width="32" height="20" version="1.1" viewBox="0 0 8.4667 5.2917" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="64" height="40" version="1.1" viewBox="0 0 8.4667 5.2917" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
   <defs>
     <linearGradient id="a" x1="9.315" x2="9.315" y1="19.048" y2="1.0256" gradientUnits="userSpaceOnUse">
       <stop stop-color="#80766b" offset="0"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__autodj_fade_disabled.svg b/res/skins/LateNight/palemoon/buttons/btn__autodj_fade_disabled.svg
index 7c67064a258..244bc05b298 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__autodj_fade_disabled.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__autodj_fade_disabled.svg
@@ -1,4 +1,4 @@
-<svg width="32" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 20">
   <path d="m22.344 6.041c-8.5814 1.2349-13.813 4.3649-18.887 9.7031l1.0859 1.0332c4.9261-5.1827 9.694-8.0547 18.014-9.252zm-.57675-3.0402.97008 7.1903 6.7052-4.5652z" color="#000001" color-rendering="auto" dominant-baseline="auto" fill="#444443" image-rendering="auto" shape-rendering="auto" solid-color="#000001" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000001;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
   <path d="m3.7793 4.8281-.2168 1.4844c3.1686.4617 5.4587 1.0047 7.8706 1.9377.59438-.29785 1.1531-.62948 1.7832-.89062-2.853-1.264-5.6118-1.9741-9.437-2.5315zm13.878 4.8589c-.63968.19217-1.2426.38965-1.8359.61523 3.0203 1.6884 5.2014 3.6519 7.8405 6.4634l1.0938-1.0273c-2.3854-2.5411-4.385-4.3747-7.0983-6.0512z" color="#000001" color-rendering="auto" dominant-baseline="auto" fill="#444443" image-rendering="auto" shape-rendering="auto" solid-color="#000001" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000001;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__autodj_fade_pressed.svg b/res/skins/LateNight/palemoon/buttons/btn__autodj_fade_pressed.svg
index 3d7094f5427..275ae1c14fb 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__autodj_fade_pressed.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__autodj_fade_pressed.svg
@@ -1,4 +1,4 @@
-<svg width="32" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="64" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 20">
   <path d="m22.344 6.041c-8.5814 1.2349-13.813 4.3649-18.887 9.7031l1.0859 1.0332c4.9261-5.1827 9.694-8.0547 18.014-9.252zm-.57675-3.0402.97008 7.1903 6.7052-4.5652z" color="#000001" color-rendering="auto" dominant-baseline="auto" fill="#000001" image-rendering="auto" shape-rendering="auto" solid-color="#000001" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000001;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
   <path d="m3.7793 4.8281-.2168 1.4844c3.1686.4617 5.4587 1.0047 7.8706 1.9377.59438-.29785 1.1531-.62948 1.7832-.89062-2.853-1.264-5.6118-1.9741-9.437-2.5315zm13.878 4.8589c-.63968.19217-1.2426.38965-1.8359.61523 3.0203 1.6884 5.2014 3.6519 7.8405 6.4634l1.0938-1.0273c-2.3854-2.5411-4.385-4.3747-7.0983-6.0512z" color="#000001" color-rendering="auto" dominant-baseline="auto" fill="#000001" image-rendering="auto" shape-rendering="auto" solid-color="#000001" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000001;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__autodj_repeat_playlist_off.svg b/res/skins/LateNight/palemoon/buttons/btn__autodj_repeat_playlist_off.svg
index 38d4b7ee5e9..e052f9ccb2c 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__autodj_repeat_playlist_off.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__autodj_repeat_playlist_off.svg
@@ -1,4 +1,4 @@
-<svg width="20" height="20" version="1.1" viewBox="0 0 5.2917 5.2917" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="40" height="40" version="1.1" viewBox="0 0 5.2917 5.2917" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
   <defs>
     <linearGradient id="a" x1="4.7118" x2="4.7118" y1="19.048" y2="1.0256" gradientTransform="matrix(.26458 0 0 .26458 0 291.71)" gradientUnits="userSpaceOnUse">
       <stop stop-color="#80766b" offset="0"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__autodj_repeat_playlist_on.svg b/res/skins/LateNight/palemoon/buttons/btn__autodj_repeat_playlist_on.svg
index d7686f621d5..68747aa96c3 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__autodj_repeat_playlist_on.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__autodj_repeat_playlist_on.svg
@@ -1,4 +1,4 @@
-<svg width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
   <path d="m8.0469 1.75-6 3 6 3v-2.25h6.9531c.71734 0 1.5.83133 1.5 1.5v4.6562l1.5 1.1562v-5.8125c0-1.6447-1.3553-3-3-3h-6.9531z" color="#000001"/>
   <path d="m11.953 18.25 6-3-6-3v2.25h-6.9531c-.71734 0-1.5-.83133-1.5-1.5v-4.6563l-1.5-1.1562v5.8125c0 1.6447 1.3553 3 3 3h6.9531z" color="#000001"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__autodj_shuffle.svg b/res/skins/LateNight/palemoon/buttons/btn__autodj_shuffle.svg
index 4afb40b5843..af032ba7dd8 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__autodj_shuffle.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__autodj_shuffle.svg
@@ -1,4 +1,4 @@
-<svg width="36" height="20" version="1.1" viewBox="0 0 9.525 5.2917" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="72" height="40" version="1.1" viewBox="0 0 9.525 5.2917" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
   <defs>
     <linearGradient id="a" x1="4.7667" x2="4.7667" y1="19.048" y2="1.0256" gradientTransform="matrix(.26458 0 0 .26458 1.4131e-8 291.71)" gradientUnits="userSpaceOnUse">
       <stop stop-color="#80766b" offset="0"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__autodj_shuffle_pressed.svg b/res/skins/LateNight/palemoon/buttons/btn__autodj_shuffle_pressed.svg
index 8434aa4fe84..c79bd9a443b 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__autodj_shuffle_pressed.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__autodj_shuffle_pressed.svg
@@ -1,4 +1,4 @@
-<svg width="36" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="72" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 20">
   <g fill="#000001">
     <path d="m26 2.2553 7.1e-5 6.0001 6-3.0001z"/>
     <path d="m26 17.789 7.1e-5-6 5.9999 3.0001z"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__autodj_skip.svg b/res/skins/LateNight/palemoon/buttons/btn__autodj_skip.svg
index 59569cbaabc..9e1f0152e52 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__autodj_skip.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__autodj_skip.svg
@@ -1,4 +1,4 @@
-<svg width="32" height="20" version="1.1" viewBox="0 0 8.4667 5.2917" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="40" version="1.1" viewBox="0 0 8.4667 5.2917" xmlns="http://www.w3.org/2000/svg">
   <defs>
     <linearGradient id="a" x1="9.315" x2="9.315" y1="14.726" y2="1.0256" gradientTransform="matrix(.26458 0 0 .26458 0 291.71)" gradientUnits="userSpaceOnUse">
       <stop stop-color="#80766b" offset="0"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__autodj_skip_disabled.svg b/res/skins/LateNight/palemoon/buttons/btn__autodj_skip_disabled.svg
index 1f4bb86c005..83aa8e7725c 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__autodj_skip_disabled.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__autodj_skip_disabled.svg
@@ -1,4 +1,4 @@
-<svg width="32" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 20">
   <g fill="#444443">
     <rect x="1" y="7" width="8" height="6" rx="1" ry="1" style="paint-order:fill markers stroke"/>
     <path d="m13 7c-.554 0-1 .446-1 1h1zm1 0v1h1v-1zm2 0v1h1v-1zm2 0v1h2c0-.554-.446-1-1-1zm-6 2v1h1v-1zm7 0v1h1v-1zm-7 2v1c0 .554.446 1 1 1v-2zm7 0c0 .554-.446 1-1 1v1h1c.554 0 1-.446 1-1v-1zm-5 1v1h1v-1zm2 0v1h1v-1z" style="paint-order:fill markers stroke"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__autodj_skip_pressed.svg b/res/skins/LateNight/palemoon/buttons/btn__autodj_skip_pressed.svg
index 3684ec7fee4..1fce44cc4a2 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__autodj_skip_pressed.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__autodj_skip_pressed.svg
@@ -1,4 +1,4 @@
-<svg width="32" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 20">
   <g fill="#000001">
     <rect x="1" y="7" width="8" height="6" rx="1" ry="1" style="paint-order:fill markers stroke"/>
     <path d="m13 7c-0.554 0-1 0.446-1 1h1zm1 0v1h1v-1zm2 0v1h1v-1zm2 0v1h2c0-0.554-0.446-1-1-1zm-6 2v1h1v-1zm7 0v1h1v-1zm-7 2v1c0 0.554 0.446 1 1 1v-2zm7 0c0 0.554-0.446 1-1 1v1h1c0.554 0 1-0.446 1-1v-1zm-5 1v1h1v-1zm2 0v1h1v-1z" style="paint-order:fill markers stroke"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__aux_play.svg b/res/skins/LateNight/palemoon/buttons/btn__aux_play.svg
index 769be548375..4d5875b0a08 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__aux_play.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__aux_play.svg
@@ -1,4 +1,4 @@
-<svg width="40" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="80" height="44" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 22">
   <text x="4.4199219" y="15.507538" fill="#000000" font-family="sans-serif" font-size="12px" letter-spacing="0px" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="4.4199219" y="15.507538" font-family="'Open Sans'" font-size="12px" font-weight="bold" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">PLAY</tspan></text>
   <text x="4.4199219" y="15.507538" fill="#918273" font-family="sans-serif" font-size="12px" letter-spacing="0px" stroke-width="1.6" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="4.4199219" y="15.507538" fill="#918273" font-family="'Open Sans'" font-size="12px" font-weight="bold" stroke-width="1.6">PLAY</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__aux_play_active.svg b/res/skins/LateNight/palemoon/buttons/btn__aux_play_active.svg
index b33995de754..059b65378cd 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__aux_play_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__aux_play_active.svg
@@ -1,3 +1,3 @@
-<svg width="40" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="80" height="44" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 22">
   <text x="4.4199219" y="15.507538" fill="#000000" font-family="sans-serif" font-size="12px" letter-spacing="0px" stroke-width="1.6" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="4.4199219" y="15.507538" fill="#000000" font-family="'Open Sans'" font-size="12px" font-weight="bold" stroke-width="1.6">PLAY</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beat_curpos.svg b/res/skins/LateNight/palemoon/buttons/btn__beat_curpos.svg
index 93a59c57690..200b86ddfdb 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__beat_curpos.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__beat_curpos.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
   <path d="m2 4h17v10h-17z" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.7" style="paint-order:markers fill stroke"/>
   <g fill="#444">
     <path d="m2 4v6h2v-6z" stroke-width=".92582"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beat_curpos_active_12.svg b/res/skins/LateNight/palemoon/buttons/btn__beat_curpos_active_12.svg
index 4906d232f23..e85d191e42b 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__beat_curpos_active_12.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__beat_curpos_active_12.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
   <g fill="#988f86">
     <path d="m2 4v6h2v-6z" stroke-width=".70711"/>
     <path d="m7 4v10h2v-10z" stroke-width=".91287"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beat_curpos_active_34.svg b/res/skins/LateNight/palemoon/buttons/btn__beat_curpos_active_34.svg
index 972ad500cee..fc2abdc864c 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__beat_curpos_active_34.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__beat_curpos_active_34.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
   <g fill="#559b99">
     <path d="m2 4v6h2v-6z" stroke-width=".70711"/>
     <path d="m7 4v10h2v-10z" stroke-width=".91287"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beat_curpos_large.svg b/res/skins/LateNight/palemoon/buttons/btn__beat_curpos_large.svg
index efd70ae9bfa..f20f4f4ff3d 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__beat_curpos_large.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__beat_curpos_large.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <g fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">
     <g transform="translate(1,-10)">
       <path d="m8 31h2v-18h-2z"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beat_curpos_large_active.svg b/res/skins/LateNight/palemoon/buttons/btn__beat_curpos_large_active.svg
index ba9e5dcb47f..3c3e637e4f4 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__beat_curpos_large_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__beat_curpos_large_active.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <g transform="translate(1,-10)">
     <path d="m8 31h2v-18h-2z"/>
     <path d="m13 31h2v-18h-2z"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beatgrid_controls_collapse.svg b/res/skins/LateNight/palemoon/buttons/btn__beatgrid_controls_collapse.svg
index 77491b7936c..75b6a797eda 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__beatgrid_controls_collapse.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__beatgrid_controls_collapse.svg
@@ -1,4 +1,4 @@
-<svg width="26" height="52" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="52" height="104" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 26 52">
   <g fill="none" stroke="#000001" stroke-linejoin="round" stroke-width="1.6">
     <path d="m20.257 45.224c-0.9573 0.83444-2.4233 0.73391-3.2577-0.22341l-7.6685-8.7975c-1.7551 0.41421-3.6769-0.10729-4.9385-1.5547-1.2625-1.4484-1.5175-3.4246-0.86593-5.1072l2.0773 2.3831c0.83445 0.95731 2.3004 1.0578 3.2577 0.2234 0.9573-0.83444 1.0563-2.2991 0.22188-3.2564l-2.0773-2.3831c1.7558-0.41578 3.6787 0.10657 4.9412 1.555 1.2627 1.4486 1.5174 3.4246 0.86593 5.1072l7.6672 8.7961c0.83445 0.95731 0.73394 2.4233-0.22337 3.2577z" color="#000001"/>
     <path d="m8.9997 37.363v7.6375h2v-5.3425z"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beatgrid_controls_expand.svg b/res/skins/LateNight/palemoon/buttons/btn__beatgrid_controls_expand.svg
index af958671041..bd18711eebe 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__beatgrid_controls_expand.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__beatgrid_controls_expand.svg
@@ -1,4 +1,4 @@
-<svg width="26" height="52" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="52" height="104" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 26 52">
   <g transform="matrix(-.5112 .44559 -.50559 -.58003 28.909 44.828)" fill="none" stroke="#000001" stroke-linejoin="round" stroke-width="2.215">
     <path transform="matrix(-1.4588,0,0,1.2857,27.506,3.1429)" d="m12 3c-1.2837 0-2.334 1.0503-2.334 2.334v11.797c-1.6125 0.8501-2.7305 2.5239-2.7305 4.4648 0 1.9422 1.1183 3.6174 2.7324 4.4668v-3.1956c0-1.2837 1.0503-2.334 2.334-2.334s2.332 1.0503 2.332 2.334v3.1956c1.6141-0.84939 2.7324-2.5246 2.7324-4.4668 0-1.9425-1.1184-3.6174-2.7324-4.4668v-11.795c0-1.2837-1.0503-2.334-2.334-2.334z" color="#000001" fill="none" stroke="#000001" stroke-linejoin="round" stroke-width="1.6173"/>
   </g>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beatjump_left.svg b/res/skins/LateNight/palemoon/buttons/btn__beatjump_left.svg
index 77ae022df57..8d3b0219c88 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__beatjump_left.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__beatjump_left.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <path d="m3.99995 10.9999 3.75 7 3.75-7h-2.99023l0.010088-2.49012h8.98044l-2.88e-4 7.49012h1.50976l2.88e-4 -7.7616c2.7e-5 -0.707602-0.615581-1.23828-1.2793-1.23828h-9.44141c-0.663716 0-1.27671 0.530685-1.2793 1.23828l-0.01009 2.7616z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#918273" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stop-color="#000000" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-east-asian:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;font-variation-settings:normal;inline-size:0;isolation:auto;mix-blend-mode:normal;shape-margin:0;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
   <path d="m6.99995 11.5663h1.50977l0.010088-3.05652h8.98044l-2.88e-4 7.49012h1.50976l2.88e-4 -7.7616c2.7e-5 -0.707602-0.615581-1.23828-1.2793-1.23828h-9.44141c-0.663716 0-1.27716 0.530683-1.2793 1.23828z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#918273" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stop-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-east-asian:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;font-variation-settings:normal;inline-size:0;isolation:auto;mix-blend-mode:normal;shape-margin:0;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
   <path d="m7.74995 17.9999-3.75-7h7.5z" fill="#918273"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beatjump_left_active.svg b/res/skins/LateNight/palemoon/buttons/btn__beatjump_left_active.svg
index 2304798105b..ffe8a6eb285 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__beatjump_left_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__beatjump_left_active.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <path d="m6.99995 11.5663h1.50977l0.010088-3.05652h8.98044l-2.88e-4 7.49012h1.50976l2.88e-4 -7.7616c2.7e-5 -0.707602-0.615581-1.23828-1.2793-1.23828h-9.44141c-0.663716 0-1.27716 0.530683-1.2793 1.23828z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stop-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-east-asian:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;font-variation-settings:normal;inline-size:0;isolation:auto;mix-blend-mode:normal;shape-margin:0;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
   <path d="m7.74995 17.9999-3.75-7h7.5z"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beatjump_right.svg b/res/skins/LateNight/palemoon/buttons/btn__beatjump_right.svg
index de8dc5c4984..326a992864b 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__beatjump_right.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__beatjump_right.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <path d="m20.0098 11-3.75 7-3.75-7h2.99023l-0.010088-2.49012h-8.98044l2.88e-4 7.49012h-1.50976l-2.88e-4 -7.7616c-2.63e-5 -0.707602 0.615581-1.23828 1.2793-1.23828h9.44141c0.663716 0 1.27671 0.530685 1.2793 1.23828l0.010088 2.7616z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#918273" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stop-color="#000000" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-east-asian:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;font-variation-settings:normal;inline-size:0;isolation:auto;mix-blend-mode:normal;shape-margin:0;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
   <path d="m17.0098 11.5664h-1.50977l-0.010088-3.05652h-8.98044l2.88e-4 7.49012h-1.50976l-2.88e-4 -7.7616c-2.63e-5 -0.707602 0.615581-1.23828 1.2793-1.23828h9.44141c0.663716 0 1.27716 0.530683 1.2793 1.23828z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#918273" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stop-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-east-asian:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;font-variation-settings:normal;inline-size:0;isolation:auto;mix-blend-mode:normal;shape-margin:0;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
   <path d="m16.2598 18 3.75-7h-7.5z" fill="#918273"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beatjump_right_active.svg b/res/skins/LateNight/palemoon/buttons/btn__beatjump_right_active.svg
index a001ba0e623..ec9429fbd97 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__beatjump_right_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__beatjump_right_active.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <path d="m17.0101 11.5663h-1.50977l-0.010088-3.05652h-8.98044l2.88e-4 7.49012h-1.50976l-2.88e-4 -7.7616c-2.7e-5 -0.707602 0.615581-1.23828 1.2793-1.23828h9.44141c0.663716 0 1.27716 0.530683 1.2793 1.23828z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stop-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-east-asian:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;font-variation-settings:normal;inline-size:0;isolation:auto;mix-blend-mode:normal;shape-margin:0;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
   <path d="m16.2601 17.9999 3.75-7h-7.5z"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beats_earlier.svg b/res/skins/LateNight/palemoon/buttons/btn__beats_earlier.svg
index e312c879ccb..493af7c7734 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__beats_earlier.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__beats_earlier.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <g fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">
     <path d="m9 3v3h13v2h-13v3l-7-4z"/>
     <path d="m15 21h-2v-12h2z"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beats_earlier_active.svg b/res/skins/LateNight/palemoon/buttons/btn__beats_earlier_active.svg
index 69a2efceda0..7b73118b634 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__beats_earlier_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__beats_earlier_active.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <path d="m9 3v3h13v2h-13v3l-7-4z" fill="#000001"/>
   <g fill="#000001">
     <path d="m15 21h-2v-12h2z"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beats_faster.svg b/res/skins/LateNight/palemoon/buttons/btn__beats_faster.svg
index 975eda390df..6b3c9836f71 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__beats_faster.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__beats_faster.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <g transform="translate(2)" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">
     <path d="m5 21h-2v-18h2z" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6"/>
   </g>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beats_faster_active.svg b/res/skins/LateNight/palemoon/buttons/btn__beats_faster_active.svg
index 67057c66a16..54d7adce8e4 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__beats_faster_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__beats_faster_active.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <g transform="translate(2)">
     <path d="m5 21h-2v-18h2z"/>
   </g>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beats_hotcues_earlier.svg b/res/skins/LateNight/palemoon/buttons/btn__beats_hotcues_earlier.svg
index 7d3d7a288d9..2c35c8fa1b5 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__beats_hotcues_earlier.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__beats_hotcues_earlier.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <path d="m14 3h-8v7h6v11h2z" fill="none" stroke="#000" stroke-linejoin="round" stroke-width="1.6"/>
   <path d="m14 3h-8v7h6v11h2z" fill="#3f3d3d"/>
   <path d="m11 20-7-4 7-4z" fill="none" stroke="#000" stroke-linejoin="round" stroke-width="1.6"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beats_hotcues_earlier_active.svg b/res/skins/LateNight/palemoon/buttons/btn__beats_hotcues_earlier_active.svg
index 57afa5222cb..b3c7f3a148d 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__beats_hotcues_earlier_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__beats_hotcues_earlier_active.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <path d="m14 3h-8v7h6v11h2z"/>
   <path d="m11 20-7-4 7-4z"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beats_hotcues_later.svg b/res/skins/LateNight/palemoon/buttons/btn__beats_hotcues_later.svg
index 7f4a5c80ff5..7a5c109c1ad 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__beats_hotcues_later.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__beats_hotcues_later.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <path d="m14 3h-8v7h6v11h2z" fill="none" stroke="#000" stroke-linejoin="round" stroke-width="1.6"/>
   <path d="m14 3h-8v7h6v11h2z" fill="#3f3d3d"/>
   <path d="m15 20 7-4-7-4z" fill="none" stroke="#000" stroke-linejoin="round" stroke-width="1.6"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beats_hotcues_later_active.svg b/res/skins/LateNight/palemoon/buttons/btn__beats_hotcues_later_active.svg
index 3ba0deede61..7ab65a0337a 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__beats_hotcues_later_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__beats_hotcues_later_active.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <path d="m14 3h-8v7h6v11h2z"/>
   <path d="m15 20 7-4-7-4z"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beats_later.svg b/res/skins/LateNight/palemoon/buttons/btn__beats_later.svg
index 01959a328e5..3aaa0148641 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__beats_later.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__beats_later.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <g fill="none" stroke="#000" stroke-linejoin="round" stroke-width="1.6">
     <path d="m15 3v3h-13v2h13v3l7-4z"/>
     <path d="m17 21h-2v-9h2z"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beats_later_active.svg b/res/skins/LateNight/palemoon/buttons/btn__beats_later_active.svg
index 80a13864a7c..f09da4d5b92 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__beats_later_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__beats_later_active.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <path d="m15 3v3h-13v2h13v3l7-4z" fill="#000001"/>
   <g fill="#000001">
     <path d="m17 21h-2v-9h2z"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beats_slower.svg b/res/skins/LateNight/palemoon/buttons/btn__beats_slower.svg
index 862b2975129..72f822bbf0f 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__beats_slower.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__beats_slower.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <g transform="translate(2)" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">
     <path d="m5 21h-2v-18h2z" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6"/>
   </g>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beats_slower_active.svg b/res/skins/LateNight/palemoon/buttons/btn__beats_slower_active.svg
index 5f6bc21cc24..16de22138fe 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__beats_slower_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__beats_slower_active.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <g transform="translate(2)">
     <path d="m5 21h-2v-18h2z"/>
   </g>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__broadcast_off.svg b/res/skins/LateNight/palemoon/buttons/btn__broadcast_off.svg
index b8c73ac9e0f..2ddccb07a9f 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__broadcast_off.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__broadcast_off.svg
@@ -1,4 +1,4 @@
-<svg width="66" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="132" height="32" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 66 16">
   <g transform="matrix(-.60802 0 0 .68989 32.4115 -16.899)" fill="#a89a8c" stroke-width="1.1274">
     <path transform="matrix(1.1347,0,0,1,-34.251,6)" d="m37.625-5-0.1875 2.625c-0.66019 0.16435-1.2765 0.43313-1.8438 0.78125l-1.9688-1.75-1.9688 1.9688 1.75 1.9688c-0.34382 0.56314-0.61891 1.1878-0.78125 1.8438l-2.625 0.1875v2.75l2.625 0.1875c0.16385 0.66212 0.431 1.2793 0.78125 1.8438l-1.75 1.9688 1.9688 1.9688 2-1.75c0.55851 0.33599 1.1644 0.58862 1.8125 0.75l0.1875 2.6562h2.75l0.1875-2.625c0.66019-0.16435 1.2765-0.43313 1.8438-0.78125l1.9688 1.75 1.9688-1.9688-1.75-1.9688c0.34382-0.56314 0.61891-1.1878 0.78125-1.8438l2.625-0.1875v-2.75l-2.625-0.1875c-0.16435-0.66019-0.43313-1.2765-0.78125-1.8438l1.75-1.9688-1.9688-1.9688-1.9688 1.75c-0.56314-0.34382-1.1878-0.61891-1.8438-0.78125l-0.1875-2.625zm1.375 6c1.6505 0 3 1.3495 3 3s-1.3495 3-3 3-3-1.3495-3-3 1.3495-3 3-3z" color="#000001" fill="#a89a8c"/>
   </g>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__broadcast_on.svg b/res/skins/LateNight/palemoon/buttons/btn__broadcast_on.svg
index b96efa6f18d..803baf104d6 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__broadcast_on.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__broadcast_on.svg
@@ -1,4 +1,4 @@
-<svg width="66" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="132" height="32" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 66 16">
   <g transform="matrix(-.60802 0 0 .68989 32.4115 -16.899)" fill="#a89a8c" stroke-width="1.1274">
     <path transform="matrix(1.1347,0,0,1,-34.251,6)" d="m37.625-5-0.1875 2.625c-0.66019 0.16435-1.2765 0.43313-1.8438 0.78125l-1.9688-1.75-1.9688 1.9688 1.75 1.9688c-0.34382 0.56314-0.61891 1.1878-0.78125 1.8438l-2.625 0.1875v2.75l2.625 0.1875c0.16385 0.66212 0.431 1.2793 0.78125 1.8438l-1.75 1.9688 1.9688 1.9688 2-1.75c0.55851 0.33599 1.1644 0.58862 1.8125 0.75l0.1875 2.6562h2.75l0.1875-2.625c0.66019-0.16435 1.2765-0.43313 1.8438-0.78125l1.9688 1.75 1.9688-1.9688-1.75-1.9688c0.34382-0.56314 0.61891-1.1878 0.78125-1.8438l2.625-0.1875v-2.75l-2.625-0.1875c-0.16435-0.66019-0.43313-1.2765-0.78125-1.8438l1.75-1.9688-1.9688-1.9688-1.9688 1.75c-0.56314-0.34382-1.1878-0.61891-1.8438-0.78125l-0.1875-2.625zm1.375 6c1.6505 0 3 1.3495 3 3s-1.3495 3-3 3-3-1.3495-3-3 1.3495-3 3-3z" color="#000001" fill="#a89a8c"/>
   </g>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__collapse_dim.svg b/res/skins/LateNight/palemoon/buttons/btn__collapse_dim.svg
index 10a6224ea67..0f86a524336 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__collapse_dim.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__collapse_dim.svg
@@ -1,4 +1,4 @@
-<svg width="16" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 18">
   <g transform="translate(.999705 -.00201898)" fill="none" stroke="#000001" stroke-linejoin="round" stroke-width="1.6">
     <path d="m11.4252 16.6379-4.42516-4.42526-4.42516 4.42526-1.10629-1.10639 5.53146-5.53155 5.53146 5.53155z"/>
     <path d="m11.4252 1.36614-4.42526 4.42526-4.42526-4.42526-1.10639 1.10639 5.53155 5.53155 5.53155-5.53155-1.10638-1.10639z"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__cue_deck.svg b/res/skins/LateNight/palemoon/buttons/btn__cue_deck.svg
index c30f61bda34..e774161b410 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__cue_deck.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__cue_deck.svg
@@ -1,4 +1,4 @@
-<svg width="38" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="76" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 38 24">
   <text x="5.9856772" y="16.762369" fill="#918273" font-family="sans-serif" font-size="40px" letter-spacing="0px" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.9856772" y="16.762369" fill="#918273" font-family="'Open Sans'" font-size="13.3333px" font-weight="bold" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">CUE</tspan></text>
   <text x="5.9856772" y="16.762369" fill="#918273" font-family="sans-serif" font-size="40px" letter-spacing="0px" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.9856772" y="16.762369" fill="#918273" font-family="'Open Sans'" font-size="13.3333px" font-weight="bold">CUE</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__cue_deck_active.svg b/res/skins/LateNight/palemoon/buttons/btn__cue_deck_active.svg
index 63b34a70740..fff7862f95e 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__cue_deck_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__cue_deck_active.svg
@@ -1,3 +1,3 @@
-<svg width="38" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="76" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 38 24">
   <text x="5.9856772" y="16.762369" fill="#000000" font-family="sans-serif" font-size="40px" letter-spacing="0px" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.9856772" y="16.762369" fill="#000000" font-family="'Open Sans'" font-size="13.3333px" font-weight="bold">CUE</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__delete.svg b/res/skins/LateNight/palemoon/buttons/btn__delete.svg
index 7a682b36add..91e208da2d2 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__delete.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__delete.svg
@@ -1,4 +1,4 @@
-<svg width="512" height="512" version="1.1" viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg">
+<svg width="1024" height="1024" version="1.1" viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg">
   <g transform="translate(-23.6434 7e-5)" fill="#a89a8c">
     <path d="m279.647 171.882c-26.0658 0-52.1305 0.0299-71.9053 0.0877l-71.9086 0.20917 11.3964 144.281c7.26636 91.9973 11.8851 146.216 12.7458 149.623 2.4022 9.50895 6.88437 16.9373 14.657 24.2839 7.88017 7.44816 14.4059 11.1211 24.0055 13.515 5.96413 1.48733 10.3043 1.57485 80.6566 1.61768 71.3036 0.0434 74.6271-0.0215 81.0244-1.57888 9.85632-2.39955 16.3474-6.02487 24.294-13.5724 7.85903-7.46439 12.3254-14.9692 14.6857-24.6752 0.90639-3.72716 5.40827-56.4458 12.7779-149.625l11.3778-143.87-71.9019-0.20917c-19.7733-0.0578-45.8395-0.0877-71.9053-0.0877zm79.2009 23.4725c1.92031 0.0545 3.91687 0.65563 5.89385 1.87747 4.29268 2.65302 5.9201 6.92117 5.75552 15.1006-0.0764 3.80014-2.86136 62.8749-6.18904 131.277-6.57263 135.104-5.97739 128.117-11.2479 131.77-4.70407 3.26046-10.5099 2.49862-14.178-1.86059-1.87869-2.2327-2.2317-3.50477-2.2317-8.05808 0-5.74085 8.32212-242.815 8.888-253.194 0.56337-10.3327 6.45099-17.1069 13.3092-16.9123zm-79.5113 0.22773c4.38547-0.10444 8.72138 2.47334 10.9915 7.105 1.52928 3.12018 1.6007 6.17808 1.40345 60.4448-0.11427 31.4373-0.45063 90.7942-0.74728 131.905-0.50093 69.4213-0.6481 74.9122-2.06301 77.0704-0.83789 1.27804-2.39249 2.86626-3.45466 3.52889-6.30109 3.93089-14.3032 0.80068-16.1263-6.30712-0.65167-2.54075-2.5629-242.038-2.06302-258.521 0.18575-6.12512 2.35757-10.777 6.23797-13.3615 1.82416-1.215 3.82792-1.8165 5.82131-1.86396zm-78.8686 7e-3c5.49185 0.14786 11.0588 4.33427 12.5198 12.0829 0.48348 2.56393 2.8998 62.4209 5.37092 133.016 4.87989 139.423 4.88156 131.263-0.0304 134.685-2.86392 1.99523-5.87605 2.50847-9.21188 1.56878-2.9698-0.83662-6.927-4.95017-7.64816-7.95012-1.01291-4.21309-13.1912-261.604-12.4928-264.039 1.8586-6.48061 6.64675-9.49416 11.4925-9.36369z"/>
     <path d="m197.352 25.9162c5.91021-9.37875 14.1004-14.3563 23.6647-14.3822l5.25609-0.01419 75.2568 40.8141 3.50577-4.10482c7.29902-8.54633 17.9694-13.6494 27.6148-13.2066l4.78273 0.219524 31.3999 17.2831c30.624 16.856 31.4654 17.372 34.0496 20.8808 5.51991 7.49508 7.17444 22.5738 3.50975 31.9865l-1.49873 3.84943 74.8485 41.792 2.7998 4.44829c5.09476 8.0945 5.27082 17.677 0.50871 27.6877l-2.88036 6.05495-286.393-157.636z"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__effect_selected.svg b/res/skins/LateNight/palemoon/buttons/btn__effect_selected.svg
index f9232c2c0f2..cafcde85336 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__effect_selected.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__effect_selected.svg
@@ -1,4 +1,4 @@
-<svg width="10" height="10" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
   <path d="m1.83596 0.781075 6.32812 4.21895-6.32812 4.21895v-8.4379" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.12505"/>
   <path d="m1.83596 0.777045 6.32812 4.21895-6.32812 4.21895v-8.4379" fill="#918273" stroke-width=".703158"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__eject.svg b/res/skins/LateNight/palemoon/buttons/btn__eject.svg
index 72ebe51dd4b..d1ca28e0708 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__eject.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__eject.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
   <g stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.7">
     <path d="M 4.4322,11 11,3.728 17.5677,11 H 4.4327" fill="none"/>
     <rect x="5" y="12.1232" width="12" height="2.87679" color="#000001"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__eject_active_12.svg b/res/skins/LateNight/palemoon/buttons/btn__eject_active_12.svg
index b3a74618c35..72565b3f4a6 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__eject_active_12.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__eject_active_12.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
   <g fill="#988f86">
     <path d="m4.43215 11 6.56785-7.27198 6.56774 7.27198h-13.1353" stroke-width="1.03885"/>
     <rect x="5" y="13" width="12" height="2" stroke-width=".784465"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__eject_active_34.svg b/res/skins/LateNight/palemoon/buttons/btn__eject_active_34.svg
index 3c7f6a00162..4e754b769c4 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__eject_active_34.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__eject_active_34.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
   <g fill="#559b99">
     <path d="m4.43215 11 6.56785-7.27198 6.56774 7.27198h-13.1353" stroke-width="1.03885"/>
     <rect x="5" y="13" width="12" height="2" stroke-width=".784465"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__eq_kill_dot_active_green.svg b/res/skins/LateNight/palemoon/buttons/btn__eq_kill_dot_active_green.svg
index b99015f5b4f..227801112ed 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__eq_kill_dot_active_green.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__eq_kill_dot_active_green.svg
@@ -1,3 +1,3 @@
-<svg width="9" height="9" version="1.1" viewBox="0 0 9 9" xmlns="http://www.w3.org/2000/svg">
+<svg width="18" height="18" version="1.1" viewBox="0 0 9 9" xmlns="http://www.w3.org/2000/svg">
   <path d="m1 4.5c0 1.93202 1.56798 3.5 3.5 3.5 1.93202 0 3.5-1.56798 3.5-3.5 0-1.93202-1.56798-3.5-3.5-3.5-1.93202 0-3.5 1.56798-3.5 3.5z" fill="#7db200"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__eq_kill_dot_active_red.svg b/res/skins/LateNight/palemoon/buttons/btn__eq_kill_dot_active_red.svg
index 6cd466ddd98..ef4cc2d9eac 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__eq_kill_dot_active_red.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__eq_kill_dot_active_red.svg
@@ -1,3 +1,3 @@
-<svg width="9" height="9" version="1.1" viewBox="0 0 9 9" xmlns="http://www.w3.org/2000/svg">
+<svg width="18" height="18" version="1.1" viewBox="0 0 9 9" xmlns="http://www.w3.org/2000/svg">
   <path d="m1 4.5c0 1.93202 1.56798 3.5 3.5 3.5 1.93202 0 3.5-1.56798 3.5-3.5s-1.56798-3.5-3.5-3.5c-1.93202 0-3.5 1.56798-3.5 3.5z" fill="#f42300"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__eq_kill_dot_off.svg b/res/skins/LateNight/palemoon/buttons/btn__eq_kill_dot_off.svg
index d2eb7808347..51bfebf315c 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__eq_kill_dot_off.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__eq_kill_dot_off.svg
@@ -1,3 +1,3 @@
-<svg width="9" height="9" version="1.1" viewBox="0 0 9 9" xmlns="http://www.w3.org/2000/svg">
+<svg width="18" height="18" version="1.1" viewBox="0 0 9 9" xmlns="http://www.w3.org/2000/svg">
   <path d="m1 4.5c0 1.93202 1.56798 3.5 3.5 3.5 1.93202 0 3.5-1.56798 3.5-3.5 0-1.93202-1.56798-3.5-3.5-3.5-1.93202 0-3.5 1.56798-3.5 3.5z" fill="#535353"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__eq_kill_high.svg b/res/skins/LateNight/palemoon/buttons/btn__eq_kill_high.svg
index 4b750506954..07ad0f8d58e 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__eq_kill_high.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__eq_kill_high.svg
@@ -1,4 +1,4 @@
-<svg width="18" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="36" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18">
   <text x="3.9139636" y="14.63623" fill="none" font-family="sans-serif" font-size="40px" letter-spacing="0px" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="3.9139636" y="14.63623" fill="none" font-family="'Open Sans'" font-size="13.3333px" font-weight="600" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">H</tspan></text>
   <text x="3.9139636" y="14.63623" fill="#91806e" font-family="sans-serif" font-size="40px" letter-spacing="0px" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="3.9139636" y="14.63623" fill="#91806e" font-family="'Open Sans'" font-size="13.3333px" font-weight="600">H</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__eq_kill_low.svg b/res/skins/LateNight/palemoon/buttons/btn__eq_kill_low.svg
index 69be68b3d72..c1bb0859289 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__eq_kill_low.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__eq_kill_low.svg
@@ -1,4 +1,4 @@
-<svg width="18" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="36" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18">
   <text x="5.1662478" y="14.63623" fill="none" font-family="sans-serif" font-size="40px" letter-spacing="0px" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.1662478" y="14.63623" fill="none" font-family="'Open Sans'" font-size="13.3333px" font-weight="600" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">L</tspan></text>
   <text x="5.1662478" y="14.63623" fill="#91806e" font-family="sans-serif" font-size="40px" letter-spacing="0px" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="5.1662478" y="14.63623" fill="#91806e" font-family="'Open Sans'" font-size="13.3333px" font-weight="600">L</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__eq_kill_mid.svg b/res/skins/LateNight/palemoon/buttons/btn__eq_kill_mid.svg
index 9a2a474f97b..18b73c9210b 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__eq_kill_mid.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__eq_kill_mid.svg
@@ -1,4 +1,4 @@
-<svg width="18" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="36" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18">
   <text x="2.7904694" y="14.63623" fill="none" font-family="sans-serif" font-size="40px" letter-spacing="0px" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="2.7904694" y="14.63623" fill="none" font-family="'Open Sans'" font-size="13.3333px" font-weight="600" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">M</tspan></text>
   <text x="2.7904694" y="14.63623" fill="#91806e" font-family="sans-serif" font-size="40px" letter-spacing="0px" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="2.7904694" y="14.63623" fill="#91806e" font-family="'Open Sans'" font-size="13.3333px" font-weight="600">M</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__expand_dim.svg b/res/skins/LateNight/palemoon/buttons/btn__expand_dim.svg
index f3bd2c74750..fd7ecbea658 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__expand_dim.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__expand_dim.svg
@@ -1,4 +1,4 @@
-<svg width="16" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 18">
   <g transform="translate(-3.00003 -1.99955)" fill="none" stroke="#000001" stroke-linejoin="round" stroke-width="1.6">
     <g transform="matrix(.939924 0 0 .939924 1.60035 1.6004)" fill="none" stroke="#000001" stroke-linejoin="round" stroke-width="1.70226">
       <path d="m14.7082 11.4378-4.708 4.7081-4.708-4.7081-1.177 1.1771 5.885 5.8851 5.885-5.8851z"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__fx_focus.svg b/res/skins/LateNight/palemoon/buttons/btn__fx_focus.svg
index d144ffc8349..028c6cd68d8 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__fx_focus.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__fx_focus.svg
@@ -1,3 +1,3 @@
-<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
   <circle cx="8" cy="8" r="5.65899" fill="none" stroke="#817365" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.70841" style="paint-order:markers fill stroke"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__fx_focus_active.svg b/res/skins/LateNight/palemoon/buttons/btn__fx_focus_active.svg
index e0086b18284..2377f6e798c 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__fx_focus_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__fx_focus_active.svg
@@ -1,4 +1,4 @@
-<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
   <path d="M 42.918766,1 41,2.9187661 46.11671,8 41,13.081234 42.918766,15 48,9.8832905 53.081234,15 55,13.081234 49.88329,8 55,2.9187661 53.081234,1 48,6.1167097 Z" fill="#01a7ff" font-family="Sans" font-weight="400" overflow="visible" stroke-width="1.13704" style="text-indent:0;text-transform:none"/>
   <circle cx="28" cy="8" r="5.65899" fill="none" stroke="#01a7ff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.70841" style="paint-order:markers fill stroke"/>
   <path d="m2.24711 1-1.24711 1.24711c1.40822 1.40822 2.73561 3.91095 2.73561 5.75289s-1.32738 4.34465-2.73561 5.75288l1.24711 1.24712c1.40822-1.40822 3.91095-2.73561 5.75289-2.73561s4.34465 1.32738 5.75289 2.73561l1.24712-1.24712c-1.40822-1.40822-2.73561-3.91095-2.73561-5.75288s1.32738-4.34465 2.73561-5.75289l-1.24712-1.24711c-1.40822 1.40822-3.91095 2.73561-5.75289 2.73561-1.8418 0-4.34465-1.32738-5.75289-2.73561zm2.53452 3.78157c1.09057 0.472378 2.21706 0.764347 3.21836 0.76436 1.00124-1.5e-5 2.12772-0.291982 3.21836-0.76436-0.472378 1.09057-0.764348 2.21706-0.76436 3.21836 1.5e-5 1.00124 0.291982 2.12772 0.76436 3.21836-1.09057-0.472378-2.21706-0.764347-3.21836-0.76436-1.00124 1.6e-5 -2.12772 0.291982-3.21836 0.76436 0.472378-1.09057 0.764347-2.21706 0.76436-3.21836-1.55e-5 -1.00124-0.291982-2.12772-0.76436-3.21836z" fill="#01a7ff" stroke-width=".874998"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__fx_mixmode_d+w.svg b/res/skins/LateNight/palemoon/buttons/btn__fx_mixmode_d+w.svg
index 37bf865cdd0..1a93b9626db 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__fx_mixmode_d+w.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__fx_mixmode_d+w.svg
@@ -1,4 +1,4 @@
-<svg width="28" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="56" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 24">
   <g fill="none" stroke="#0d0505" stroke-linecap="round" stroke-opacity=".99608" stroke-width="3.2">
     <path d="m3.4619 8.0017h20.972"/>
     <path d="m24.433 8.0017c-14.68 3.7456-20.972 9.9882-20.972 9.9882"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__fx_mixmode_d-w.svg b/res/skins/LateNight/palemoon/buttons/btn__fx_mixmode_d-w.svg
index 420b4dcf266..daf54bf7339 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__fx_mixmode_d-w.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__fx_mixmode_d-w.svg
@@ -1,4 +1,4 @@
-<svg width="28" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="56" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 24">
   <g fill="none" stroke-linecap="round">
     <g transform="translate(0 1.0003)" stroke="#060202" stroke-linejoin="round" stroke-opacity=".99608" stroke-width="3.2">
       <path d="m3.5141 7.0017c14.682 3.7456 20.975 9.9882 20.975 9.9882"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__fx_selector_down.svg b/res/skins/LateNight/palemoon/buttons/btn__fx_selector_down.svg
index 786ba1d5c41..3cbe6324845 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__fx_selector_down.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__fx_selector_down.svg
@@ -1,4 +1,24 @@
-<svg width="16" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
-  <path d="m8 15.918 4.5715-7.9181h-9.143z" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6"/>
-  <path d="m8 15.918 4.5715-7.9181h-9.143z" fill="#817365"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="32"
+   height="48"
+   version="1.1"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2" />
+  <path
+     d="m 16,31.91818 9.143,-15.8362 H 6.857 Z"
+     fill="none"
+     stroke="#000001"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     stroke-width="3.2"
+     id="path1" />
+  <path
+     d="M 16,31.9181 25.143,16.0819 H 6.857 Z"
+     fill="#817365"
+     id="path2"
+     style="stroke-width:2" />
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__fx_settings.svg b/res/skins/LateNight/palemoon/buttons/btn__fx_settings.svg
index 06e8d45d371..2984362862e 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__fx_settings.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__fx_settings.svg
@@ -1,4 +1,4 @@
-<svg width="18" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="36" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18">
   <g transform="matrix(-.88128042 0 0 .99998333 17.814781 -.9999333)" fill="#918273" stroke-width=".77781">
     <path transform="matrix(1.1347,0,0,1,-34.251,6)" d="m37.625-5-0.1875 2.625c-0.66019 0.16435-1.2765 0.43313-1.8438 0.78125l-1.9688-1.75-1.9688 1.9688 1.75 1.9688c-0.34382 0.56314-0.61891 1.1878-0.78125 1.8438l-2.625 0.1875v2.75l2.625 0.1875c0.16385 0.66212 0.431 1.2793 0.78125 1.8438l-1.75 1.9688 1.9688 1.9688 2-1.75c0.55851 0.33599 1.1644 0.58862 1.8125 0.75l0.1875 2.6562h2.75l0.1875-2.625c0.66019-0.16435 1.2765-0.43313 1.8438-0.78125l1.9688 1.75 1.9688-1.9688-1.75-1.9688c0.34382-0.56314 0.61891-1.1878 0.78125-1.8438l2.625-0.1875v-2.75l-2.625-0.1875c-0.16435-0.66019-0.43313-1.2765-0.78125-1.8438l1.75-1.9688-1.9688-1.9688-1.9688 1.75c-0.56314-0.34382-1.1878-0.61891-1.8438-0.78125l-0.1875-2.625zm1.375 6c1.6505 0 3 1.3495 3 3s-1.3495 3-3 3-3-1.3495-3-3 1.3495-3 3-3z" color="#000001" fill="#918273" stroke-width=".646064"/>
   </g>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__fx_toggle.svg b/res/skins/LateNight/palemoon/buttons/btn__fx_toggle.svg
index d5a61924112..bda73bb8850 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__fx_toggle.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__fx_toggle.svg
@@ -1,4 +1,4 @@
-<svg width="22" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="44" height="44" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
   <g transform="matrix(.881636 0 0 .882853 1.30201 1.26286)" fill="none" stroke="#000001" stroke-linejoin="round" stroke-width="1.81356">
     <path d="m13.7302 7.08042c1.50933 0.923162 2.51995 2.58119 2.51995 4.47995 0 2.90059-2.34935 5.25002-5.25002 5.25002s-5.25002-2.34944-5.25002-5.25002c0-1.89876 1.01062-3.55679 2.51995-4.47995l-1.26438-1.26438c-1.81562 1.26438-3.00564 3.36428-3.00564 5.74433 0 3.86748 3.13252 6.99991 7 6.99991 3.86748 0 7-3.13243 7-6.99991 0-2.38005-1.19003-4.47995-3.00564-5.74433z"/>
     <path d="m12 3h-2v6h2z"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__fx_toggle_active.svg b/res/skins/LateNight/palemoon/buttons/btn__fx_toggle_active.svg
index 7d1246f65f0..c1f5c163023 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__fx_toggle_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__fx_toggle_active.svg
@@ -1,4 +1,4 @@
-<svg width="22" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="44" height="44" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
   <path d="m14.522 6.40326-1.11481 1.11481c1.33079 0.813958 2.22186 2.27586 2.22186 3.95 0 2.55747-2.07144 4.62898-4.62898 4.62898-2.55755 0-4.62898-2.07151-4.62898-4.62898 0-1.67415 0.891072-3.13605 2.22186-3.95l-1.11481-1.11481c-1.60084 1.11481-2.6501 2.96631-2.6501 5.06481 0 3.40998 2.76197 6.17187 6.17195 6.17187 3.40998 0 6.17195-2.76189 6.17195-6.17187 0-2.0985-1.04926-3.95-2.6501-5.06481z" fill="#0e0e0e" stroke-width=".999997"/>
   <path d="m11.8817 3.92034h-1.76341v5.29024h1.76341z" fill="#0e0e0e" stroke-width=".999997"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__intro_end.svg b/res/skins/LateNight/palemoon/buttons/btn__intro_end.svg
index 987dbdb8765..266d04db97b 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__intro_end.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__intro_end.svg
@@ -1,4 +1,4 @@
-<svg width="18" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="36" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 24">
   <g transform="translate(-2.99971)" fill="none" stroke="#000001" stroke-linecap="square" stroke-linejoin="round" stroke-width="1.6">
     <rect transform="scale(-1,1)" x="-18" y="7" width="2" height="10" style="paint-order:markers fill stroke"/>
     <path d="m5 17 9-10v10z"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__intro_end_active.svg b/res/skins/LateNight/palemoon/buttons/btn__intro_end_active.svg
index 9e374c00fae..1c041860f1f 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__intro_end_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__intro_end_active.svg
@@ -1,4 +1,4 @@
-<svg width="18" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="36" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 24">
   <g transform="translate(-2.99971)" fill="#000001">
     <rect transform="scale(-1,1)" x="-18" y="7" width="2" height="10" style="paint-order:markers fill stroke"/>
     <path d="m5 17 9-10v10z"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__intro_start.svg b/res/skins/LateNight/palemoon/buttons/btn__intro_start.svg
index 69ee330a7d2..887ee4383e1 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__intro_start.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__intro_start.svg
@@ -1,4 +1,4 @@
-<svg width="18" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="36" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 24">
   <g transform="translate(-3)" fill="none" stroke="#000001" stroke-linecap="square" stroke-linejoin="round" stroke-width="1.6">
     <rect x="6" y="7" width="2" height="10" style="paint-order:markers fill stroke"/>
     <path d="m9 17 9-10v10z"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__intro_start_active.svg b/res/skins/LateNight/palemoon/buttons/btn__intro_start_active.svg
index 607e02c2f6c..4f18852c185 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__intro_start_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__intro_start_active.svg
@@ -1,4 +1,4 @@
-<svg width="18" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="36" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 24">
   <g transform="translate(-3)" fill="#000001">
     <rect x="6" y="7" width="2" height="10"/>
     <path d="m9 17 9-10v10z"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__key_down.svg b/res/skins/LateNight/palemoon/buttons/btn__key_down.svg
index a25ccfcbbb5..de4efae7dc0 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__key_down.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__key_down.svg
@@ -1,4 +1,4 @@
-<svg width="10" height="9" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="20" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 9">
   <path d="m5.00005 8.00008-3.46414-6h6.9282z" fill="none" stroke="#000001" stroke-linejoin="round" stroke-width="1.6"/>
   <path d="m5.00005 8.00008-3.46414-6h6.9282z" fill="#a89a8c" stroke-width=".857143"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__key_down_active.svg b/res/skins/LateNight/palemoon/buttons/btn__key_down_active.svg
index d9f29cce69d..e4714350733 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__key_down_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__key_down_active.svg
@@ -1,3 +1,3 @@
-<svg width="10" height="9" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="20" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 9">
   <path d="m5.00005 8.00008-3.46414-6h6.9282z" fill="#000001"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__key_match.svg b/res/skins/LateNight/palemoon/buttons/btn__key_match.svg
index 6fb6d12a758..5c2f354ad20 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__key_match.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__key_match.svg
@@ -1,4 +1,4 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
   <g transform="matrix(.774637 0 0 .774637 19.5076 .200978)" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.06548" aria-label="♪">
     <path d="m-14.6232 1.77188h1.13281l0.104167 0.091146v0.507812c0.234375 0.46875 1.10243 0.976562 2.60417 1.52344 2.08333 0.607639 3.125 1.51042 3.125 2.70833 0 1.26736-0.529514 2.31771-1.58854 3.15104h-0.05208l-0.390625-0.416667c0.529514-0.425347 0.794271-1.0026 0.794271-1.73177 0-0.607639-0.989583-1.21962-2.96875-1.83594-0.798611-0.364583-1.30642-0.659722-1.52344-0.885417v11.2984c0 1.32812-0.972222 2.1875-2.91667 2.57812h-0.742187c-2.1007 0-3.15104-0.729167-3.15104-2.1875 0-1.13715 0.920139-1.80556 2.76042-2.00521h0.299479c0.833333 0 1.63628 0.277778 2.40885 0.833333v-13.5379z" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.06548"/>
   </g>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__key_match_active.svg b/res/skins/LateNight/palemoon/buttons/btn__key_match_active.svg
index 02e7167994c..ee1920b3883 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__key_match_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__key_match_active.svg
@@ -1,4 +1,4 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
   <g transform="matrix(.774637 0 0 .774637 19.5076 .200977)" fill="#000001" aria-label="♪">
     <path d="m-14.6232 1.77188h1.13281l0.104167 0.091146v0.507812c0.234375 0.46875 1.10243 0.976562 2.60417 1.52344 2.08333 0.607639 3.125 1.51042 3.125 2.70833 0 1.26736-0.529514 2.31771-1.58854 3.15104h-0.05208l-0.390625-0.416667c0.529514-0.425347 0.794271-1.0026 0.794271-1.73177 0-0.607639-0.989583-1.21962-2.96875-1.83594-0.798611-0.364583-1.30642-0.659722-1.52344-0.885417v11.2984c0 1.32812-0.972222 2.1875-2.91667 2.57812h-0.742187c-2.1007 0-3.15104-0.729167-3.15104-2.1875 0-1.13715 0.920139-1.80556 2.76042-2.00521h0.299479c0.833333 0 1.63628 0.277778 2.40885 0.833333v-13.5379z" fill="#000001" stroke-width="1.29093"/>
   </g>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__key_up.svg b/res/skins/LateNight/palemoon/buttons/btn__key_up.svg
index 3329256ea96..edcf462db60 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__key_up.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__key_up.svg
@@ -1,4 +1,4 @@
-<svg width="10" height="9" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="20" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 9">
   <path d="m5.00005 1-3.46414 6h6.9282z" fill="none" stroke="#000001" stroke-linejoin="round" stroke-width="1.6"/>
   <path d="m5.00005 1-3.46414 6h6.9282z" fill="#a89a8c" stroke-width=".857143"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__key_up_active.svg b/res/skins/LateNight/palemoon/buttons/btn__key_up_active.svg
index 2f6bae5452b..7d549a3892f 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__key_up_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__key_up_active.svg
@@ -1,3 +1,3 @@
-<svg width="10" height="9" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="20" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 9">
   <path d="m5.00005 1-3.46414 6h6.9282z" fill="#000001"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__keylock.svg b/res/skins/LateNight/palemoon/buttons/btn__keylock.svg
index 4eca5e5cfe2..f170c1e443b 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__keylock.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__keylock.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
   <path d="m10.5 2.5c-1.3568 0-2.5597 0.6128-3.3848 1.5625l1.5039 1.3066c0.45838-0.52834 1.1265-0.86914 1.8809-0.86914 1.3807 0 2.5 1.1193 2.5 2.5v1h2v-1c0-2.4853-2.0147-4.5-4.5-4.5zm-0.5 7.5v3h1v-3zm-6-2h13v7h-13z" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.7"/>
   <path d="m10.5 2.5c-1.3568 0-2.5597 0.6128-3.3848 1.5625l1.5039 1.3066c0.45838-0.52834 1.1265-0.86914 1.8809-0.86914 1.3807 0 2.5 1.1193 2.5 2.5v1h2v-1c0-2.4853-2.0147-4.5-4.5-4.5zm-0.5 7.5v3h1v-3zm-6-2h13v7h-13z" fill="#444"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__keylock_active_12.svg b/res/skins/LateNight/palemoon/buttons/btn__keylock_active_12.svg
index c3699d320b5..32a7eb98d99 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__keylock_active_12.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__keylock_active_12.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
   <path d="m4 8v7h13v-7zm6 2h1v3h-1z" fill="#988f86"/>
   <path d="m10.5 2.5c-2.48528 0-4.5 2.01472-4.5 4.5v1h2v-1c0-1.38071 1.11929-2.5 2.5-2.5 1.38071 0 2.5 1.11929 2.5 2.5v1h2v-1c0-2.48528-2.01472-4.5-4.5-4.5z" fill="#988f86"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__keylock_active_34.svg b/res/skins/LateNight/palemoon/buttons/btn__keylock_active_34.svg
index a8248339b0a..5c72e893446 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__keylock_active_34.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__keylock_active_34.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
   <path d="m10 10v3h1v-3h-1zm-6-2h13v7h-13v-7z" fill="#559b99"/>
   <path d="m10.5 2.5c-2.48528 0-4.5 2.01472-4.5 4.5v1h2v-1c0-1.38071 1.11929-2.5 2.5-2.5 1.38071 0 2.5 1.11929 2.5 2.5v1h2v-1c0-2.48528-2.01472-4.5-4.5-4.5z" fill="#559b99"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_bpm_locked_black.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_bpm_locked_black.svg
index 0e9735dcd83..ff7fb2e279b 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__lib_bpm_locked_black.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_bpm_locked_black.svg
@@ -1,3 +1,3 @@
-<svg width="10" height="12" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 12">
   <path d="m4.9765625 0c-1.4489106.00994182-2.441829.65947319-2.9335937 1.4238281-.491765.764355-.5464175 1.549471-.5429688 1.9726563.0047842.5863697.0007237 2.2786766 0 2.6035156h-.66601562c-.41667001 0-.83398438.4149781-.83398438.8300781v4.3398439c0 .4151.41732437.830078.83398438.830078h8.33203122c.41667 0 .8339844-.414978.8339844-.830078v-4.3398439c0-.4151-.4173244-.8300781-.8339844-.8300781h-.6660156c.000169-.2983616.0009685-1.5773226 0-2.171875-.0010016-.6121197-.0602547-1.5109887-.5585938-2.3417969-.4983389-.83080816-1.5189215-1.49626715-2.9648437-1.4863281zm.0097656 1.5c1.0446779-.007181 1.4069609.3194157 1.6699219.7578125s.3429516 1.0862385.34375 1.5742187c.0009639.5890622.0001684 1.8689344 0 2.1679688h-4c.0007682-.324936.0050349-1.9972105 0-2.6152344-.0019313-.2369985.0561849-.7641406.3046875-1.1503906s.6238412-.7271168 1.6816406-.734375zm-2.9863281 6.5h6c.277 0 .5.223.5.5s-.223.5-.5.5h-6c-.277 0-.5-.223-.5-.5s.223-.5.5-.5zm0 2h6c.277 0 .5.223.5.5s-.223.5-.5.5h-6c-.277 0-.5-.223-.5-.5s.223-.5.5-.5z" color="#000001" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000001" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000001;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_bpm_locked_blue.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_bpm_locked_blue.svg
index 5b98f19eec1..f3484171333 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__lib_bpm_locked_blue.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_bpm_locked_blue.svg
@@ -1,4 +1,4 @@
-<svg width="10" height="12" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 12">
   <path d="m2.25 6.25s0.00538-2.2 0-2.8599c-0.00538-0.66018 0.22449-2.6227 2.7312-2.6399 2.4906-0.01712 2.767 1.9798 2.7688 3.0799 0.00108 0.65999 0 2.42 0 2.42" fill="none" stroke="#4097ba" stroke-width="1.5"/>
   <path d="m0.83398 6c-0.41667 0-0.83398 0.41498-0.83398 0.83008v4.3398c0 0.4151 0.41732 0.83008 0.83398 0.83008h8.332c0.41667 0 0.83398-0.41498 0.83398-0.83008v-4.3398c0-0.4151-0.41732-0.83008-0.83398-0.83008zm1.166 2h6c0.277 0 0.5 0.223 0.5 0.5s-0.223 0.5-0.5 0.5h-6c-0.277 0-0.5-0.223-0.5-0.5s0.223-0.5 0.5-0.5zm0 2h6c0.277 0 0.5 0.223 0.5 0.5s-0.223 0.5-0.5 0.5h-6c-0.277 0-0.5-0.223-0.5-0.5s0.223-0.5 0.5-0.5z" color="#000001" fill="#4097ba" style="text-decoration-line:none;text-indent:0;text-transform:none"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_bpm_unlocked_grey.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_bpm_unlocked_grey.svg
index d7d17eddba7..9cfd0262531 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__lib_bpm_unlocked_grey.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_bpm_unlocked_grey.svg
@@ -1,4 +1,4 @@
-<svg width="10" height="12" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 12">
   <g transform="translate(0,-20)">
     <path transform="translate(0,20)" d="m4.9766 0c-1.4489.01-2.4418.65947-2.9336 1.4238l1.26172.81059c.2485-.38625.62385-.7271 1.6816-.73438 1.0447-.00718 1.407.31941 1.6699.75781.26297.4384.34296 1.0862.34375 1.5742.0009639.58906.0001684 1.8689 0 2.168h-6.166c-.41667 0-.83398.41498-.83398.83008v4.3398c0 .4151.41732.83008.83398.83008h8.332c.41667 0 .83398-.41498.83398-.83008v-4.3398c0-.4151-.41732-.83008-.83398-.83008h-.66602c.000169-.29836.0009685-1.5773 0-2.1719-.0009966-.61214-.060246-1.5129-.55859-2.3438-.49835-.83081-1.5189-1.4943-2.9648-1.4844zm-2.9766 8h6c.277 0 .5.223.5.5s-.223.5-.5.5h-6c-.277 0-.5-.223-.5-.5s.223-.5.5-.5zm0 2h6c.277 0 .5.223.5.5s-.223.5-.5.5h-6c-.277 0-.5-.223-.5-.5s.223-.5.5-.5z" color="#000001" color-rendering="auto" dominant-baseline="auto" fill="#979797" fill-opacity=".50196" image-rendering="auto" shape-rendering="auto" solid-color="#000001" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000001;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
   </g>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_checkbox.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_checkbox.svg
index 5c7d23067b7..0765d59e174 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__lib_checkbox.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_checkbox.svg
@@ -1,3 +1,3 @@
-<svg width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
   <rect x=".5" y=".5" width="19" height="19" rx="1" ry="1" stroke="#3b3b3b" stroke-linecap="square" stroke-linejoin="round" style="paint-order:markers fill stroke"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_checkmark_blue.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_checkmark_blue.svg
index dfab6d20b93..8cfae560f02 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__lib_checkmark_blue.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_checkmark_blue.svg
@@ -1,3 +1,3 @@
-<svg width="10" height="10" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
   <path d="m1.62763 6.12425 2.24831 2.24832 4.49668-6.74481" fill="none" stroke="#4097ba" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_checkmark_grey.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_checkmark_grey.svg
index 8c1e80dac7c..34ad54dc8fe 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__lib_checkmark_grey.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_checkmark_grey.svg
@@ -1,3 +1,3 @@
-<svg width="10" height="10" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
   <path d="m2.0001 6.0001 2 2 4-5.9999" fill="none" stroke="#666" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_checkmark_indeterminate_blue.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_checkmark_indeterminate_blue.svg
index 67c75fc505a..8cfd89adc8e 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__lib_checkmark_indeterminate_blue.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_checkmark_indeterminate_blue.svg
@@ -1,3 +1,3 @@
-<svg width="10" height="10" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
   <rect x="3" y="3" width="4" height="4" fill="#4097ba" style="paint-order:stroke markers fill"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_checkmark_indeterminate_grey.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_checkmark_indeterminate_grey.svg
index c492f824bfa..9af0f6fa4e9 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__lib_checkmark_indeterminate_grey.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_checkmark_indeterminate_grey.svg
@@ -1,3 +1,3 @@
-<svg width="10" height="10" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
   <rect x="3" y="3" width="4" height="4" fill="#666" style="paint-order:stroke markers fill"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_checkmark_ivory.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_checkmark_ivory.svg
index 3b14994c0a5..7df7f290119 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__lib_checkmark_ivory.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_checkmark_ivory.svg
@@ -1,3 +1,3 @@
-<svg width="10" height="10" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
   <path d="m2.00012 6.0001 1.99999 1.99999 4.00003-5.99986" fill="none" stroke="#a7a099" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.99999"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_clear_search.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_clear_search.svg
index e4e48c05ac0..e921bf55e61 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__lib_clear_search.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_clear_search.svg
@@ -1,4 +1,4 @@
-<svg width="19" height="19" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="38" height="38" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19">
   <path d="m-3 4v11h-10l-5-5.5 5-5.5z" fill="none" stroke="#676767" stroke-width=".846154px"/>
   <g transform="matrix(1.01661 0 0 1.01661 -.457333 -13.3738)" stroke="#676767" stroke-width=".696756">
     <g transform="matrix(.4151 0 0 .4151 -1.6604 19.547)" stroke="#676767" stroke-width=".696756">
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_clear_search_focus.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_clear_search_focus.svg
index c6201acff62..10a521c6922 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__lib_clear_search_focus.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_clear_search_focus.svg
@@ -1,4 +1,4 @@
-<svg width="19" height="19" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="38" height="38" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19">
   <path d="m17 4v11h-10l-5-5.5 5-5.5z" fill="#0c7199"/>
   <g transform="matrix(.708331 0 0 .708331 4.65134 -6.43746)" fill="none" stroke="#000">
     <g transform="matrix(.4151 0 0 .4151 -1.6604 19.547)" fill="none" stroke="#000">
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_preview_pause.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_preview_pause.svg
index b450d322ef8..dce5ee111f6 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__lib_preview_pause.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_preview_pause.svg
@@ -1,4 +1,4 @@
-<svg width="30" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="60" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 18">
   <rect x="21.000324" y="4.9999399" width="1.9999517" height="8.0002222" color="#000001" fill="#000001" stroke-width=".4151"/>
   <rect x="25.000227" y="4.9999399" width="1.9999517" height="8.0002222" color="#000001" fill="#000001" stroke-width=".4151"/>
   <g transform="matrix(.7980027 0 0 .79816412 .47773332 -1.0809237)">
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_preview_play.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_preview_play.svg
index e3db8b36a10..12cc49ff71d 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__lib_preview_play.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_preview_play.svg
@@ -1,4 +1,4 @@
-<svg width="30" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="60" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 18">
   <path d="m20.999992 13.290607v-8.5827732l7.35661 4.2913869z" fill="#7f7571" stroke-width=".36618"/>
   <g transform="matrix(.7980027 0 0 .79816412 .47773332 -1.0809237)" fill="#7f7571">
     <path d="m4.876466 13.943484 2.5941394-0.483697c0.4106097-0.07653 0.8028092 0.192371 0.8793703 0.602971l0.8982555 4.8177c0.07656 0.410601-0.1923702 0.802731-0.6029799 0.879344l-2.5941394 0.483609c-0.4106097 0.076526-0.8028093-0.19237-0.8793703-0.602971l-0.8982556-4.817612c-0.076559-0.410601 0.1923703-0.802819 0.60298-0.879344z" stroke-width="1.10215"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_radio_button_off.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_radio_button_off.svg
index 54e0da074f8..ed7a0809add 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__lib_radio_button_off.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_radio_button_off.svg
@@ -1,3 +1,3 @@
-<svg version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
+<svg version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg" width="36" height="36">
   <path d="m9 2c-3.8677 0-7 3.1323-7 7s3.1323 7 7 7 7-3.1323 7-7-3.132-7-7-7zm0 12.6c-3.094 0-5.6-2.506-5.6-5.6s2.506-5.6 5.6-5.6 5.6 2.506 5.6 5.6-2.506 5.6-5.6 5.6z" fill="#777"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_radio_button_on_blue.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_radio_button_on_blue.svg
index 15fbe5ef481..cbcb348b28a 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__lib_radio_button_on_blue.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_radio_button_on_blue.svg
@@ -1,4 +1,4 @@
-<svg version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
+<svg version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg" width="36" height="36">
   <path d="m9 5.1042c-2.1505 0-3.8958 1.7453-3.8958 3.8958s1.7453 3.8958 3.8958 3.8958 3.8958-1.7453 3.8958-3.8958-1.7453-3.8958-3.8958-3.8958z" fill="#4097ba"/>
   <path d="m9 2c-3.8675 0-7 3.1325-7 7s3.1325 7 7 7 7-3.1325 7-7-3.132-7-7-7zm0 1.4062c3.094 0 5.5938 2.4998 5.5938 5.5938s-2.4998 5.5938-5.5938 5.5938-5.5938-2.4998-5.5938-5.5938 2.4998-5.5938 5.5938-5.5938z" fill="#777"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_sort_down.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_sort_down.svg
index bb63ad1dd3f..8c669cb0fa0 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__lib_sort_down.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_sort_down.svg
@@ -1,4 +1,4 @@
-<svg width="12" height="12" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 12">
   <path d="m6 9.9181 4.5715-7.9181h-9.143z" fill="none" stroke="#000001" stroke-linejoin="round" stroke-width="1.6"/>
   <path d="m6 9.9181 4.5715-7.9181h-9.143z" fill="#ac9886"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_sort_up.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_sort_up.svg
index 101ede9223e..34a94802b9e 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__lib_sort_up.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_sort_up.svg
@@ -1,4 +1,4 @@
-<svg width="12" height="12" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 12">
   <path d="m6 2.0819 4.5715 7.9181h-9.143z" fill="none" stroke="#000001" stroke-linejoin="round" stroke-width="1.6"/>
   <path d="m6 2.0819 4.5715 7.9181h-9.143z" fill="#ac9886"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_spinbox_down.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_spinbox_down.svg
index 51b2f9b0de8..c761911d254 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__lib_spinbox_down.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_spinbox_down.svg
@@ -1,3 +1,3 @@
-<svg width="12" height="10" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="24" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 10">
   <path d="m6.00006 8-4.0415-7h8.0829z" fill="#918273"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_spinbox_up.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_spinbox_up.svg
index f11a1514937..de1c68af3fa 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__lib_spinbox_up.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_spinbox_up.svg
@@ -1,3 +1,3 @@
-<svg width="12" height="10" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="24" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 10">
   <path d="m6.00006 2-4.0415 7h8.0829z" fill="#918273"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__loop.svg b/res/skins/LateNight/palemoon/buttons/btn__loop.svg
index d1687c8ee82..d0d3c1b820f 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__loop.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__loop.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <g display="none" opacity=".360743">
     <g fill="none" stroke="#000001" stroke-linejoin="round" stroke-width="1.6">
       <path d="m20 18v-12h-5v-3l-7 3.75 7 3.75-1e-4 -2.9999 3.5001-1e-4v9l-1.5-1e-4v1.5001z" color="#000001"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__loop_active.svg b/res/skins/LateNight/palemoon/buttons/btn__loop_active.svg
index d13f8b99d0a..a7253f5c5b4 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__loop_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__loop_active.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <g display="none" opacity=".360743">
     <g fill="none" stroke="#000001" stroke-linejoin="round" stroke-width="1.6">
       <path d="m20 18v-12h-5v-3l-7 3.75 7 3.75-1e-4 -2.9999 3.5001-1e-4v9l-1.5-1e-4v1.5001z" color="#000001"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__loop_in.svg b/res/skins/LateNight/palemoon/buttons/btn__loop_in.svg
index 70c0e34ca25..d7773b05ce1 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__loop_in.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__loop_in.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <g display="none" opacity=".360743">
     <g fill="none" stroke="#000001" stroke-linejoin="round" stroke-width="1.6">
       <path d="m20 18v-12h-5v-3l-7 3.75 7 3.75-1e-4 -2.9999 3.5001-1e-4v9l-1.5-1e-4v1.5001z" color="#000001"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__loop_in_active.svg b/res/skins/LateNight/palemoon/buttons/btn__loop_in_active.svg
index 680817bc0c0..a0e9e4e2b96 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__loop_in_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__loop_in_active.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <path d="m9 6h5v13h-1v-7h-4v-6" fill="#000001"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__loop_out.svg b/res/skins/LateNight/palemoon/buttons/btn__loop_out.svg
index 70044f65693..d7c24ac0023 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__loop_out.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__loop_out.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <g display="none" opacity=".360743">
     <g fill="none" stroke="#000001" stroke-linejoin="round" stroke-width="1.6">
       <path d="m20 18v-12h-5v-3l-7 3.75 7 3.75-1e-4 -2.9999 3.5001-1e-4v9l-1.5-1e-4v1.5001z" color="#000001"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__loop_out_active.svg b/res/skins/LateNight/palemoon/buttons/btn__loop_out_active.svg
index 239341164e4..a50beda8b9d 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__loop_out_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__loop_out_active.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <path d="m14 6h-5v13h1v-7h4v-6" fill="#000001"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__menu_checkbox.svg b/res/skins/LateNight/palemoon/buttons/btn__menu_checkbox.svg
index 36a59452236..f96a52879bf 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__menu_checkbox.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__menu_checkbox.svg
@@ -1,3 +1,3 @@
-<svg width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
   <rect x="1.5" y="1.5" width="17" height="17" rx="1" ry="1" stroke="#3b3b3b" stroke-linecap="square" stroke-linejoin="round" style="paint-order:markers fill stroke"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__menu_checkbox_checked.svg b/res/skins/LateNight/palemoon/buttons/btn__menu_checkbox_checked.svg
index 6c00fa5d9c3..5f6de1fdfc0 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__menu_checkbox_checked.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__menu_checkbox_checked.svg
@@ -1,4 +1,4 @@
-<svg width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="40" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
   <rect x="2.5" y="2.5" width="15" height="15" rx="1" ry="1" stroke="#3b3b3b" stroke-linecap="square" stroke-linejoin="round" style="paint-order:markers fill stroke"/>
   <path d="m5.49272 11.5024 3.00483 3.00484 6.00973-9.01432" fill="none" stroke="#4097ba" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.67296"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__mic_duck_auto.svg b/res/skins/LateNight/palemoon/buttons/btn__mic_duck_auto.svg
index d63efecdcff..94d483dd23a 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__mic_duck_auto.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__mic_duck_auto.svg
@@ -1,3 +1,3 @@
-<svg width="40" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="80" height="44" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 22">
   <text x="20.494831" y="15.584389" fill="#000000" font-family="sans-serif" font-size="40px" letter-spacing="0px" stroke-width="1.6" text-align="center" text-anchor="middle" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="20.494831" y="15.584389" fill="#000000" font-family="'Open Sans'" font-size="12px" font-weight="bold" stroke-width="1.6" text-align="center" text-anchor="middle">AUTO</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__mic_duck_manual.svg b/res/skins/LateNight/palemoon/buttons/btn__mic_duck_manual.svg
index e2c67836db4..3127946d56d 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__mic_duck_manual.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__mic_duck_manual.svg
@@ -1,3 +1,3 @@
-<svg width="40" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="80" height="44" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 22">
   <text x="19.941521" y="15.593179" fill="#000000" font-family="sans-serif" font-size="40px" letter-spacing="0px" stroke-width="1.6" text-align="center" text-anchor="middle" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="19.941521" y="15.593179" fill="#000000" font-family="'Open Sans'" font-size="12px" font-weight="bold" stroke-width="1.6" text-align="center" text-anchor="middle">MAN</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__mic_duck_off.svg b/res/skins/LateNight/palemoon/buttons/btn__mic_duck_off.svg
index 3022bcb2a58..04490e96011 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__mic_duck_off.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__mic_duck_off.svg
@@ -1,4 +1,4 @@
-<svg width="40" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="80" height="44" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 22">
   <text x="2.5979552" y="15.578529" fill="#000000" font-family="sans-serif" font-size="12px" letter-spacing="0px" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="2.5979552" y="15.578529" font-family="'Open Sans'" font-size="12px" font-weight="bold" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">DUCK</tspan></text>
   <text x="2.5979552" y="15.578529" fill="#918273" font-family="sans-serif" font-size="12px" letter-spacing="0px" stroke-width="1.6" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="2.5979552" y="15.578529" fill="#918273" font-family="'Open Sans'" font-size="12px" font-weight="bold" stroke-width="1.6">DUCK</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__mic_talk.svg b/res/skins/LateNight/palemoon/buttons/btn__mic_talk.svg
index 0284b30f0f6..cb53d9d7fa0 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__mic_talk.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__mic_talk.svg
@@ -1,4 +1,4 @@
-<svg width="40" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="80" height="44" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 22">
   <path d="m14.7756 6.04464a0.80008 0.80008 0 0 0-0.753906 0.535156l-3.02344 8.60156a0.80008 0.80008 0 0 0 0.753906 1.06641h1.95703a0.80008 0.80008 0 0 0 0.765625-0.568359l0.449219-1.4707h1.9375l0.449219 1.4707a0.80008 0.80008 0 0 0 0.765624 0.568359h1.95703a0.80008 0.80008 0 0 0 0.537109-0.210937 0.80008 0.80008 0 0 0 0.541016 0.210937h5.28906a0.80008 0.80008 0 0 0 0.744141-0.507812 0.80008 0.80008 0 0 0 0.74414 0.507812h1.81641a0.80008 0.80008 0 0 0 0.800781-0.800781v-2.04492l1.5332 2.4668a0.80008 0.80008 0 0 0 0.677735 0.378906h2.0625a0.80008 0.80008 0 0 0 0.677734-1.22656l-2.71094-4.29883 2.63867-3.3457a0.80008 0.80008 0 0 0-0.628906-1.29688h-2.01562a0.80008 0.80008 0 0 0-0.625 0.302734l-1.60938 2.01953v-1.52148a0.80008 0.80008 0 0 0-0.800781-0.800781h-1.81641a0.80008 0.80008 0 0 0-0.798828 0.800781v6.66016a0.80008 0.80008 0 0 0-0.689453-0.394531h-2.67383v-6.26563a0.80008 0.80008 0 0 0-0.798828-0.800781h-1.81641a0.80008 0.80008 0 0 0-0.800781 0.800781v6.95117l-2.55859-7.25195a0.80008 0.80008 0 0 0-0.753906-0.535156zm-9.73047 0.0351563a0.80008 0.80008 0 0 0-0.800781 0.800781v1.51172a0.80008 0.80008 0 0 0 0.800781 0.800781h1.52539v6.25391a0.80008 0.80008 0 0 0 0.798828 0.800781h1.81641a0.80008 0.80008 0 0 0 0.800781-0.800781v-6.25391h1.52734a0.80008 0.80008 0 0 0 0.798829-0.800781v-1.51172a0.80008 0.80008 0 0 0-0.798829-0.800781zm2.69141 1.60156h1.08594a0.80008 0.80008 0 0 0-0.435547 0.710938v6.25391h-0.216797v-6.25391a0.80008 0.80008 0 0 0-0.433594-0.710938zm14.1738 0h0.216797v6.26563a0.80008 0.80008 0 0 0 0.412109 0.699219h-0.628906zm6.7793 0h0.216797v3.11914a0.80008 0.80008 0 0 0 0.572265 0.767578l-0.238281 0.169922a0.80008 0.80008 0 0 0-0.333984 0.650391v2.25781h-0.216797zm2.64453 2.24805-0.193359 0.246095a0.80008 0.80008 0 0 0-0.04883 0.921875l2.23828 3.54883h-0.167969l-2.00977-3.23047a0.80008 0.80008 0 0 0-0.634765-0.376953l0.542969-0.765625zm-16.8184 0.072266c-0.17609 0.587056-0.219359 0.763289-0.492188 1.64648a0.80008 0.80008 0 0 0 0.423828 0.958985h-0.117187a0.80008 0.80008 0 0 0-0.763672 0.568359l-0.449219 1.4707h-0.234375zm2.84375 0.277344 1.54102 4.36719h-0.234375l-0.447265-1.4707a0.80008 0.80008 0 0 0-0.763672-0.568359h-0.0957a0.80008 0.80008 0 0 0 0.425778-0.960938c-0.250787-0.806953-0.27025-0.866083-0.425781-1.36719zm-1.46289 0.6875c0.01458 0.04695 0.02183 0.068 0.03711 0.117188h-0.07227c0.01492-0.04895 0.02071-0.06966 0.03516-0.117188z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#000001" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
   <g transform="translate(-.0877193 .146199)" fill="#918273" aria-label="TALK">
     <path d="m9.27441 15.3008h-1.81641v-7.05469h-2.32617v-1.51172h6.46875v1.51172h-2.32617z"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__mic_talk_active.svg b/res/skins/LateNight/palemoon/buttons/btn__mic_talk_active.svg
index 45870841854..223c229ff29 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__mic_talk_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__mic_talk_active.svg
@@ -1,4 +1,4 @@
-<svg width="40" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="80" height="44" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 22">
   <g transform="translate(-.0877193 .146199)" fill="#0f0e0c" aria-label="TALK">
     <path d="m9.27441 15.3008h-1.81641v-7.05469h-2.32617v-1.51172h6.46875v1.51172h-2.32617z"/>
     <path d="m18.1631 15.3008-0.621094-2.03906h-3.12305l-0.621093 2.03906h-1.95703l3.02344-8.60156h2.2207l3.03516 8.60156zm-1.05469-3.5625q-0.861328-2.77148-0.972656-3.13477-0.105469-0.363281-0.152344-0.574219-0.193359 0.75-1.10742 3.70898z"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__minus.svg b/res/skins/LateNight/palemoon/buttons/btn__minus.svg
index 32877c68fa5..03cb477519e 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__minus.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__minus.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <path d="m8 10h9v3h-9z" fill="none" stroke="#000001" stroke-linecap="square" stroke-linejoin="round" stroke-width="1.6"/>
   <path d="m8 10h9v3h-9z" fill="#8e8276"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__minus_active.svg b/res/skins/LateNight/palemoon/buttons/btn__minus_active.svg
index 3a5432f25be..df10104c2b7 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__minus_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__minus_active.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <path d="m8 10h9v3h-9v-3" fill="#000001"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__outro_end.svg b/res/skins/LateNight/palemoon/buttons/btn__outro_end.svg
index e5e4bc0e75e..83ff7b23ffc 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__outro_end.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__outro_end.svg
@@ -1,4 +1,4 @@
-<svg width="18" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="36" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 24">
   <g transform="translate(-3)" fill="none" stroke="#000001" stroke-linecap="square" stroke-linejoin="round" stroke-width="1.6">
     <rect transform="scale(-1,1)" x="-18" y="7" width="2" height="10" style="paint-order:markers fill stroke"/>
     <path d="m15 17-9-10v10z"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__outro_end_active.svg b/res/skins/LateNight/palemoon/buttons/btn__outro_end_active.svg
index 030357759cd..5fb69951b2e 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__outro_end_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__outro_end_active.svg
@@ -1,4 +1,4 @@
-<svg width="18" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="36" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 24">
   <g transform="translate(-3)" fill="#000001">
     <rect transform="scale(-1,1)" x="-18" y="7" width="2" height="10" style="paint-order:markers fill stroke"/>
     <path d="m15 17-9-10v10z"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__outro_start.svg b/res/skins/LateNight/palemoon/buttons/btn__outro_start.svg
index 303a4690aee..4be24a831ec 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__outro_start.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__outro_start.svg
@@ -1,4 +1,4 @@
-<svg width="18" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="36" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 24">
   <g transform="translate(-3)" fill="none" stroke="#000001" stroke-linecap="square" stroke-linejoin="round" stroke-width="1.6">
     <rect x="6" y="7" width="2" height="10" style="paint-order:markers fill stroke"/>
     <path d="m19 17-9-10v10z"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__outro_start_active.svg b/res/skins/LateNight/palemoon/buttons/btn__outro_start_active.svg
index 12c9e637d87..888db6b6706 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__outro_start_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__outro_start_active.svg
@@ -1,4 +1,4 @@
-<svg width="18" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="36" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 24">
   <g transform="translate(-3)" fill="#000001">
     <rect x="6" y="7" width="2" height="10" style="paint-order:markers fill stroke"/>
     <path d="m19 17-9-10v10z"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__pause_deck_mini.svg b/res/skins/LateNight/palemoon/buttons/btn__pause_deck_mini.svg
index 85a14cc491e..72cc462adcd 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__pause_deck_mini.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__pause_deck_mini.svg
@@ -1,4 +1,4 @@
-<svg width="40" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="80" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 24">
   <g transform="translate(0,2)" fill="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">
     <path d="m14.0005 4h4v12h-4v-12"/>
     <path d="m22.0004 4v12h4v-12h-4"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__pause_sampler.svg b/res/skins/LateNight/palemoon/buttons/btn__pause_sampler.svg
index 821a7d610b9..1ac5aaad76a 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__pause_sampler.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__pause_sampler.svg
@@ -1,4 +1,4 @@
-<svg width="32" height="32" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
   <g transform="translate(1,1)" fill="#000001" stroke-linecap="square" stroke-width="1.6">
     <path d="m8 7h5v15h-5v-15"/>
     <path d="m17 7v15h5v-15h-5"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__pfl.svg b/res/skins/LateNight/palemoon/buttons/btn__pfl.svg
index a229bdeb6e8..882b9d78d62 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__pfl.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__pfl.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <g transform="matrix(.91829643 0 0 .91848218 .98042259 1.0046746)" fill="none" stroke="#000" stroke-width="1.74218">
     <path d="m4.876466 13.943484 2.5941394-0.483697c0.4106097-0.07653 0.8028092 0.192371 0.8793703 0.602971l0.8982555 4.8177c0.07656 0.410601-0.1923702 0.802731-0.6029799 0.879344l-2.5941394 0.483609c-0.4106097 0.076526-0.8028093-0.19237-0.8793703-0.602971l-0.8982556-4.817612c-0.076559-0.410601 0.1923703-0.802819 0.60298-0.879344z"/>
     <path d="m11.99997 4.3935815c-4.2131456 0-7.6455512 1.673102-7.6455512 5.8863355 0 0.481673 0.043953 2.704354 0.1295838 3.161047 0.364615 1.98545 0.7420547 3.96835 1.1309118 5.949139l1.6610514-0.318066c-0.3586337-2.026968-0.8433504-4.181831-1.1309118-6.043346-0.0555921-0.324135-0.0942412-2.405991-0.0942412-2.748774 0-3.2962423 2.6529852-4.1899238 5.9491392-4.1899238 3.296155 0 5.94914 0.8936815 5.94914 4.1899238 0 0.342783-0.03865 2.424639-0.09424 2.748774-0.287579 1.861515-0.772296 4.016378-1.130912 6.043346l1.661051 0.318066c0.388875-1.980789 0.766306-3.963689 1.130912-5.949139 0.08563-0.456693 0.129584-2.679374 0.129584-3.161047 0-4.2132335-3.432406-5.8863355-7.645551-5.8863355z" color="#000000" style="text-indent:0;text-transform:none"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__pfl_active.svg b/res/skins/LateNight/palemoon/buttons/btn__pfl_active.svg
index fad0d8c5f78..86add1b4048 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__pfl_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__pfl_active.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <g transform="matrix(.91829643 0 0 .91848218 .98042259 1.0046746)" stroke-width=".957772">
     <path d="m4.876466 13.943484 2.5941394-0.483697c0.4106097-0.07653 0.8028092 0.192371 0.8793703 0.602971l0.8982555 4.8177c0.07656 0.410601-0.1923702 0.802731-0.6029799 0.879344l-2.5941394 0.483609c-0.4106097 0.076526-0.8028093-0.19237-0.8793703-0.602971l-0.8982556-4.817612c-0.076559-0.410601 0.1923703-0.802819 0.60298-0.879344z"/>
     <path d="m11.99997 4.3935815c-4.2131456 0-7.6455512 1.673102-7.6455512 5.8863355 0 0.481673 0.043953 2.704354 0.1295838 3.161047 0.364615 1.98545 0.7420547 3.96835 1.1309118 5.949139l0.5301396-6.361412c0.076139-0.91363-0.094241-2.405991-0.094241-2.748774 0-3.2962423 2.6529852-4.1899238 5.949139-4.1899238 3.296155 0 5.94914 0.8936815 5.94914 4.1899238 0 0.342783-0.170379 1.835144-0.09424 2.748774 0.530139 6.361412 0.530139 6.361412 0.530139 6.361412 0.388875-1.980789 0.766306-3.963689 1.130912-5.949139 0.08563-0.456693 0.129584-2.679374 0.129584-3.161047 0-4.2132335-3.432406-5.8863355-7.645551-5.8863355z" color="#000000" style="text-indent:0;text-transform:none"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__play_deck.svg b/res/skins/LateNight/palemoon/buttons/btn__play_deck.svg
index 7f259fc7500..808cf0a727b 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__play_deck.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__play_deck.svg
@@ -1,4 +1,4 @@
-<svg width="50" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="100" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 24">
   <g transform="translate(0,2)" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">
     <path d="m28.0005 4h4v12h-4v-12"/>
     <path d="m35.0009 4v12h4v-12h-4"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__play_deck_active.svg b/res/skins/LateNight/palemoon/buttons/btn__play_deck_active.svg
index fb9f96e695f..d8a86201da2 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__play_deck_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__play_deck_active.svg
@@ -1,4 +1,4 @@
-<svg width="50" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="100" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 24">
   <g transform="translate(1.00049 1)" fill="#000001">
     <path d="m27 5h4v12h-4v-12"/>
     <path d="m34 5v12h4v-12h-4"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__play_deck_mini.svg b/res/skins/LateNight/palemoon/buttons/btn__play_deck_mini.svg
index 5e107fde94b..544e34d4e35 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__play_deck_mini.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__play_deck_mini.svg
@@ -1,4 +1,4 @@
-<svg width="40" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="80" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 24">
   <g transform="translate(0,2)" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">
     <path d="m16.0005 4 8.9995 6-8.9995 6v-12"/>
   </g>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__play_sampler.svg b/res/skins/LateNight/palemoon/buttons/btn__play_sampler.svg
index 5e172c2e059..49da2d3dc13 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__play_sampler.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__play_sampler.svg
@@ -1,4 +1,4 @@
-<svg width="32" height="32" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="64" height="64" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
   <path d="m11 7.3661 12.95 8.634-12.95 8.6339z" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6"/>
   <path d="m11 7.3661 12.95 8.634-12.95 8.6339z" fill="#918273"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__plus.svg b/res/skins/LateNight/palemoon/buttons/btn__plus.svg
index 5d64d2f3f4f..bd1add3383d 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__plus.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__plus.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <path d="m8 10h3v-3h3v3h3v3h-3v3h-3v-3h-3z" fill="none" stroke="#000001" stroke-linecap="square" stroke-linejoin="round" stroke-width="1.6"/>
   <path d="m8 10h3v-3h3v3h3v3h-3v3h-3v-3h-3z" fill="#8e8276"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__plus_active.svg b/res/skins/LateNight/palemoon/buttons/btn__plus_active.svg
index 34d64354d72..a24b9100997 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__plus_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__plus_active.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <path d="m8 10h3v-3h3v3h3v3h-3v3h-3v-3h-3v-3" fill="#000001"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__plus_flat.svg b/res/skins/LateNight/palemoon/buttons/btn__plus_flat.svg
index af431d2e4f6..43066bea72a 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__plus_flat.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__plus_flat.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <path d="m8 10h3v-3h3v3h3v3h-3v3h-3v-3h-3v-3" fill="#a89a8c" opacity=".598985"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__prev.svg b/res/skins/LateNight/palemoon/buttons/btn__prev.svg
index 8eeb2877477..6914a7a9f49 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__prev.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__prev.svg
@@ -1,3 +1,3 @@
-<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="44" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 22">
   <path d="m11 6.3331-7 4.667 7 4.6669v-9.3339" fill="#918273"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__quantize.svg b/res/skins/LateNight/palemoon/buttons/btn__quantize.svg
index c7d83d99e11..13263a21352 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__quantize.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__quantize.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
   <path d="m9.156 4c-2.7614 0-5 2.2386-5 5s2.2386 5 5 5h7.844v-3h-7.969c-1.1046 0-2-0.89543-2-2 0-1.1046 0.89543-2 2-2h7.969v-3z" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.8"/>
   <g fill="#444">
     <path d="m9.156 4c-2.7614 0-5 2.2386-5 5s2.2386 5 5 5h3.8438v-3h-3.9688c-1.1046 0-2-0.89543-2-2 0-1.1046 0.89543-2 2-2h3.9688v-3z"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__quantize_active_12.svg b/res/skins/LateNight/palemoon/buttons/btn__quantize_active_12.svg
index bae2506aa2a..0fe637944c5 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__quantize_active_12.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__quantize_active_12.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
   <path d="m9.156 4c-2.7614 0-5 2.2386-5 5s2.2386 5 5 5h3.8438v-3h-3.9688c-1.1046 0-2-.89543-2-2 0-1.1046.89543-2 2-2h3.9688v-3z" fill="#988f86"/>
   <g fill="#e6e6e6">
     <path d="m17 11h-3v3h3z"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__quantize_active_34.svg b/res/skins/LateNight/palemoon/buttons/btn__quantize_active_34.svg
index fea278c0eae..5edbd8dbd54 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__quantize_active_34.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__quantize_active_34.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
   <path d="m9.156 4c-2.7614 0-5 2.2386-5 5s2.2386 5 5 5h3.8438v-3h-3.9688c-1.1046 0-2-.89543-2-2 0-1.1046.89543-2 2-2h3.9688v-3z" fill="#559b99"/>
   <g fill="#e6e6e6">
     <path d="m17 11h-3v3h3z"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__rate_center_cyan.svg b/res/skins/LateNight/palemoon/buttons/btn__rate_center_cyan.svg
index cf50983b34b..d05e2f86f75 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__rate_center_cyan.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__rate_center_cyan.svg
@@ -1,3 +1,3 @@
-<svg width="10" height="10" version="1.1" viewBox="0 0 10 10" xmlns="http://www.w3.org/2000/svg">
+<svg width="20" height="20" version="1.1" viewBox="0 0 10 10" xmlns="http://www.w3.org/2000/svg">
   <path d="m5 8.5c-1.93375 0-3.5-1.56625-3.5-3.5 0-1.93375 1.56625-3.5 3.5-3.5s3.5 1.56625 3.5 3.5c0 1.93375-1.56625 3.5-3.5 3.5z" fill="#00a4d4" stroke="#a4a4a2"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__rate_center_off.svg b/res/skins/LateNight/palemoon/buttons/btn__rate_center_off.svg
index 636104dfa3f..0fe2cf9cc8f 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__rate_center_off.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__rate_center_off.svg
@@ -1,3 +1,3 @@
-<svg width="6" height="6" version="1.1" viewBox="0 0 6 6" xmlns="http://www.w3.org/2000/svg">
+<svg width="12" height="12" version="1.1" viewBox="0 0 6 6" xmlns="http://www.w3.org/2000/svg">
   <path d="m3 5.625c-1.45031 0-2.625-1.17469-2.625-2.625 0-1.45031 1.17469-2.625 2.625-2.625s2.625 1.17469 2.625 2.625c0 1.45031-1.17469 2.625-2.625 2.625z" fill="#090909" stroke="#8d8d8b" stroke-width=".75"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__rec_dot.svg b/res/skins/LateNight/palemoon/buttons/btn__rec_dot.svg
index 62479f2a9d3..81c00c7e2a5 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__rec_dot.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__rec_dot.svg
@@ -1,3 +1,3 @@
-<svg version="1.1" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg">
+<svg version="1.1" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" width="30" height="30">
   <path d="m13.477 7.5a3.9775 3.9775 0 1 1-7.955 0 3.9775 3.9775 0 1 1 7.955 0z" color="#000001" fill="#a89a8c"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__rec_dot_active.svg b/res/skins/LateNight/palemoon/buttons/btn__rec_dot_active.svg
index 4abd4121610..539c12017a2 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__rec_dot_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__rec_dot_active.svg
@@ -1,3 +1,3 @@
-<svg version="1.1" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg">
+<svg version="1.1" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg" width="30" height="30">
   <path d="m13.477 7.5a3.9775 3.9775 0 1 1-7.955 0 3.9775 3.9775 0 1 1 7.955 0z" color="#000001" fill="#000001"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__reloop.svg b/res/skins/LateNight/palemoon/buttons/btn__reloop.svg
index 43fa4509e0b..fd9d07545af 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__reloop.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__reloop.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <g display="none" opacity=".334599">
     <g fill="none" stroke="#000001" stroke-linejoin="round" stroke-width="1.6">
       <path d="m11 3h2v6h-2z" color="#000001"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__reloop_active.svg b/res/skins/LateNight/palemoon/buttons/btn__reloop_active.svg
index d3602f025a1..09082cf36c3 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__reloop_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__reloop_active.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <g display="none" opacity=".334599">
     <g fill="none" stroke="#000001" stroke-linejoin="round" stroke-width="1.6">
       <path d="m11 3h2v6h-2z" color="#000001"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__repeat.svg b/res/skins/LateNight/palemoon/buttons/btn__repeat.svg
index a1e8beb424f..011001b6fc9 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__repeat.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__repeat.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
   <path d="m8 16.5508v-2.5508h6.0996c2.7111 0 4.9004-2.2607 4.9004-5 0-0.37247-0.07713-1.5509-0.502617-2.2722l-1.9655 1.07428c0.793792 2.05856-0.82218 4.19792-2.43228 4.19792h-6.0996v-3l-6.541 3.7754z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.7" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
   <path d="M 13,1.4492 V 4 H 6.9004 C 4.1893,4 2,6.2607 2,9 c 0,0.37247 0.077125,1.550903 0.5026168,2.272202 L 4.4681203,10.197924 C 3.6743278,8.1393659 5.2903,6 6.9004,6 H 13 v 3 l 6.541,-3.7754 z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.7" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
   <path d="m13 1.4492v2.5508h-6.0996c-2.7111 0-4.9004 2.2607-4.9004 5 0 0.37247 0.048235 0.73369 0.125 1.084l1.875-1.084c0-1.6927 1.2903-3 2.9004-3h6.0996v3l6.541-3.7754z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#444" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__repeat_active_12.svg b/res/skins/LateNight/palemoon/buttons/btn__repeat_active_12.svg
index 79f9574bf90..76006460fe6 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__repeat_active_12.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__repeat_active_12.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
   <g fill="#988f86" shape-rendering="auto">
     <path d="m13 1.44922v2.55078h-6.09961c-2.71106 0-4.90039 2.26071-4.90039 5 0 0.372474 0.0482349 0.733689 0.125 1.08398l1.875-1.08398c0-1.69271 1.29025-3 2.90039-3h6.09961v3l6.54102-3.77539z" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
     <path d="m18.877 7.91797-1.87695 1.08203c0 1.69272-1.29026 3-2.90039 3h-6.09961v-3l-6.54102 3.77539 6.54102 3.77734v-2.55273h6.09961c2.71106 0 4.90039-2.26072 4.90039-5 0-0.37162-0.046624-0.732476-0.123047-1.08203z" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__repeat_active_34.svg b/res/skins/LateNight/palemoon/buttons/btn__repeat_active_34.svg
index c5c8855f6d4..f53db09979a 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__repeat_active_34.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__repeat_active_34.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
   <g fill="#559b99" shape-rendering="auto">
     <path d="m13 1.44922v2.55078h-6.09961c-2.71106 0-4.90039 2.26071-4.90039 5 0 0.372474 0.0482349 0.733689 0.125 1.08398l1.875-1.08398c0-1.69271 1.29025-3 2.90039-3h6.09961v3l6.54102-3.77539z" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
     <path d="m18.877 7.91797-1.87695 1.08203c0 1.69272-1.29026 3-2.90039 3h-6.09961v-3l-6.54102 3.77539 6.54102 3.77734v-2.55273h6.09961c2.71106 0 4.90039-2.26072 4.90039-5 0-0.37162-0.046624-0.732476-0.123047-1.08203z" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__reverse.svg b/res/skins/LateNight/palemoon/buttons/btn__reverse.svg
index 30972c18800..8a2b1843a9f 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__reverse.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__reverse.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <path d="m16.0005 6.0058-8.99957 6 8.99957 6v-12" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6"/>
   <path d="m16.0005 6.00007-8.99957 6 8.99957 6v-12" fill="#918273"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__reverse_active.svg b/res/skins/LateNight/palemoon/buttons/btn__reverse_active.svg
index 452c714b9e3..0fa35d991ff 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__reverse_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__reverse_active.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <path d="m16.0005 6.0058-8.99957 6 8.99957 6v-12" fill="#000001" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__settings_off.svg b/res/skins/LateNight/palemoon/buttons/btn__settings_off.svg
index ba9738b1dd1..e0c392d84d2 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__settings_off.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__settings_off.svg
@@ -1,4 +1,4 @@
-<svg width="76" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="152" height="32" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 76 16">
   <g transform="matrix(-.60802 0 0 .68989 14.4115 1.10103)" fill="#a89a8c" stroke-width="1.1274">
     <path transform="matrix(1.1347,0,0,1,-34.251,6)" d="m37.625-5-.1875 2.625c-.66019.16435-1.2765.43313-1.8438.78125l-1.9688-1.75-1.9688 1.9688 1.75 1.9688c-.34382.56314-.61891 1.1878-.78125 1.8438l-2.625.1875v2.75l2.625.1875c.16385.66212.431 1.2793.78125 1.8438l-1.75 1.9688 1.9688 1.9688 2-1.75c.55851.33599 1.1644.58862 1.8125.75l.1875 2.6562h2.75l.1875-2.625c.66019-.16435 1.2765-.43313 1.8438-.78125l1.9688 1.75 1.9688-1.9688-1.75-1.9688c.34382-.56314.61891-1.1878.78125-1.8438l2.625-.1875v-2.75l-2.625-.1875c-.16435-.66019-.43313-1.2765-.78125-1.8438l1.75-1.9688-1.9688-1.9688-1.9688 1.75c-.56314-.34382-1.1878-.61891-1.8438-.78125l-.1875-2.625zm1.375 6c1.6505 0 3 1.3495 3 3s-1.3495 3-3 3-3-1.3495-3-3 1.3495-3 3-3z" color="#000001" fill="#a89a8c"/>
   </g>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__settings_on.svg b/res/skins/LateNight/palemoon/buttons/btn__settings_on.svg
index 9cf8c215c01..d91ebcd55a5 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__settings_on.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__settings_on.svg
@@ -1,4 +1,4 @@
-<svg width="76" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="152" height="32" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 76 16">
   <g transform="matrix(-.608035 0 0 .689933 14.3563 1.1006)" stroke-width="1.12735">
     <path transform="matrix(1.1347,0,0,1,-34.251,6)" d="m37.625-5-.1875 2.625c-.66019.16435-1.2765.43313-1.8438.78125l-1.9688-1.75-1.9688 1.9688 1.75 1.9688c-.34382.56314-.61891 1.1878-.78125 1.8438l-2.625.1875v2.75l2.625.1875c.16385.66212.431 1.2793.78125 1.8438l-1.75 1.9688 1.9688 1.9688 2-1.75c.55851.33599 1.1644.58862 1.8125.75l.1875 2.6562h2.75l.1875-2.625c.66019-.16435 1.2765-.43313 1.8438-.78125l1.9688 1.75 1.9688-1.9688-1.75-1.9688c.34382-.56314.61891-1.1878.78125-1.8438l2.625-.1875v-2.75l-2.625-.1875c-.16435-.66019-.43313-1.2765-.78125-1.8438l1.75-1.9688-1.9688-1.9688-1.9688 1.75c-.56314-.34382-1.1878-.61891-1.8438-.78125l-.1875-2.625zm1.375 6c1.6505 0 3 1.3495 3 3s-1.3495 3-3 3-3-1.3495-3-3 1.3495-3 3-3z" color="#000001" stroke-width="1.12735"/>
   </g>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__slip.svg b/res/skins/LateNight/palemoon/buttons/btn__slip.svg
index a5f9340a4ac..cc40ed61977 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__slip.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__slip.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
   <path d="m7.3334 14.97-6.3333-10.97 12.666-3e-7z" color="#000001" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.8"/>
   <path d="m7.3333 4.0003 6.3333 10.965 6.3333-10.965h-12.667z" color="#000001" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.8"/>
   <path d="m7.3334 14.97-6.3333-10.97 12.666-3e-7z" color="#000001" fill="#444" stroke-width=".91414"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__slip_active_12.svg b/res/skins/LateNight/palemoon/buttons/btn__slip_active_12.svg
index 6429a0e1aea..4c4d8de2ebc 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__slip_active_12.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__slip_active_12.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
   <path d="m1 4 6.33398 10.9707 2.68945-4.6582-3.64453-6.3125h-5.37891z" fill="#988f86"/>
   <path d="m7.3333 4.0003 6.3333 10.965 6.3333-10.965h-12.667zm2.9292 1.7021h6.8083l-3.4042 5.8979-3.4042-5.8979z" fill="#e6e6e6"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__slip_active_34.svg b/res/skins/LateNight/palemoon/buttons/btn__slip_active_34.svg
index 3b9060cc6e0..16f53819961 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__slip_active_34.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__slip_active_34.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
   <path d="m7.3333 4.0003 6.3333 10.965 6.3333-10.965h-12.667zm2.9292 1.7021h6.8083l-3.4042 5.8979-3.4042-5.8979z" color="#000001" fill="#e6e6e6"/>
   <path d="m1 4 6.33398 10.9707 2.68945-4.6582-3.64453-6.3125z" fill="#559b99"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__spinbox_down.svg b/res/skins/LateNight/palemoon/buttons/btn__spinbox_down.svg
index 19a1ca8cc0f..594ee0660a2 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__spinbox_down.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__spinbox_down.svg
@@ -1,4 +1,4 @@
-<svg width="18" height="11" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="36" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 11">
   <rect x="-18.3526" y="-57.9835" width="49.5216" height="38.627" rx="2" fill="#1a1a1a" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/>
   <rect x="40" y="8.88178e-16" width="18" height="11" fill="#ac0606" fill-opacity=".73545"/>
   <path d="m9.00005 8-3.46414-6h6.9282z" fill="none" stroke="#000001" stroke-linejoin="round" stroke-width="1.6"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__spinbox_up.svg b/res/skins/LateNight/palemoon/buttons/btn__spinbox_up.svg
index 621833c17bc..11bb9552bcd 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__spinbox_up.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__spinbox_up.svg
@@ -1,4 +1,4 @@
-<svg width="18" height="11" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="36" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 11">
   <path d="m9.00005 3-3.46414 6h6.9282z" fill="none" stroke="#000001" stroke-linejoin="round" stroke-width="1.6"/>
   <path d="m9.00005 3-3.46414 6h6.9282z" fill="#918273" stroke-width=".857143"/>
   <path d="m-0.199219-1c-0.434551 0-0.800781 0.36623-0.800781 0.800781v22.3984c0 0.434551 0.36623 0.800781 0.800781 0.800781h18.4024c0.434551 0 0.800781-0.36623 0.800781-0.800781v-22.3984c0-0.434551-0.36623-0.800781-0.800781-0.800781zm1.19922 1h16.004c0.562649 0 1 0.437351 1 1v20c0 0.562649-0.437351 1-1 1h-16.004c-0.562649 0-1-0.437351-1-1v-20c0-0.562649 0.437351-1 1-1z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#000001" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__split.svg b/res/skins/LateNight/palemoon/buttons/btn__split.svg
index cedab4beb65..d71b5341c53 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__split.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__split.svg
@@ -1,4 +1,4 @@
-<svg width="46" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="92" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 46 20">
   <text x="6.6918755" y="14.569261" fill="#000000" font-family="sans-serif" font-size="40px" letter-spacing="0px" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="6.6918755" y="14.569261" font-family="'Open Sans'" font-size="12px" font-weight="bold" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">SPLIT</tspan></text>
   <text x="6.6918755" y="14.569261" fill="#828282" font-family="sans-serif" font-size="40px" letter-spacing="0px" stroke-width="1.6" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="6.6918755" y="14.569261" fill="#828282" font-family="'Open Sans'" font-size="12px" font-weight="bold" stroke-width="1.6">SPLIT</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__split_active.svg b/res/skins/LateNight/palemoon/buttons/btn__split_active.svg
index a11a1dddfd2..c9f27bf7a27 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__split_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__split_active.svg
@@ -1,3 +1,3 @@
-<svg width="46" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="92" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 46 20">
   <text x="6.6918755" y="14.569261" fill="#000000" font-family="sans-serif" font-size="40px" letter-spacing="0px" stroke-width="1.6" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="6.6918755" y="14.569261" fill="#000000" font-family="'Open Sans'" font-size="12px" font-weight="bold" stroke-width="1.6">SPLIT</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__star.svg b/res/skins/LateNight/palemoon/buttons/btn__star.svg
index 63defd3da3d..9600c2b682c 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__star.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__star.svg
@@ -1,4 +1,4 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="32" height="32" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
   <path d="m8 1.74219-1.42969 4.26758-4.5 0.041016 3.61719 2.67773-1.35352 4.29297 3.66602-2.61328 3.66602 2.61328-1.35352-4.29297 3.61719-2.67773-4.5-0.0410156z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="none" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
   <path d="m8 1.74219-1.42969 4.26758-4.5 0.041016 3.61719 2.67773-1.35352 4.29297 3.66602-2.61328 3.66602 2.61328-1.35352-4.29297 3.61719-2.67773-4.5-0.0410156z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#a89a8c" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__sync_deck.svg b/res/skins/LateNight/palemoon/buttons/btn__sync_deck.svg
index 95b68c70e84..81f224ea9a8 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__sync_deck.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__sync_deck.svg
@@ -1,4 +1,4 @@
-<svg width="36" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="72" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 18">
   <text x="2.1855469" y="13.555793" fill="#000000" font-family="sans-serif" font-size="40px" letter-spacing="0px" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="2.1855469" y="13.555793" font-family="'Open Sans'" font-size="12px" font-weight="bold" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">SYNC</tspan></text>
   <text x="2.1855469" y="13.555793" fill="#a89a8c" font-family="sans-serif" font-size="40px" letter-spacing="0px" stroke-width="1.6" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="2.1855469" y="13.555793" fill="#a89a8c" font-family="'Open Sans'" font-size="12px" font-weight="bold" stroke-width="1.6">SYNC</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__sync_deck_active.svg b/res/skins/LateNight/palemoon/buttons/btn__sync_deck_active.svg
index a14a1de1863..37fd7be2076 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__sync_deck_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__sync_deck_active.svg
@@ -1,3 +1,3 @@
-<svg width="36" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="72" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 18">
   <text x="2.1855469" y="13.555453" fill="#000000" font-family="sans-serif" font-size="40px" letter-spacing="0px" stroke-width="1.6" word-spacing="0px" style="line-height:1.25" xml:space="preserve"><tspan x="2.1855469" y="13.555453" fill="#000000" font-family="'Open Sans'" font-size="12px" font-weight="bold" stroke-width="1.6">SYNC</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__sync_leader.svg b/res/skins/LateNight/palemoon/buttons/btn__sync_leader.svg
index 86370b8e446..63666d4f38b 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__sync_leader.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__sync_leader.svg
@@ -1,4 +1,4 @@
-<svg width="19" height="18" version="1.1" viewBox="0 0 19 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="38" height="36" version="1.1" viewBox="0 0 19 18" xmlns="http://www.w3.org/2000/svg">
   <path d="m4 12h11l1-7-3.5 4-3-5-3 5-3.5-4z" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6"/>
   <path d="m4 13h11v1h-11z" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6" style="paint-order:markers fill stroke"/>
   <path d="m4 12h11l1-7-3.5 4-3-5-3 5-3.5-4z" fill="#66564d"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__sync_leader_explicit.svg b/res/skins/LateNight/palemoon/buttons/btn__sync_leader_explicit.svg
index 597e3cfe3f4..b182c791d11 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__sync_leader_explicit.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__sync_leader_explicit.svg
@@ -1,4 +1,4 @@
-<svg width="19" height="18" version="1.1" viewBox="0 0 19 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="38" height="36" version="1.1" viewBox="0 0 19 18" xmlns="http://www.w3.org/2000/svg">
   <path d="m4 12h11l1-7-3.5 4-3-5-3 5-3.5-4z"/>
   <path d="m4 13h11v1h-11z" stroke-linejoin="round" stroke-width="1.6" style="paint-order:markers fill stroke"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__sync_leader_implicit.svg b/res/skins/LateNight/palemoon/buttons/btn__sync_leader_implicit.svg
index d99a457dd98..ac08b70489b 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__sync_leader_implicit.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__sync_leader_implicit.svg
@@ -1,4 +1,4 @@
-<svg width="19" height="18" version="1.1" viewBox="0 0 19 18" xmlns="http://www.w3.org/2000/svg">
+<svg width="38" height="36" version="1.1" viewBox="0 0 19 18" xmlns="http://www.w3.org/2000/svg">
   <path d="m9.5 4-3 5-3.5-4 1 7v2h11v-2l1-7-3.5 4-3-5zm0 2.1074219 2.5 4.2734371 2-1.380859-0.21875 2.335938v1.55664h-8.5625v-1.55664l-0.21875-2.335938 2 1.380859 2.5-4.2734371z"/>
   <path d="m24 12v2h11v-2l1-7-3.5 4-3-5-3 5-3.5-4z"/>
   <path d="m 25.218744,11.33523 v 1.556821 h 8.562512 V 11.33523 L 34,9 32,10.381356 29.5,6.108 27,10.381356 25,9 Z" fill="#a2a2a2"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__sync_sampler.svg b/res/skins/LateNight/palemoon/buttons/btn__sync_sampler.svg
index 75e8271539c..0eb30ab70e1 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__sync_sampler.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__sync_sampler.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <g fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">
     <path d="m5 7.3636 6.955 4.6367-6.955 4.6367z"/>
     <path d="M 19,7.3633 12.045,12 19,16.6367 Z"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__sync_sampler_active.svg b/res/skins/LateNight/palemoon/buttons/btn__sync_sampler_active.svg
index 6a8d858f0b0..bcff5c6700a 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__sync_sampler_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__sync_sampler_active.svg
@@ -1,4 +1,4 @@
-<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <g transform="translate(1 -.9997)" fill="none">
     <path d="M 4,8.3633 10.955,13 4,17.6367 V 8.3633"/>
     <path d="M 18,8.3633 11.045,13 18,17.6367 V 8.3633"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_left.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_left.svg
index 74d5f3ad5a0..50af6c1762e 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_left.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_left.svg
@@ -1,11 +1,60 @@
-<svg width="11" height="13" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <defs>
-    <linearGradient id="a" x1="-11.2589" x2="-1.077" y1="8" y2="8" gradientTransform="matrix(.875436 0 0 .875445 -2.38124 -7.46765)" gradientUnits="userSpaceOnUse">
-      <stop offset="0"/>
-      <stop stop-color="#fff" stop-opacity="0" offset="1"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="22"
+   height="26"
+   version="1.1"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="a"
+       x1="-11.2589"
+       x2="-1.077"
+       y1="8"
+       y2="8"
+       gradientTransform="matrix(1.7508715,0,0,1.7508908,-4.7624891,-14.935315)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         id="stop1" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop2" />
     </linearGradient>
   </defs>
-  <rect y="2" width="14.7647" height="8" rx="4" ry="4" fill="#0f0f0f"/>
-  <circle transform="scale(-1,1)" cx="-4" cy="6" r="4" fill="#787878"/>
-  <ellipse transform="matrix(-.500007 -.866021 -.86603 .499993 0 0)" cx="-7.19613" cy="-.464092" rx="3.50174" ry="3.50178" fill="none" stroke="url(#a)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.00001"/>
+  <rect
+     y="4.0000052"
+     width="29.5294"
+     height="16"
+     rx="8"
+     ry="8"
+     fill="#0f0f0f"
+     id="rect2"
+     x="1.1740101e-05"
+     style="stroke-width:2" />
+  <circle
+     transform="scale(-1,1)"
+     cx="-8.0000114"
+     cy="12.000006"
+     r="8"
+     fill="#787878"
+     id="circle2"
+     style="stroke-width:2" />
+  <ellipse
+     transform="matrix(-0.50000716,-0.86602127,-0.86602958,0.49999276,0,0)"
+     cx="-14.392266"
+     cy="-0.92819202"
+     rx="7.0034776"
+     ry="7.0035634"
+     fill="none"
+     stroke="url(#a)"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     stroke-width="2.00002"
+     id="ellipse2"
+     style="stroke:url(#a)" />
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_left_off.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_left_off.svg
index ff4be030baa..fe8fb4012e8 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_left_off.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_left_off.svg
@@ -1,3 +1,21 @@
-<svg width="11" height="13" version="1.1" xmlns="http://www.w3.org/2000/svg">
-  <rect y="2" width="14.7647" height="8" rx="4" ry="4" fill="#0f0f0f"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="22"
+   height="26"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <rect
+     y="4"
+     width="29.5294"
+     height="16"
+     rx="8"
+     ry="8"
+     fill="#0f0f0f"
+     id="rect1"
+     x="0"
+     style="stroke-width:2" />
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_mid.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_mid.svg
index ce1aac6ed82..10a70fd4609 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_mid.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_mid.svg
@@ -1,11 +1,60 @@
-<svg width="11" height="13" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <defs>
-    <linearGradient id="a" x1="-11.2589" x2="-1.077" y1="8" y2="8" gradientTransform="matrix(.875436 0 0 .875445 -3.13122 -8.76668)" gradientUnits="userSpaceOnUse">
-      <stop offset="0"/>
-      <stop stop-color="#fff" stop-opacity="0" offset="1"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="22"
+   height="26"
+   version="1.1"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="a"
+       x1="-11.2589"
+       x2="-1.077"
+       y1="8"
+       y2="8"
+       gradientTransform="matrix(1.7508715,0,0,1.7508908,-7.1285084,-17.033268)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         id="stop1" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop2" />
     </linearGradient>
   </defs>
-  <rect x="-6.82094" y="2" width="23.2068" height="8" rx="4" ry="4" fill="#0f0f0f"/>
-  <circle transform="scale(-1,1)" cx="-5.5" cy="6" r="4" fill="#787878"/>
-  <ellipse transform="matrix(-.500007 -.866021 -.86603 .499993 0 0)" cx="-7.94612" cy="-1.76312" rx="3.50174" ry="3.50178" fill="none" stroke="url(#a)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.00001"/>
+  <rect
+     x="-12.2068"
+     y="5"
+     width="46.413601"
+     height="16"
+     rx="8"
+     ry="8"
+     fill="#0f0f0f"
+     id="rect2"
+     style="stroke-width:2" />
+  <circle
+     transform="scale(-1,1)"
+     cx="-11"
+     cy="13"
+     r="8"
+     fill="#787878"
+     id="circle2"
+     style="stroke-width:2" />
+  <ellipse
+     transform="matrix(-0.50000716,-0.86602127,-0.86602958,0.49999276,0,0)"
+     cx="-16.758305"
+     cy="-3.0261407"
+     rx="7.0034776"
+     ry="7.0035634"
+     fill="none"
+     stroke="url(#a)"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     stroke-width="2.00002"
+     id="ellipse2"
+     style="stroke:url(#a)" />
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_mid_off.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_mid_off.svg
index dcc6bf3d8ed..fcc40186566 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_mid_off.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_mid_off.svg
@@ -1,3 +1,21 @@
-<svg width="11" height="13" version="1.1" xmlns="http://www.w3.org/2000/svg">
-  <rect x="-6.82094" y="2" width="23.2068" height="8" rx="4" ry="4" fill="#0f0f0f"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="22"
+   height="26"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <rect
+     x="-12.2068"
+     y="5"
+     width="46.413601"
+     height="16"
+     rx="8"
+     ry="8"
+     fill="#0f0f0f"
+     id="rect1"
+     style="stroke-width:2" />
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_right.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_right.svg
index 08547669146..1b8619f22bc 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_right.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_right.svg
@@ -1,11 +1,60 @@
-<svg width="11" height="13" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <defs>
-    <linearGradient id="a" x1="-11.2589" x2="-1.077" y1="8" y2="8" gradientTransform="matrix(.875436 0 0 .875445 -3.88121 -10.0657)" gradientUnits="userSpaceOnUse">
-      <stop offset="0"/>
-      <stop stop-color="#fff" stop-opacity="0" offset="1"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="22"
+   height="26"
+   version="1.1"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="a"
+       x1="-11.2589"
+       x2="-1.077"
+       y1="8"
+       y2="8"
+       gradientTransform="matrix(1.7508715,0,0,1.7508908,-7.7624252,-20.131405)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         id="stop1" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop2" />
     </linearGradient>
   </defs>
-  <rect transform="scale(-1,1)" x="-11" y="2" width="15" height="8" rx="4" ry="4" fill="#0f0f0f"/>
-  <circle cx="7" cy="6" r="4" fill="#787878"/>
-  <ellipse transform="matrix(-.500007 -.866021 -.86603 .499993 0 0)" cx="-8.69611" cy="-3.06216" rx="3.50174" ry="3.50178" fill="none" stroke="url(#a)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.00001"/>
+  <rect
+     transform="scale(-1,1)"
+     x="-22"
+     y="4.0000091"
+     width="30"
+     height="16"
+     rx="8"
+     ry="8"
+     fill="#0f0f0f"
+     id="rect2"
+     style="stroke-width:2" />
+  <circle
+     cx="14"
+     cy="12.00001"
+     r="8"
+     fill="#787878"
+     id="circle2"
+     style="stroke-width:2" />
+  <ellipse
+     transform="matrix(-0.50000716,-0.86602127,-0.86602958,0.49999276,0,0)"
+     cx="-17.392221"
+     cy="-6.1243186"
+     rx="7.0034776"
+     ry="7.0035634"
+     fill="none"
+     stroke="url(#a)"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     stroke-width="2.00002"
+     id="ellipse2"
+     style="stroke:url(#a)" />
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_right_off.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_right_off.svg
index 24988943837..fceaf408bb7 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_right_off.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_right_off.svg
@@ -1,3 +1,22 @@
-<svg width="11" height="13" version="1.1" xmlns="http://www.w3.org/2000/svg">
-  <rect transform="scale(-1,1)" x="-11" y="2" width="15" height="8" rx="4" ry="4" fill="#0f0f0f"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="22"
+   height="26"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <rect
+     transform="scale(-1,1)"
+     x="-22"
+     y="4"
+     width="30"
+     height="16"
+     rx="8"
+     ry="8"
+     fill="#0f0f0f"
+     id="rect1"
+     style="stroke-width:2" />
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_left_default.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_left_default.svg
index 63a22d3d0d2..1e0c073e696 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_left_default.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_left_default.svg
@@ -1,11 +1,60 @@
-<svg width="11" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <defs>
-    <linearGradient id="a" x1="-11.2589" x2="-1.077" y1="8" y2="8" gradientTransform="matrix(.875436 0 0 .875445 -4.8633 -7.76661)" gradientUnits="userSpaceOnUse">
-      <stop offset="0"/>
-      <stop stop-color="#fff" stop-opacity="0" offset="1"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="22"
+   height="30"
+   version="1.1"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="a"
+       x1="-11.2589"
+       x2="-1.077"
+       y1="8"
+       y2="8"
+       gradientTransform="matrix(1.7508715,0,0,1.7508908,-9.726637,-15.533297)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         id="stop1" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop2" />
     </linearGradient>
   </defs>
-  <rect x="1.5" y="4" width="14.7647" height="8" rx="4" ry="4" fill="#0f0f0f"/>
-  <circle transform="scale(-1,1)" cx="-5.5" cy="8" r="4" fill="#787878"/>
-  <ellipse transform="matrix(-.500007 -.866021 -.86603 .499993 0 0)" cx="-9.6782" cy="-.763058" rx="3.50174" ry="3.50178" fill="none" stroke="url(#a)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.00001"/>
+  <rect
+     x="3.0000799"
+     y="8"
+     width="29.5294"
+     height="16"
+     rx="8"
+     ry="8"
+     fill="#0f0f0f"
+     id="rect2"
+     style="stroke-width:2" />
+  <circle
+     transform="scale(-1,1)"
+     cx="-11.00008"
+     cy="16"
+     r="8"
+     fill="#787878"
+     id="circle2"
+     style="stroke-width:2" />
+  <ellipse
+     transform="matrix(-0.50000716,-0.86602127,-0.86602958,0.49999276,0,0)"
+     cx="-19.356434"
+     cy="-1.5261859"
+     rx="7.0034776"
+     ry="7.0035634"
+     fill="none"
+     stroke="url(#a)"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     stroke-width="2.00002"
+     id="ellipse2"
+     style="stroke:url(#a)" />
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_left_off.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_left_off.svg
index eaa0d2e3503..fef387e7dcd 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_left_off.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_left_off.svg
@@ -1,3 +1,21 @@
-<svg width="11" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg">
-  <rect x="1.5" y="4" width="14.7647" height="8" rx="4" ry="4" fill="#0f0f0f"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="22"
+   height="30"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <rect
+     x="3"
+     y="8"
+     width="29.5294"
+     height="16"
+     rx="8"
+     ry="8"
+     fill="#0f0f0f"
+     id="rect1"
+     style="stroke-width:2" />
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_left_warning.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_left_warning.svg
index 1f1cc256730..863ad64ca14 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_left_warning.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_left_warning.svg
@@ -1,11 +1,60 @@
-<svg width="11" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <defs>
-    <linearGradient id="a" x1="-11.2589" x2="-1.077" y1="8" y2="8" gradientTransform="matrix(.875436 0 0 .875445 -4.8633 -7.76661)" gradientUnits="userSpaceOnUse">
-      <stop offset="0"/>
-      <stop stop-color="#fff" stop-opacity="0" offset="1"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="22"
+   height="30"
+   version="1.1"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="a"
+       x1="-11.2589"
+       x2="-1.077"
+       y1="8"
+       y2="8"
+       gradientTransform="matrix(1.7508715,0,0,1.7508908,-9.726637,-15.533297)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         id="stop1" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop2" />
     </linearGradient>
   </defs>
-  <rect x="1.5" y="4" width="14.7647" height="8" rx="4" ry="4" fill="#0f0f0f"/>
-  <circle transform="scale(-1,1)" cx="-5.5" cy="8" r="4" fill="#f856e7"/>
-  <ellipse transform="matrix(-.500007 -.866021 -.86603 .499993 0 0)" cx="-9.6782" cy="-.763058" rx="3.50174" ry="3.50178" fill="none" stroke="url(#a)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.00001"/>
+  <rect
+     x="3.0000799"
+     y="8"
+     width="29.5294"
+     height="16"
+     rx="8"
+     ry="8"
+     fill="#0f0f0f"
+     id="rect2"
+     style="stroke-width:2" />
+  <circle
+     transform="scale(-1,1)"
+     cx="-11.00008"
+     cy="16"
+     r="8"
+     fill="#f856e7"
+     id="circle2"
+     style="stroke-width:2" />
+  <ellipse
+     transform="matrix(-0.50000716,-0.86602127,-0.86602958,0.49999276,0,0)"
+     cx="-19.356434"
+     cy="-1.5261859"
+     rx="7.0034776"
+     ry="7.0035634"
+     fill="none"
+     stroke="url(#a)"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     stroke-width="2.00002"
+     id="ellipse2"
+     style="stroke:url(#a)" />
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_mid_off.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_mid_off.svg
index 94a1d938491..f3d80b62ab1 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_mid_off.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_mid_off.svg
@@ -1,3 +1,21 @@
-<svg width="11" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg">
-  <rect x="-6.68898" y="4" width="23.954" height="8" rx="3" ry="3" fill="#0f0f0f"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="22"
+   height="30"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <rect
+     x="-12.954"
+     y="8"
+     width="47.908001"
+     height="16"
+     rx="6"
+     ry="6"
+     fill="#0f0f0f"
+     id="rect1"
+     style="stroke-width:2" />
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_mid_warning.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_mid_warning.svg
index 0d5f430b28e..bd03cef83c1 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_mid_warning.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_mid_warning.svg
@@ -1,11 +1,60 @@
-<svg width="11" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <defs>
-    <linearGradient id="a" x1="-11.2589" x2="-1.077" y1="8" y2="8" gradientTransform="matrix(.875436 0 0 .875445 -4.8633 -7.76661)" gradientUnits="userSpaceOnUse">
-      <stop offset="0"/>
-      <stop stop-color="#fff" stop-opacity="0" offset="1"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="22"
+   height="30"
+   version="1.1"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="a"
+       x1="-11.2589"
+       x2="-1.077"
+       y1="8"
+       y2="8"
+       gradientTransform="matrix(1.7508715,0,0,1.7508908,-9.7265983,-15.53323)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         id="stop1" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop2" />
     </linearGradient>
   </defs>
-  <rect x="-6.68898" y="4" width="23.954" height="8" rx="3" ry="3" fill="#0f0f0f"/>
-  <circle transform="scale(-1,1)" cx="-5.5" cy="8" r="4" fill="#f0bb2b"/>
-  <ellipse transform="matrix(-.500007 -.866021 -.86603 .499993 0 0)" cx="-9.6782" cy="-.763058" rx="3.50174" ry="3.50178" fill="none" stroke="url(#a)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.00001"/>
+  <rect
+     x="-12.954"
+     y="8"
+     width="47.908001"
+     height="16"
+     rx="6"
+     ry="6"
+     fill="#0f0f0f"
+     id="rect2"
+     style="stroke-width:2" />
+  <circle
+     transform="scale(-1,1)"
+     cx="-11"
+     cy="16"
+     r="8"
+     fill="#f0bb2b"
+     id="circle2"
+     style="stroke-width:2" />
+  <ellipse
+     transform="matrix(-0.50000716,-0.86602127,-0.86602958,0.49999276,0,0)"
+     cx="-19.356394"
+     cy="-1.526119"
+     rx="7.0034776"
+     ry="7.0035634"
+     fill="none"
+     stroke="url(#a)"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     stroke-width="2.00002"
+     id="ellipse2"
+     style="stroke:url(#a)" />
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_right_default.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_right_default.svg
index 86b36785245..b83988c2a32 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_right_default.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_right_default.svg
@@ -1,11 +1,60 @@
-<svg width="11" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <defs>
-    <linearGradient id="a" x1="-11.2589" x2="-1.077" y1="8" y2="8" gradientTransform="matrix(.875436 0 0 .875445 -4.8633 -7.76661)" gradientUnits="userSpaceOnUse">
-      <stop offset="0"/>
-      <stop stop-color="#fff" stop-opacity="0" offset="1"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="22"
+   height="30"
+   version="1.1"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="a"
+       x1="-11.2589"
+       x2="-1.077"
+       y1="8"
+       y2="8"
+       gradientTransform="matrix(1.7508715,0,0,1.7508908,-9.7265971,-15.533228)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         id="stop1" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop2" />
     </linearGradient>
   </defs>
-  <rect x="-5.5" y="4" width="15" height="8" rx="4" ry="4" fill="#0f0f0f"/>
-  <circle transform="scale(-1,1)" cx="-5.5" cy="8" r="4" fill="#787878"/>
-  <ellipse transform="matrix(-.500007 -.866021 -.86603 .499993 0 0)" cx="-9.6782" cy="-.763058" rx="3.50174" ry="3.50178" fill="none" stroke="url(#a)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.00001"/>
+  <rect
+     x="-11"
+     y="8"
+     width="30"
+     height="16"
+     rx="8"
+     ry="8"
+     fill="#0f0f0f"
+     id="rect2"
+     style="stroke-width:2" />
+  <circle
+     transform="scale(-1,1)"
+     cx="-11"
+     cy="16"
+     r="8"
+     fill="#787878"
+     id="circle2"
+     style="stroke-width:2" />
+  <ellipse
+     transform="matrix(-0.50000716,-0.86602127,-0.86602958,0.49999276,0,0)"
+     cx="-19.356394"
+     cy="-1.5261167"
+     rx="7.0034776"
+     ry="7.0035634"
+     fill="none"
+     stroke="url(#a)"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     stroke-width="2.00002"
+     id="ellipse2"
+     style="stroke:url(#a)" />
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_right_off.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_right_off.svg
index c40ec374081..a0ed969f84a 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_right_off.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_right_off.svg
@@ -1,3 +1,21 @@
-<svg width="11" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg">
-  <rect x="-5.5" y="4" width="15" height="8" rx="4" ry="4" fill="#0f0f0f"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="22"
+   height="30"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <rect
+     x="-11"
+     y="8"
+     width="30"
+     height="16"
+     rx="8"
+     ry="8"
+     fill="#0f0f0f"
+     id="rect1"
+     style="stroke-width:2" />
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_right_warning.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_right_warning.svg
index 16bb8f78727..2625790220c 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_right_warning.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_right_warning.svg
@@ -1,11 +1,60 @@
-<svg width="11" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <defs>
-    <linearGradient id="a" x1="-11.2589" x2="-1.077" y1="8" y2="8" gradientTransform="matrix(.875436 0 0 .875445 -4.8633 -7.76661)" gradientUnits="userSpaceOnUse">
-      <stop offset="0"/>
-      <stop stop-color="#fff" stop-opacity="0" offset="1"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="22"
+   height="30"
+   version="1.1"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="a"
+       x1="-11.2589"
+       x2="-1.077"
+       y1="8"
+       y2="8"
+       gradientTransform="matrix(1.7508693,1.179157e-8,0,1.7508886,-9.7265876,-15.53319)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         id="stop1" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1"
+         id="stop2" />
     </linearGradient>
   </defs>
-  <rect x="-5.5" y="4" width="15" height="8" rx="4" ry="4" fill="#0f0f0f"/>
-  <circle transform="scale(-1,1)" cx="-5.5" cy="8" r="4" fill="#f856e7"/>
-  <ellipse transform="matrix(-.500007 -.866021 -.86603 .499993 0 0)" cx="-9.6782" cy="-.763058" rx="3.50174" ry="3.50178" fill="none" stroke="url(#a)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.00001"/>
+  <rect
+     x="-11"
+     y="8"
+     width="29.999962"
+     height="15.99998"
+     rx="7.99999"
+     ry="7.99999"
+     fill="#0f0f0f"
+     id="rect2"
+     style="stroke-width:2" />
+  <circle
+     transform="scale(-1,1)"
+     cx="-10.999972"
+     cy="15.99999"
+     r="7.99999"
+     fill="#f856e7"
+     id="circle2"
+     style="stroke-width:2" />
+  <ellipse
+     transform="matrix(-0.50000716,-0.86602127,-0.86602958,0.49999276,0,0)"
+     cx="-19.356373"
+     cy="-1.5260991"
+     rx="7.003469"
+     ry="7.0035548"
+     fill="none"
+     stroke="url(#a)"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     stroke-width="2.00002"
+     id="ellipse2"
+     style="stroke:url(#a)" />
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_sampler_left.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_sampler_left.svg
index 5fba469b1fe..c749b7ba488 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__xfader_sampler_left.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_sampler_left.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="42" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 21 18">
   <defs>
     <linearGradient id="a" x1="-11.2589" x2="-1.077" y1="8" y2="8" gradientTransform="matrix(.875436 0 0 .875445 -6.09535 -5.90063)" gradientUnits="userSpaceOnUse">
       <stop offset="0"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_sampler_main.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_sampler_main.svg
index f3b4a04fa98..1e077753dfe 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__xfader_sampler_main.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_sampler_main.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="42" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 21 18">
   <rect x=".5" y="6" width="20" height="8" rx="4" ry="4" fill="#0f0f0f"/>
   <circle transform="scale(-1,1)" cx="-10.5" cy="10" r="4" fill="#3d3d3c"/>
   <ellipse transform="matrix(-.500007 -.866021 -.86603 .499993 0 0)" cx="-13.9102" cy="-4.0932" rx="3.50174" ry="3.50178" fill="none"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_sampler_right.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_sampler_right.svg
index 342ae95fe8b..e84cc78dca9 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__xfader_sampler_right.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_sampler_right.svg
@@ -1,4 +1,4 @@
-<svg width="21" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg width="42" height="36" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 18">
   <defs>
     <linearGradient id="a" x1="-11.2589" x2="-1.077" y1="8" y2="8" gradientTransform="matrix(.875436 0 0 .875445 -12.0953 -16.2929)" gradientUnits="userSpaceOnUse">
       <stop offset="0"/>
diff --git a/res/skins/LateNight/style_classic.qss b/res/skins/LateNight/style_classic.qss
index 8d419e0dbf4..9ea9d60dd30 100644
--- a/res/skins/LateNight/style_classic.qss
+++ b/res/skins/LateNight/style_classic.qss
@@ -804,6 +804,8 @@ WLibrary {
 
 WEffectChainPresetButton::menu-indicator {
   image: url(skin:../LateNight/classic/buttons/btn__fx_settings.svg) no-repeat center center;
+  width: 18px;
+  height: 18px;
 }
 
 #DryWetKnob,
@@ -879,6 +881,8 @@ WEffectSelector,
   /* Arrow size is set in C++ to match the library font size */
   WSearchLineEdit::down-arrow {
     image: url(skin:../LateNight/classic/buttons/btn__fx_selector_down.svg);
+    width: 16px;
+    height: 24px;
     }
     WEffectSelector::down-arrow:hover,
     WEffectChainPresetSelector::down-arrow:hover,

From 2e3b5139d1f799cd96fcd6a8041b5d81ed9a97d3 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Fri, 8 Dec 2023 02:04:30 +0100
Subject: [PATCH 363/388] LateNight: fix library radio buttons (Analyze)

* fixed size
* background: -> image:
---
 .../buttons/btn__lib_radio_button_gold_on.svg |  4 --
 .../btn__lib_radio_button_yellow_on.svg       |  1 -
 res/skins/LateNight/style.qss                 |  9 +++--
 res/skins/LateNight/style_classic.qss         | 16 +++++---
 res/skins/LateNight/style_palemoon.qss        | 37 +++++++------------
 5 files changed, 29 insertions(+), 38 deletions(-)
 delete mode 100644 res/skins/LateNight/classic/buttons/btn__lib_radio_button_gold_on.svg
 delete mode 100644 res/skins/LateNight/classic/buttons/btn__lib_radio_button_yellow_on.svg

diff --git a/res/skins/LateNight/classic/buttons/btn__lib_radio_button_gold_on.svg b/res/skins/LateNight/classic/buttons/btn__lib_radio_button_gold_on.svg
deleted file mode 100644
index af13df7919d..00000000000
--- a/res/skins/LateNight/classic/buttons/btn__lib_radio_button_gold_on.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="svg2" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg" width="36" height="36">
-  <path id="path2987" d="m9 5.1042c-2.1505 0-3.8958 1.7453-3.8958 3.8958s1.7453 3.8958 3.8958 3.8958 3.8958-1.7453 3.8958-3.8958-1.7453-3.8958-3.8958-3.8958z" fill="#cab32c"/>
-  <path id="path2985" d="m9 2c-3.8675 0-7 3.1325-7 7s3.1325 7 7 7 7-3.1325 7-7-3.132-7-7-7zm0 1.4062c3.094 0 5.5938 2.4998 5.5938 5.5938s-2.4998 5.5938-5.5938 5.5938-5.5938-2.4998-5.5938-5.5938 2.4998-5.5938 5.5938-5.5938z" fill="#d2d2d1"/>
-</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__lib_radio_button_yellow_on.svg b/res/skins/LateNight/classic/buttons/btn__lib_radio_button_yellow_on.svg
deleted file mode 100644
index 5207747fc87..00000000000
--- a/res/skins/LateNight/classic/buttons/btn__lib_radio_button_yellow_on.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg" width="36" height="36"><path id="path2987" d="m9 5.1042c-2.1505 0-3.8958 1.7453-3.8958 3.8958s1.7453 3.8958 3.8958 3.8958 3.8958-1.7453 3.8958-3.8958-1.7453-3.8958-3.8958-3.8958z" fill="#cab32c"/><path id="path2985" d="m9 2c-3.8675 0-7 3.1325-7 7s3.1325 7 7 7 7-3.1325 7-7-3.132-7-7-7zm0 1.4062c3.094 0 5.5938 2.4998 5.5938 5.5938s-2.4998 5.5938-5.5938 5.5938-5.5938-2.4998-5.5938-5.5938 2.4998-5.5938 5.5938-5.5938z" fill="#d2d2d1"/></svg>
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index 0892c091fc6..a7572edc9d4 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -841,14 +841,15 @@ WEffectChainPresetButton::menu-indicator {
       min-width: 40px;
     }
 
+/* Extra declaration for QRadioButton otherwise it shows up with wrong colors in
+   Linux with Gnome */
 #LibraryFeatureControls QLabel,
 #LibraryFeatureControls QRadioButton {
   background: transparent;
 }
-
-/* Additional space for QRadionButtons */
-#LibraryFeatureControls QRadioButton {
-  margin: 2px 3px 2px 3px;
+#LibraryFeatureControls QRadioButton::indicator {
+  width: 18px;
+  height: 18px;
   }
   /* Push 'New' radio button away from corner */
   QRadioButton#radioButtonRecentlyAdded {
diff --git a/res/skins/LateNight/style_classic.qss b/res/skins/LateNight/style_classic.qss
index 9ea9d60dd30..c9b9ef46eb0 100644
--- a/res/skins/LateNight/style_classic.qss
+++ b/res/skins/LateNight/style_classic.qss
@@ -2362,13 +2362,17 @@ WSearchLineEdit {
 
 
 /************ Library feature controls / tree view / table view *************/
-WLibrary QRadioButton::indicator:checked {
-  background: url(skin:../LateNight/classic/buttons/btn__lib_radio_button_on_yellow.svg) center center;
-}
 
-WLibrary QRadioButton::indicator:unchecked {
-  background: url(skin:../LateNight/classic/buttons/btn__lib_radio_button_off.svg) center center;
-}
+/* Additional space */
+#LibraryFeatureControls QRadioButton {
+  margin: 2px 3px 2px 3px;
+  }
+  #LibraryFeatureControls QRadioButton::indicator:checked {
+    image: url(skin:../LateNight/classic/buttons/btn__lib_radio_button_on_yellow.svg) center center;
+  }
+  #LibraryFeatureControls QRadioButton::indicator:unchecked {
+    image: url(skin:../LateNight/classic/buttons/btn__lib_radio_button_off.svg) center center;
+  }
 
 /* triangle for closed/opened branches in treeview */
 /* closed */
diff --git a/res/skins/LateNight/style_palemoon.qss b/res/skins/LateNight/style_palemoon.qss
index 2966410dab3..a15cbc03e93 100644
--- a/res/skins/LateNight/style_palemoon.qss
+++ b/res/skins/LateNight/style_palemoon.qss
@@ -2824,21 +2824,16 @@ WSearchLineEdit {
   }
 /************ splitters ***********************/
 
-
-/* Extra declaration for QRadioButton otherwise it shows up with wrong colors in
-   Linux with Gnome */
-#LibraryFeatureControls QLabel,
 #LibraryFeatureControls QRadioButton {
-  background: transparent;
-}
-
-#LibraryFeatureControls QRadioButton::indicator:checked {
-  image: url(skin:../LateNight/palemoon/buttons/btn__lib_radio_button_on_blue.svg) center center;
-}
-
-#LibraryFeatureControls QRadioButton::indicator:unchecked {
-  image: url(skin:../LateNight/palemoon/buttons/btn__lib_radio_button_off.svg) center center;
-}
+  /* bottom margin! */
+  margin: 6px 3px 4px 3px;
+  }
+  #LibraryFeatureControls QRadioButton::indicator:checked {
+    image: url(skin:../LateNight/palemoon/buttons/btn__lib_radio_button_on_blue.svg) center center;
+  }
+  #LibraryFeatureControls QRadioButton::indicator:unchecked {
+    image: url(skin:../LateNight/palemoon/buttons/btn__lib_radio_button_off.svg) center center;
+  }
 
 /* Library feature pushbuttons
   Don't use 'WLibrary QPushButton' here, as this would apply padding
@@ -2852,15 +2847,11 @@ WSearchLineEdit {
 /* #fadeModeCombobox set below */
 #spinBoxTransition {
   margin-top: 4px;
-  }
-  #LibraryFeatureControls QRadioButton {
-    /* bottom margin! */
-    margin: 6px 3px 4px 3px;
-  }
-  QLabel#labelProgress, /* Analysis progress */
-  QLabel#labelSelectionInfo /* AutoDJ track selection info */ {
-    margin: 4px 5px 5px 1px;
-  }
+}
+QLabel#labelProgress, /* Analysis progress */
+QLabel#labelSelectionInfo /* AutoDJ track selection info */ {
+  margin: 4px 5px 5px 1px;
+}
 
 WLibrarySidebar {
   show-decoration-selected: 0;

From 87442175e6ce9f85d762fe4e604c2e03e9cb80f7 Mon Sep 17 00:00:00 2001
From: m0dB <m0dB@mixxx.org>
Date: Fri, 8 Dec 2023 11:43:45 +0100
Subject: [PATCH 364/388] fix clamping of the index so left of zero is not
 drawn with the first value

---
 .../renderers/allshader/waveformrendererfiltered.cpp         | 3 +--
 src/waveform/renderers/allshader/waveformrendererhsv.cpp     | 3 +--
 src/waveform/renderers/allshader/waveformrendererlrrgb.cpp   | 3 +--
 src/waveform/renderers/allshader/waveformrendererrgb.cpp     | 3 +--
 src/waveform/renderers/allshader/waveformrenderersimple.cpp  | 5 ++---
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/waveform/renderers/allshader/waveformrendererfiltered.cpp b/src/waveform/renderers/allshader/waveformrendererfiltered.cpp
index 48e93a1ca51..27bf733fdec 100644
--- a/src/waveform/renderers/allshader/waveformrendererfiltered.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererfiltered.cpp
@@ -99,8 +99,7 @@ void WaveformRendererFiltered::paintGL() {
 
         const int visualIndexStart = std::max(visualFrameStart * 2, 0);
         const int visualIndexStop =
-                std::min(std::max(visualFrameStop * 2, visualIndexStart + 1),
-                        dataSize - 1);
+                std::min(std::max(visualFrameStop, visualFrameStart + 1) * 2, dataSize - 1);
 
         const float fpos = static_cast<float>(pos);
 
diff --git a/src/waveform/renderers/allshader/waveformrendererhsv.cpp b/src/waveform/renderers/allshader/waveformrendererhsv.cpp
index 82c0dda1b9f..eb2a88af894 100644
--- a/src/waveform/renderers/allshader/waveformrendererhsv.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererhsv.cpp
@@ -99,8 +99,7 @@ void WaveformRendererHSV::paintGL() {
 
         const int visualIndexStart = std::max(visualFrameStart * 2, 0);
         const int visualIndexStop =
-                std::min(std::max(visualFrameStop * 2, visualIndexStart + 1),
-                        dataSize - 1);
+                std::min(std::max(visualFrameStop, visualFrameStart + 1) * 2, dataSize - 1);
 
         const float fpos = static_cast<float>(pos);
 
diff --git a/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp b/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp
index e1082257be0..be49d260bdd 100644
--- a/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererlrrgb.cpp
@@ -112,8 +112,7 @@ void WaveformRendererLRRGB::paintGL() {
 
         const int visualIndexStart = std::max(visualFrameStart * 2, 0);
         const int visualIndexStop =
-                std::min(std::max(visualFrameStop * 2, visualIndexStart + 1),
-                        dataSize - 1);
+                std::min(std::max(visualFrameStop, visualFrameStart + 1) * 2, dataSize - 1);
 
         const float fpos = static_cast<float>(pos);
 
diff --git a/src/waveform/renderers/allshader/waveformrendererrgb.cpp b/src/waveform/renderers/allshader/waveformrendererrgb.cpp
index 906d0d47b32..076acfb2278 100644
--- a/src/waveform/renderers/allshader/waveformrendererrgb.cpp
+++ b/src/waveform/renderers/allshader/waveformrendererrgb.cpp
@@ -111,8 +111,7 @@ void WaveformRendererRGB::paintGL() {
 
         const int visualIndexStart = std::max(visualFrameStart * 2, 0);
         const int visualIndexStop =
-                std::min(std::max(visualFrameStop * 2, visualIndexStart + 1),
-                        dataSize - 1);
+                std::min(std::max(visualFrameStop, visualFrameStart + 1) * 2, dataSize - 1);
 
         const float fpos = static_cast<float>(pos);
 
diff --git a/src/waveform/renderers/allshader/waveformrenderersimple.cpp b/src/waveform/renderers/allshader/waveformrenderersimple.cpp
index f1339309fc0..3537c92d874 100644
--- a/src/waveform/renderers/allshader/waveformrenderersimple.cpp
+++ b/src/waveform/renderers/allshader/waveformrenderersimple.cpp
@@ -108,10 +108,9 @@ void WaveformRendererSimple::paintGL() {
         const int visualIndexStart = std::max(visualFrameStart * 2, 0);
         // and at the upper boundary.
         // Note: * dataSize - 1, because below we add chn = 1
-        //       * visualIndexStart + 1, because we want to have at least 1 value
+        //       * visualFrameStart + 1, because we want to have at least 1 value
         const int visualIndexStop =
-                std::min(std::max(visualFrameStop * 2, visualIndexStart + 1),
-                        dataSize - 1);
+                std::min(std::max(visualFrameStop, visualFrameStart + 1) * 2, dataSize - 1);
 
         // 2 channels
         float max[2]{};

From f7e7cd5c78404e3dd5a37b0b9024708785f32b89 Mon Sep 17 00:00:00 2001
From: m0dB <m0dB@mixxx.org>
Date: Fri, 8 Dec 2023 23:02:38 +0100
Subject: [PATCH 365/388] added comments and minor changed based on review

---
 src/waveform/renderers/waveformmark.cpp           | 11 +++++++----
 src/waveform/renderers/waveformmark.h             |  8 ++++++--
 src/waveform/renderers/waveformmarkset.cpp        |  4 ++++
 src/waveform/renderers/waveformrendermarkbase.cpp |  6 +++---
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/waveform/renderers/waveformmark.cpp b/src/waveform/renderers/waveformmark.cpp
index 3a1e2651f68..4088895620f 100644
--- a/src/waveform/renderers/waveformmark.cpp
+++ b/src/waveform/renderers/waveformmark.cpp
@@ -10,6 +10,11 @@
 #include "widget/wskincolor.h"
 
 namespace {
+
+// Without some padding, the user would only have a single pixel width that
+// would count as hovering over the WaveformMark.
+constexpr float lineHoverPadding = 5.0;
+
 Qt::Alignment decodeAlignmentFlags(const QString& alignString, Qt::Alignment defaultFlags) {
     QStringList stringFlags = alignString.toLower()
                                       .split('|',
@@ -137,10 +142,8 @@ void WaveformMark::setBaseColor(QColor baseColor, int dimBrightThreshold) {
 }
 
 bool WaveformMark::lineHovered(QPoint point, Qt::Orientation orientation) const {
-    // Without some padding, the user would only have a single pixel width that
-    // would count as hovering over the WaveformMark.
-    float lineHoverPadding = 5.0;
     if (orientation == Qt::Vertical) {
+        // Note that for vertical orientation, breadth is set to the width.
         point = QPoint(point.y(), static_cast<int>(m_breadth) - point.x());
     }
     return m_linePosition >= point.x() - lineHoverPadding &&
@@ -306,7 +309,7 @@ QImage WaveformMark::generateImage(float devicePixelRatio) {
     const bool useIcon = m_iconPath != "";
 
     // Determine drawing geometries
-    const MarkerGeometry markerGeometry(label, useIcon, m_align, m_breadth, m_level);
+    const MarkerGeometry markerGeometry{label, useIcon, m_align, m_breadth, m_level};
 
     m_label.setAreaRect(markerGeometry.m_labelRect);
 
diff --git a/src/waveform/renderers/waveformmark.h b/src/waveform/renderers/waveformmark.h
index abb738b3d79..8929ba74cb2 100644
--- a/src/waveform/renderers/waveformmark.h
+++ b/src/waveform/renderers/waveformmark.h
@@ -19,8 +19,8 @@ class WaveformMark {
   public:
     class Graphics {
       public:
-        Graphics() {
-        }
+        // To indicate that the image for the mark needs to be regenerated,
+        // when the text, color, breadth or level are changed.
         bool m_obsolete{};
     };
 
@@ -149,6 +149,10 @@ class WaveformMark {
 
     float m_linePosition;
     float m_breadth;
+
+    // When there are overlapping marks, level is increased for each overlapping mark,
+    // so that we can draw them at different positions: The marks at the top go lower
+    // when the level increased, the marks at the bottom higher.
     int m_level;
 
     WaveformMarkLabel m_label;
diff --git a/src/waveform/renderers/waveformmarkset.cpp b/src/waveform/renderers/waveformmarkset.cpp
index 2d600744405..8fe24730146 100644
--- a/src/waveform/renderers/waveformmarkset.cpp
+++ b/src/waveform/renderers/waveformmarkset.cpp
@@ -101,6 +101,10 @@ void WaveformMarkSet::update() {
             [](auto const& pair) { return pair.second; });
 
     double prevSamplePosition = Cue::kNoPosition;
+
+    // Avoid overlapping marks by increasing the level per alignment.
+    // We take this into account when drawing the marks aligned at:
+    // left top, right top, left bottom, right bottom.
     std::map<Qt::Alignment, int> levels;
     for (auto& pMark : m_marksToRender) {
         if (pMark->getSamplePosition() != prevSamplePosition) {
diff --git a/src/waveform/renderers/waveformrendermarkbase.cpp b/src/waveform/renderers/waveformrendermarkbase.cpp
index 0c8904bb3bf..2471dbf7044 100644
--- a/src/waveform/renderers/waveformrendermarkbase.cpp
+++ b/src/waveform/renderers/waveformrendermarkbase.cpp
@@ -5,9 +5,9 @@
 #include "waveform/renderers/waveformwidgetrenderer.h"
 
 WaveformRenderMarkBase::WaveformRenderMarkBase(
-        WaveformWidgetRenderer* waveformWidgetRenderer,
+        WaveformWidgetRenderer* pWaveformWidgetRenderer,
         bool updateImagesImmediately)
-        : WaveformRendererAbstract(waveformWidgetRenderer),
+        : WaveformRendererAbstract(pWaveformWidgetRenderer),
           m_updateImagesImmediately(updateImagesImmediately) {
 }
 
@@ -88,7 +88,7 @@ void WaveformRenderMarkBase::updateMarks() {
 }
 
 void WaveformRenderMarkBase::updateMarkImages() {
-    for (auto& pMark : m_marks) {
+    for (const auto& pMark : m_marks) {
         if (pMark->needsImageUpdate()) {
             updateMarkImage(pMark);
         }

From 5a267c3f2b13dba31870a9b7fde9e72e0ce18bfa Mon Sep 17 00:00:00 2001
From: Joerg <JoergAtGithub@worldwartweb.com>
Date: Sat, 9 Dec 2023 00:14:13 +0100
Subject: [PATCH 366/388] Increased pixmapCache size limit and made it
 dependent on devicePixelRatio Moved this general definition out off
 coverartcache.cpp

---
 src/library/coverartcache.cpp | 10 ----------
 src/main.cpp                  | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/library/coverartcache.cpp b/src/library/coverartcache.cpp
index ff0d7a53ba8..5f07813abad 100644
--- a/src/library/coverartcache.cpp
+++ b/src/library/coverartcache.cpp
@@ -14,15 +14,6 @@ namespace {
 
 mixxx::Logger kLogger("CoverArtCache");
 
-// The initial QPixmapCache limit is 10MB.
-// But it is not used just by the coverArt stuff,
-// it is also used by Qt to handle other things behind the scenes.
-// Consequently coverArt cache will always have less than those
-// 10MB available to store the pixmaps.
-// So, we must increase this size a bit more,
-// in order to allow CoverCache handle more covers (performance gain).
-constexpr int kPixmapCacheLimit = 20480;
-
 QString pixmapCacheKey(mixxx::cache_key_t hash, int width) {
     return QString("CoverArtCache_%1_%2")
             .arg(QString::number(hash), QString::number(width));
@@ -39,7 +30,6 @@ inline QImage resizeImageWidth(const QImage& image, int width) {
 } // anonymous namespace
 
 CoverArtCache::CoverArtCache() {
-    QPixmapCache::setCacheLimit(kPixmapCacheLimit);
 }
 
 //static
diff --git a/src/main.cpp b/src/main.cpp
index 478af0d057b..e4065d0df9b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,5 +1,6 @@
 #include <QApplication>
 #include <QDir>
+#include <QPixmapCache>
 #include <QString>
 #include <QStringList>
 #include <QTextCodec>
@@ -40,6 +41,16 @@ constexpr char kScaleFactorEnvVar[] = "QT_SCALE_FACTOR";
 const QString kConfigGroup = QStringLiteral("[Config]");
 const QString kScaleFactorKey = QStringLiteral("ScaleFactor");
 
+// The default initial QPixmapCache limit is 10MB.
+// But this is used for all CoverArts in all used sizes and
+// as rendering cache for all SVG icons by Qt behind the scenes.
+// Consequently coverArt cache will always have less than those
+// 10MB available to store the pixmaps.
+// Profiling at 100% HiDPI zoom on Windows, that with 20MByte,
+// the SVG rendering happens sometimes during normal operation.
+// An indicator that the QPixmapCache was too small.
+constexpr int kPixmapCacheLimitAt100PercentZoom = 32 * 1024; // 32 MByte
+
 int runMixxx(MixxxApplication* pApp, const CmdlineArgs& args) {
     const auto pCoreServices = std::make_shared<mixxx::CoreServices>(args, pApp);
 
@@ -67,6 +78,12 @@ int runMixxx(MixxxApplication* pApp, const CmdlineArgs& args) {
                 &mixxx::CoreServices::initializationProgressUpdate,
                 &mainWindow,
                 &MixxxMainWindow::initializationProgressUpdate);
+
+        // The size of cached pixmaps increases with the square of devicePixelRatio
+        // (this covers both, operating system scaling and Mixxx preferences scaling)
+        QPixmapCache::setCacheLimit(static_cast<int>(kPixmapCacheLimitAt100PercentZoom *
+                pow(pApp->devicePixelRatio(), 2.0f)));
+
         pCoreServices->initialize(pApp);
 
 #ifdef MIXXX_USE_QOPENGL

From 1908318413b6686e52a032078b4cd05e734eb1f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Fri, 8 Dec 2023 10:42:14 +0100
Subject: [PATCH 367/388] Suppress possible loss of data warning explicit a /w
 after /W3 seems to no longer work "overriding '/W3' with '/w'"

---
 CMakeLists.txt | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ca8b2b7496..9b25806c7a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1545,15 +1545,10 @@ if(GNU_GCC OR LLVM_CLANG)
     PROPERTY COMPILE_OPTIONS -Wno-unused-parameter -Wno-switch
   )
 elseif(MSVC)
-  set_property(
-    SOURCE src/library/rekordbox/kaitaistructs/rekordbox_anlz.cpp
-    APPEND_STRING
-    PROPERTY COMPILE_OPTIONS /w
-  )
   set_property(
     SOURCE src/library/rekordbox/kaitaistructs/rekordbox_pdb.cpp
     APPEND_STRING
-    PROPERTY COMPILE_OPTIONS /w
+    PROPERTY COMPILE_OPTIONS /wd4244
   )
 endif()
 

From 436f15b080f98ae5e0fd9b469982acbf63cace9a Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Sun, 23 Jul 2023 03:22:12 +0200
Subject: [PATCH 368/388] Pref Sound: auto-select free channels when picking a
 new I/O device

---
 src/preferences/dialog/dlgprefsound.cpp     | 97 ++++++++++++++++++++-
 src/preferences/dialog/dlgprefsound.h       |  6 +-
 src/preferences/dialog/dlgprefsounditem.cpp | 23 ++++-
 src/preferences/dialog/dlgprefsounditem.h   | 13 ++-
 4 files changed, 129 insertions(+), 10 deletions(-)

diff --git a/src/preferences/dialog/dlgprefsound.cpp b/src/preferences/dialog/dlgprefsound.cpp
index b5c3c9856f6..97e7501ba6d 100644
--- a/src/preferences/dialog/dlgprefsound.cpp
+++ b/src/preferences/dialog/dlgprefsound.cpp
@@ -378,16 +378,24 @@ void DlgPrefSound::addPath(const AudioInput& input) {
             &DlgPrefSound::refreshInputDevices,
             pSoundItem,
             &DlgPrefSoundItem::refreshDevices);
-    insertItem(pSoundItem, inputVLayout);
     connectSoundItem(pSoundItem);
+    insertItem(pSoundItem, inputVLayout);
 
     setScrollSafeGuardForAllInputWidgets(pSoundItem);
 }
 
 void DlgPrefSound::connectSoundItem(DlgPrefSoundItem* pItem) {
-    connect(pItem, &DlgPrefSoundItem::settingChanged, this, &DlgPrefSound::deviceSettingChanged);
+    connect(pItem,
+            &DlgPrefSoundItem::selectedDeviceChanged,
+            this,
+            &DlgPrefSound::deviceChanged);
+    connect(pItem,
+            &DlgPrefSoundItem::selectedChannelsChanged,
+            this,
+            &DlgPrefSound::deviceChannelsChanged);
     connect(this, &DlgPrefSound::loadPaths, pItem, &DlgPrefSoundItem::loadPath);
     connect(this, &DlgPrefSound::writePaths, pItem, &DlgPrefSoundItem::writePath);
+    connect(this, &DlgPrefSound::refreshInputDevices, pItem, &DlgPrefSoundItem::refreshDevices);
     connect(this, &DlgPrefSound::updatingAPI, pItem, &DlgPrefSoundItem::save);
     connect(this, &DlgPrefSound::updatedAPI, pItem, &DlgPrefSoundItem::reload);
 }
@@ -397,7 +405,7 @@ void DlgPrefSound::insertItem(DlgPrefSoundItem *pItem, QVBoxLayout *pLayout) {
     for (pos = 0; pos < pLayout->count() - 1; ++pos) {
         DlgPrefSoundItem *pOther(qobject_cast<DlgPrefSoundItem*>(
             pLayout->itemAt(pos)->widget()));
-        if (!pOther) {
+        if (!pOther) { // not a sound item, skip
             continue;
         }
         if (pItem->type() < pOther->type()) {
@@ -477,6 +485,33 @@ void DlgPrefSound::loadSettings(const SoundManagerConfig& config) {
         keylockComboBox->setCurrentIndex(keylockComboBox->count() - 1);
     }
 
+    // Collect selected I/O channel indices for all non-empty device comboboxes
+    // in order to allow auto-selecting free channels when different devices are
+    // selected later on, when a different device is selected for any I/O.
+    m_selectedOutputChannelIndices.clear();
+    m_selectedInputChannelIndices.clear();
+    for (auto* ch : qAsConst(outputTab->children())) {
+        DlgPrefSoundItem* pItem = qobject_cast<DlgPrefSoundItem*>(ch);
+        if (pItem) {
+            auto id = pItem->getDeviceId();
+            if (id == SoundDeviceId()) {
+                continue;
+            }
+            m_selectedOutputChannelIndices.insert(pItem,
+                    QPair<SoundDeviceId, int>(id, pItem->getChannelIndex()));
+        }
+    }
+    for (auto* ch : qAsConst(inputTab->children())) {
+        DlgPrefSoundItem* pItem = qobject_cast<DlgPrefSoundItem*>(ch);
+        if (pItem) {
+            auto id = pItem->getDeviceId();
+            if (id == SoundDeviceId()) {
+                continue;
+            }
+            m_selectedInputChannelIndices.insert(pItem,
+                    QPair<SoundDeviceId, int>(id, pItem->getChannelIndex()));
+        }
+    }
     m_loading = false;
     // DlgPrefSoundItem has it's own inhibit flag
     emit loadPaths(m_config);
@@ -643,10 +678,64 @@ void DlgPrefSound::settingChanged() {
     m_settingsModified = true;
 }
 
-void DlgPrefSound::deviceSettingChanged() {
+void DlgPrefSound::deviceChanged() {
+    if (m_loading) {
+        return;
+    }
+
+    DlgPrefSoundItem* pItem = qobject_cast<DlgPrefSoundItem*>(sender());
+    if (!pItem) {
+        return;
+    }
+    QHash<DlgPrefSoundItem*, QPair<SoundDeviceId, int>>* channels;
+    if (pItem->isInput()) {
+        channels = &m_selectedInputChannelIndices;
+    } else {
+        channels = &m_selectedOutputChannelIndices;
+    }
+    auto id = pItem->getDeviceId();
+    if (id == SoundDeviceId()) {
+        if (channels->contains(pItem)) {
+            channels->remove(pItem);
+        }
+    } else {
+        QList<int> selectedChannelsForDevice;
+        QHashIterator<DlgPrefSoundItem*, QPair<SoundDeviceId, int>> it(
+                pItem->isInput()
+                        ? m_selectedInputChannelIndices
+                        : m_selectedOutputChannelIndices);
+        while (it.hasNext()) {
+            it.next();
+            if (it.value().first == id) {
+                qWarning() << "     -> match";
+                selectedChannelsForDevice.append(it.value().second);
+            }
+        }
+        pItem->selectFirstUnusedChannelIndex(selectedChannelsForDevice);
+    }
+
+    checkLatencyCompensation();
+    m_settingsModified = true;
+}
+
+void DlgPrefSound::deviceChannelsChanged() {
     if (m_loading) {
         return;
     }
+    DlgPrefSoundItem* pItem = qobject_cast<DlgPrefSoundItem*>(sender());
+    if (!pItem) {
+        return;
+    }
+    auto id = pItem->getDeviceId();
+    int index = pItem->getChannelIndex();
+    if (id != SoundDeviceId()) {
+        if (pItem->isInput()) {
+            m_selectedInputChannelIndices.insert(pItem, QPair<SoundDeviceId, int>(id, index));
+        } else {
+            m_selectedOutputChannelIndices.insert(pItem, QPair<SoundDeviceId, int>(id, index));
+        }
+    }
+
     checkLatencyCompensation();
     m_settingsModified = true;
 }
diff --git a/src/preferences/dialog/dlgprefsound.h b/src/preferences/dialog/dlgprefsound.h
index 57aedd72e9a..2a7089a28eb 100644
--- a/src/preferences/dialog/dlgprefsound.h
+++ b/src/preferences/dialog/dlgprefsound.h
@@ -14,6 +14,7 @@ class SoundManager;
 class PlayerManager;
 class ControlObject;
 class SoundDevice;
+class SoundDeviceId;
 class DlgPrefSoundItem;
 class ControlProxy;
 
@@ -67,7 +68,8 @@ class DlgPrefSound : public DlgPreferencePage, public Ui::DlgPrefSoundDlg  {
     void engineClockChanged(int index);
     void refreshDevices();
     void settingChanged();
-    void deviceSettingChanged();
+    void deviceChanged();
+    void deviceChannelsChanged();
     void queryClicked();
 
   private:
@@ -92,6 +94,8 @@ class DlgPrefSound : public DlgPreferencePage, public Ui::DlgPrefSoundDlg  {
     ControlProxy* m_pMicMonitorMode;
     QList<SoundDevicePointer> m_inputDevices;
     QList<SoundDevicePointer> m_outputDevices;
+    QHash<DlgPrefSoundItem*, QPair<SoundDeviceId, int>> m_selectedOutputChannelIndices;
+    QHash<DlgPrefSoundItem*, QPair<SoundDeviceId, int>> m_selectedInputChannelIndices;
     bool m_settingsModified;
     bool m_bLatencyChanged;
     bool m_bSkipConfigClear;
diff --git a/src/preferences/dialog/dlgprefsounditem.cpp b/src/preferences/dialog/dlgprefsounditem.cpp
index 6a9e62f1f8b..c4e18cfb8fc 100644
--- a/src/preferences/dialog/dlgprefsounditem.cpp
+++ b/src/preferences/dialog/dlgprefsounditem.cpp
@@ -95,6 +95,7 @@ void DlgPrefSoundItem::deviceChanged(int index) {
         unsigned char maxChannelsForType =
                 AudioPath::maxChannelsForType(m_type);
 
+        channelComboBox->blockSignals(true);
         // Count down from the max so that stereo channels are first.
         for (int channelsForType = maxChannelsForType;
                  channelsForType >= minChannelsForType; --channelsForType) {
@@ -117,16 +118,28 @@ void DlgPrefSoundItem::deviceChanged(int index) {
                                          QPoint(i - 1, channelsForType));
             }
         }
+        channelComboBox->setCurrentIndex(-1); // clear selection
+        channelComboBox->blockSignals(false);
     }
 emitAndReturn:
     if (m_emitSettingChanged) {
-        emit settingChanged();
+        emit selectedDeviceChanged();
     }
 }
 
 void DlgPrefSoundItem::channelChanged() {
     if (m_emitSettingChanged) {
-        emit settingChanged();
+        emit selectedChannelsChanged();
+    }
+}
+
+void DlgPrefSoundItem::selectFirstUnusedChannelIndex(const QList<int>& selectedChannels) {
+    // Go through the list of occupied channel indices and pick the first unoccupied
+    for (int i = 0; i < channelComboBox->count(); i++) {
+        if (!selectedChannels.contains(i)) {
+            channelComboBox->setCurrentIndex(i);
+            return;
+        }
     }
 }
 
@@ -177,6 +190,8 @@ void DlgPrefSoundItem::writePath(SoundManagerConfig* config) const {
     int channelBase = channelData.x();
     int channelCount = channelData.y();
 
+    // check config for occupied channels of this device
+    // auto-select next free channel (pair)
 
     if (m_isInput) {
         config->addInput(
@@ -232,7 +247,7 @@ void DlgPrefSoundItem::setDevice(const SoundDeviceId& device) {
     //qDebug() << "DlgPrefSoundItem::setDevice" << device;
     if (index == -1) {
         deviceComboBox->setCurrentIndex(0); // None
-        emit settingChanged();
+        emit selectedDeviceChanged();
     } else {
         m_emitSettingChanged = false;
         deviceComboBox->setCurrentIndex(index);
@@ -251,7 +266,7 @@ void DlgPrefSoundItem::setChannel(unsigned int channelBase,
     if (index == -1) {
         // channel(s) not found
         channelComboBox->setCurrentIndex(0); // 1
-        emit settingChanged();
+        emit selectedChannelsChanged();
     } else {
         m_emitSettingChanged = false;
         channelComboBox->setCurrentIndex(index);
diff --git a/src/preferences/dialog/dlgprefsounditem.h b/src/preferences/dialog/dlgprefsounditem.h
index 3f369db5756..6fe3a49404d 100644
--- a/src/preferences/dialog/dlgprefsounditem.h
+++ b/src/preferences/dialog/dlgprefsounditem.h
@@ -23,9 +23,20 @@ class DlgPrefSoundItem : public QWidget, public Ui::DlgPrefSoundItem {
 
     AudioPathType type() const { return m_type; };
     unsigned int index() const { return m_index; };
+    bool isInput() {
+        return m_isInput;
+    }
+    const SoundDeviceId getDeviceId() {
+        return deviceComboBox->itemData(deviceComboBox->currentIndex()).value<SoundDeviceId>();
+    }
+    int getChannelIndex() {
+        return channelComboBox->currentIndex();
+    }
+    void selectFirstUnusedChannelIndex(const QList<int>& selectedChannels);
 
   signals:
-    void settingChanged();
+    void selectedDeviceChanged();
+    void selectedChannelsChanged();
 
   public slots:
     void refreshDevices(const QList<SoundDevicePointer>& devices);

From 12520aa381d1feef10ce1431d4cf586e7d184ecf Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Mon, 28 Aug 2023 15:22:33 +0200
Subject: [PATCH 369/388] SoundDeviceItem: add comment with ideas to improve
 channel auto-select

---
 src/preferences/dialog/dlgprefsounditem.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/preferences/dialog/dlgprefsounditem.cpp b/src/preferences/dialog/dlgprefsounditem.cpp
index c4e18cfb8fc..3a875b025a5 100644
--- a/src/preferences/dialog/dlgprefsounditem.cpp
+++ b/src/preferences/dialog/dlgprefsounditem.cpp
@@ -137,6 +137,12 @@ void DlgPrefSoundItem::selectFirstUnusedChannelIndex(const QList<int>& selectedC
     // Go through the list of occupied channel indices and pick the first unoccupied
     for (int i = 0; i < channelComboBox->count(); i++) {
         if (!selectedChannels.contains(i)) {
+            // TODO(xxx) Some ideas to improve auto-select:
+            // * check selected indices and new selection for channel overlap, e.g.
+            //   if the device has 4 channels and ch.1/2 + ch.3/4 are already selected
+            //   don't select next index (ch.1) but fall back to ch.1/2?
+            // * if there are only mono indices selected, try to pick the next mono
+            //   channel index instead of suggesting index 0 (ch.1/)
             channelComboBox->setCurrentIndex(i);
             return;
         }

From a50fca9f32c0bacf6814048c4c8d11b7ca0de587 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Wed, 13 Sep 2023 10:27:19 +0200
Subject: [PATCH 370/388] Pref Sound: consolidate item conncetions in
 connectSoundItem()

---
 src/preferences/dialog/dlgprefsound.cpp | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/preferences/dialog/dlgprefsound.cpp b/src/preferences/dialog/dlgprefsound.cpp
index 97e7501ba6d..75e8e88e424 100644
--- a/src/preferences/dialog/dlgprefsound.cpp
+++ b/src/preferences/dialog/dlgprefsound.cpp
@@ -352,10 +352,6 @@ void DlgPrefSound::addPath(const AudioOutput& output) {
             m_outputDevices,
             false,
             AudioPath::isIndexed(type) ? output.getIndex() : 0);
-    connect(this,
-            &DlgPrefSound::refreshOutputDevices,
-            pSoundItem,
-            &DlgPrefSoundItem::refreshDevices);
     insertItem(pSoundItem, outputVLayout);
     connectSoundItem(pSoundItem);
 
@@ -373,11 +369,6 @@ void DlgPrefSound::addPath(const AudioInput& input) {
             m_inputDevices,
             true,
             AudioPath::isIndexed(type) ? input.getIndex() : 0);
-
-    connect(this,
-            &DlgPrefSound::refreshInputDevices,
-            pSoundItem,
-            &DlgPrefSoundItem::refreshDevices);
     connectSoundItem(pSoundItem);
     insertItem(pSoundItem, inputVLayout);
 
@@ -395,7 +386,14 @@ void DlgPrefSound::connectSoundItem(DlgPrefSoundItem* pItem) {
             &DlgPrefSound::deviceChannelsChanged);
     connect(this, &DlgPrefSound::loadPaths, pItem, &DlgPrefSoundItem::loadPath);
     connect(this, &DlgPrefSound::writePaths, pItem, &DlgPrefSoundItem::writePath);
-    connect(this, &DlgPrefSound::refreshInputDevices, pItem, &DlgPrefSoundItem::refreshDevices);
+    if (pItem->isInput()) {
+        connect(this, &DlgPrefSound::refreshInputDevices, pItem, &DlgPrefSoundItem::refreshDevices);
+    } else {
+        connect(this,
+                &DlgPrefSound::refreshOutputDevices,
+                pItem,
+                &DlgPrefSoundItem::refreshDevices);
+    }
     connect(this, &DlgPrefSound::updatingAPI, pItem, &DlgPrefSoundItem::save);
     connect(this, &DlgPrefSound::updatedAPI, pItem, &DlgPrefSoundItem::reload);
 }

From 8279ccd7f401e5f5cd8395ba305badf6256ef008 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Fri, 8 Dec 2023 16:55:49 +0100
Subject: [PATCH 371/388] Display the samplerate in the track info dialog.

---
 src/library/dlgtrackinfo.cpp |   7 ++
 src/library/dlgtrackinfo.ui  | 211 +++++++++++++++++------------------
 2 files changed, 107 insertions(+), 111 deletions(-)

diff --git a/src/library/dlgtrackinfo.cpp b/src/library/dlgtrackinfo.cpp
index 8e43e59570b..8e3d9db146b 100644
--- a/src/library/dlgtrackinfo.cpp
+++ b/src/library/dlgtrackinfo.cpp
@@ -425,6 +425,13 @@ void DlgTrackInfo::updateTrackMetadataFields() {
     txtReplayGain->setText(
             mixxx::ReplayGain::ratioToString(
                     m_trackRecord.getMetadata().getTrackInfo().getReplayGain().getRatio()));
+
+    auto samplerate = m_trackRecord.getMetadata().getStreamInfo().getSignalInfo().getSampleRate();
+    if (samplerate.isValid()) {
+        txtSamplerate->setText(QString::number(samplerate.value()) + " Hz");
+    } else {
+        txtSamplerate->clear();
+    }
 }
 
 void DlgTrackInfo::updateSpinBpmFromBeats() {
diff --git a/src/library/dlgtrackinfo.ui b/src/library/dlgtrackinfo.ui
index 45aeffed784..f3da4ee311a 100644
--- a/src/library/dlgtrackinfo.ui
+++ b/src/library/dlgtrackinfo.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>575</width>
-    <height>595</height>
+    <height>642</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -43,7 +43,6 @@
      <property name="currentIndex">
       <number>0</number>
      </property>
-
      <widget class="QWidget" name="tabSummary">
       <attribute name="title">
        <string>Summary</string>
@@ -54,7 +53,6 @@
          <layout class="QGridLayout" name="gridLayout_2">
           <item row="0" column="0">
            <layout class="QGridLayout" name="gridLayout_5" columnstretch="0,10,0,2">
-
             <item row="0" column="0">
              <widget class="QLabel" name="lblTrackName">
               <property name="sizePolicy">
@@ -76,7 +74,6 @@
               </property>
              </widget>
             </item>
-
             <item row="0" column="1">
              <widget class="QLineEdit" name="txtTrackName">
               <property name="sizePolicy">
@@ -111,7 +108,6 @@
               </layout>
              </widget>
             </item>
-
             <item row="1" column="0">
              <widget class="QLabel" name="lblArtist">
               <property name="sizePolicy">
@@ -128,7 +124,6 @@
               </property>
              </widget>
             </item>
-
             <item row="1" column="1">
              <widget class="QLineEdit" name="txtArtist">
               <property name="sizePolicy">
@@ -145,7 +140,6 @@
               </property>
              </widget>
             </item>
-
             <item row="2" column="0">
              <widget class="QLabel" name="lblAlbum">
               <property name="sizePolicy">
@@ -162,7 +156,6 @@
               </property>
              </widget>
             </item>
-
             <item row="2" column="1">
              <widget class="QLineEdit" name="txtAlbum">
               <property name="sizePolicy">
@@ -179,7 +172,6 @@
               </property>
              </widget>
             </item>
-
             <item row="3" column="0">
              <widget class="QLabel" name="lblAlbumArtist">
               <property name="sizePolicy">
@@ -196,7 +188,6 @@
               </property>
              </widget>
             </item>
-
             <item row="3" column="1">
              <widget class="QLineEdit" name="txtAlbumArtist">
               <property name="sizePolicy">
@@ -213,7 +204,6 @@
               </property>
              </widget>
             </item>
-
             <item row="3" column="2" colspan="2">
              <widget class="QWidget" name="verticalWidgetStars" native="true">
               <property name="sizePolicy">
@@ -232,7 +222,6 @@
               </layout>
              </widget>
             </item>
-
             <item row="4" column="0">
              <widget class="QLabel" name="lblComposer">
               <property name="text">
@@ -243,7 +232,6 @@
               </property>
              </widget>
             </item>
-
             <item row="4" column="1">
              <widget class="QLineEdit" name="txtComposer">
               <property name="sizePolicy">
@@ -260,7 +248,6 @@
               </property>
              </widget>
             </item>
-
             <item row="4" column="2">
              <widget class="QLabel" name="lblYear">
               <property name="text">
@@ -268,7 +255,6 @@
               </property>
              </widget>
             </item>
-
             <item row="4" column="3">
              <widget class="QLineEdit" name="txtYear">
               <property name="sizePolicy">
@@ -279,7 +265,6 @@
               </property>
              </widget>
             </item>
-
             <item row="5" column="0">
              <widget class="QLabel" name="lblGenre">
               <property name="text">
@@ -290,7 +275,6 @@
               </property>
              </widget>
             </item>
-
             <item row="5" column="1">
              <widget class="QLineEdit" name="txtGenre">
               <property name="sizePolicy">
@@ -307,7 +291,6 @@
               </property>
              </widget>
             </item>
-
             <item row="5" column="2">
              <widget class="QLabel" name="lblKey">
               <property name="text">
@@ -315,7 +298,6 @@
               </property>
              </widget>
             </item>
-
             <item row="5" column="3">
              <widget class="QLineEdit" name="txtKey">
               <property name="sizePolicy">
@@ -332,7 +314,6 @@
               </property>
              </widget>
             </item>
-
             <item row="6" column="0">
              <widget class="QLabel" name="lblGrouping">
               <property name="text">
@@ -343,7 +324,6 @@
               </property>
              </widget>
             </item>
-
             <item row="6" column="1">
              <widget class="QLineEdit" name="txtGrouping">
               <property name="sizePolicy">
@@ -360,7 +340,6 @@
               </property>
              </widget>
             </item>
-
             <item row="6" column="2">
              <widget class="QLabel" name="lblTrackNumber">
               <property name="text">
@@ -368,7 +347,6 @@
               </property>
              </widget>
             </item>
-
             <item row="6" column="3">
              <widget class="QLineEdit" name="txtTrackNumber">
               <property name="sizePolicy">
@@ -385,7 +363,6 @@
               </property>
              </widget>
             </item>
-
             <item row="7" column="0">
              <widget class="QLabel" name="lblTrackComment">
               <property name="text">
@@ -396,7 +373,6 @@
               </property>
              </widget>
             </item>
-
             <item row="7" column="1" colspan="3">
              <widget class="QPlainTextEdit" name="txtComment">
               <property name="tabChangesFocus">
@@ -404,7 +380,6 @@
               </property>
              </widget>
             </item>
-
             <item row="8" column="1" colspan="3">
              <layout class="QHBoxLayout" name="horizontalLayout_3">
               <item>
@@ -436,7 +411,6 @@
               </item>
              </layout>
             </item>
-
             <item row="9" column="0">
              <widget class="QLabel" name="lblTrackColor">
               <property name="text">
@@ -447,7 +421,6 @@
               </property>
              </widget>
             </item>
-
             <item row="9" column="1" colspan="3">
              <widget class="QPushButton" name="btnColorPicker">
               <property name="sizePolicy">
@@ -458,8 +431,7 @@
               </property>
              </widget>
             </item>
-
-            <item>
+            <item row="0" column="0">
              <spacer name="horizontalSpacer_5">
               <property name="orientation">
                <enum>Qt::Horizontal</enum>
@@ -474,8 +446,6 @@
             </item>
            </layout>
           </item>
-
-
          </layout>
         </widget>
        </item>
@@ -489,16 +459,23 @@
          </property>
          <layout class="QGridLayout" name="gridLayout_3">
           <item row="0" column="0">
-           <layout class="QGridLayout" name="gridLayout_4" rowstretch="0,0,0,0,0" columnstretch="0,1,0,1">
-            <item row="0" column="0">
-             <widget class="QLabel" name="lblDuration">
+           <layout class="QGridLayout" name="gridLayout_4" rowstretch="0,0,0,0,0,0" columnstretch="0,1,0,1">
+            <item row="1" column="0">
+             <widget class="QLabel" name="lblBpm">
               <property name="text">
-               <string>Duration:</string>
+               <string>BPM:</string>
               </property>
              </widget>
             </item>
-            <item row="0" column="1">
-             <widget class="QLabel" name="txtDuration">
+            <item row="0" column="2">
+             <widget class="QLabel" name="lblType">
+              <property name="text">
+               <string>Filetype:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="3">
+             <widget class="QLabel" name="txtType">
               <property name="font">
                <font>
                 <weight>75</weight>
@@ -513,38 +490,69 @@
               </property>
              </widget>
             </item>
-            <item row="1" column="0">
-             <widget class="QLabel" name="lblBpm">
+            <item row="4" column="0">
+             <widget class="QLabel" name="lblLocation">
               <property name="text">
-               <string>BPM:</string>
+               <string>Location:</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
               </property>
              </widget>
             </item>
-            <item row="1" column="1">
-             <widget class="QLabel" name="txtBpm">
-              <property name="font">
-               <font>
-                <weight>75</weight>
-                <bold>true</bold>
-               </font>
-              </property>
+            <item row="4" column="1" colspan="3">
+             <widget class="QLabel" name="txtLocation">
               <property name="text">
                <string/>
               </property>
+              <property name="wordWrap">
+               <bool>true</bool>
+              </property>
               <property name="textInteractionFlags">
                <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
               </property>
              </widget>
             </item>
-            <item row="2" column="0">
-             <widget class="QLabel" name="lblReplayGain">
+            <item row="1" column="2">
+             <widget class="QLabel" name="lblBitrate">
               <property name="text">
-               <string>ReplayGain:</string>
+               <string>Bitrate:</string>
               </property>
              </widget>
             </item>
-            <item row="2" column="1">
-             <widget class="QLabel" name="txtReplayGain">
+            <item row="0" column="0">
+             <widget class="QLabel" name="lblDuration">
+              <property name="text">
+               <string>Duration:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="5" column="1" colspan="3">
+             <layout class="QHBoxLayout" name="horizontalLayout_5">
+              <item>
+               <widget class="QPushButton" name="btnOpenFileBrowser">
+                <property name="text">
+                 <string>Open in File Browser</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <spacer name="horizontalSpacer_6">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>40</width>
+                  <height>10</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+             </layout>
+            </item>
+            <item row="1" column="1">
+             <widget class="QLabel" name="txtBpm">
               <property name="font">
                <font>
                 <weight>75</weight>
@@ -559,15 +567,24 @@
               </property>
              </widget>
             </item>
-            <item row="0" column="2">
-             <widget class="QLabel" name="lblType">
+            <item row="1" column="3">
+             <widget class="QLabel" name="txtBitrate">
+              <property name="font">
+               <font>
+                <weight>75</weight>
+                <bold>true</bold>
+               </font>
+              </property>
               <property name="text">
-               <string>Filetype:</string>
+               <string/>
+              </property>
+              <property name="textInteractionFlags">
+               <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
               </property>
              </widget>
             </item>
-            <item row="0" column="3">
-             <widget class="QLabel" name="txtType">
+            <item row="0" column="1">
+             <widget class="QLabel" name="txtDuration">
               <property name="font">
                <font>
                 <weight>75</weight>
@@ -582,15 +599,22 @@
               </property>
              </widget>
             </item>
-            <item row="1" column="2">
-             <widget class="QLabel" name="lblBitrate">
+            <item row="3" column="0">
+             <widget class="QLabel" name="lblReplayGain">
               <property name="text">
-               <string>Bitrate:</string>
+               <string>ReplayGain:</string>
               </property>
              </widget>
             </item>
-            <item row="1" column="3">
-             <widget class="QLabel" name="txtBitrate">
+            <item row="2" column="0">
+             <widget class="QLabel" name="lblDateAdded">
+              <property name="text">
+               <string>Date added:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="1">
+             <widget class="QLabel" name="txtReplayGain">
               <property name="font">
                <font>
                 <weight>75</weight>
@@ -605,14 +629,7 @@
               </property>
              </widget>
             </item>
-            <item row="2" column="2">
-             <widget class="QLabel" name="lblDateAdded">
-              <property name="text">
-               <string>Date added:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="3">
+            <item row="2" column="1">
              <widget class="QLabel" name="txtDateAdded">
               <property name="font">
                <font>
@@ -628,53 +645,26 @@
               </property>
              </widget>
             </item>
-            <item row="3" column="0">
-             <widget class="QLabel" name="lblLocation">
+            <item row="2" column="2">
+             <widget class="QLabel" name="lblSamplerate">
               <property name="text">
-               <string>Location:</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+               <string>Samplerate:</string>
               </property>
              </widget>
             </item>
-            <item row="3" column="1" colspan="3">
-             <widget class="QLabel" name="txtLocation">
+            <item row="2" column="3">
+             <widget class="QLabel" name="txtSamplerate">
+              <property name="font">
+               <font>
+                <weight>75</weight>
+                <bold>true</bold>
+               </font>
+              </property>
               <property name="text">
                <string/>
               </property>
-              <property name="wordWrap">
-               <bool>true</bool>
-              </property>
-              <property name="textInteractionFlags">
-               <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
-              </property>
              </widget>
             </item>
-            <item row="4" column="1" colspan="3">
-             <layout class="QHBoxLayout" name="horizontalLayout_5">
-              <item>
-               <widget class="QPushButton" name="btnOpenFileBrowser">
-                <property name="text">
-                 <string>Open in File Browser</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <spacer name="horizontalSpacer_6">
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>40</width>
-                  <height>10</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-             </layout>
-            </item>
            </layout>
           </item>
          </layout>
@@ -698,7 +688,6 @@
        </item>
       </layout>
      </widget>
-
      <widget class="QWidget" name="tabBPM">
       <attribute name="title">
        <string>BPM</string>

From a2f91da2f031de4cd57eb35f15bfbd2b752e4102 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Sat, 9 Dec 2023 00:31:57 +0100
Subject: [PATCH 372/388] LateNight, PaleMoon: fix active loop in/out icons

---
 .../LateNight/palemoon/buttons/btn__loop_active.svg  | 12 ++----------
 .../LateNight/palemoon/buttons/btn__loop_in.svg      |  4 ++--
 .../palemoon/buttons/btn__loop_in_active.svg         |  5 +++--
 .../LateNight/palemoon/buttons/btn__loop_out.svg     |  4 ++--
 .../palemoon/buttons/btn__loop_out_active.svg        |  5 +++--
 5 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/res/skins/LateNight/palemoon/buttons/btn__loop_active.svg b/res/skins/LateNight/palemoon/buttons/btn__loop_active.svg
index a7253f5c5b4..69740f76efc 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__loop_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__loop_active.svg
@@ -1,13 +1,5 @@
-<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-  <g display="none" opacity=".360743">
-    <g fill="none" stroke="#000001" stroke-linejoin="round" stroke-width="1.6">
-      <path d="m20 18v-12h-5v-3l-7 3.75 7 3.75-1e-4 -2.9999 3.5001-1e-4v9l-1.5-1e-4v1.5001z" color="#000001"/>
-      <path d="m4 6v12h5v3l7-3.75-7-3.75 1e-4 2.9999-3.5001 1e-4v-9l1.5 1e-4v-1.5001z" color="#000001"/>
-    </g>
-    <path d="m20 18v-12h-5v-3l-7 3.75 7 3.75-1e-4 -2.9999 3.5001-1e-4v9l-1.5-1e-4v1.5001z" fill="#918273"/>
-    <path d="m4 6v12h5v3l7-3.75-7-3.75 1e-4 2.9999-3.5001 1e-4v-9l1.5 1e-4v-1.5001z" color="#000001" fill="#918273"/>
-  </g>
+<svg width="48" height="48" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
   <g>
-    <path d="m15 3-7 3.75 7 3.75v-2.99023h3.49023v8.98047h-1.49023v1.50977h1.76172c0.707602 0 1.23828-0.615581 1.23828-1.2793v-9.44141c0-0.663716-0.53068-1.2793-1.23828-1.2793h-3.76172v-3zm-9.76172 3c-0.707601 0-1.23828 0.615582-1.23828 1.2793v9.44141c0 0.663715 0.53068 1.2793 1.23828 1.2793h3.76172v3l7-3.75-7-3.75v2.99023h-3.49023v-8.98047h1.49023v-1.50977h-1.76172z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stop-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-east-asian:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;font-variation-settings:normal;inline-size:0;isolation:auto;mix-blend-mode:normal;shape-margin:0;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+    <path d="m15 3-7 3.75 7 3.75v-2.99023h3.49023v8.98047h-1.49023v1.50977h1.76172c0.707602 0 1.23828-0.615581 1.23828-1.2793v-9.44141c0-0.663716-0.53068-1.2793-1.23828-1.2793h-3.76172v-3zm-9.76172 3c-0.707601 0-1.23828 0.615582-1.23828 1.2793v9.44141c0 0.663715 0.53068 1.2793 1.23828 1.2793h3.76172v3l7-3.75-7-3.75v2.99023h-3.49023v-8.98047h1.49023v-1.50977h-1.76172z" fill="#000000"/>
   </g>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__loop_in.svg b/res/skins/LateNight/palemoon/buttons/btn__loop_in.svg
index d7773b05ce1..bfbfa8d2121 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__loop_in.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__loop_in.svg
@@ -7,7 +7,7 @@
     <path d="m20 18v-12h-5v-3l-7 3.75 7 3.75-1e-4 -2.9999 3.5001-1e-4v9l-1.5-1e-4v1.5001z" fill="#918273"/>
     <path d="m4 6v12h5v3l7-3.75-7-3.75 1e-4 2.9999-3.5001 1e-4v-9l1.5 1e-4v-1.5001z" color="#000001" fill="#918273"/>
   </g>
-  <path d="m9.23828 6c-0.707601 0-1.23828 0.615582-1.23828 1.2793v9.44141c0 0.663715 0.53068 1.2793 1.23828 1.2793h3.76172v3l7-3.75-7-3.75v2.99023h-3.49023v-8.98047h1.49023v-1.50977z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#918273" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stop-color="#000000" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-east-asian:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;font-variation-settings:normal;inline-size:0;isolation:auto;mix-blend-mode:normal;shape-margin:0;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
-  <path d="m9.23828 6c-0.707601 0-1.23828 0.615582-1.23828 1.2793v9.44141c0 0.663715 0.53068 1.2793 1.23828 1.2793h4.32812v-1.50977h-4.05664v-8.98047h1.49023v-1.50977z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#918273" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stop-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-east-asian:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;font-variation-settings:normal;inline-size:0;isolation:auto;mix-blend-mode:normal;shape-margin:0;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+  <path d="m9.23828 6c-0.707601 0-1.23828 0.615582-1.23828 1.2793v9.44141c0 0.663715 0.53068 1.2793 1.23828 1.2793h3.76172v3l7-3.75-7-3.75v2.99023h-3.49023v-8.98047h1.49023v-1.50977z" fill="#918273" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6"/>
+  <path d="m9.23828 6c-0.707601 0-1.23828 0.615582-1.23828 1.2793v9.44141c0 0.663715 0.53068 1.2793 1.23828 1.2793h4.32812v-1.50977h-4.05664v-8.98047h1.49023v-1.50977z" fill="#918273"/>
   <path d="m13 13.5v7.5l7-3.75z" fill="#918273"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__loop_in_active.svg b/res/skins/LateNight/palemoon/buttons/btn__loop_in_active.svg
index a0e9e4e2b96..845fb58c31d 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__loop_in_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__loop_in_active.svg
@@ -1,3 +1,4 @@
-<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-  <path d="m9 6h5v13h-1v-7h-4v-6" fill="#000001"/>
+<svg width="48" height="48" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <path d="m9.23828 6c-0.707601 0-1.23828 0.615582-1.23828 1.2793v9.44141c0 0.663715 0.53068 1.2793 1.23828 1.2793h4.32812v-1.50977h-4.05664v-8.98047h1.49023v-1.50977z"  fill="#000001"/>
+  <path d="m13 13.5v7.5l7-3.75z"  fill="#000001"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__loop_out.svg b/res/skins/LateNight/palemoon/buttons/btn__loop_out.svg
index d7c24ac0023..cff83d7386c 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__loop_out.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__loop_out.svg
@@ -7,7 +7,7 @@
     <path d="m20 18v-12h-5v-3l-7 3.75 7 3.75-1e-4 -2.9999 3.5001-1e-4v9l-1.5-1e-4v1.5001z" fill="#918273"/>
     <path d="m4 6v12h5v3l7-3.75-7-3.75 1e-4 2.9999-3.5001 1e-4v-9l1.5 1e-4v-1.5001z" color="#000001" fill="#918273"/>
   </g>
-  <path d="m11 3.99995-7 3.75 7 3.75v-2.99023h3.49023v8.98047h-1.49023v1.50977h1.76172c0.707602 0 1.23828-0.615581 1.23828-1.2793v-9.44141c0-0.663716-0.53068-1.2793-1.23828-1.2793h-3.76172z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#918273" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stop-color="#000000" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-east-asian:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;font-variation-settings:normal;inline-size:0;isolation:auto;mix-blend-mode:normal;shape-margin:0;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
-  <path d="m10.4336 6.99995v1.50977h4.05664v8.98047h-1.49023v1.50977h1.76172c0.707602 0 1.23828-0.615581 1.23828-1.2793v-9.44141c0-0.663716-0.53068-1.2793-1.23828-1.2793z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#918273" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stop-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-east-asian:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;font-variation-settings:normal;inline-size:0;isolation:auto;mix-blend-mode:normal;shape-margin:0;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+  <path d="m11 3.99995-7 3.75 7 3.75v-2.99023h3.49023v8.98047h-1.49023v1.50977h1.76172c0.707602 0 1.23828-0.615581 1.23828-1.2793v-9.44141c0-0.663716-0.53068-1.2793-1.23828-1.2793h-3.76172z" fill="#918273" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6"/>
+  <path d="m10.4336 6.99995v1.50977h4.05664v8.98047h-1.49023v1.50977h1.76172c0.707602 0 1.23828-0.615581 1.23828-1.2793v-9.44141c0-0.663716-0.53068-1.2793-1.23828-1.2793z" fill="#918273"/>
   <path d="m4 7.74995 7-3.75v7.5z" fill="#918273"/>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__loop_out_active.svg b/res/skins/LateNight/palemoon/buttons/btn__loop_out_active.svg
index a50beda8b9d..94462fdfbf9 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__loop_out_active.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__loop_out_active.svg
@@ -1,3 +1,4 @@
-<svg width="48" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-  <path d="m14 6h-5v13h1v-7h4v-6" fill="#000001"/>
+<svg width="48" height="48" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <path d="m10.4336 6.99995v1.50977h4.05664v8.98047h-1.49023v1.50977h1.76172c0.707602 0 1.23828-0.615581 1.23828-1.2793v-9.44141c0-0.663716-0.53068-1.2793-1.23828-1.2793z"  fill="#000001"/>
+  <path d="m4 7.74995 7-3.75v7.5z"  fill="#000001"/>
 </svg>

From 19fdc2151b8f2710e2ef4f893dac62c071865723 Mon Sep 17 00:00:00 2001
From: m0dB <m0dB@mixxx.org>
Date: Sat, 9 Dec 2023 23:41:03 +0100
Subject: [PATCH 373/388] minor tweak

---
 .../classic/buttons/btn__intro_end.svg        | 45 +++++++++++++++----
 .../classic/buttons/btn__outro_end.svg        | 42 +++++++++++++----
 2 files changed, 69 insertions(+), 18 deletions(-)

diff --git a/res/skins/LateNight/classic/buttons/btn__intro_end.svg b/res/skins/LateNight/classic/buttons/btn__intro_end.svg
index 0b46d96e8bb..2f4b1e36f2b 100644
--- a/res/skins/LateNight/classic/buttons/btn__intro_end.svg
+++ b/res/skins/LateNight/classic/buttons/btn__intro_end.svg
@@ -1,10 +1,37 @@
-<svg width="36" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 24">
-	<g transform="translate(-2.99971)" fill="none" stroke="#000001" stroke-linecap="square" stroke-width="1.6">
-		<rect transform="scale(-1,1)" x="-18" y="7" width="2" height="10" style="paint-order:markers fill stroke"/>
-		<path d="m5 17 9-10v10z"/>
-	</g>
-	<g transform="translate(-2.99971)" fill="#d2d2d1">
-		<rect transform="scale(-1,1)" x="-18" y="7" width="2" height="10" style="paint-order:markers fill stroke"/>
-		<path d="m5 17 9-10v10z"/>
-	</g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="36"
+   height="48"
+   version="1.1"
+   viewBox="0 0 18 24"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2" />
+  <g
+     id="g2">
+    <rect
+       x="13"
+       y="7"
+       width="2"
+       height="10"
+       style="fill:none;stroke:#000001;stroke-width:1.6;stroke-linecap:square;paint-order:markers fill stroke"
+       id="rect1" />
+    <path
+       d="M 2,17 11,7 v 10 z"
+       id="path1"
+       style="fill:none;stroke:#000001;stroke-width:1.6;stroke-linecap:square" />
+    <rect
+       x="13"
+       y="7"
+       width="2"
+       height="10"
+       style="fill:#d2d2d1;paint-order:markers fill stroke"
+       id="rect2" />
+    <path
+       d="M 2,17 11,7 v 10 z"
+       id="path2"
+       style="fill:#d2d2d1" />
+  </g>
 </svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__outro_end.svg b/res/skins/LateNight/classic/buttons/btn__outro_end.svg
index 1f1a770a9ee..a77eb105119 100644
--- a/res/skins/LateNight/classic/buttons/btn__outro_end.svg
+++ b/res/skins/LateNight/classic/buttons/btn__outro_end.svg
@@ -1,10 +1,34 @@
-<svg width="36" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 24">
-	<g transform="translate(-3)" fill="none" stroke="#000001" stroke-linecap="square" stroke-width="1.6">
-		<rect transform="scale(-1,1)" x="-18" y="7" width="2" height="10" style="paint-order:markers fill stroke"/>
-		<path d="m15 17-9-10v10z"/>
-	</g>
-	<g transform="translate(-3)" fill="#d2d2d1">
-		<rect transform="scale(-1,1)" x="-18" y="7" width="2" height="10" style="paint-order:markers fill stroke"/>
-		<path d="m15 17-9-10v10z"/>
-	</g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="36"
+   height="48"
+   version="1.1"
+   viewBox="0 0 18 24"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2" />
+  <rect
+     x="13"
+     y="7"
+     width="2"
+     height="10"
+     style="fill:none;stroke:#000001;stroke-width:1.6;stroke-linecap:square;paint-order:markers fill stroke"
+     id="rect1" />
+  <path
+     d="M 12,17 3,7 v 10 z"
+     id="path1"
+     style="fill:none;stroke:#000001;stroke-width:1.6;stroke-linecap:square" />
+  <rect
+     x="13"
+     y="7"
+     width="2"
+     height="10"
+     style="fill:#d2d2d1;paint-order:markers fill stroke"
+     id="rect2" />
+  <path
+     d="M 12,17 3,7 v 10 z"
+     id="path2"
+     style="fill:#d2d2d1" />
 </svg>

From 07c1e1d7511854e458e2aaa195a152d5172c4c67 Mon Sep 17 00:00:00 2001
From: Eugene Erokhin <uncle.eugene@gmail.com>
Date: Mon, 11 Dec 2023 16:15:28 +0600
Subject: [PATCH 374/388] A small fix to .desktop file that improves Gnome dock
 integration on linux. The issue was that gnome dock couldn't pick right icon
 for the app and it wasn't possible to pin Mixxx to the dock. Both fixed.

---
 res/linux/org.mixxx.Mixxx.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/linux/org.mixxx.Mixxx.desktop b/res/linux/org.mixxx.Mixxx.desktop
index 06cc99ced91..4218ed78544 100644
--- a/res/linux/org.mixxx.Mixxx.desktop
+++ b/res/linux/org.mixxx.Mixxx.desktop
@@ -13,4 +13,5 @@ Terminal=false
 Icon=mixxx
 Type=Application
 StartupNotify=true
+StartupWMClass=org.mixxx.mixxx
 Categories=Qt;AudioVideo;Audio;Midi;Mixer;Player;Recorder;Sequencer;

From 9735725ecb1b609f22d26fd8ce891fa87c6ff9a3 Mon Sep 17 00:00:00 2001
From: djantti <djantti@proton.me>
Date: Mon, 11 Dec 2023 14:44:47 +0200
Subject: [PATCH 375/388] Correct spelling and fix LED brightness discrepancy

---
 res/controllers/Traktor-Kontrol-Z1-scripts.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/controllers/Traktor-Kontrol-Z1-scripts.js b/res/controllers/Traktor-Kontrol-Z1-scripts.js
index a18ad0b7af8..83eafbb6d3a 100644
--- a/res/controllers/Traktor-Kontrol-Z1-scripts.js
+++ b/res/controllers/Traktor-Kontrol-Z1-scripts.js
@@ -12,7 +12,7 @@ class TraktorZ1Class {
         // Modifier state
         this.modePressed = false;
 
-        // VuMeter
+        // VU meters
         this.vuLeftConnection = {};
         this.vuRightConnection = {};
         this.vuMeterThresholds = {"vu-30": (1 / 7), "vu-15": (2 / 7), "vu-6": (3 / 7), "vu-3": (4 / 7), "vu0": (5 / 7), "vu3": (6 / 7), "vu6": (7 / 7)};
@@ -186,7 +186,7 @@ class TraktorZ1Class {
             if (this.vuMeterThresholds[vuKeys[i]] > value) {
                 this.controller.setOutput(group, vuKeys[i], 0x00, last);
             } else {
-                this.controller.setOutput(group, vuKeys[i], 0x7E, last);
+                this.controller.setOutput(group, vuKeys[i], 0x7F, last);
             }
         }
     }

From 3d4199028b491bd975c421f2d9f814d9ff34758e Mon Sep 17 00:00:00 2001
From: Owen Williams <owilliams@mixxx.org>
Date: Mon, 11 Dec 2023 14:33:12 -0500
Subject: [PATCH 376/388] common-hid: revert callsites that use the disconnect
 parameter

---
 res/controllers/common-hid-packet-parser.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/controllers/common-hid-packet-parser.js b/res/controllers/common-hid-packet-parser.js
index 59e227a402b..34a9aa123b4 100644
--- a/res/controllers/common-hid-packet-parser.js
+++ b/res/controllers/common-hid-packet-parser.js
@@ -2077,7 +2077,7 @@ class HIDController {
                                 continue;
                             }
                             const bitControlGroup = this.resolveGroup(bit.mapped_group);
-                            engine.makeConnection(
+                            engine.connectControl(
                                 bitControlGroup, bit.mapped_name, bit.mapped_callback, true);
                             engine.makeConnection(new_group, bit.mapped_name, bit.mapped_callback);
                             const value = engine.getValue(new_group, bit.mapped_name);
@@ -2100,7 +2100,7 @@ class HIDController {
                         continue;
                     }
                     const fieldControlGroup = this.resolveGroup(field.mapped_group);
-                    engine.makeConnection(
+                    engine.connectControl(
                         fieldControlGroup, field.mapped_name, field.mapped_callback, true);
                     engine.makeConnection(new_group, field.mapped_name, field.mapped_callback);
                     const value = engine.getValue(new_group, field.mapped_name);
@@ -2169,7 +2169,7 @@ class HIDController {
             return;
         }
         const controlgroup = this.resolveGroup(field.mapped_group);
-        engine.makeConnection(controlgroup, field.mapped_name, callback, true);
+        engine.connectControl(controlgroup, field.mapped_name, callback, true);
         field.mapped_group = undefined;
         field.mapped_name = undefined;
         field.mapped_callback = undefined;

From e2f054e4230fe152c1377ebc689a61d8e7b66ccb Mon Sep 17 00:00:00 2001
From: djantti <djantti@proton.me>
Date: Mon, 11 Dec 2023 22:43:59 +0200
Subject: [PATCH 377/388] Synchronize on-screen controls with controller
 positions on startup

---
 res/controllers/Traktor-Kontrol-Z1-scripts.js | 80 +++++++++++--------
 1 file changed, 47 insertions(+), 33 deletions(-)

diff --git a/res/controllers/Traktor-Kontrol-Z1-scripts.js b/res/controllers/Traktor-Kontrol-Z1-scripts.js
index 83eafbb6d3a..b5e32e58fd8 100644
--- a/res/controllers/Traktor-Kontrol-Z1-scripts.js
+++ b/res/controllers/Traktor-Kontrol-Z1-scripts.js
@@ -1,7 +1,7 @@
 //
 // Native Instruments Traktor Kontrol Z1 HID controller script for Mixxx 2.4
 // -------------------------------------------------------------------------
-// Based on: Kontrol S2 MK3 script by mi01 and Kontrol Z1 script by xeruf
+// Based on: NI Traktor Kontrol series scripts by leifhelm, mi01 & xeruf
 // Author: djantti
 //
 
@@ -20,8 +20,12 @@ class TraktorZ1Class {
 
     init(_id) {
         this.id = _id;
+
         this.registerInputPackets();
         this.registerOutputPackets();
+        this.readCurrentPosition();
+        this.enableSoftTakeover();
+
         console.log(this.id + " initialized");
     }
 
@@ -66,38 +70,6 @@ class TraktorZ1Class {
         this.registerInputScaler(InputReport0x01, "[Master]", "crossfader", 0x1B, 0xFFFF, this.parameterHandler.bind(this));
 
         this.controller.registerInputPacket(InputReport0x01);
-
-        // Soft takeover for all knobs and faders
-        engine.softTakeover("[EqualizerRack1_[Channel1]_Effect1]", "parameter3", true);
-        engine.softTakeover("[EqualizerRack1_[Channel1]_Effect1]", "parameter2", true);
-        engine.softTakeover("[EqualizerRack1_[Channel1]_Effect1]", "parameter1", true);
-
-        engine.softTakeover("[EqualizerRack1_[Channel2]_Effect1]", "parameter3", true);
-        engine.softTakeover("[EqualizerRack1_[Channel2]_Effect1]", "parameter2", true);
-        engine.softTakeover("[EqualizerRack1_[Channel2]_Effect1]", "parameter1", true);
-
-        engine.softTakeover("[QuickEffectRack1_[Channel1]]", "super1", true);
-        engine.softTakeover("[QuickEffectRack1_[Channel2]]", "super1", true);
-
-        engine.softTakeover("[Channel1]", "pregain", true);
-        engine.softTakeover("[Channel2]", "pregain", true);
-
-        engine.softTakeover("[Master]", "headMix", true);
-
-        engine.softTakeover("[Channel1]", "volume", true);
-        engine.softTakeover("[Channel2]", "volume", true);
-
-        engine.softTakeover("[Master]", "crossfader", true);
-    }
-
-    registerInputButton(inputReport, group, name, offset, bitmask, callback) {
-        inputReport.addControl(group, name, offset, "B", bitmask);
-        inputReport.setCallback(group, name, callback);
-    }
-
-    registerInputScaler(inputReport, group, name, offset, bitmask, callback) {
-        inputReport.addControl(group, name, offset, "H", bitmask);
-        inputReport.setCallback(group, name, callback);
     }
 
     registerOutputPackets() {
@@ -144,6 +116,48 @@ class TraktorZ1Class {
         this.lightDeck(false);
     }
 
+    readCurrentPosition() {
+        // Sync on-screen controls with controller knob positions
+        const report0x01 = new Uint8Array(controller.getInputReport(0x01));
+        // The first packet is ignored by HIDController
+        this.controller.parsePacket([0x01, ...Array.from(report0x01.map(x => x ^ 0xFF))]);
+        this.controller.parsePacket([0x01, ...Array.from(report0x01)]);
+    }
+
+    enableSoftTakeover() {
+        // Soft takeover for all knobs and faders
+        engine.softTakeover("[EqualizerRack1_[Channel1]_Effect1]", "parameter3", true);
+        engine.softTakeover("[EqualizerRack1_[Channel1]_Effect1]", "parameter2", true);
+        engine.softTakeover("[EqualizerRack1_[Channel1]_Effect1]", "parameter1", true);
+
+        engine.softTakeover("[EqualizerRack1_[Channel2]_Effect1]", "parameter3", true);
+        engine.softTakeover("[EqualizerRack1_[Channel2]_Effect1]", "parameter2", true);
+        engine.softTakeover("[EqualizerRack1_[Channel2]_Effect1]", "parameter1", true);
+
+        engine.softTakeover("[QuickEffectRack1_[Channel1]]", "super1", true);
+        engine.softTakeover("[QuickEffectRack1_[Channel2]]", "super1", true);
+
+        engine.softTakeover("[Channel1]", "pregain", true);
+        engine.softTakeover("[Channel2]", "pregain", true);
+
+        engine.softTakeover("[Master]", "headMix", true);
+
+        engine.softTakeover("[Channel1]", "volume", true);
+        engine.softTakeover("[Channel2]", "volume", true);
+
+        engine.softTakeover("[Master]", "crossfader", true);
+    }
+
+    registerInputButton(inputReport, group, name, offset, bitmask, callback) {
+        inputReport.addControl(group, name, offset, "B", bitmask);
+        inputReport.setCallback(group, name, callback);
+    }
+
+    registerInputScaler(inputReport, group, name, offset, bitmask, callback) {
+        inputReport.addControl(group, name, offset, "H", bitmask);
+        inputReport.setCallback(group, name, callback);
+    }
+
     modeHandler(field) {
         this.modePressed = field.value;
         this.outputHandler(field.value, field.group, "mode");

From ba3dd4f0d98cdfb1ea0581b880f36028dbca2dc8 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 12 Dec 2023 13:58:51 +0100
Subject: [PATCH 378/388] Color preferences: remove unneeded group box

---
 src/preferences/dialog/dlgprefcolorsdlg.ui | 195 ++++++++++-----------
 1 file changed, 96 insertions(+), 99 deletions(-)

diff --git a/src/preferences/dialog/dlgprefcolorsdlg.ui b/src/preferences/dialog/dlgprefcolorsdlg.ui
index 22abf4d0178..9126f7f34ba 100644
--- a/src/preferences/dialog/dlgprefcolorsdlg.ui
+++ b/src/preferences/dialog/dlgprefcolorsdlg.ui
@@ -19,105 +19,102 @@
   <property name="windowTitle">
    <string>Color Preferences</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <item>
-    <widget class="QGroupBox" name="groupBoxPalettes">
-     <property name="title">
-      <string>Colors</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="3" column="0">
-       <widget class="QLabel" name="labelHotcueDefaultColor">
-        <property name="text">
-         <string>Hotcue default color</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="2">
-       <widget class="QPushButton" name="pushButtonReplaceCueColor">
-        <property name="text">
-         <string>Replace…</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="QPushButton" name="pushButtonEditHotcuePalette">
-        <property name="text">
-         <string>Edit…</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1">
-       <widget class="QComboBox" name="comboBoxHotcueDefaultColor"/>
-      </item>
-      <item row="0" column="2">
-       <widget class="QPushButton" name="pushButtonEditTrackPalette">
-        <property name="text">
-         <string>Edit…</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QComboBox" name="comboBoxHotcueColors">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="labelHotcueColors">
-        <property name="text">
-         <string>Hotcue palette</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="labelTrackColors">
-        <property name="text">
-         <string>Track palette</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QComboBox" name="comboBoxTrackColors">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="labelLoopDefaultColor">
-        <property name="text">
-         <string>Loop default color</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1">
-       <widget class="QComboBox" name="comboBoxLoopDefaultColor"/>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <spacer>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
+   <layout class="QGridLayout" name="gridLayout">
+
+    <item row="0" column="0">
+     <widget class="QLabel" name="labelTrackColors">
+      <property name="text">
+       <string>Track palette</string>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="1">
+     <widget class="QComboBox" name="comboBoxTrackColors">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="2">
+     <widget class="QPushButton" name="pushButtonEditTrackPalette">
+      <property name="text">
+       <string>Edit…</string>
+      </property>
+     </widget>
+    </item>
+
+    <item row="1" column="0">
+     <widget class="QLabel" name="labelHotcueColors">
+      <property name="text">
+       <string>Hotcue palette</string>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="1">
+     <widget class="QComboBox" name="comboBoxHotcueColors">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="2">
+     <widget class="QPushButton" name="pushButtonEditHotcuePalette">
+      <property name="text">
+       <string>Edit…</string>
+      </property>
+     </widget>
+    </item>
+
+    <item row="2" column="0">
+     <widget class="QLabel" name="labelHotcueDefaultColor">
+      <property name="text">
+       <string>Hotcue default color</string>
+      </property>
+     </widget>
+    </item>
+    <item row="2" column="1">
+     <widget class="QComboBox" name="comboBoxHotcueDefaultColor"/>
+    </item>
+    <item row="2" column="2">
+     <widget class="QPushButton" name="pushButtonReplaceCueColor">
+      <property name="text">
+       <string>Replace…</string>
+      </property>
+     </widget>
+    </item>
+
+    <item row="3" column="0">
+     <widget class="QLabel" name="labelLoopDefaultColor">
+      <property name="text">
+       <string>Loop default color</string>
+      </property>
+     </widget>
+    </item>
+    <item row="3" column="1">
+     <widget class="QComboBox" name="comboBoxLoopDefaultColor"/>
+    </item>
+
+    <item row="4" column="0" colspan="2">
+     <spacer>
+      <property name="orientation">
+       <enum>Qt::Vertical</enum>
+      </property>
+      <property name="sizeHint" stdset="0">
+       <size>
+        <width>20</width>
+        <height>40</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
+
+   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <tabstops>

From 814c0f966844f465884d8f542d4e0a47e42c220b Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 12 Dec 2023 15:17:26 +0100
Subject: [PATCH 379/388] Interface preferences: group into Skin and Misc,
 remove unneeded spacer

---
 src/preferences/dialog/dlgprefinterface.cpp   |  10 +-
 src/preferences/dialog/dlgprefinterfacedlg.ui | 131 +++++-------------
 2 files changed, 37 insertions(+), 104 deletions(-)

diff --git a/src/preferences/dialog/dlgprefinterface.cpp b/src/preferences/dialog/dlgprefinterface.cpp
index 9148b414c37..c7c7ade152f 100644
--- a/src/preferences/dialog/dlgprefinterface.cpp
+++ b/src/preferences/dialog/dlgprefinterface.cpp
@@ -133,10 +133,7 @@ DlgPrefInterface::DlgPrefInterface(
         warningLabel->setText(sizeWarningString);
 
         ComboBoxSkinconf->clear();
-        // align left edge of preview image and skin description with comboboxes
-        skinPreviewLabel->setStyleSheet("QLabel { margin-left: 4px; }");
         skinPreviewLabel->setText("");
-        skinDescriptionText->setStyleSheet("QLabel { margin-left: 2px; }");
         skinDescriptionText->setText("");
         skinDescriptionText->hide();
 
@@ -169,12 +166,7 @@ DlgPrefInterface::DlgPrefInterface(
                 this,
                 &DlgPrefInterface::slotSetScheme);
     } else {
-        lableSkin_2->hide();
-        labelColorScheme->hide();
-        ComboBoxSkinconf->hide();
-        ComboBoxSchemeconf->hide();
-        skinDescriptionText->hide();
-        skinPreviewLabel->hide();
+        groupBoxSkinOptions->hide();
     }
 
     // Screensaver mode
diff --git a/src/preferences/dialog/dlgprefinterfacedlg.ui b/src/preferences/dialog/dlgprefinterfacedlg.ui
index 51a7cc6b543..bf3c858f58e 100644
--- a/src/preferences/dialog/dlgprefinterfacedlg.ui
+++ b/src/preferences/dialog/dlgprefinterfacedlg.ui
@@ -13,59 +13,16 @@
   <property name="windowTitle">
    <string>Interface Preferences</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout_3">
-   <item row="3" column="0">
-    <spacer name="verticalSpacer2">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="0" column="0">
+  <layout class="QVBoxLayout" name="gridLayout_skin">
+
+   <item>
     <widget class="QGroupBox" name="groupBoxSkinOptions">
      <property name="title">
-      <string/>
+      <string>Skin</string>
      </property>
-     <layout class="QGridLayout" name="GridLayout1">
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
+     <layout class="QVBoxLayout" name="skinLayout">
 
-      <item row="0" column="0">
-       <widget class="QLabel" name="lableSkin_2">
-        <property name="enabled">
-         <bool>true</bool>
-        </property>
-        <property name="font">
-         <font/>
-        </property>
-        <property name="text">
-         <string>Skin</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-        <property name="buddy">
-         <cstring>ComboBoxSkinconf</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" colspan="2">
+      <item>
        <widget class="QComboBox" name="ComboBoxSkinconf">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -73,13 +30,13 @@
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="font">
-         <font/>
+        <property name="accessibleName">
+         <string>Skin selector</string>
         </property>
        </widget>
       </item>
 
-      <item row="3" column="0" rowspan="2">
+      <item>
        <widget class="QLabel" name="labelColorScheme">
         <property name="enabled">
          <bool>true</bool>
@@ -98,7 +55,8 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="1" rowspan="2" colspan="2">
+
+      <item>
        <widget class="QComboBox" name="ComboBoxSchemeconf">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -106,16 +64,13 @@
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="font">
-         <font/>
-        </property>
         <property name="toolTip">
          <string>Select from different color schemes of a skin if available.</string>
         </property>
        </widget>
       </item>
 
-      <item row="5" column="1" colspan="2">
+      <item>
        <widget class="QLabel" name="skinDescriptionText">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -135,7 +90,7 @@
        </widget>
       </item>
 
-      <item row="6" column="1" colspan="2">
+      <item>
        <widget class="QLabel" name="warningLabel">
         <property name="text">
          <string/>
@@ -146,42 +101,25 @@
        </widget>
       </item>
 
-      <item row="7" column="1">
+      <item>
        <widget class="QLabel" name="skinPreviewLabel">
         <property name="text">
          <string notr="true">skin preview screenshot goes here</string>
         </property>
        </widget>
       </item>
+     </layout>
+    </widget>
+   </item>
 
-      <item row="8" column="0">
-       <spacer name="verticalSpacer1">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>10</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="8" column="2">
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
+   <item>
+    <widget class="QGroupBox" name="groupBoxMiscOptions">
+     <property name="title">
+      <string>Miscellaneous</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_Misc">
 
-      <item row="9" column="0">
+      <item row="0" column="0">
        <widget class="QLabel" name="textLabelLocale">
         <property name="text">
          <string>Locale</string>
@@ -191,7 +129,7 @@
         </property>
        </widget>
       </item>
-      <item row="9" column="1" colspan="2">
+      <item row="0" column="1" colspan="2">
        <widget class="QComboBox" name="ComboBoxLocale">
         <property name="toolTip">
          <string>Locales determine country and language specific settings.</string>
@@ -199,14 +137,17 @@
        </widget>
       </item>
 
-      <item row="10" column="0">
+      <item row="1" column="0">
        <widget class="QLabel" name="labelScaleFactor">
         <property name="text">
          <string>HiDPI / Retina scaling</string>
         </property>
+        <property name="buddy">
+         <cstring>spinBoxScaleFactor</cstring>
+        </property>
        </widget>
       </item>
-      <item row="10" column="1">
+      <item row="1" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <item>
          <widget class="QDoubleSpinBox" name="spinBoxScaleFactor">
@@ -246,7 +187,7 @@
        </layout>
       </item>
 
-      <item row="11" column="0">
+      <item row="2" column="0">
        <widget class="QLabel" name="labelFullscreenOption">
         <property name="text">
          <string>Full-screen mode</string>
@@ -256,7 +197,7 @@
         </property>
        </widget>
       </item>
-      <item row="11" column="1" colspan="2">
+      <item row="2" column="1" colspan="2">
        <widget class="QCheckBox" name="checkBoxStartFullScreen">
         <property name="text">
          <string>Start in full-screen mode</string>
@@ -264,7 +205,7 @@
        </widget>
       </item>
 
-      <item row="12" column="0">
+      <item row="3" column="0">
        <widget class="QLabel" name="labelTooltips">
         <property name="enabled">
          <bool>true</bool>
@@ -283,7 +224,7 @@
         </property>
        </widget>
       </item>
-      <item row="12" column="1" colspan="2">
+      <item row="3" column="1" colspan="2">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="QRadioButton" name="radioButtonTooltipsOff">
@@ -318,14 +259,14 @@
        </layout>
       </item>
 
-      <item row="13" column="0">
+      <item row="4" column="0">
        <widget class="QLabel" name="label">
         <property name="text">
          <string>Screen saver</string>
         </property>
        </widget>
       </item>
-      <item row="13" column="1" colspan="2">
+      <item row="4" column="1" colspan="2">
        <widget class="QComboBox" name="comboBoxScreensaver"/>
       </item>
 

From 8486d5a8874c196b3308599b3354b9adcd2ca122 Mon Sep 17 00:00:00 2001
From: Uwe Klotz <uwe.klotz@gmail.com>
Date: Tue, 12 Dec 2023 17:25:21 +0100
Subject: [PATCH 380/388] Replace qAsConst() with std::as_const()

---
 src/preferences/dialog/dlgprefsound.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/preferences/dialog/dlgprefsound.cpp b/src/preferences/dialog/dlgprefsound.cpp
index e01c4d3737a..8e7d5c7eeb6 100644
--- a/src/preferences/dialog/dlgprefsound.cpp
+++ b/src/preferences/dialog/dlgprefsound.cpp
@@ -490,7 +490,7 @@ void DlgPrefSound::loadSettings(const SoundManagerConfig& config) {
     // selected later on, when a different device is selected for any I/O.
     m_selectedOutputChannelIndices.clear();
     m_selectedInputChannelIndices.clear();
-    for (auto* ch : qAsConst(outputTab->children())) {
+    for (auto* ch : std::as_const(outputTab->children())) {
         DlgPrefSoundItem* pItem = qobject_cast<DlgPrefSoundItem*>(ch);
         if (pItem) {
             auto id = pItem->getDeviceId();
@@ -501,7 +501,7 @@ void DlgPrefSound::loadSettings(const SoundManagerConfig& config) {
                     QPair<SoundDeviceId, int>(id, pItem->getChannelIndex()));
         }
     }
-    for (auto* ch : qAsConst(inputTab->children())) {
+    for (auto* ch : std::as_const(inputTab->children())) {
         DlgPrefSoundItem* pItem = qobject_cast<DlgPrefSoundItem*>(ch);
         if (pItem) {
             auto id = pItem->getDeviceId();

From b077e555fa3729604aa09cb15023651e1fc77516 Mon Sep 17 00:00:00 2001
From: Owen Williams <owilliams@mixxx.org>
Date: Tue, 12 Dec 2023 15:48:45 -0500
Subject: [PATCH 381/388] Sync Lock: disallow selection of Explicit Leader

This helps work around stopped-leader bugs, like https://github.com/mixxxdj/mixxx/issues/11788.

We can reenable this later if we can fix those issues.
---
 src/engine/sync/enginesync.cpp  | 22 +++++++++++++++++++---
 src/engine/sync/synccontrol.cpp |  6 +++++-
 src/test/enginesynctest.cpp     | 29 ++++++++++++++---------------
 3 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/src/engine/sync/enginesync.cpp b/src/engine/sync/enginesync.cpp
index c918b922418..26f1ce44c13 100644
--- a/src/engine/sync/enginesync.cpp
+++ b/src/engine/sync/enginesync.cpp
@@ -56,9 +56,25 @@ void EngineSync::requestSyncMode(Syncable* pSyncable, SyncMode mode) {
         [[fallthrough]];
     }
     case SyncMode::LeaderSoft: {
-        if (pSyncable->getBaseBpm().isValid() &&
-                pSyncable->isPlaying() &&
-                pSyncable->isAudible()) {
+        if (pSyncable->getBaseBpm().isValid()) {
+            if (!pSyncable->isPlaying()) {
+                bool anyPlaying = false;
+                // Only allow a non-playing deck to be leader if no deck is playing
+                for (Syncable* pSyncable : m_syncables) {
+                    if (!pSyncable->isSynchronized()) {
+                        continue;
+                    }
+
+                    if (pSyncable->isPlaying()) {
+                        anyPlaying = true;
+                        break;
+                    }
+                }
+                if (!anyPlaying) {
+                    activateLeader(pSyncable, mode);
+                }
+                break;
+            }
             activateLeader(pSyncable, mode);
             break;
         }
diff --git a/src/engine/sync/synccontrol.cpp b/src/engine/sync/synccontrol.cpp
index 100125d6967..39871784195 100644
--- a/src/engine/sync/synccontrol.cpp
+++ b/src/engine/sync/synccontrol.cpp
@@ -512,7 +512,11 @@ void SyncControl::slotSyncLeaderEnabledChangeRequest(double state) {
             qDebug() << "Disallowing enabling of sync mode when passthrough active";
             return;
         }
-        m_pChannel->getEngineBuffer()->requestSyncMode(SyncMode::LeaderExplicit);
+        // NOTE: This branch would normally activate Explicit Leader mode. Due to the large number
+        // of side effects and bugs, this mode is disabled. For now, requesting explicit leader mode
+        // only activates the chosen deck as the soft leader. See:
+        // https://github.com/mixxxdj/mixxx/issues/11788
+        m_pChannel->getEngineBuffer()->requestSyncMode(SyncMode::LeaderSoft);
     } else {
         // Turning off leader goes back to follower mode.
         switch (mode) {
diff --git a/src/test/enginesynctest.cpp b/src/test/enginesynctest.cpp
index b4f3773b3bb..23756489664 100644
--- a/src/test/enginesynctest.cpp
+++ b/src/test/enginesynctest.cpp
@@ -378,14 +378,14 @@ TEST_F(EngineSyncTest, DisableSyncOnLeader) {
     pButtonSyncLeader2->set(1.0);
     ProcessBuffer();
     EXPECT_TRUE(isFollower(m_sGroup1));
-    EXPECT_TRUE(isExplicitLeader(m_sGroup2));
+    EXPECT_TRUE(isSoftLeader(m_sGroup2));
 
     // Set deck 2 to playing, now it becomes explicit leader.
     ControlObject::getControl(ConfigKey(m_sGroup2, "play"))->set(1.0);
     // The request to become leader is queued, so we have to process a buffer.
     ProcessBuffer();
     EXPECT_TRUE(isFollower(m_sGroup1));
-    EXPECT_TRUE(isExplicitLeader(m_sGroup2));
+    EXPECT_TRUE(isSoftLeader(m_sGroup2));
 
     // Unset enabled on channel2, it should work.
     auto pButtonSyncEnabled2 =
@@ -557,7 +557,7 @@ TEST_F(EngineSyncTest, SetExplicitLeaderByLights) {
     ProcessBuffer();
 
     // The sync lock should now be channel 1.
-    EXPECT_TRUE(isExplicitLeader(m_sGroup1));
+    EXPECT_TRUE(isSoftLeader(m_sGroup1));
 
     // Set channel 2 to be follower.
     pButtonSyncEnabled2->set(1);
@@ -571,31 +571,30 @@ TEST_F(EngineSyncTest, SetExplicitLeaderByLights) {
 
     // Now channel 2 should be leader, and channel 1 should be a follower.
     EXPECT_TRUE(isFollower(m_sGroup1));
-    EXPECT_TRUE(isExplicitLeader(m_sGroup2));
+    EXPECT_TRUE(isSoftLeader(m_sGroup2));
 
     // Now back again.
     pButtonSyncLeader1->set(1);
     ProcessBuffer();
 
     // Now channel 1 should be leader, and channel 2 should be a follower.
-    EXPECT_TRUE(isExplicitLeader(m_sGroup1));
+    EXPECT_TRUE(isSoftLeader(m_sGroup1));
     EXPECT_TRUE(isFollower(m_sGroup2));
 
     // Now set channel 1 to not-leader.
-    // This will choose automatically a Soft Leader, but prefers the old
-    // explicit leader it is still playing with a valid BPM
+    // This will choose automatically a Soft Leader, so it chooses the other deck.
     pButtonSyncLeader1->set(0);
     ProcessBuffer();
 
     EXPECT_TRUE(isFollower(m_sInternalClockGroup));
-    EXPECT_TRUE(isSoftLeader(m_sGroup1));
-    EXPECT_TRUE(isFollower(m_sGroup2));
+    EXPECT_TRUE(isFollower(m_sGroup1));
+    EXPECT_TRUE(isSoftLeader(m_sGroup2));
 
     // Try again without playing
     pButtonSyncLeader1->set(1);
     ProcessBuffer();
 
-    EXPECT_TRUE(isExplicitLeader(m_sGroup1));
+    EXPECT_TRUE(isSoftLeader(m_sGroup1));
     EXPECT_TRUE(isFollower(m_sGroup2));
 
     ControlObject::set(ConfigKey(m_sGroup1, "play"), 0.0);
@@ -2399,7 +2398,7 @@ TEST_F(EngineSyncTest, FollowerUserTweakPreservedInLeaderChange) {
     ControlObject::set(ConfigKey(m_sGroup1, "play"), 1.0);
     ControlObject::set(ConfigKey(m_sGroup2, "play"), 1.0);
 
-    EXPECT_TRUE(isExplicitLeader(m_sGroup1));
+    EXPECT_TRUE(isSoftLeader(m_sGroup1));
     EXPECT_TRUE(isFollower(m_sGroup2));
 
     ProcessBuffer();
@@ -2419,7 +2418,7 @@ TEST_F(EngineSyncTest, FollowerUserTweakPreservedInLeaderChange) {
     ControlObject::getControl(ConfigKey(m_sGroup2, "sync_leader"))->set(1);
     ProcessBuffer();
     EXPECT_TRUE(isFollower(m_sGroup1));
-    EXPECT_TRUE(isExplicitLeader(m_sGroup2));
+    EXPECT_TRUE(isSoftLeader(m_sGroup2));
 
     for (int i = 0; i < 10; ++i) {
         ProcessBuffer();
@@ -2452,7 +2451,7 @@ TEST_F(EngineSyncTest, FollowerUserTweakPreservedInSyncDisable) {
     m_pChannel2->getEngineBuffer()
             ->m_pBpmControl->m_dUserOffset.setValue(0.3);
 
-    EXPECT_TRUE(isExplicitLeader(m_sGroup1));
+    EXPECT_TRUE(isSoftLeader(m_sGroup1));
     EXPECT_TRUE(isFollower(m_sGroup2));
 
     ProcessBuffer();
@@ -2483,7 +2482,7 @@ TEST_F(EngineSyncTest, LeaderUserTweakPreservedInLeaderChange) {
     ControlObject::set(ConfigKey(m_sGroup1, "play"), 1.0);
     ControlObject::set(ConfigKey(m_sGroup2, "play"), 1.0);
 
-    EXPECT_TRUE(isExplicitLeader(m_sGroup1));
+    EXPECT_TRUE(isSoftLeader(m_sGroup1));
     EXPECT_TRUE(isFollower(m_sGroup2));
 
     ProcessBuffer();
@@ -2507,7 +2506,7 @@ TEST_F(EngineSyncTest, LeaderUserTweakPreservedInLeaderChange) {
     ControlObject::getControl(ConfigKey(m_sGroup2, "sync_leader"))->set(1);
     ProcessBuffer();
     EXPECT_TRUE(isFollower(m_sGroup1));
-    EXPECT_TRUE(isExplicitLeader(m_sGroup2));
+    EXPECT_TRUE(isSoftLeader(m_sGroup2));
 
     for (int i = 0; i < 10; ++i) {
         ProcessBuffer();

From 9230c781acab8be8253ddb7aad9ac8a8f027a413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Tue, 12 Dec 2023 09:59:24 +0100
Subject: [PATCH 382/388] Adjust nativeEventFilter() for Qt6

---
 src/nativeeventhandlerwin.cpp | 9 ++++++++-
 src/nativeeventhandlerwin.h   | 5 ++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/nativeeventhandlerwin.cpp b/src/nativeeventhandlerwin.cpp
index dcd99a7ca5f..1600c4acdcd 100644
--- a/src/nativeeventhandlerwin.cpp
+++ b/src/nativeeventhandlerwin.cpp
@@ -11,8 +11,15 @@
 #include "moc_nativeeventhandlerwin.cpp"
 
 bool WindowsEventHandler::nativeEventFilter(
-        const QByteArray& eventType, void* message, long* result) {
+        const QByteArray& eventType,
+        void* message,
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+        long* result) {
+#else
+        qintptr* result) {
+#endif
     Q_UNUSED(eventType);
+    Q_UNUSED(result);
     MSG* msg = reinterpret_cast<MSG*>(message);
     if (msg && msg->message == WM_NCLBUTTONDOWN) {
         // Trigger the modal loop to prevent 500ms wait in Event Loop
diff --git a/src/nativeeventhandlerwin.h b/src/nativeeventhandlerwin.h
index 0d0a924b3d0..22f1a48a9ee 100644
--- a/src/nativeeventhandlerwin.h
+++ b/src/nativeeventhandlerwin.h
@@ -6,8 +6,11 @@ class WindowsEventHandler : public QAbstractNativeEventFilter {
   public:
     WindowsEventHandler() = default;
     ~WindowsEventHandler() override = default;
-
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     bool nativeEventFilter(const QByteArray& eventType, void* message, long* result) override;
+#else
+    bool nativeEventFilter(const QByteArray& eventType, void* message, qintptr* result) override;
+#endif
 };
 
 #endif

From 0dc81b4405aadaa1f8b7676ef8187af5babf9bd5 Mon Sep 17 00:00:00 2001
From: Owen Williams <owilliams@mixxx.org>
Date: Wed, 13 Dec 2023 09:57:07 -0500
Subject: [PATCH 383/388] Sync Lock: prefer an existing soft leader if it is
 valid

This prevents unexpected switches of leader status.

Also corrects a test that did not match its comments.
---
 src/engine/sync/enginesync.cpp | 48 +++++++++++++++++++---------------
 src/engine/sync/enginesync.h   | 12 +++------
 src/test/enginesynctest.cpp    |  4 +--
 3 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/src/engine/sync/enginesync.cpp b/src/engine/sync/enginesync.cpp
index 26f1ce44c13..456eb0a71bb 100644
--- a/src/engine/sync/enginesync.cpp
+++ b/src/engine/sync/enginesync.cpp
@@ -60,7 +60,7 @@ void EngineSync::requestSyncMode(Syncable* pSyncable, SyncMode mode) {
             if (!pSyncable->isPlaying()) {
                 bool anyPlaying = false;
                 // Only allow a non-playing deck to be leader if no deck is playing
-                for (Syncable* pSyncable : m_syncables) {
+                for (Syncable* pSyncable : std::as_const(m_syncables)) {
                     if (!pSyncable->isSynchronized()) {
                         continue;
                     }
@@ -85,9 +85,9 @@ void EngineSync::requestSyncMode(Syncable* pSyncable, SyncMode mode) {
         if (!m_pLeaderSyncable || m_pLeaderSyncable == pSyncable ||
                 m_pLeaderSyncable->getSyncMode() != SyncMode::LeaderExplicit) {
             // Pick a new leader, in case we would have none after becoming follower
-            Syncable* pNewLeader = pickNewLeader(pSyncable);
-            // Note: A request for follower mode may have been converted into
-            // enabling of soft leader mode if this still be best choice
+            Syncable* pNewLeader = pickLeader(pSyncable, false);
+            // Note: A request for follower mode may have been converted into enabling of soft
+            // leader mode if this syncable is still the best choice.
             if (pNewLeader) {
                 activateLeader(pNewLeader, SyncMode::LeaderSoft);
             }
@@ -225,14 +225,17 @@ void EngineSync::deactivateSync(Syncable* pSyncable) {
     }
 
     if (wasLeader) {
-        Syncable* newLeader = pickNewLeader(nullptr);
+        Syncable* newLeader = pickLeader(nullptr, false);
         if (newLeader != nullptr) {
             activateLeader(newLeader, SyncMode::LeaderSoft);
         }
     }
 }
 
-Syncable* EngineSync::pickLeader(Syncable* pEnablingSyncable) {
+Syncable* EngineSync::pickLeader(Syncable* triggering_syncable, bool newStatus) {
+    if (kLogger.traceEnabled()) {
+        kLogger.trace() << "EngineSync::pickLeader";
+    }
     if (m_pLeaderSyncable &&
             m_pLeaderSyncable->getSyncMode() == SyncMode::LeaderExplicit &&
             m_pLeaderSyncable->getBaseBpm().isValid()) {
@@ -241,21 +244,18 @@ Syncable* EngineSync::pickLeader(Syncable* pEnablingSyncable) {
         }
         return m_pLeaderSyncable;
     }
-    return pickNewLeader(pEnablingSyncable);
-}
 
-Syncable* EngineSync::pickNewLeader(Syncable* pEnablingSyncable) {
-    if (kLogger.traceEnabled()) {
-        kLogger.trace() << "EngineSync::pickNewLeader";
-    }
-    // First preference: some other sync deck that is playing.
-    // Note, if we are using PREFER_LOCK_BPM we don't use this option.
+    // TODO: We should probably convert this function to use a ranking system and then pick the
+    // deck with the top rank, rather than this hacky series of conditionals.
+    bool leaderIsValid = (m_pLeaderSyncable
+            // The current leader is not valid if it's the triggering_syncable
+            // and it's being turned off.
+            && (m_pLeaderSyncable != triggering_syncable || newStatus) &&
+            m_pLeaderSyncable->isPlaying() &&
+            m_pLeaderSyncable->getBaseBpm().isValid());
     Syncable* first_other_playing_deck = nullptr;
-    // Second preference: whatever the first playing sync deck is, even if it's us.
     Syncable* first_playing_deck = nullptr;
-    // Third preference: the first stopped sync deck.
     Syncable* first_stopped_deck = nullptr;
-    // Last resorts: Internal Clock or nullptr.
 
     int stopped_deck_count = 0;
     int playing_deck_count = 0;
@@ -265,7 +265,7 @@ Syncable* EngineSync::pickNewLeader(Syncable* pEnablingSyncable) {
             continue;
         }
 
-        if (pSyncable != pEnablingSyncable) {
+        if (pSyncable != triggering_syncable) {
             if (!pSyncable->getChannel()->isPrimaryDeck()) {
                 continue;
             }
@@ -278,7 +278,7 @@ Syncable* EngineSync::pickNewLeader(Syncable* pEnablingSyncable) {
             if (playing_deck_count == 0) {
                 first_playing_deck = pSyncable;
             }
-            if (!first_other_playing_deck && pSyncable != pEnablingSyncable) {
+            if (!first_other_playing_deck && pSyncable != triggering_syncable) {
                 first_other_playing_deck = pSyncable;
             }
             playing_deck_count++;
@@ -299,7 +299,13 @@ Syncable* EngineSync::pickNewLeader(Syncable* pEnablingSyncable) {
         if (playing_deck_count == 1) {
             return first_playing_deck;
         } else if (playing_deck_count > 1) {
-            return first_other_playing_deck;
+            // Prefer keeping the current leader rather than switching it with the first playing
+            // deck.
+            if (leaderIsValid) {
+                return m_pLeaderSyncable;
+            } else {
+                return first_other_playing_deck;
+            }
         }
 
         if (stopped_deck_count >= 1) {
@@ -398,7 +404,7 @@ void EngineSync::notifyPlayingAudible(Syncable* pSyncable, bool playingAudible)
     }
 
     // similar to enablesync -- we pick a new leader and maybe reinit.
-    Syncable* newLeader = pickLeader(pSyncable);
+    Syncable* newLeader = pickLeader(pSyncable, playingAudible);
 
     if (newLeader != nullptr && newLeader != m_pLeaderSyncable) {
         activateLeader(newLeader, SyncMode::LeaderSoft);
diff --git a/src/engine/sync/enginesync.h b/src/engine/sync/enginesync.h
index 6b9ec5db0ea..c5c4a5ae9b9 100644
--- a/src/engine/sync/enginesync.h
+++ b/src/engine/sync/enginesync.h
@@ -75,14 +75,10 @@ class EngineSync : public SyncableListener {
     void onCallbackEnd(mixxx::audio::SampleRate sampleRate, int bufferSize);
 
   private:
-    /// Iterate over decks, and based on sync and play status, pick a new Leader.
-    /// if enabling_syncable is not null, we treat it as if it were enabled because we may
-    /// be in the process of enabling it.
-    Syncable* pickNewLeader(Syncable* enabling_syncable);
-
-    /// Return the explicit leader if the one has been selected or picks a new leader using
-    /// pickNewLeader();
-    Syncable* pickLeader(Syncable* enabling_syncable);
+    /// Iterate over decks, and based on sync and play status, pick a new Leader, or return the
+    /// explicit leader if the one has been selected. If triggering_syncable is not null, we treat
+    /// it as if it had newStatus because we may be in the process of enabling or disabling it.
+    Syncable* pickLeader(Syncable* triggering_syncable, bool newStatus);
 
     /// Find a deck to match against, used in the case where there is no sync Leader.
     /// Looks first for a playing deck, and falls back to the first non-playing deck.
diff --git a/src/test/enginesynctest.cpp b/src/test/enginesynctest.cpp
index 23756489664..3b7d1c2ede1 100644
--- a/src/test/enginesynctest.cpp
+++ b/src/test/enginesynctest.cpp
@@ -356,8 +356,8 @@ TEST_F(EngineSyncTest, DisableInternalLeaderWhilePlaying) {
     ProcessBuffer();
 
     // This is not allowed, Internal should still be leader.
-    EXPECT_TRUE(isFollower(m_sInternalClockGroup));
-    EXPECT_EQ(0, pButtonLeaderSync->get());
+    EXPECT_TRUE(isSoftLeader(m_sInternalClockGroup));
+    EXPECT_EQ(1, pButtonLeaderSync->get());
 }
 
 TEST_F(EngineSyncTest, DisableSyncOnLeader) {

From a7d0e1aa0bb095d171e4bf8a106a9bc537487363 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Thu, 14 Dec 2023 15:08:06 +0100
Subject: [PATCH 384/388] Bump libc6 downgrade version

---
 .github/workflows/build-checks.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-checks.yml b/.github/workflows/build-checks.yml
index 9a0ae7641bc..63cbb837b7b 100644
--- a/.github/workflows/build-checks.yml
+++ b/.github/workflows/build-checks.yml
@@ -118,7 +118,7 @@ jobs:
         run: |
           sudo rm -f /etc/apt/sources.list.d/ubuntu-toolchain-r-ubuntu-test-jammy.list
           sudo apt-get update
-          sudo apt-get install -y --allow-downgrades libc6=2.35-0ubuntu3.4 libc6-dev=2.35-0ubuntu3.4 libstdc++6=12.3.0-1ubuntu1~22.04 libgcc-s1=12.3.0-1ubuntu1~22.04
+          sudo apt-get install -y --allow-downgrades libc6=2.35-0ubuntu3.5 libc6-dev=2.35-0ubuntu3.5 libstdc++6=12.3.0-1ubuntu1~22.04 libgcc-s1=12.3.0-1ubuntu1~22.04
       - name: Build
         # Do not abort on errors and build/check the whole project
         run: cmake --build . -j $(nproc) -- --keep-going

From 85d3d96f25e112e4b76b71f30d517b87bfe809d2 Mon Sep 17 00:00:00 2001
From: Owen Williams <owilliams@mixxx.org>
Date: Thu, 14 Dec 2023 10:33:55 -0500
Subject: [PATCH 385/388] Sync Lock: revert ability to set soft leader on
 stopped decks.

---
 src/engine/sync/enginesync.cpp  | 26 ++++----------------------
 src/engine/sync/synccontrol.cpp |  2 +-
 src/test/enginesynctest.cpp     |  6 +++---
 3 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/src/engine/sync/enginesync.cpp b/src/engine/sync/enginesync.cpp
index 456eb0a71bb..5f6b6f51812 100644
--- a/src/engine/sync/enginesync.cpp
+++ b/src/engine/sync/enginesync.cpp
@@ -56,32 +56,16 @@ void EngineSync::requestSyncMode(Syncable* pSyncable, SyncMode mode) {
         [[fallthrough]];
     }
     case SyncMode::LeaderSoft: {
-        if (pSyncable->getBaseBpm().isValid()) {
-            if (!pSyncable->isPlaying()) {
-                bool anyPlaying = false;
-                // Only allow a non-playing deck to be leader if no deck is playing
-                for (Syncable* pSyncable : std::as_const(m_syncables)) {
-                    if (!pSyncable->isSynchronized()) {
-                        continue;
-                    }
-
-                    if (pSyncable->isPlaying()) {
-                        anyPlaying = true;
-                        break;
-                    }
-                }
-                if (!anyPlaying) {
-                    activateLeader(pSyncable, mode);
-                }
-                break;
-            }
+        if (pSyncable->getBaseBpm().isValid() &&
+                pSyncable->isPlaying() &&
+                pSyncable->isAudible()) {
             activateLeader(pSyncable, mode);
             break;
         }
         [[fallthrough]];
     }
     case SyncMode::Follower: {
-        // This request is also used to verifies and moves a soft leader
+        // This request is also used to verify and move a soft leader
         if (!m_pLeaderSyncable || m_pLeaderSyncable == pSyncable ||
                 m_pLeaderSyncable->getSyncMode() != SyncMode::LeaderExplicit) {
             // Pick a new leader, in case we would have none after becoming follower
@@ -596,7 +580,6 @@ bool EngineSync::otherSyncedPlaying(const QString& group) {
 
 void EngineSync::addSyncableDeck(Syncable* pSyncable) {
     if (m_syncables.contains(pSyncable)) {
-        qDebug() << "EngineSync: already has" << pSyncable;
         return;
     }
     m_syncables.append(pSyncable);
@@ -654,7 +637,6 @@ mixxx::Bpm EngineSync::leaderBaseBpm() const {
 }
 
 void EngineSync::updateLeaderBpm(Syncable* pSource, mixxx::Bpm bpm) {
-    //qDebug() << "EngineSync::updateLeaderBpm" << pSource << bpm;
     if (pSource != m_pInternalClock) {
         m_pInternalClock->updateLeaderBpm(bpm);
     }
diff --git a/src/engine/sync/synccontrol.cpp b/src/engine/sync/synccontrol.cpp
index 39871784195..4cdc3693c02 100644
--- a/src/engine/sync/synccontrol.cpp
+++ b/src/engine/sync/synccontrol.cpp
@@ -471,7 +471,7 @@ void SyncControl::slotControlBeatSync(double value) {
 
 void SyncControl::slotControlPlay(double play) {
     if (kLogger.traceEnabled()) {
-        kLogger.trace() << "SyncControl::slotControlPlay" << getSyncMode() << play;
+        kLogger.trace() << "SyncControl::slotControlPlay" << getGroup() << getSyncMode() << play;
     }
     m_pEngineSync->notifyPlayingAudible(this, play > 0.0 && m_audible);
 }
diff --git a/src/test/enginesynctest.cpp b/src/test/enginesynctest.cpp
index 3b7d1c2ede1..c60f60500ca 100644
--- a/src/test/enginesynctest.cpp
+++ b/src/test/enginesynctest.cpp
@@ -372,13 +372,13 @@ TEST_F(EngineSyncTest, DisableSyncOnLeader) {
     mixxx::BeatsPointer pBeats2 = mixxx::Beats::fromConstTempo(
             m_pTrack2->getSampleRate(), mixxx::audio::kStartFramePos, mixxx::Bpm(130));
     m_pTrack2->trySetBeats(pBeats2);
-    // Set deck two to explicit leader.
+    // Set deck two to leader, but this is not allowed because it's stopped.
     auto pButtonSyncLeader2 =
             std::make_unique<ControlProxy>(m_sGroup2, "sync_leader");
     pButtonSyncLeader2->set(1.0);
     ProcessBuffer();
-    EXPECT_TRUE(isFollower(m_sGroup1));
-    EXPECT_TRUE(isSoftLeader(m_sGroup2));
+    EXPECT_TRUE(isSoftLeader(m_sGroup1));
+    EXPECT_TRUE(isFollower(m_sGroup2));
 
     // Set deck 2 to playing, now it becomes explicit leader.
     ControlObject::getControl(ConfigKey(m_sGroup2, "play"))->set(1.0);

From c3982ea9f821165dffbc0c4122b512f3d245c990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Fri, 15 Dec 2023 09:46:48 +0100
Subject: [PATCH 386/388] improve mixxx-libdjinterop definition

---
 CMakeLists.txt | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b25806c7a5..285407f4cbe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2348,22 +2348,24 @@ if(ENGINEPRIME)
       EXCLUDE_FROM_ALL TRUE
     )
 
-    # Assemble a library based on the external project.
-    add_library(mixxx-libdjinterop STATIC IMPORTED)
-    add_dependencies(mixxx-libdjinterop libdjinterop)
-    set(DJINTEROP_INCLUDE_DIR "${DJINTEROP_INSTALL_DIR}/include")
-    set(DJINTEROP_LIBRARY_PATH "${DJINTEROP_INSTALL_DIR}/${DJINTEROP_LIBRARY}")
-    set_target_properties(mixxx-libdjinterop PROPERTIES IMPORTED_LOCATION "${DJINTEROP_LIBRARY_PATH}")
-    target_include_directories(mixxx-lib PUBLIC ${DJINTEROP_INCLUDE_DIR})
-    target_link_libraries(mixxx-lib PRIVATE mixxx-libdjinterop)
-
     # Since we have built libdjinterop from sources as a static library, its
     # transitive dependencies are not automatically recognised.  libdjinterop
     # depends on zlib and optionally sqlite3.  If libdjinterop was configured
     # to depend on system SQLite, Mixxx will already have the dependency.
     # But it does not have zlib, so we explicitly add that here.
     find_package(ZLIB 1.2.8 REQUIRED)
-    target_link_libraries(mixxx-lib PRIVATE ${ZLIB_LIBRARIES})
+    # The include folder needs to already exist, otherwise INTERFACE_INCLUDE_DIRECTORIES will not be propagated
+    file(MAKE_DIRECTORY "${DJINTEROP_INSTALL_DIR}/include")
+
+    # Assemble a library based on the external project.
+    add_library(mixxx-libdjinterop STATIC IMPORTED)
+    set_target_properties(mixxx-libdjinterop PROPERTIES
+      INTERFACE_INCLUDE_DIRECTORIES "${DJINTEROP_INSTALL_DIR}/include"
+      INTERFACE_LINK_LIBRARIES ${ZLIB_LIBRARIES}
+      IMPORTED_LOCATION "${DJINTEROP_INSTALL_DIR}/${DJINTEROP_LIBRARY}"
+    )
+    add_dependencies(mixxx-libdjinterop libdjinterop)
+    target_link_libraries(mixxx-lib PRIVATE mixxx-libdjinterop)
   endif()
 
   # Include conditional sources only required with Engine Prime export support.

From 79dcbbb1efd158dfe479f1069838646b05da132f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Fri, 15 Dec 2023 18:58:43 +0100
Subject: [PATCH 387/388] Add a workaround to inherit dependencies for
 'CMakeFiles/mixxx-lib_autogen_timestamp_deps' with make.

---
 CMakeLists.txt | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 285407f4cbe..06629d30d1f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2357,6 +2357,17 @@ if(ENGINEPRIME)
     # The include folder needs to already exist, otherwise INTERFACE_INCLUDE_DIRECTORIES will not be propagated
     file(MAKE_DIRECTORY "${DJINTEROP_INSTALL_DIR}/include")
 
+    if(NOT CMAKE_GENERATOR STREQUAL "Ninja")
+      # Required for 'CMakeFiles/mixxx-lib_autogen_timestamp_deps'
+      # This tells 'make" that the libdjinterop is required for the djinterop library
+      # BUILD_BYPRODUCTS work for Ninja only, while this workaround does not work for Ninja on macOS
+      add_custom_command(
+        OUTPUT "${DJINTEROP_INSTALL_DIR}/${DJINTEROP_LIBRARY}"
+        DEPENDS libdjinterop
+        COMMAND echo libdjinterop installed
+      )
+    endif()
+
     # Assemble a library based on the external project.
     add_library(mixxx-libdjinterop STATIC IMPORTED)
     set_target_properties(mixxx-libdjinterop PROPERTIES

From 9c1d8253f27839429756eac09e6159e5cd9c905f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sun, 17 Dec 2023 10:50:31 +0100
Subject: [PATCH 388/388] Use imported target ZLIB::ZLIB

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86d3c36d6e1..45329a90d12 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2372,7 +2372,7 @@ if(ENGINEPRIME)
     add_library(mixxx-libdjinterop STATIC IMPORTED)
     set_target_properties(mixxx-libdjinterop PROPERTIES
       INTERFACE_INCLUDE_DIRECTORIES "${DJINTEROP_INSTALL_DIR}/include"
-      INTERFACE_LINK_LIBRARIES ${ZLIB_LIBRARIES}
+      INTERFACE_LINK_LIBRARIES ZLIB::ZLIB
       IMPORTED_LOCATION "${DJINTEROP_INSTALL_DIR}/${DJINTEROP_LIBRARY}"
     )
     add_dependencies(mixxx-libdjinterop libdjinterop)