Merge remote-tracking branch 'upstream/master' into rate_ratio

Conflicts:
	src/engine/controls/bpmcontrol.cpp
	src/engine/controls/keycontrol.cpp
	src/engine/sync/synccontrol.cpp
	src/widget/wnumberrate.cpp

2 files changed, 2 insertions, 8 deletions

diff --git a/src/vinylcontrol/vinylcontrol.cpp b/src/vinylcontrol/vinylcontrol.cpp
index 878bfab54f..bf8552e3cd 100644
--- a/src/vinylcontrol/vinylcontrol.cpp
+++ b/src/vinylcontrol/vinylcontrol.cpp
@@ -40,12 +40,6 @@ VinylControl::VinylControl(UserSettingsPointer pConfig, QString group)
 
     //Enabled or not -- load from saved value in case vinyl control is restarting
     m_bIsEnabled = wantenabled->get() > 0.0;
-
-    // Load VC pre-amp gain from the config.
-    // TODO(rryan): Should probably live in VinylControlManager since it's not
-    // specific to a VC deck.
-    ControlObject::set(ConfigKey(VINYL_PREF_KEY, "gain"),
-        m_pConfig->getValueString(ConfigKey(VINYL_PREF_KEY,"gain")).toInt());
 }
 
 bool VinylControl::isEnabled() {
diff --git a/src/vinylcontrol/vinylcontrolmanager.cpp b/src/vinylcontrol/vinylcontrolmanager.cpp
index b902e21a46..d438a510ef 100644
--- a/src/vinylcontrol/vinylcontrolmanager.cpp
+++ b/src/vinylcontrol/vinylcontrolmanager.cpp
@@ -55,7 +55,7 @@ VinylControlManager::~VinylControlManager() {
 
 void VinylControlManager::init() {
     m_pNumDecks = new ControlProxy("[Master]", "num_decks", this);
-    m_pNumDecks->connectValueChanged(SLOT(slotNumDecksChanged(double)));
+    m_pNumDecks->connectValueChanged(this, &VinylControlManager::slotNumDecksChanged);
     slotNumDecksChanged(m_pNumDecks->get());
 }
 
@@ -88,7 +88,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, SLOT(map()));
+        pEnabled->connectValueChanged(&m_vinylControlEnabledMapper, QOverload<int>::of(&QSignalMapper::mapped));
         m_vinylControlEnabledMapper.setMapping(pEnabled, i);
 
         // Default cueing should be off.