DeckAttributes: Add TrackOrDeckAttributes as base class of DeckAttributes

Author: cr7pt0gr4ph7

CMakeLists.txt

@@ -1389,6 +1389,7 @@ add_library(
   src/library/autodj/dlgautodj.cpp
   src/library/autodj/dlgautodj.ui
   src/library/autodj/track/deckattributes.cpp
+  src/library/autodj/track/trackordeckattributes.cpp
   src/library/banshee/bansheedbconnection.cpp
   src/library/banshee/bansheefeature.cpp
   src/library/banshee/bansheeplaylistmodel.cpp

src/library/autodj/autodjprocessor.h

@@ -10,6 +10,7 @@
 #include "control/controlpushbutton.h"
 #include "control/pollingcontrolproxy.h"
 #include "library/autodj/track/deckattributes.h"
+#include "library/autodj/track/trackordeckattributes.h"
 #include "library/playlisttablemodel.h"
 #include "preferences/usersettings.h"
 #include "track/track_decl.h"

src/library/autodj/track/deckattributes.h

@@ -1,15 +1,13 @@
 #pragma once
 
-#include "audio/frame.h"
-#include "audio/types.h"
 #include "control/controlproxy.h"
 #include "engine/channels/enginechannel.h"
-#include "track/track_decl.h"
+#include "library/autodj/track/trackordeckattributes.h"
 
 class BaseTrackPlayer;
 
 /// Exposes the attributes of the track loaded in a certain player deck.
-class DeckAttributes : public QObject {
+class DeckAttributes : public TrackOrDeckAttributes {
     Q_OBJECT
   public:
     /// Special value for startPos that indicates the deck
@@ -44,7 +42,7 @@ class DeckAttributes : public QObject {
         m_play.set(1.0);
     }
 
-    double playPosition() const {
+    double playPosition() const override {
         return m_playPos.get();
     }
 
@@ -60,35 +58,35 @@ class DeckAttributes : public QObject {
         m_repeat.set(enabled ? 1.0 : 0.0);
     }
 
-    mixxx::audio::FramePos introStartPosition() const {
+    mixxx::audio::FramePos introStartPosition() const override {
         return mixxx::audio::FramePos::fromEngineSamplePosMaybeInvalid(m_introStartPos.get());
     }
 
-    mixxx::audio::FramePos introEndPosition() const {
+    mixxx::audio::FramePos introEndPosition() const override {
         return mixxx::audio::FramePos::fromEngineSamplePosMaybeInvalid(m_introEndPos.get());
     }
 
-    mixxx::audio::FramePos outroStartPosition() const {
+    mixxx::audio::FramePos outroStartPosition() const override {
         return mixxx::audio::FramePos::fromEngineSamplePosMaybeInvalid(m_outroStartPos.get());
     }
 
-    mixxx::audio::FramePos outroEndPosition() const {
+    mixxx::audio::FramePos outroEndPosition() const override {
         return mixxx::audio::FramePos::fromEngineSamplePosMaybeInvalid(m_outroEndPos.get());
     }
 
-    mixxx::audio::SampleRate sampleRate() const {
+    mixxx::audio::SampleRate sampleRate() const override {
         return mixxx::audio::SampleRate::fromDouble(m_sampleRate.get());
     }
 
-    mixxx::audio::FramePos trackEndPosition() const {
+    mixxx::audio::FramePos trackEndPosition() const override {
         return mixxx::audio::FramePos::fromEngineSamplePosMaybeInvalid(m_trackSamples.get());
     }
 
-    double rateRatio() const {
+    double rateRatio() const override {
         return m_rateRatio.get();
     }
 
-    TrackPointer getLoadedTrack() const;
+    TrackPointer getLoadedTrack() const override;
 
   signals:
     void playChanged(DeckAttributes* pDeck, bool playing);

src/library/autodj/track/trackordeckattributes.cpp

@@ -0,0 +1,6 @@
+#include "library/autodj/track/trackordeckattributes.h"
+
+#include "moc_trackordeckattributes.cpp"
+
+TrackOrDeckAttributes::~TrackOrDeckAttributes() {
+}

src/library/autodj/track/trackordeckattributes.h

@@ -0,0 +1,30 @@
+#pragma once
+
+#include <QObject>
+
+#include "audio/frame.h"
+#include "audio/types.h"
+#include "track/track_decl.h"
+
+/// Represents either a track in the Auto DJ queue,
+/// or a player deck controlled by the Auto DJ processor.
+class TrackOrDeckAttributes : public QObject {
+    Q_OBJECT
+  public:
+    virtual ~TrackOrDeckAttributes();
+
+    virtual mixxx::audio::FramePos introStartPosition() const = 0;
+    virtual mixxx::audio::FramePos introEndPosition() const = 0;
+    virtual mixxx::audio::FramePos outroStartPosition() const = 0;
+    virtual mixxx::audio::FramePos outroEndPosition() const = 0;
+    virtual mixxx::audio::SampleRate sampleRate() const = 0;
+    virtual mixxx::audio::FramePos trackEndPosition() const = 0;
+    virtual double playPosition() const = 0;
+    virtual double rateRatio() const = 0;
+
+    virtual TrackPointer getLoadedTrack() const = 0;
+
+    inline bool isEmpty() const {
+        return !getLoadedTrack();
+    }
+};