Merge pull request #4471 from Be-ing/main_eq

fix setting of effect parameters programatically
mixxxdj · Oct 24, 2021 · 30bdf83 · 30bdf83
2 parents 3a5fac3 + 82ebe77
commit 30bdf83
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/src/effects/effectbuttonparameterslot.cpp b/src/effects/effectbuttonparameterslot.cpp
@@ -77,7 +77,6 @@ void EffectButtonParameterSlot::clear() {
     emit updated();
 }
 
-void EffectButtonParameterSlot::slotParameterValueChanged(double value) {
-    //qDebug() << debugString() << "slotParameterValueChanged" << value.toDouble();
-    m_pControlValue->set(value);
+void EffectButtonParameterSlot::setParameter(double value) {
+    m_pControlValue->setParameterFrom(value, this);
 }
diff --git a/src/effects/effectbuttonparameterslot.h b/src/effects/effectbuttonparameterslot.h
@@ -26,9 +26,7 @@ class EffectButtonParameterSlot : public EffectParameterSlotBase {
 
     void clear() override;
 
-  private slots:
-    // Solely for handling control changes
-    void slotParameterValueChanged(double value) override;
+    void setParameter(double value) override;
 
   private:
     QString debugString() const {

diff --git a/src/effects/effectknobparameterslot.cpp b/src/effects/effectknobparameterslot.cpp
@@ -110,8 +110,8 @@ void EffectKnobParameterSlot::clear() {
     emit updated();
 }
 
-void EffectKnobParameterSlot::slotParameterValueChanged(double value) {
-    m_pControlValue->set(value);
+void EffectKnobParameterSlot::setParameter(double value) {
+    m_pControlValue->setParameterFrom(value, this);
 }
 
 void EffectKnobParameterSlot::slotLinkTypeChanging(double v) {

diff --git a/src/effects/effectknobparameterslot.h b/src/effects/effectknobparameterslot.h
@@ -39,9 +39,10 @@ class EffectKnobParameterSlot : public EffectParameterSlotBase {
     // Clear the currently loaded effect
     void clear() override;
 
+    void setParameter(double value) override;
+
   private slots:
     // Solely for handling control changes
-    void slotParameterValueChanged(double value) override;
     void slotLinkTypeChanging(double v);
     void slotLinkInverseChanged(double v);
 

diff --git a/src/effects/effectparameterslotbase.h b/src/effects/effectparameterslotbase.h
@@ -50,14 +50,15 @@ class EffectParameterSlotBase : public QObject {
         return m_iParameterSlotNumber;
     }
 
+    virtual void setParameter(double value) = 0;
+
   signals:
     // Signal that indicates that the EffectParameterSlotBase has been updated.
     void updated();
 
   public slots:
     // Solely for handling control changes
     void slotValueChanged(double v);
-    virtual void slotParameterValueChanged(double value) = 0;
 
   protected:
     const unsigned int m_iParameterSlotNumber;

diff --git a/src/preferences/dialog/dlgprefeq.cpp b/src/preferences/dialog/dlgprefeq.cpp
@@ -443,7 +443,7 @@ void DlgPrefEQ::slotUpdateMainEQParameter(int value) {
 
         if (pParameterSlot->isLoaded()) {
             double dValue = value / 100.0;
-            pParameterSlot->slotParameterValueChanged(dValue);
+            pParameterSlot->setParameter(dValue);
             QLabel* valueLabel = m_mainEQValues[index];
             QString valueText = QString::number(dValue);
             valueLabel->setText(valueText);
@@ -709,7 +709,7 @@ void DlgPrefEQ::setMainEQParameter(int i, double value) {
                 EffectManifestParameter::ParameterType::Knob, i);
 
         if (pParameterSlot->isLoaded()) {
-            pParameterSlot->slotParameterValueChanged(value);
+            pParameterSlot->setParameter(value);
             m_mainEQSliders[i]->setValue(static_cast<int>(value * 100));
 
             QLabel* valueLabel = m_mainEQValues[i];