Merge pull request #1700 from daschuer/valueChangedFromEngine

Remove valueChangedFromEngine 

1 files changed, 17 insertions, 43 deletions

diff --git a/src/engine/keycontrol.cpp b/src/engine/keycontrol.cpp
index 32d24b2358..4924783f74 100644
--- a/src/engine/keycontrol.cpp
+++ b/src/engine/keycontrol.cpp
@@ -77,56 +77,28 @@ KeyControl::KeyControl(QString group,
     m_keyunlockMode->setButtonMode(ControlPushButton::TOGGLE);
 
     // In case of vinyl control "rate" is a filtered mean value for display
-    m_pRateSlider = ControlObject::getControl(ConfigKey(group, "rate"));
-    connect(m_pRateSlider, SIGNAL(valueChanged(double)),
-            this, SLOT(slotRateChanged()),
-            Qt::DirectConnection);
-    connect(m_pRateSlider, SIGNAL(valueChangedFromEngine(double)),
-            this, SLOT(slotRateChanged()),
+    m_pRateSlider = new ControlProxy(group, "rate", this);
+    m_pRateSlider->connectValueChanged(SLOT(slotRateChanged()),
             Qt::DirectConnection);
 
-    m_pRateRange = ControlObject::getControl(ConfigKey(group, "rateRange"));
-    connect(m_pRateRange, SIGNAL(valueChanged(double)),
-            this, SLOT(slotRateChanged()),
-            Qt::DirectConnection);
-    connect(m_pRateRange, SIGNAL(valueChangedFromEngine(double)),
-            this, SLOT(slotRateChanged()),
+    m_pRateRange = new ControlProxy(group, "rateRange", this);
+    m_pRateRange->connectValueChanged(SLOT(slotRateChanged()),
             Qt::DirectConnection);
 
-    m_pRateDir = ControlObject::getControl(ConfigKey(group, "rate_dir"));
-    connect(m_pRateDir, SIGNAL(valueChanged(double)),
-            this, SLOT(slotRateChanged()),
-            Qt::DirectConnection);
-    connect(m_pRateDir, SIGNAL(valueChangedFromEngine(double)),
-            this, SLOT(slotRateChanged()),
+    m_pRateDir = new ControlProxy(group, "rate_dir", this);
+    m_pRateDir->connectValueChanged(SLOT(slotRateChanged()),
             Qt::DirectConnection);
 
-    m_pVCEnabled = ControlObject::getControl(ConfigKey(group, "vinylcontrol_enabled"));
-    if (m_pVCEnabled) {
-        connect(m_pVCEnabled, SIGNAL(valueChanged(double)),
-                this, SLOT(slotRateChanged()),
-                Qt::DirectConnection);
-        connect(m_pVCEnabled, SIGNAL(valueChangedFromEngine(double)),
-                this, SLOT(slotRateChanged()),
-                Qt::DirectConnection);
-    }
+    m_pVCEnabled = new ControlProxy(group, "vinylcontrol_enabled", this);
+    m_pVCEnabled->connectValueChanged(SLOT(slotRateChanged()),
+            Qt::DirectConnection);
 
-    m_pVCRate = ControlObject::getControl(ConfigKey(group, "vinylcontrol_rate"));
-    if (m_pVCRate) {
-        connect(m_pVCRate, SIGNAL(valueChanged(double)),
-                this, SLOT(slotRateChanged()),
-                Qt::DirectConnection);
-        connect(m_pVCRate, SIGNAL(valueChangedFromEngine(double)),
-                this, SLOT(slotRateChanged()),
+    m_pVCRate = new ControlProxy(group, "vinylcontrol_rate", this);
+    m_pVCRate->connectValueChanged(SLOT(slotRateChanged()),
                 Qt::DirectConnection);
-    }
 
-    m_pKeylock = ControlObject::getControl(ConfigKey(group, "keylock"));
-    connect(m_pKeylock, SIGNAL(valueChanged(double)),
-            this, SLOT(slotRateChanged()),
-            Qt::DirectConnection);
-    connect(m_pKeylock, SIGNAL(valueChangedFromEngine(double)),
-            this, SLOT(slotRateChanged()),
+    m_pKeylock = new ControlProxy(group, "keylock", this);
+    m_pKeylock->connectValueChanged(SLOT(slotRateChanged()),
             Qt::DirectConnection);
 }
 
@@ -172,10 +144,12 @@ void KeyControl::updateRate() {
     // If rate is not 1.0 then we have to try and calculate the octave change
     // caused by it.
 
-    if(m_pVCEnabled && m_pVCEnabled->toBool()) {
+    if(m_pVCEnabled->toBool()) {
         m_pitchRateInfo.tempoRatio = m_pVCRate->get();
     } else {
-        m_pitchRateInfo.tempoRatio = 1.0 + m_pRateDir->get() * m_pRateRange->get() * m_pRateSlider->get();
+        m_pitchRateInfo.tempoRatio = 1.0
+                + m_pRateDir->get() * m_pRateRange->get()
+                        * m_pRateSlider->get();
     }
 
     if (m_pitchRateInfo.tempoRatio == 0) {