chore: Use new mixer controls in C++ code

Author: Holzhaus

src/controllers/controlpickermenu.cpp

@@ -16,6 +16,7 @@
 
 namespace {
 const QString kAppGroup = QStringLiteral("[App]");
+const QString kMixerGroup = QStringLiteral("[Mixer]");
 } // namespace
 
 ControlPickerMenu::ControlPickerMenu(QWidget* pParent)
@@ -53,8 +54,8 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent)
     QMenu* pMixerMenu = addSubmenu(tr("Mixer"));
     // Crossfader / Orientation
     QMenu* pCrossfaderMenu = addSubmenu(tr("Crossfader / Orientation"), pMixerMenu);
-    addControl("[Master]",
-            "crossfader",
+    addControl(kMixerGroup,
+            QStringLiteral("crossfader"),
             tr("Crossfader"),
             tr("Crossfader"),
             pCrossfaderMenu,
@@ -77,45 +78,45 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent)
             pCrossfaderMenu);
     // Main Output
     QMenu* pMainOutputMenu = addSubmenu(tr("Main Output"), pMixerMenu);
-    addControl("[Master]",
-            "gain",
+    addControl(kMixerGroup,
+            QStringLiteral("main_gain"),
             tr("Main Output Gain"),
             tr("Main Output gain"),
             pMainOutputMenu,
             true);
-    addControl("[Master]",
-            "balance",
+    addControl(kMixerGroup,
+            QStringLiteral("balance"),
             tr("Main Output Balance"),
             tr("Main Output balance"),
             pMainOutputMenu,
             true);
-    addControl("[Master]",
-            "delay",
+    addControl(kMixerGroup,
+            QStringLiteral("main_delay"),
             tr("Main Output Delay"),
             tr("Main Output delay"),
             pMainOutputMenu,
             true);
     // Headphone
     QMenu* pHeadphoneMenu = addSubmenu(tr("Headphone"), pMixerMenu);
-    addControl("[Master]",
-            "headGain",
+    addControl(kMixerGroup,
+            QStringLiteral("headphone_gain"),
             tr("Headphone Gain"),
             tr("Headphone gain"),
             pHeadphoneMenu,
             true);
-    addControl("[Master]",
-            "headMix",
+    addControl(kMixerGroup,
+            QStringLiteral("headphone_mix"),
             tr("Headphone Mix"),
             tr("Headphone mix (pre/main)"),
             pHeadphoneMenu,
             true);
-    addControl("[Master]",
-            "headSplit",
+    addControl(kMixerGroup,
+            QStringLiteral("headphone_split"),
             tr("Headphone Split Cue"),
             tr("Toggle headphone split cueing"),
             pHeadphoneMenu);
-    addControl("[Master]",
-            "headDelay",
+    addControl(kMixerGroup,
+            QStringLiteral("headphone_delay"),
             tr("Headphone Delay"),
             tr("Headphone delay"),
             pHeadphoneMenu,
@@ -1347,14 +1348,14 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent)
             pMicrophoneMenu,
             true,
             false);
-    addControl("[Master]",
-            "duckStrength",
+    addControl(kMixerGroup,
+            QStringLiteral("talkover_ducking_strength"),
             tr("Microphone Ducking Strength"),
             tr("Microphone Ducking Strength"),
             pMicrophoneMenu,
             true);
-    addControl("[Master]",
-            "talkoverDucking",
+    addControl(kMixerGroup,
+            QStringLiteral("talkover_ducking_mode"),
             tr("Microphone Ducking Mode"),
             tr("Toggle microphone ducking mode (OFF, AUTO, MANUAL)"),
             pMicrophoneMenu);

src/library/autodj/autodjprocessor.cpp

@@ -119,7 +119,7 @@ AutoDJProcessor::AutoDJProcessor(
           m_transitionProgress(0.0),
           m_transitionTime(kTransitionPreferenceDefault),
           m_pPlayerManager(pPlayerManager),
-          m_coCrossfader(QStringLiteral("[Master]"), QStringLiteral("crossfader")),
+          m_coCrossfader(QStringLiteral("[Mixer]"), QStringLiteral("crossfader")),
           m_coCrossfaderReverse(QStringLiteral("[Mixer Profile]"), QStringLiteral("xFaderReverse")),
           m_shufflePlaylist(ConfigKey(kControlGroup, QStringLiteral("shuffle_playlist"))),
           m_skipNext(ConfigKey(kControlGroup, QStringLiteral("skip_next"))),

src/mixer/playerinfo.cpp

@@ -15,12 +15,11 @@ constexpr int kPlayingDeckUpdateIntervalMillis = 2000;
 PlayerInfo* s_pPlayerInfo = nullptr;
 
 const QString kAppGroup = QStringLiteral("[App]");
-const QString kMasterGroup = QStringLiteral("[Master]");
 
 } // namespace
 
 PlayerInfo::PlayerInfo()
-        : m_xfader(kMasterGroup, QStringLiteral("crossfader")),
+        : m_xfader(QStringLiteral("[Master]"), QStringLiteral("crossfader")),
           m_numDecks(kAppGroup, QStringLiteral("num_decks")),
           m_numSamplers(kAppGroup, QStringLiteral("num_samplers")),
           m_numPreviewDecks(kAppGroup, QStringLiteral("num_preview_decks")),

src/preferences/dialog/dlgprefmixer.cpp

@@ -78,7 +78,7 @@ DlgPrefMixer::DlgPrefMixer(
           m_xfCurveCO(make_parented<ControlProxy>(kXfaderCurveKey, this)),
           m_xfReverseCO(make_parented<ControlProxy>(kXfaderReverseKey, this)),
           m_xfCalibrationCO(make_parented<ControlProxy>(kXfaderCalibrationKey, this)),
-          m_crossfader(QStringLiteral("[Master]"), QStringLiteral("crossfader")),
+          m_crossfader(QStringLiteral("[Mixer]"), QStringLiteral("crossfader")),
           m_xFaderReverse(false),
           m_COLoFreq(kLowEqFreqKey),
           m_COHiFreq(kHighEqFreqKey),

src/test/autodjprocessor_test.cpp

@@ -32,7 +32,10 @@ const QString kAppGroup = QStringLiteral("[App]");
 class FakeMixer {
   public:
     FakeMixer()
-            : crossfader(ConfigKey("[Master]", "crossfader"), -1.0, 1.0),
+            : crossfader(ConfigKey(QStringLiteral("[Mixer]"),
+                                 QStringLiteral("crossfader")),
+                      -1.0,
+                      1.0),
               crossfaderReverse(ConfigKey("[Mixer Profile]", "xFaderReverse")) {
         crossfaderReverse.setButtonMode(mixxx::control::ButtonMode::Toggle);
     }

src/test/signalpathtest.cpp

@@ -1,6 +1,5 @@
 #include "test/signalpathtest.h"
 
-const QString BaseSignalPathTest::m_sMainGroup = QStringLiteral("[Master]");
 const QString BaseSignalPathTest::m_sInternalClockGroup = QStringLiteral("[InternalClock]");
 // these names need to match PlayerManager::groupForDeck and friends
 const QString BaseSignalPathTest::m_sGroup1 = QStringLiteral("[Channel1]");

src/test/signalpathtest.h

@@ -124,7 +124,9 @@ class BaseSignalPathTest : public MixxxTest, SoundSourceProviderRegistration {
         addDeck(m_pChannel3);
 
         m_pEngineSync = m_pEngineMixer->getEngineSync();
-        ControlObject::set(ConfigKey(m_sMainGroup, "enabled"), 1.0);
+        ControlObject::set(ConfigKey(QStringLiteral("[Mixer]"),
+                                   QStringLiteral("main_enabled")),
+                1.0);
 
         PlayerInfo::create();
     }
@@ -274,7 +276,6 @@ class BaseSignalPathTest : public MixxxTest, SoundSourceProviderRegistration {
     EngineDeck *m_pChannel1, *m_pChannel2, *m_pChannel3;
     PreviewDeck* m_pPreview1;
 
-    static const QString m_sMainGroup;
     static const QString m_sInternalClockGroup;
     static const QString m_sGroup1;
     static const QString m_sGroup2;