Extract interface from BaseTrackPlayer and PlayerManager.

This will make mocking and faking them much easier and prevent
implementation details from being exposed elsewhere in Mixxx.

1 files changed, 29 insertions, 16 deletions

diff --git a/src/basetrackplayer.h b/src/basetrackplayer.h
index 63231d5b73..a444935ed7 100644
--- a/src/basetrackplayer.h
+++ b/src/basetrackplayer.h
@@ -15,18 +15,38 @@ class ControlObjectSlave;
 class AnalyserQueue;
 class EffectsManager;
 
+// Interface for not leaking implementation details of BaseTrackPlayer into the
+// rest of Mixxx. Also makes testing a lot easier.
 class BaseTrackPlayer : public BasePlayer {
     Q_OBJECT
   public:
-    BaseTrackPlayer(QObject* pParent,
-                    ConfigObject<ConfigValue>* pConfig,
-                    EngineMaster* pMixingEngine,
-                    EffectsManager* pEffectsManager,
-                    EngineChannel::ChannelOrientation defaultOrientation,
-                    QString group,
-                    bool defaultMaster,
-                    bool defaultHeadphones);
-    virtual ~BaseTrackPlayer();
+    BaseTrackPlayer(QObject* pParent, const QString& group);
+    virtual ~BaseTrackPlayer() {}
+
+    virtual TrackPointer getLoadedTrack() const = 0;
+
+  public slots:
+    virtual void slotLoadTrack(TrackPointer pTrack, bool bPlay=false) = 0;
+
+  signals:
+    void loadTrack(TrackPointer pTrack, bool bPlay=false);
+    void loadTrackFailed(TrackPointer pTrack);
+    void newTrackLoaded(TrackPointer pLoadedTrack);
+    void unloadingTrack(TrackPointer pAboutToBeUnloaded);
+};
+
+class BaseTrackPlayerImpl : public BaseTrackPlayer {
+    Q_OBJECT
+  public:
+    BaseTrackPlayerImpl(QObject* pParent,
+                        ConfigObject<ConfigValue>* pConfig,
+                        EngineMaster* pMixingEngine,
+                        EffectsManager* pEffectsManager,
+                        EngineChannel::ChannelOrientation defaultOrientation,
+                        QString group,
+                        bool defaultMaster,
+                        bool defaultHeadphones);
+    virtual ~BaseTrackPlayerImpl();
 
     TrackPointer getLoadedTrack() const;
 
@@ -44,12 +64,6 @@ class BaseTrackPlayer : public BasePlayer {
     void slotSetReplayGain(double replayGain);
     void slotPlayToggled(double);
 
-  signals:
-    void loadTrack(TrackPointer pTrack, bool bPlay=false);
-    void loadTrackFailed(TrackPointer pTrack);
-    void newTrackLoaded(TrackPointer pLoadedTrack);
-    void unloadingTrack(TrackPointer pAboutToBeUnloaded);
-
   private:
     ConfigObject<ConfigValue>* m_pConfig;
     TrackPointer m_pLoadedTrack;
@@ -77,5 +91,4 @@ class BaseTrackPlayer : public BasePlayer {
     bool m_replaygainPending;
 };
 
-
 #endif // BASETRACKPLAYER_H