Remove addBeat() function

6 files changed, 9 insertions, 37 deletions

diff --git a/src/test/enginesynctest.cpp b/src/test/enginesynctest.cpp
index 65f1337d01..ea6348ed92 100644
--- a/src/test/enginesynctest.cpp
+++ b/src/test/enginesynctest.cpp
@@ -2416,10 +2416,13 @@ TEST_F(EngineSyncTest, BeatMapQantizePlay) {
     mixxx::BeatsPointer pBeats1 = BeatFactory::makeBeatGrid(*m_pTrack1, 120, 0.0);
     m_pTrack1->setBeats(pBeats1);
 
-    mixxx::BeatsPointer pBeats2 = mixxx::BeatsPointer(new mixxx::BeatMap(*m_pTrack2, 44100));
-    // Add two beats at 120 Bpm
-    pBeats2->addBeat(44100 / 2);
-    pBeats2->addBeat(44100);
+    constexpr int kSampleRate = 44100;
+
+    mixxx::BeatsPointer pBeats2 = mixxx::BeatsPointer(new mixxx::BeatMap(
+            *m_pTrack2,
+            kSampleRate,
+            // Add two beats at 120 Bpm
+            QVector<double>({kSampleRate / 2, kSampleRate})));
     m_pTrack2->setBeats(pBeats2);
 
     ControlObject::set(ConfigKey(m_sGroup1, "quantize"), 1.0);
diff --git a/src/track/beatgrid.cpp b/src/track/beatgrid.cpp
index a3fe95d94a..81be4b14a8 100644
--- a/src/track/beatgrid.cpp
+++ b/src/track/beatgrid.cpp
@@ -298,12 +298,6 @@ double BeatGrid::getBpmAroundPosition(double curSample, int n) const {
     return bpm();
 }
 
-void BeatGrid::addBeat(double dBeatSample) {
-    Q_UNUSED(dBeatSample);
-    //QMutexLocker locker(&m_mutex);
-    return;
-}
-
 void BeatGrid::removeBeat(double dBeatSample) {
     Q_UNUSED(dBeatSample);
     //QMutexLocker locker(&m_mutex);
diff --git a/src/track/beatgrid.h b/src/track/beatgrid.h
index 5ee929614f..80f5df127d 100644
--- a/src/track/beatgrid.h
+++ b/src/track/beatgrid.h
@@ -65,7 +65,6 @@ class BeatGrid final : public Beats {
     // Beat mutations
     ////////////////////////////////////////////////////////////////////////////
 
-    void addBeat(double dBeatSample) override;
     void removeBeat(double dBeatSample) override;
     void translate(double dNumSamples) override;
     void scale(enum BPMScale scale) override;
diff --git a/src/track/beatmap.cpp b/src/track/beatmap.cpp
index 93c630ecbd..ff29fa364a 100644
--- a/src/track/beatmap.cpp
+++ b/src/track/beatmap.cpp
@@ -487,25 +487,6 @@ double BeatMap::getBpmAroundPosition(double curSample, int n) const {
     return BeatUtils::calculateAverageBpm(numberOfBeats, m_iSampleRate, lowerFrame, upperFrame);
 }
 
-void BeatMap::addBeat(double dBeatSample) {
-    QMutexLocker locker(&m_mutex);
-    Beat beat;
-    beat.set_frame_position(static_cast<google::protobuf::int32>(samplesToFrames(dBeatSample)));
-    BeatList::iterator it = std::lower_bound(
-        m_beats.begin(), m_beats.end(), beat, BeatLessThan);
-
-    // Don't insert a duplicate beat. TODO(XXX) determine what epsilon to
-    // consider a beat identical to another.
-    if (it != m_beats.end() && it->frame_position() == beat.frame_position()) {
-        return;
-    }
-
-    m_beats.insert(it, beat);
-    onBeatlistChanged();
-    locker.unlock();
-    emit updated();
-}
-
 void BeatMap::removeBeat(double dBeatSample) {
     QMutexLocker locker(&m_mutex);
     Beat beat;
diff --git a/src/track/beatmap.h b/src/track/beatmap.h
index 56858ba7b1..10b099ddb5 100644
--- a/src/track/beatmap.h
+++ b/src/track/beatmap.h
@@ -74,7 +74,6 @@ class BeatMap final : public Beats {
     // Beat mutations
     ////////////////////////////////////////////////////////////////////////////
 
-    void addBeat(double dBeatSample) override;
     void removeBeat(double dBeatSample) override;
     void translate(double dNumSamples) override;
     void scale(enum BPMScale scale) override;
diff --git a/src/track/beats.h b/src/track/beats.h
index bafbabdbc4..f23b70539c 100644
--- a/src/track/beats.h
+++ b/src/track/beats.h
@@ -25,7 +25,7 @@ class BeatIterator {
     virtual double next() = 0;
 };
 
-// Beats is a pure abstract base class for BPM and beat management classes. It
+// Beats is the base class for BPM and beat management classes. It
 // provides a specification of all methods a beat-manager class must provide, as
 // well as a capability model for representing optional features.
 class Beats : public QObject {
@@ -108,7 +108,7 @@ class Beats : public QObject {
     // then dSamples is returned. If no beat can be found, returns -1.
     virtual double findNthBeat(double dSamples, int n) const = 0;
 
-    int numBeatsInRange(double dStartSample, double dEndSample);
+    int numBeatsInRange(double dStartSample, double dEndSample) const;
 
     // Find the sample N beats away from dSample. The number of beats may be
     // negative and does not need to be an integer.
@@ -141,10 +141,6 @@ class Beats : public QObject {
     // Beat mutations
     ////////////////////////////////////////////////////////////////////////////
 
-    // Add a beat at location dBeatSample. Beats instance must have the
-    // capability BEATSCAP_ADDREMOVE.
-    virtual void addBeat(double dBeatSample) = 0;
-
     // Remove a beat at location dBeatSample. Beats instance must have the
     // capability BEATSCAP_ADDREMOVE.
     virtual void removeBeat(double dBeatSample) = 0;