DeckAttributes: Move computed fade fields to TrackOrDeckAttributes

Author: cr7pt0gr4ph7

src/library/autodj/autodjprocessor.cpp

@@ -13,7 +13,7 @@ const QString kControlGroup = QStringLiteral("[AutoDJ]");
 const char* kTransitionPreferenceName = "Transition";
 const char* kTransitionModePreferenceName = "TransitionMode";
 constexpr double kTransitionPreferenceDefault = 10.0;
-constexpr double kKeepPosition = DeckAttributes::kKeepPosition;
+constexpr double kKeepPosition = TrackOrDeckAttributes::kKeepPosition;
 
 // A track needs to be longer than two callbacks to not stop AutoDJ
 constexpr double kMinimumTrackDurationSec = 0.2;

src/library/autodj/track/deckattributes.cpp

@@ -7,10 +7,6 @@ DeckAttributes::DeckAttributes(int index,
         BaseTrackPlayer* pPlayer)
         : index(index),
           group(pPlayer->getGroup()),
-          startPos(DeckAttributes::kKeepPosition),
-          fadeBeginPos(1.0),
-          fadeEndPos(1.0),
-          isFromDeck(false),
           loading(false),
           m_orientation(group, "orientation"),
           m_playPos(group, "playposition"),

src/library/autodj/track/deckattributes.h

@@ -10,16 +10,7 @@ class BaseTrackPlayer;
 class DeckAttributes : public TrackOrDeckAttributes {
     Q_OBJECT
   public:
-    /// Special value for startPos that indicates the deck
-    /// should start playing from its current position.
-    static constexpr double kKeepPosition = -1.0;
-
-    /// Special value for startPos that indicates a track
-    /// should be skipped because it is too short.
-    static constexpr double kSkipToNextTrack = -2.0;
-
-    DeckAttributes(int index,
-            BaseTrackPlayer* pPlayer);
+    DeckAttributes(int index, BaseTrackPlayer* pPlayer);
     virtual ~DeckAttributes();
 
     bool isLeft() const {
@@ -117,10 +108,6 @@ class DeckAttributes : public TrackOrDeckAttributes {
   public:
     int index;
     QString group;
-    double startPos;     // Set in toDeck nature
-    double fadeBeginPos; // set in fromDeck nature
-    double fadeEndPos;   // set in fromDeck nature
-    bool isFromDeck;
     bool loading; // The data is inconsistent during loading a deck
 
   private:

src/library/autodj/track/trackordeckattributes.cpp

@@ -1,6 +1,15 @@
 #include "library/autodj/track/trackordeckattributes.h"
 
+#include "library/autodj/autodjconstants.h"
 #include "moc_trackordeckattributes.cpp"
 
+TrackOrDeckAttributes::TrackOrDeckAttributes()
+        : startPos(TrackOrDeckAttributes::kKeepPosition),
+          fadeBeginPos(1.0),
+          fadeEndPos(1.0),
+          adjustDurationSeconds(0.0),
+          isFromDeck(false) {
+}
+
 TrackOrDeckAttributes::~TrackOrDeckAttributes() {
 }

src/library/autodj/track/trackordeckattributes.h

@@ -11,6 +11,15 @@
 class TrackOrDeckAttributes : public QObject {
     Q_OBJECT
   public:
+    /// Special value for startPos that indicates the deck
+    /// should start playing from its current position.
+    static constexpr double kKeepPosition = -1.0;
+
+    /// Special value for startPos that indicates a track
+    /// should be skipped because it is too short.
+    static constexpr double kSkipToNextTrack = -2.0;
+
+    TrackOrDeckAttributes();
     virtual ~TrackOrDeckAttributes();
 
     virtual mixxx::audio::FramePos introStartPosition() const = 0;
@@ -27,4 +36,9 @@ class TrackOrDeckAttributes : public QObject {
     inline bool isEmpty() const {
         return !getLoadedTrack();
     }
+
+    double startPos;     // Set for toDeck
+    double fadeBeginPos; // Set for fromDeck
+    double fadeEndPos;   // Set for fromDeck
+    bool isFromDeck;
 };