Effects: replace m_isQuickEffectChain with EffectsManager::chainIsQui…

…ckEffectChain
mixxxdj · Sep 1, 2022 · 79aee27 · 79aee27
1 parent 0234c55
commit 79aee27
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/src/effects/chains/quickeffectchain.cpp b/src/effects/chains/quickeffectchain.cpp
@@ -11,7 +11,6 @@ QuickEffectChain::QuickEffectChain(const QString& group,
                   SignalProcessingStage::Postfader,
                   pEffectsManager,
                   pEffectsMessenger) {
-    m_isQuickEffectChain = true;
     for (int i = 0; i < kNumEffectsPerUnit; ++i) {
         addEffectSlot(formatEffectSlotGroup(group, i));
         m_effectSlots.at(i)->setEnabled(true);

diff --git a/src/effects/effectchain.cpp b/src/effects/effectchain.cpp
@@ -218,7 +218,12 @@ void EffectChain::loadChainPreset(EffectChainPresetPointer pPreset) {
         //  after loading an effect. Thus, if this is not a Quick Effetc chain, we
         //  just clear the preset name which in turn clears the chain's preset
         //  selector and chain name label.
-        m_presetName = m_isQuickEffectChain ? kNoEffectString : QString();
+
+        // Check if this is a QuickEffectChain
+        m_presetName = m_pEffectsManager->chainIsQuickEffectChain(this)
+                ? kNoEffectString
+                : QString();
+
         emit chainPresetChanged(m_presetName);
         setControlLoadedPresetIndex(std::nullopt);
         return;

diff --git a/src/effects/effectchain.h b/src/effects/effectchain.h
@@ -91,7 +91,6 @@ class EffectChain : public QObject {
 
   protected:
     EffectSlotPointer addEffectSlot(const QString& group);
-    bool m_isQuickEffectChain = false;
 
     virtual int numPresets() const;
 

diff --git a/src/effects/effectsmanager.cpp b/src/effects/effectsmanager.cpp
@@ -163,6 +163,10 @@ EffectChainPointer EffectsManager::getEffectChain(
     return m_effectChainSlotsByGroup.value(group);
 }
 
+bool EffectsManager::chainIsQuickEffectChain(const EffectChain* pEffectChain) const {
+    return dynamic_cast<const QuickEffectChain*>(pEffectChain) != nullptr;
+}
+
 bool EffectsManager::isAdoptMetaknobSettingEnabled() const {
     return m_pConfig->getValue(ConfigKey("[Effects]", "AdoptMetaknobValue"), true);
 }

diff --git a/src/effects/effectsmanager.h b/src/effects/effectsmanager.h
@@ -36,6 +36,8 @@ class EffectsManager {
     EffectChainPointer getStandardEffectChain(int unitNumber) const;
     EffectChainPointer getOutputEffectChain() const;
 
+    bool chainIsQuickEffectChain(const EffectChain* pEffectChain) const;
+
     EngineEffectsManager* getEngineEffectsManager() const {
         return m_pEngineEffectsManager;
     }