BeatFactory: Remove makeBeatGrid function

src/analyzer/analyzerbeats.cpp

@@ -10,6 +10,7 @@
 #include "analyzer/plugins/analyzersoundtouchbeats.h"
 #include "library/rekordbox/rekordboxconstants.h"
 #include "track/beatfactory.h"
+#include "track/beatgrid.h"
 #include "track/beatmap.h"
 #include "track/beatutils.h"
 #include "track/track.h"
@@ -234,7 +235,7 @@ void AnalyzerBeats::storeResults(TrackPointer pTrack) {
     } else {
         mixxx::Bpm bpm = m_pPlugin->getBpm();
         qDebug() << "AnalyzerBeats plugin detected constant BPM: " << bpm;
-        pBeats = BeatFactory::makeBeatGrid(m_sampleRate, bpm, mixxx::audio::kStartFramePos);
+        pBeats = mixxx::BeatGrid::makeBeatGrid(m_sampleRate, bpm, mixxx::audio::kStartFramePos);
     }
 
     pTrack->trySetBeats(pBeats);

src/engine/enginebuffer.cpp

@@ -27,7 +27,6 @@
 #include "engine/sync/synccontrol.h"
 #include "moc_enginebuffer.cpp"
 #include "preferences/usersettings.h"
-#include "track/beatfactory.h"
 #include "track/keyutils.h"
 #include "track/track.h"
 #include "util/assert.h"

src/library/banshee/bansheeplaylistmodel.cpp

@@ -9,7 +9,6 @@
 #include "library/trackcollectionmanager.h"
 #include "mixer/playermanager.h"
 #include "moc_bansheeplaylistmodel.cpp"
-#include "track/beatfactory.h"
 #include "track/beats.h"
 #include "track/track.h"
 

src/library/dao/trackdao.cpp

@@ -24,7 +24,7 @@
 #include "library/trackset/crate/cratestorage.h"
 #include "moc_trackdao.cpp"
 #include "sources/soundsourceproxy.h"
-#include "track/beatfactory.h"
+#include "track/beatgrid.h"
 #include "track/beats.h"
 #include "track/globaltrackcache.h"
 #include "track/keyfactory.h"
@@ -1243,11 +1243,13 @@ bool setTrackBeats(const QSqlRecord& record, const int column, Track* pTrack) {
         } else {
             pTrack->trySetBeats(pBeats);
         }
-    } else {
+    } else if (bpm.isValid()) {
         // Load a temporary beat grid without offset that will be replaced by the analyzer.
-        const auto pBeats = BeatFactory::makeBeatGrid(
+        const auto pBeats = mixxx::BeatGrid::makeBeatGrid(
                 pTrack->getSampleRate(), bpm, mixxx::audio::kStartFramePos);
         pTrack->trySetBeats(pBeats);
+    } else {
+        pTrack->trySetBeats(nullptr);
     }
     return false;
 }

src/library/dlgtrackinfo.cpp

@@ -13,7 +13,7 @@
 #include "moc_dlgtrackinfo.cpp"
 #include "preferences/colorpalettesettings.h"
 #include "sources/soundsourceproxy.h"
-#include "track/beatfactory.h"
+#include "track/beatgrid.h"
 #include "track/beatutils.h"
 #include "track/keyfactory.h"
 #include "track/keyutils.h"
@@ -571,10 +571,10 @@ void DlgTrackInfo::slotBpmConstChanged(int state) {
             // The cue point should be set on a beat, so this seems
             // to be a good alternative
             const mixxx::audio::FramePos cuePosition = m_pLoadedTrack->getMainCuePosition();
-            m_pBeatsClone =
-                    BeatFactory::makeBeatGrid(m_pLoadedTrack->getSampleRate(),
-                            bpm,
-                            cuePosition);
+            m_pBeatsClone = mixxx::BeatGrid::makeBeatGrid(
+                    m_pLoadedTrack->getSampleRate(),
+                    bpm,
+                    cuePosition);
         } else {
             m_pBeatsClone.clear();
         }
@@ -610,7 +610,7 @@ void DlgTrackInfo::slotSpinBpmValueChanged(double value) {
 
     if (!m_pBeatsClone) {
         const mixxx::audio::FramePos cuePosition = m_pLoadedTrack->getMainCuePosition();
-        m_pBeatsClone = BeatFactory::makeBeatGrid(
+        m_pBeatsClone = mixxx::BeatGrid::makeBeatGrid(
                 m_pLoadedTrack->getSampleRate(),
                 bpm,
                 cuePosition);

src/library/serato/seratofeature.cpp

@@ -13,7 +13,6 @@
 #include "library/trackcollectionmanager.h"
 #include "library/treeitem.h"
 #include "moc_seratofeature.cpp"
-#include "track/beatfactory.h"
 #include "track/cue.h"
 #include "track/keyfactory.h"
 #include "util/assert.h"

src/test/beatgridtest.cpp

@@ -30,7 +30,6 @@ TEST(BeatGridTest, Scale) {
     pTrack->trySetBpm(bpm.value());
 
     auto pGrid = BeatGrid::makeBeatGrid(pTrack->getSampleRate(),
-            QString(),
             mixxx::Bpm(bpm),
             mixxx::audio::kStartFramePos);
 
@@ -63,7 +62,6 @@ TEST(BeatGridTest, TestNthBeatWhenOnBeat) {
     constexpr mixxx::audio::FrameDiff_t beatLengthFrames = 60.0 * sampleRate / bpm;
 
     auto pGrid = BeatGrid::makeBeatGrid(pTrack->getSampleRate(),
-            QString(),
             mixxx::Bpm(bpm),
             mixxx::audio::kStartFramePos);
     // Pretend we're on the 20th beat;
@@ -108,7 +106,6 @@ TEST(BeatGridTest, TestNthBeatWhenNotOnBeat) {
     const mixxx::audio::FrameDiff_t beatLengthFrames = 60.0 * sampleRate / bpm.value();
 
     auto pGrid = BeatGrid::makeBeatGrid(pTrack->getSampleRate(),
-            QString(),
             bpm,
             mixxx::audio::kStartFramePos);
 

src/test/beatstranslatetest.cpp

@@ -10,13 +10,13 @@ TEST_F(BeatsTranslateTest, SimpleTranslateMatch) {
     const auto bpm = mixxx::Bpm(60.0);
     constexpr auto firstBeat = mixxx::audio::kStartFramePos;
     auto grid1 = mixxx::BeatGrid::makeBeatGrid(
-            m_pTrack1->getSampleRate(), QString(), bpm, firstBeat);
+            m_pTrack1->getSampleRate(), bpm, firstBeat);
     m_pTrack1->trySetBeats(grid1);
     ASSERT_DOUBLE_EQ(firstBeat.value(),
             grid1->findClosestBeat(mixxx::audio::kStartFramePos).value());
 
     auto grid2 = mixxx::BeatGrid::makeBeatGrid(
-            m_pTrack2->getSampleRate(), QString(), bpm, firstBeat);
+            m_pTrack2->getSampleRate(), bpm, firstBeat);
     m_pTrack2->trySetBeats(grid2);
     ASSERT_DOUBLE_EQ(firstBeat.value(),
             grid2->findClosestBeat(mixxx::audio::kStartFramePos).value());

src/test/bpmcontrol_test.cpp

@@ -7,7 +7,6 @@
 #include "control/controlobject.h"
 #include "control/controlpushbutton.h"
 #include "engine/controls/bpmcontrol.h"
-#include "track/beatfactory.h"
 #include "track/beatgrid.h"
 #include "track/beatmap.h"
 #include "track/track.h"
@@ -36,7 +35,7 @@ TEST_F(BpmControlTest, BeatContext_BeatGrid) {
     const auto bpm = mixxx::Bpm(60.0);
     const mixxx::audio::FrameDiff_t expectedBeatLengthFrames = (60.0 * sampleRate / bpm.value());
 
-    const mixxx::BeatsPointer pBeats = BeatFactory::makeBeatGrid(
+    const mixxx::BeatsPointer pBeats = mixxx::BeatGrid::makeBeatGrid(
             pTrack->getSampleRate(), bpm, mixxx::audio::kStartFramePos);
 
     // On a beat.