Merge pull request #18 from daschuer/restore_metaknob_effect_switch_b…

…ehavior use isAdoptMetaknobValueEnabled and "[Effects]", "AdoptMetaknobValue"
mixxxdj · Apr 3, 2018 · f3f010e · f3f010e
2 parents f104162 + 0dd89ef
commit f3f010e
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/src/effects/effectchainmanager.cpp b/src/effects/effectchainmanager.cpp
@@ -218,6 +218,6 @@ void EffectChainManager::loadEffectChains() {
     }
 }
 
-bool EffectChainManager::getAdoptMetaknobPositionSetting() const {
-    return m_pConfig->getValue(ConfigKey("[Effects]", "EffectLoadMetaknobBehavior"), true);
+bool EffectChainManager::isAdoptMetaknobValueEnabled() const {
+    return m_pConfig->getValue(ConfigKey("[Effects]", "AdoptMetaknobValue"), true);
 }
diff --git a/src/effects/effectchainmanager.h b/src/effects/effectchainmanager.h
@@ -63,7 +63,7 @@ class EffectChainManager : public QObject {
 
     static const int kNumStandardEffectChains = 4;
 
-    bool getAdoptMetaknobPositionSetting() const;
+    bool isAdoptMetaknobValueEnabled() const;
 
   private:
     QString debugString() const {

diff --git a/src/effects/effectchainslot.cpp b/src/effects/effectchainslot.cpp
@@ -180,7 +180,7 @@ void EffectChainSlot::slotChainEffectChanged(unsigned int effectSlotNumber,
             pEffect = effects.at(effectSlotNumber);
         }
         if (pSlot != nullptr) {
-            pSlot->loadEffect(pEffect, m_pEffectRack->getAdoptMetaknobPositionSetting());
+            pSlot->loadEffect(pEffect, m_pEffectRack->isAdoptMetaknobValueEnabled());
         }
 
         m_pControlNumEffects->forceSet(math_min(

diff --git a/src/effects/effectrack.cpp b/src/effects/effectrack.cpp
@@ -211,8 +211,8 @@ QDomElement EffectRack::toXml(QDomDocument* doc) const {
     return rackElement;
 }
 
-bool EffectRack::getAdoptMetaknobPositionSetting() const {
-    return m_pEffectChainManager->getAdoptMetaknobPositionSetting();
+bool EffectRack::isAdoptMetaknobValueEnabled() const {
+    return m_pEffectChainManager->isAdoptMetaknobValueEnabled();
 }
 
 StandardEffectRack::StandardEffectRack(EffectsManager* pEffectsManager,

diff --git a/src/effects/effectrack.h b/src/effects/effectrack.h
@@ -57,7 +57,7 @@ class EffectRack : public QObject {
 
     QDomElement toXml(QDomDocument* doc) const;
 
-    virtual bool getAdoptMetaknobPositionSetting() const;
+    virtual bool isAdoptMetaknobValueEnabled() const;
 
   public slots:
     void slotClearRack(double v);
@@ -199,7 +199,7 @@ class QuickEffectRack : public PerGroupRack {
                                            group);
     }
 
-    bool getAdoptMetaknobPositionSetting() const override {
+    bool isAdoptMetaknobValueEnabled() const override {
         // No visible Metaknobs to adopt
         return false;
     }
@@ -251,7 +251,7 @@ class EqualizerRack : public PerGroupRack {
                                            group);
     }
 
-    bool getAdoptMetaknobPositionSetting() const override {
+    bool isAdoptMetaknobValueEnabled() const override {
         // No visible Metaknobs to adopt
         return false;
     }

diff --git a/src/preferences/dialog/dlgprefinterface.cpp b/src/preferences/dialog/dlgprefinterface.cpp
@@ -256,10 +256,10 @@ void DlgPrefInterface::slotUpdate() {
     int inhibitsettings = static_cast<int>(m_mixxx->getInhibitScreensaver());
     comboBoxScreensaver->setCurrentIndex(comboBoxScreensaver->findData(inhibitsettings));
 
-    bool effectLoadMetaknobBehavior = m_pConfig->getValue(
-            ConfigKey("[Effects]", "EffectLoadMetaknobBehavior"), true);
-    radioButtonKeepMetaknobPosition->setChecked(effectLoadMetaknobBehavior);
-    radioButtonMetaknobLoadDefault->setChecked(!effectLoadMetaknobBehavior);
+    bool effectAdoptMetaknobValue = m_pConfig->getValue(
+            ConfigKey("[Effects]", "AdoptMetaknobValue"), true);
+    radioButtonKeepMetaknobPosition->setChecked(effectAdoptMetaknobValue);
+    radioButtonMetaknobLoadDefault->setChecked(!effectAdoptMetaknobValue);
 }
 
 void DlgPrefInterface::slotResetToDefaults() {
@@ -367,7 +367,7 @@ void DlgPrefInterface::slotApply() {
     m_pConfig->set(ConfigKey("[Config]", "StartInFullscreen"),
             ConfigValue(checkBoxStartFullScreen->isChecked()));
 
-    m_pConfig->set(ConfigKey("[Effects]", "EffectLoadMetaknobBehavior"),
+    m_pConfig->set(ConfigKey("[Effects]", "AdoptMetaknobValue"),
             ConfigValue(radioButtonKeepMetaknobPosition->isChecked()));
 
     m_mixxx->setToolTipsCfg(m_tooltipMode);