Use a shared_ptr for EffectsManager in EngineChannel.

mixxxdj · Sep 17, 2018 · e7bebe3 · e7bebe3
1 parent d951200
commit e7bebe3
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 18 deletions.
diff --git a/src/engine/engineaux.cpp b/src/engine/engineaux.cpp
@@ -13,7 +13,8 @@
 #include "engine/effects/engineeffectsmanager.h"
 #include "util/sample.h"
 
-EngineAux::EngineAux(const ChannelHandleAndGroup& handle_group, EffectsManager* pEffectsManager)
+EngineAux::EngineAux(const ChannelHandleAndGroup& handle_group,
+                     std::shared_ptr<EffectsManager> pEffectsManager)
         : EngineChannel(handle_group, EngineChannel::CENTER, pEffectsManager),
           m_pInputConfigured(new ControlObject(ConfigKey(getGroup(), "input_configured"))),
           m_pPregain(new ControlAudioTaperPot(ConfigKey(getGroup(), "pregain"), -12, 12, 0.5)),
@@ -75,7 +76,7 @@ void EngineAux::process(CSAMPLE* pOut, const int iBufferSize) {
     double pregain = m_pPregain->get();
     if (sampleBuffer) {
         SampleUtil::copyWithGain(pOut, sampleBuffer, pregain, iBufferSize);
-        EngineEffectsManager* pEngineEffectsManager = m_pEffectsManager->getEngineEffectsManager();
+        EngineEffectsManager* pEngineEffectsManager = m_pEffectsManager ? m_pEffectsManager->getEngineEffectsManager() : nullptr;
         if (pEngineEffectsManager != nullptr) {
             pEngineEffectsManager->processPreFaderInPlace(
                 m_group.handle(), m_pEffectsManager->getMasterHandle(),

diff --git a/src/engine/engineaux.h b/src/engine/engineaux.h
@@ -20,7 +20,8 @@ class ControlAudioTaperPot;
 class EngineAux : public EngineChannel, public AudioDestination {
     Q_OBJECT
   public:
-    EngineAux(const ChannelHandleAndGroup& handle_group, EffectsManager* pEffectsManager);
+    EngineAux(const ChannelHandleAndGroup& handle_group,
+              std::shared_ptr<EffectsManager> pEffectsManager);
     virtual ~EngineAux();
 
     bool isActive();

diff --git a/src/engine/enginechannel.cpp b/src/engine/enginechannel.cpp
@@ -22,7 +22,8 @@
 
 EngineChannel::EngineChannel(const ChannelHandleAndGroup& handle_group,
                              EngineChannel::ChannelOrientation defaultOrientation,
-                             EffectsManager* pEffectsManager, bool isTalkoverChannel)
+                             std::shared_ptr<EffectsManager> pEffectsManager,
+                             bool isTalkoverChannel)
         : m_group(handle_group),
           m_pEffectsManager(pEffectsManager),
           m_vuMeter(getGroup()),
@@ -49,7 +50,7 @@ EngineChannel::EngineChannel(const ChannelHandleAndGroup& handle_group,
     m_pTalkover = new ControlPushButton(ConfigKey(getGroup(), "talkover"));
     m_pTalkover->setButtonMode(ControlPushButton::POWERWINDOW);
 
-    if (m_pEffectsManager != nullptr) {
+    if (m_pEffectsManager) {
         m_pEffectsManager->registerInputChannel(handle_group);
     }
 }

diff --git a/src/engine/enginechannel.h b/src/engine/enginechannel.h
@@ -41,7 +41,7 @@ class EngineChannel : public EngineObject {
 
     EngineChannel(const ChannelHandleAndGroup& handle_group,
                   ChannelOrientation defaultOrientation = CENTER,
-                  EffectsManager* pEffectsManager = nullptr,
+                  std::shared_ptr<EffectsManager> pEffectsManager = std::shared_ptr<EffectsManager>(),
                   bool isTalkoverChannel = false);
     virtual ~EngineChannel();
 
@@ -75,7 +75,7 @@ class EngineChannel : public EngineObject {
 
   protected:
     const ChannelHandleAndGroup m_group;
-    EffectsManager* m_pEffectsManager;
+    std::shared_ptr<EffectsManager> m_pEffectsManager;
 
     EngineVuMeter m_vuMeter;
     ControlProxy* m_pSampleRate;
@@ -98,4 +98,3 @@ class EngineChannel : public EngineObject {
 };
 
 #endif
-
diff --git a/src/engine/enginedeck.cpp b/src/engine/enginedeck.cpp
@@ -29,7 +29,7 @@
 EngineDeck::EngineDeck(const ChannelHandleAndGroup& handle_group,
                        UserSettingsPointer pConfig,
                        EngineMaster* pMixingEngine,
-                       EffectsManager* pEffectsManager,
+                       std::shared_ptr<EffectsManager> pEffectsManager,
                        EngineChannel::ChannelOrientation defaultOrientation)
         : EngineChannel(handle_group, defaultOrientation, pEffectsManager),
           m_pConfig(pConfig),
@@ -84,7 +84,7 @@ void EngineDeck::process(CSAMPLE* pOut, const int iBufferSize) {
     // Apply pregain
     m_pPregain->process(pOut, iBufferSize);
 
-    EngineEffectsManager* pEngineEffectsManager = m_pEffectsManager->getEngineEffectsManager();
+    EngineEffectsManager* pEngineEffectsManager = m_pEffectsManager ? m_pEffectsManager->getEngineEffectsManager() : nullptr;
     if (pEngineEffectsManager != nullptr) {
         pEngineEffectsManager->processPreFaderInPlace(
             m_group.handle(), m_pEffectsManager->getMasterHandle(),

diff --git a/src/engine/enginedeck.h b/src/engine/enginedeck.h
@@ -41,7 +41,7 @@ class EngineDeck : public EngineChannel, public AudioDestination {
     Q_OBJECT
   public:
     EngineDeck(const ChannelHandleAndGroup& handle_group, UserSettingsPointer pConfig,
-               EngineMaster* pMixingEngine, EffectsManager* pEffectsManager,
+               EngineMaster* pMixingEngine, std::shared_ptr<EffectsManager> pEffectsManager,
                EngineChannel::ChannelOrientation defaultOrientation = CENTER);
     virtual ~EngineDeck();
 

diff --git a/src/engine/enginemicrophone.cpp b/src/engine/enginemicrophone.cpp
@@ -13,7 +13,7 @@
 #include "util/sample.h"
 
 EngineMicrophone::EngineMicrophone(const ChannelHandleAndGroup& handle_group,
-                                   EffectsManager* pEffectsManager)
+                                   std::shared_ptr<EffectsManager> pEffectsManager)
         : EngineChannel(handle_group, EngineChannel::CENTER, pEffectsManager, true),
           m_pInputConfigured(new ControlObject(ConfigKey(getGroup(), "input_configured"))),
           m_pPregain(new ControlAudioTaperPot(ConfigKey(getGroup(), "pregain"), -12, 12, 0.5)),
@@ -75,7 +75,7 @@ void EngineMicrophone::process(CSAMPLE* pOut, const int iBufferSize) {
     double pregain =  m_pPregain->get();
     if (sampleBuffer) {
         SampleUtil::copyWithGain(pOut, sampleBuffer, pregain, iBufferSize);
-        EngineEffectsManager* pEngineEffectsManager = m_pEffectsManager->getEngineEffectsManager();
+        EngineEffectsManager* pEngineEffectsManager = m_pEffectsManager ? m_pEffectsManager->getEngineEffectsManager() : nullptr;
         if (pEngineEffectsManager != nullptr) {
             pEngineEffectsManager->processPreFaderInPlace(
                 m_group.handle(), m_pEffectsManager->getMasterHandle(),

diff --git a/src/engine/enginemicrophone.h b/src/engine/enginemicrophone.h
@@ -23,7 +23,7 @@ class EngineMicrophone : public EngineChannel, public AudioDestination {
     Q_OBJECT
   public:
     EngineMicrophone(const ChannelHandleAndGroup& handle_group,
-                     EffectsManager* pEffectsManager);
+                     std::shared_ptr<EffectsManager> pEffectsManager);
     virtual ~EngineMicrophone();
 
     bool isActive();

diff --git a/src/mixer/auxiliary.cpp b/src/mixer/auxiliary.cpp
@@ -11,7 +11,7 @@ Auxiliary::Auxiliary(QObject* pParent, const QString& group, int index,
                      std::shared_ptr<EffectsManager> pEffectsManager)
         : BasePlayer(pParent, group) {
     ChannelHandleAndGroup channelGroup = pEngine->registerChannelGroup(group);
-    auto pAuxiliary = std::make_shared<EngineAux>(channelGroup, pEffectsManager.get());
+    auto pAuxiliary = std::make_shared<EngineAux>(channelGroup, pEffectsManager);
     pEngine->addChannel(pAuxiliary);
     AudioInput auxInput = AudioInput(AudioPath::AUXILIARY, 0, 2, index);
     pSoundManager->registerInput(auxInput, pAuxiliary);

diff --git a/src/mixer/basetrackplayer.cpp b/src/mixer/basetrackplayer.cpp
@@ -40,7 +40,7 @@ BaseTrackPlayerImpl::BaseTrackPlayerImpl(QObject* pParent,
     ChannelHandleAndGroup channelGroup =
             pMixingEngine->registerChannelGroup(group);
     m_pChannel = std::make_shared<EngineDeck>(channelGroup, pConfig, pMixingEngine.get(),
-                                              pEffectsManager.get(), defaultOrientation);
+                                              pEffectsManager, defaultOrientation);
 
     m_pInputConfigured = std::make_unique<ControlProxy>(group, "input_configured", this);
     m_pPassthroughEnabled = std::make_unique<ControlProxy>(group, "passthrough", this);

diff --git a/src/mixer/microphone.cpp b/src/mixer/microphone.cpp
@@ -13,7 +13,7 @@ Microphone::Microphone(QObject* pParent, const QString& group, int index,
         : BasePlayer(pParent, group) {
     ChannelHandleAndGroup channelGroup = pEngine->registerChannelGroup(group);
     auto pMicrophone = std::make_shared<EngineMicrophone>(
-            channelGroup, pEffectsManager.get());
+            channelGroup, pEffectsManager);
     pEngine->addChannel(pMicrophone);
     AudioInput micInput = AudioInput(AudioPath::MICROPHONE, 0, 2, index);
     pSoundManager->registerInput(micInput, pMicrophone);

diff --git a/src/test/enginemicrophonetest.cpp b/src/test/enginemicrophonetest.cpp
@@ -24,7 +24,7 @@ class EngineMicrophoneTest : public SignalPathTest {
 
         // No need for a real handle in this test.
         m_pMicrophone = new EngineMicrophone(
-                ChannelHandleAndGroup(ChannelHandle(), "[Microphone]"), m_pEffectsManager.get());
+                ChannelHandleAndGroup(ChannelHandle(), "[Microphone]"), m_pEffectsManager);
         m_pTalkover = ControlObject::getControl(ConfigKey("[Microphone]", "talkover"));
     }