extract EffectsMessenger class from EffectsManager

1 files changed, 13 insertions, 9 deletions

diff --git a/src/effects/effectchainslot.cpp b/src/effects/effectchainslot.cpp
index 8548d8e250..24c5d1e9a3 100644
--- a/src/effects/effectchainslot.cpp
+++ b/src/effects/effectchainslot.cpp
@@ -6,9 +6,8 @@
 #include "effects/backends/effectprocessor.h"
 #include "effects/effectslot.h"
 #include "effects/effectsmanager.h"
-#include "effects/specialeffectchainslots.h"
+#include "effects/effectsmessenger.h"
 #include "engine/effects/engineeffectchain.h"
-#include "engine/effects/message.h"
 #include "engine/engine.h"
 #include "mixer/playermanager.h"
 #include "util/defs.h"
@@ -18,11 +17,13 @@
 
 EffectChainSlot::EffectChainSlot(const QString& group,
         EffectsManager* pEffectsManager,
+        EffectsMessengerPointer pEffectsMessenger,
         SignalProcessingStage stage,
         const QString& id)
         : // The control group names are 1-indexed while internally everything
           // is 0-indexed.
           m_pEffectsManager(pEffectsManager),
+          m_pMessenger(pEffectsMessenger),
           m_group(group),
           m_presetName(""),
           m_mixMode(EffectChainMixMode::DrySlashWet),
@@ -163,7 +164,7 @@ void EffectChainSlot::addToEngine() {
     pRequest->type = EffectsRequest::ADD_EFFECT_CHAIN;
     pRequest->AddEffectChain.signalProcessingStage = m_signalProcessingStage;
     pRequest->AddEffectChain.pChain = m_pEngineEffectChain;
-    m_pEffectsManager->writeRequest(pRequest);
+    m_pMessenger->writeRequest(pRequest);
 
     sendParameterUpdate();
 }
@@ -177,7 +178,7 @@ void EffectChainSlot::removeFromEngine() {
     pRequest->type = EffectsRequest::REMOVE_EFFECT_CHAIN;
     pRequest->RemoveEffectChain.signalProcessingStage = m_signalProcessingStage;
     pRequest->RemoveEffectChain.pChain = m_pEngineEffectChain;
-    m_pEffectsManager->writeRequest(pRequest);
+    m_pMessenger->writeRequest(pRequest);
 
     m_pEngineEffectChain = nullptr;
 }
@@ -216,7 +217,7 @@ void EffectChainSlot::sendParameterUpdate() {
     pRequest->SetEffectChainParameters.mix_mode = static_cast<EffectChainMixMode>(
                                                     static_cast<int>(m_pControlChainMixMode->get()));
     pRequest->SetEffectChainParameters.mix = m_pControlChainMix->get();
-    m_pEffectsManager->writeRequest(pRequest);
+    m_pMessenger->writeRequest(pRequest);
 }
 
 QString EffectChainSlot::group() const {
@@ -245,8 +246,11 @@ EffectSlotPointer EffectChainSlot::addEffectSlot(const QString& group) {
     if (kEffectDebugOutput) {
         qDebug() << debugString() << "addEffectSlot" << group;
     }
-    EffectSlotPointer pEffectSlot = EffectSlotPointer(
-            new EffectSlot(group, m_pEffectsManager, m_effectSlots.size(), m_pEngineEffectChain));
+    EffectSlotPointer pEffectSlot = EffectSlotPointer(new EffectSlot(group,
+            m_pEffectsManager,
+            m_pMessenger,
+            m_effectSlots.size(),
+            m_pEngineEffectChain));
 
     m_effectSlots.append(pEffectSlot);
     int numEffectSlots = m_pControlNumEffectSlots->get() + 1;
@@ -368,7 +372,7 @@ void EffectChainSlot::enableForInputChannel(const ChannelHandleAndGroup& handle_
     }
     request->EnableInputChannelForChain.pEffectStatesMapArray = pEffectStatesMapArray;
 
-    m_pEffectsManager->writeRequest(request);
+    m_pMessenger->writeRequest(request);
 
     m_enabledInputChannels.insert(handle_group);
 }
@@ -382,5 +386,5 @@ void EffectChainSlot::disableForInputChannel(const ChannelHandleAndGroup& handle
     request->type = EffectsRequest::DISABLE_EFFECT_CHAIN_FOR_INPUT_CHANNEL;
     request->pTargetChain = m_pEngineEffectChain;
     request->DisableInputChannelForChain.pChannelHandle = &handle_group.handle();
-    m_pEffectsManager->writeRequest(request);
+    m_pMessenger->writeRequest(request);
 }