Added new VisualsManager class

10 files changed, 24 insertions, 8 deletions

diff --git a/src/mixer/basetrackplayer.cpp b/src/mixer/basetrackplayer.cpp
index f4a50db2a7..10fdcbf793 100644
--- a/src/mixer/basetrackplayer.cpp
+++ b/src/mixer/basetrackplayer.cpp
@@ -1,3 +1,4 @@
+#include <waveform/visualsmanager.h>
 #include <QMessageBox>
 
 #include "mixer/basetrackplayer.h"
@@ -28,6 +29,7 @@ BaseTrackPlayerImpl::BaseTrackPlayerImpl(QObject* pParent,
                                          UserSettingsPointer pConfig,
                                          EngineMaster* pMixingEngine,
                                          EffectsManager* pEffectsManager,
+                                         VisualsManager* pVisualsManager,
                                          EngineChannel::ChannelOrientation defaultOrientation,
                                          const QString& group,
                                          bool defaultMaster,
@@ -106,6 +108,8 @@ BaseTrackPlayerImpl::BaseTrackPlayerImpl(QObject* pParent,
     m_pReplayGain = std::make_unique<ControlProxy>(group, "replaygain", this);
     m_pPlay = std::make_unique<ControlProxy>(group, "play", this);
     m_pPlay->connectValueChanged(SLOT(slotPlayToggled(double)));
+
+    pVisualsManager->addDeck(group);
 }
 
 BaseTrackPlayerImpl::~BaseTrackPlayerImpl() {
diff --git a/src/mixer/basetrackplayer.h b/src/mixer/basetrackplayer.h
index e814497fb0..ce50d5a441 100644
--- a/src/mixer/basetrackplayer.h
+++ b/src/mixer/basetrackplayer.h
@@ -17,6 +17,7 @@ class ControlObject;
 class ControlPotmeter;
 class ControlProxy;
 class EffectsManager;
+class VisualsManager;
 
 // Interface for not leaking implementation details of BaseTrackPlayer into the
 // rest of Mixxx. Also makes testing a lot easier.
@@ -53,6 +54,7 @@ class BaseTrackPlayerImpl : public BaseTrackPlayer {
                         UserSettingsPointer pConfig,
                         EngineMaster* pMixingEngine,
                         EffectsManager* pEffectsManager,
+                        VisualsManager* pVisualsManager,
                         EngineChannel::ChannelOrientation defaultOrientation,
                         const QString& group,
                         bool defaultMaster,
diff --git a/src/mixer/deck.cpp b/src/mixer/deck.cpp
index 5e68611188..9b584a8024 100644
--- a/src/mixer/deck.cpp
+++ b/src/mixer/deck.cpp
@@ -4,10 +4,11 @@ Deck::Deck(QObject* pParent,
            UserSettingsPointer pConfig,
            EngineMaster* pMixingEngine,
            EffectsManager* pEffectsManager,
+           VisualsManager* pVisualsManager,
            EngineChannel::ChannelOrientation defaultOrientation,
            const QString& group) :
         BaseTrackPlayerImpl(pParent, pConfig, pMixingEngine, pEffectsManager,
-                            defaultOrientation, group, true, false) {
+                pVisualsManager, defaultOrientation, group, true, false) {
 }
 
 Deck::~Deck() {
diff --git a/src/mixer/deck.h b/src/mixer/deck.h
index d596985ee6..561c37b032 100644
--- a/src/mixer/deck.h
+++ b/src/mixer/deck.h
@@ -12,6 +12,7 @@ class Deck : public BaseTrackPlayerImpl {
          UserSettingsPointer pConfig,
          EngineMaster* pMixingEngine,
          EffectsManager* pEffectsManager,
+         VisualsManager* pVisualsManager,
          EngineChannel::ChannelOrientation defaultOrientation,
          const QString& group);
     virtual ~Deck();
diff --git a/src/mixer/playermanager.cpp b/src/mixer/playermanager.cpp
index 866c3f7b12..5a3ed6b547 100644
--- a/src/mixer/playermanager.cpp
+++ b/src/mixer/playermanager.cpp
@@ -34,11 +34,13 @@ QAtomicPointer<ControlProxy> PlayerManager::m_pCOPNumPreviewDecks;
 PlayerManager::PlayerManager(UserSettingsPointer pConfig,
                              SoundManager* pSoundManager,
                              EffectsManager* pEffectsManager,
+                             VisualsManager* pVisualsManager,
                              EngineMaster* pEngine) :
         m_mutex(QMutex::Recursive),
         m_pConfig(pConfig),
         m_pSoundManager(pSoundManager),
         m_pEffectsManager(pEffectsManager),
+        m_pVisualsManager(pVisualsManager),
         m_pEngine(pEngine),
         // NOTE(XXX) LegacySkinParser relies on these controls being Controls
         // and not ControlProxies.
@@ -339,7 +341,7 @@ void PlayerManager::addDeckInner() {
     }
 
     Deck* pDeck = new Deck(this, m_pConfig, m_pEngine, m_pEffectsManager,
-                           orientation, group);
+            m_pVisualsManager, orientation, group);
     connect(pDeck, SIGNAL(noPassthroughInputConfigured()),
             this, SIGNAL(noDeckPassthroughInputConfigured()));
     connect(pDeck, SIGNAL(noVinylControlInputConfigured()),
@@ -405,8 +407,8 @@ void PlayerManager::addSamplerInner() {
     EngineChannel::ChannelOrientation orientation = EngineChannel::CENTER;
 
     Sampler* pSampler = new Sampler(this, m_pConfig, m_pEngine,
-                                    m_pEffectsManager, orientation, group);
-    if (m_pAnalyzerQueue) {
+            m_pEffectsManager, m_pVisualsManager, orientation, group);
+   if (m_pAnalyzerQueue) {
         connect(pSampler, SIGNAL(newTrackLoaded(TrackPointer)),
                 m_pAnalyzerQueue, SLOT(slotAnalyseTrack(TrackPointer)));
     }
@@ -431,8 +433,7 @@ void PlayerManager::addPreviewDeckInner() {
     EngineChannel::ChannelOrientation orientation = EngineChannel::CENTER;
 
     PreviewDeck* pPreviewDeck = new PreviewDeck(this, m_pConfig, m_pEngine,
-                                                m_pEffectsManager, orientation,
-                                                group);
+            m_pEffectsManager, m_pVisualsManager, orientation, group);
     if (m_pAnalyzerQueue) {
         connect(pPreviewDeck, SIGNAL(newTrackLoaded(TrackPointer)),
                 m_pAnalyzerQueue, SLOT(slotAnalyseTrack(TrackPointer)));
diff --git a/src/mixer/playermanager.h b/src/mixer/playermanager.h
index 98d8ba60ef..2958d58ee0 100644
--- a/src/mixer/playermanager.h
+++ b/src/mixer/playermanager.h
@@ -25,6 +25,7 @@ class PreviewDeck;
 class Sampler;
 class SamplerBank;
 class SoundManager;
+class VisualsManager;
 
 // For mocking PlayerManager.
 class PlayerManagerInterface {
@@ -60,6 +61,7 @@ class PlayerManager : public QObject, public PlayerManagerInterface {
     PlayerManager(UserSettingsPointer pConfig,
                   SoundManager* pSoundManager,
                   EffectsManager* pEffectsManager,
+                  VisualsManager* pVisualsManager,
                   EngineMaster* pEngine);
     virtual ~PlayerManager();
 
@@ -241,6 +243,7 @@ class PlayerManager : public QObject, public PlayerManagerInterface {
     UserSettingsPointer m_pConfig;
     SoundManager* m_pSoundManager;
     EffectsManager* m_pEffectsManager;
+    VisualsManager* m_pVisualsManager;
     EngineMaster* m_pEngine;
     SamplerBank* m_pSamplerBank;
     AnalyzerQueue* m_pAnalyzerQueue;
diff --git a/src/mixer/previewdeck.cpp b/src/mixer/previewdeck.cpp
index dba001ea16..f30ca48573 100644
--- a/src/mixer/previewdeck.cpp
+++ b/src/mixer/previewdeck.cpp
@@ -4,10 +4,11 @@ PreviewDeck::PreviewDeck(QObject* pParent,
                          UserSettingsPointer pConfig,
                          EngineMaster* pMixingEngine,
                          EffectsManager* pEffectsManager,
+                         VisualsManager* pVisualsManager,
                          EngineChannel::ChannelOrientation defaultOrientation,
                          QString group) :
         BaseTrackPlayerImpl(pParent, pConfig, pMixingEngine, pEffectsManager,
-                            defaultOrientation, group, false, true) {
+                pVisualsManager, defaultOrientation, group, false, true) {
 }
 
 PreviewDeck::~PreviewDeck() {
diff --git a/src/mixer/previewdeck.h b/src/mixer/previewdeck.h
index a5c6128770..63ad2b2768 100644
--- a/src/mixer/previewdeck.h
+++ b/src/mixer/previewdeck.h
@@ -10,6 +10,7 @@ class PreviewDeck : public BaseTrackPlayerImpl {
                 UserSettingsPointer pConfig,
                 EngineMaster* pMixingEngine,
                 EffectsManager* pEffectsManager,
+                VisualsManager* pVisualsManager,
                 EngineChannel::ChannelOrientation defaultOrientation,
                 QString group);
     virtual ~PreviewDeck();
diff --git a/src/mixer/sampler.cpp b/src/mixer/sampler.cpp
index b086c1b2ca..d378e1839a 100644
--- a/src/mixer/sampler.cpp
+++ b/src/mixer/sampler.cpp
@@ -6,10 +6,11 @@ Sampler::Sampler(QObject* pParent,
                  UserSettingsPointer pConfig,
                  EngineMaster* pMixingEngine,
                  EffectsManager* pEffectsManager,
+                 VisualsManager* pVisualsManager,
                  EngineChannel::ChannelOrientation defaultOrientation,
                  QString group) :
         BaseTrackPlayerImpl(pParent, pConfig, pMixingEngine, pEffectsManager,
-                            defaultOrientation, group, true, false) {
+                pVisualsManager, defaultOrientation, group, true, false) {
 }
 
 Sampler::~Sampler() {
diff --git a/src/mixer/sampler.h b/src/mixer/sampler.h
index e2e0422ac3..20e7481338 100644
--- a/src/mixer/sampler.h
+++ b/src/mixer/sampler.h
@@ -10,6 +10,7 @@ class Sampler : public BaseTrackPlayerImpl {
             UserSettingsPointer pConfig,
             EngineMaster* pMixingEngine,
             EffectsManager* pEffectsManager,
+            VisualsManager* pVisualsManager,
             EngineChannel::ChannelOrientation defaultOrientation,
             QString group);
     virtual ~Sampler();