Merge branch 'master' of github.com:mixxxdj/mixxx into mastersync-onemaster

2 files changed, 2 insertions, 10 deletions

diff --git a/src/vinylcontrol/vinylcontrolmanager.cpp b/src/vinylcontrol/vinylcontrolmanager.cpp
index cbb337c8ab..7e3570391a 100644
--- a/src/vinylcontrol/vinylcontrolmanager.cpp
+++ b/src/vinylcontrol/vinylcontrolmanager.cpp
@@ -32,11 +32,6 @@ VinylControlManager::VinylControlManager(QObject* pParent,
         pSoundManager->registerInput(
             AudioInput(AudioInput::VINYLCONTROL, 0, 2, i), m_pProcessor);
     }
-
-    connect(&m_vinylControlEnabledMapper,
-            QOverload<int>::of(&QSignalMapper::mapped),
-            this,
-            &VinylControlManager::slotVinylControlEnabledChanged);
 }
 
 VinylControlManager::~VinylControlManager() {
@@ -91,8 +86,7 @@ void VinylControlManager::slotNumDecksChanged(double dNumDecks) {
         QString group = PlayerManager::groupForDeck(i);
         ControlProxy* pEnabled = new ControlProxy(group, "vinylcontrol_enabled", this);
         m_pVcEnabled.push_back(pEnabled);
-        pEnabled->connectValueChanged(&m_vinylControlEnabledMapper, QOverload<int>::of(&QSignalMapper::mapped));
-        m_vinylControlEnabledMapper.setMapping(pEnabled, i);
+        pEnabled->connectValueChanged(this, [this, i] { slotVinylControlEnabledChanged(i); });
 
         // Default cueing should be off.
         ControlObject::set(ConfigKey(group, "vinylcontrol_cueing"),
@@ -115,7 +109,7 @@ void VinylControlManager::slotVinylControlEnabledChanged(int deck) {
     }
 
     ControlProxy* pEnabled = m_pVcEnabled.at(deck);
-    emit(vinylControlDeckEnabled(deck, pEnabled->toBool()));
+    emit vinylControlDeckEnabled(deck, pEnabled->toBool());
 }
 
 void VinylControlManager::requestReloadConfig() {
diff --git a/src/vinylcontrol/vinylcontrolmanager.h b/src/vinylcontrol/vinylcontrolmanager.h
index 4bf975331b..0b85a2e0d6 100644
--- a/src/vinylcontrol/vinylcontrolmanager.h
+++ b/src/vinylcontrol/vinylcontrolmanager.h
@@ -8,7 +8,6 @@
 #define VINYLCONTROLMANAGER_H
 
 #include <QObject>
-#include <QSignalMapper>
 #include <QString>
 #include <QTimerEvent>
 
@@ -69,7 +68,6 @@ class VinylControlManager : public QObject {
     QList<ControlProxy*> m_pVcEnabled;
     ControlProxy* m_pNumDecks;
     int m_iNumConfiguredDecks;
-    QSignalMapper m_vinylControlEnabledMapper;
 };
 
 #endif // VINYLCONTROLMANAGER_H