Merge pull request #4061 from Holzhaus/frame-refactor

Remove all sample-based Cue methods
mixxxdj · Jul 12, 2021 · 611a153 · 611a153
2 parents 0979e8e + 004fc48
commit 611a153
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 68 deletions.
diff --git a/src/track/cue.cpp b/src/track/cue.cpp
@@ -273,7 +273,3 @@ mixxx::audio::FramePos Cue::getEndPosition() const {
     QMutexLocker lock(&m_mutex);
     return m_endPosition;
 }
-
-bool operator==(const CuePosition& lhs, const CuePosition& rhs) {
-    return lhs.getPosition() == rhs.getPosition();
-}
diff --git a/src/track/cue.h b/src/track/cue.h
@@ -68,27 +68,10 @@ class Cue : public QObject {
 
     mixxx::audio::FramePos getPosition() const;
     void setStartPosition(mixxx::audio::FramePos position);
-    void setStartPosition(double samplePosition) {
-        setStartPosition(mixxx::audio::FramePos::fromEngineSamplePosMaybeInvalid(samplePosition));
-    }
     void setEndPosition(mixxx::audio::FramePos position);
-    void setEndPosition(double samplePosition) {
-        setEndPosition(mixxx::audio::FramePos::fromEngineSamplePosMaybeInvalid(samplePosition));
-    }
     void setStartAndEndPosition(
             mixxx::audio::FramePos startPosition,
             mixxx::audio::FramePos endPosition);
-    void setStartAndEndPosition(
-            double sampleStartPosition,
-            double sampleEndPosition) {
-        const auto startPosition =
-                mixxx::audio::FramePos::fromEngineSamplePosMaybeInvalid(
-                        sampleStartPosition);
-        const auto endPosition =
-                mixxx::audio::FramePos::fromEngineSamplePosMaybeInvalid(
-                        sampleEndPosition);
-        setStartAndEndPosition(startPosition, endPosition);
-    }
     void shiftPositionFrames(mixxx::audio::FrameDiff_t frameOffset);
 
     mixxx::audio::FrameDiff_t getLengthFrames() const;
@@ -145,42 +128,3 @@ class CuePointer : public std::shared_ptr<Cue> {
   private:
     static void deleteLater(Cue* pCue);
 };
-
-class CuePosition {
-  public:
-    CuePosition()
-            : m_position(0.0) {
-    }
-    CuePosition(double position)
-            : m_position(position) {
-    }
-
-    double getPosition() const {
-        return m_position;
-    }
-
-    void setPosition(double position) {
-        m_position = position;
-    }
-
-    void set(double position) {
-        m_position = position;
-    }
-
-    void reset() {
-        m_position = 0.0;
-    }
-
-  private:
-    double m_position;
-};
-
-bool operator==(const CuePosition& lhs, const CuePosition& rhs);
-
-inline bool operator!=(const CuePosition& lhs, const CuePosition& rhs) {
-    return !(lhs == rhs);
-}
-
-inline QDebug operator<<(QDebug dbg, const CuePosition& arg) {
-    return dbg << "position =" << arg.getPosition();
-}
diff --git a/src/track/track.h b/src/track/track.h
@@ -263,16 +263,8 @@ class Track : public QObject {
 
     /// Get the track's main cue point
     mixxx::audio::FramePos getMainCuePosition() const;
-    CuePosition getCuePoint() const {
-        return getMainCuePosition().toEngineSamplePosMaybeInvalid();
-    };
     // Set the track's main cue point
     void setMainCuePosition(mixxx::audio::FramePos position);
-    void setCuePoint(CuePosition position) {
-        setMainCuePosition(
-                mixxx::audio::FramePos::fromEngineSamplePosMaybeInvalid(
-                        position.getPosition()));
-    }
     /// Shift all cues by a constant offset
     void shiftCuePositionsMillis(mixxx::audio::FrameDiff_t milliseconds);
     // Call when analysis is done.