[WIP] Remove beatmap and beatgrid

CMakeLists.txt

@@ -704,8 +704,6 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/sources/soundsourcesndfile.cpp
   src/track/albuminfo.cpp
   src/track/beatfactory.cpp
-  src/track/beatgrid.cpp
-  src/track/beatmap.cpp
   src/track/beats.cpp
   src/track/beatutils.cpp
   src/track/bpm.cpp
@@ -1197,8 +1195,7 @@ add_executable(mixxx-test
   src/test/audiotaperpot_test.cpp
   src/test/autodjprocessor_test.cpp
   src/test/baseeffecttest.cpp
-  src/test/beatgridtest.cpp
-  src/test/beatmaptest.cpp
+  src/test/beatstest.cpp
   src/test/beatstranslatetest.cpp
   src/test/bpmcontrol_test.cpp
   src/test/broadcastprofile_test.cpp

build/depends.py

@@ -1218,8 +1218,6 @@ def sources(self, build):
                    "src/skin/launchimage.cpp",
 
                    "src/track/beatfactory.cpp",
-                   "src/track/beatgrid.cpp",
-                   "src/track/beatmap.cpp",
                    "src/track/beatutils.cpp",
                    "src/track/beats.cpp",
                    "src/track/bpm.cpp",

res/skins/Tango/style.qss

@@ -458,6 +458,7 @@ WWidgetGroup {
 #BeatgridFaster,
 #BeatgridEarlier,
 #BeatgridLater,
+#BeatgridSetBarBeat,
 #HotcuesEarlier,
 #HotcuesLater {
   background-color: #333;
@@ -467,13 +468,17 @@ WWidgetGroup {
   #BeatgridFaster:hover,
   #BeatgridEarlier:hover,
   #BeatgridLater:hover,
+  #BeatgridSetBarBeat:hover,
   #HotcuesEarlier:hover,
   #HotcuesLater:hover {
     background-color: #0f0f0f;
   }
   #BeatgridCurpos {
     image: url(skin:/buttons/btn_beats_curpos.svg) no-repeat center center;
   }
+  #BeatgridSetBarBeat {
+    image: url(skin:/buttons/btn_beats_set_bar_beat.svg) no-repeat center center;
+  }
   #BeatgridSlower {
     image: url(skin:/buttons/btn_beats_slower.svg) no-repeat center center;
   }

res/skins/Tango/waveform.xml

@@ -29,6 +29,7 @@ Variables:
         <SignalRGBMidColor><Variable name="SignalRGBMidColor"/></SignalRGBMidColor>
         <SignalRGBHighColor><Variable name="SignalRGBHighColor"/></SignalRGBHighColor>
         <BeatColor>#ffffff</BeatColor>
+        <BarColor>#ffff00</BarColor>
         <PlayPosColor>#FF4300</PlayPosColor>
         <EndOfTrackColor><Variable name="EndOfTrackColor"/></EndOfTrackColor>
         <DefaultMark>
@@ -161,6 +162,28 @@ Variables:
                 </Connection>
               </WidgetGroup>
 
+              <WidgetGroup><!-- Set Bar and Phrase beat -->
+                <Layout>vertical</Layout>
+                <SizePolicy>f,f</SizePolicy>
+                <Children>
+                  <Template src="skin:button_1state.xml">
+                    <SetVariable name="TooltipId">beats_set_downbeat</SetVariable>
+                    <SetVariable name="ObjectName">BeatgridSetBarBeat</SetVariable>
+                    <SetVariable name="Size">28f,24f</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="group"/>,beats_set_downbeat</SetVariable>
+                  </Template>
+
+                  <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
+
+                  <Template src="skin:button_1state.xml">
+                    <SetVariable name="TooltipId">beats_adjust_faster</SetVariable>
+                    <SetVariable name="ObjectName">BeatgridFaster</SetVariable>
+                    <SetVariable name="Size">28f,24f</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="group"/>,beats_adjust_faster</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup><!-- Set Bar and Phrase beat -->
+
               <WidgetGroup>
                 <Layout>vertical</Layout>
                 <SizePolicy>f,f</SizePolicy>

src/analyzer/analyzerbeats.cpp

@@ -9,7 +9,7 @@
 #include "analyzer/plugins/analyzerqueenmarybeats.h"
 #include "analyzer/plugins/analyzersoundtouchbeats.h"
 #include "track/beatfactory.h"
-#include "track/beatmap.h"
+#include "track/beats.h"
 #include "track/beatutils.h"
 #include "track/track.h"
 
@@ -43,7 +43,7 @@ AnalyzerBeats::AnalyzerBeats(UserSettingsPointer pConfig, bool enforceBpmDetecti
           m_iMaxBpm(9999) {
 }
 
-bool AnalyzerBeats::initialize(TrackPointer tio, int sampleRate, int totalSamples) {
+bool AnalyzerBeats::initialize(TrackPointer pTrack, int sampleRate, int totalSamples) {
     if (totalSamples == 0) {
         return false;
     }
@@ -55,7 +55,7 @@ bool AnalyzerBeats::initialize(TrackPointer tio, int sampleRate, int totalSample
         return false;
     }
 
-    bool bpmLock = tio->isBpmLocked();
+    bool bpmLock = pTrack->isBpmLocked();
     if (bpmLock) {
         qDebug() << "Track is BpmLocked: Beat calculation will not start";
         return false;
@@ -101,8 +101,7 @@ bool AnalyzerBeats::initialize(TrackPointer tio, int sampleRate, int totalSample
     m_iCurrentSample = 0;
 
     // if we can load a stored track don't reanalyze it
-    bool bShouldAnalyze = shouldAnalyze(tio);
-
+    bool bShouldAnalyze = shouldAnalyze(pTrack);
 
     DEBUG_ASSERT(!m_pPlugin);
     if (bShouldAnalyze) {
@@ -131,11 +130,11 @@ bool AnalyzerBeats::initialize(TrackPointer tio, int sampleRate, int totalSample
     return bShouldAnalyze;
 }
 
-bool AnalyzerBeats::shouldAnalyze(TrackPointer tio) const {
+bool AnalyzerBeats::shouldAnalyze(TrackPointer pTrack) const {
     int iMinBpm = m_bpmSettings.getBpmRangeStart();
     int iMaxBpm = m_bpmSettings.getBpmRangeEnd();
 
-    bool bpmLock = tio->isBpmLocked();
+    bool bpmLock = pTrack->isBpmLocked();
     if (bpmLock) {
         qDebug() << "Track is BpmLocked: Beat calculation will not start";
         return false;
@@ -148,11 +147,11 @@ bool AnalyzerBeats::shouldAnalyze(TrackPointer tio) const {
 
     // If the track already has a Beats object then we need to decide whether to
     // analyze this track or not.
-    mixxx::BeatsPointer pBeats = tio->getBeats();
+    mixxx::BeatsPointer pBeats = pTrack->getBeats();
     if (!pBeats) {
         return true;
     }
-    if (!mixxx::Bpm::isValidValue(pBeats->getBpm())) {
+    if (!mixxx::Bpm::isValidValue(pBeats->getBpm().getValue())) {
         // Tracks with an invalid bpm <= 0 should be re-analyzed,
         // independent of the preference settings. We expect that
         // all tracks have a bpm > 0 when analyzed. Users that want
@@ -161,7 +160,7 @@ bool AnalyzerBeats::shouldAnalyze(TrackPointer tio) const {
         qDebug() << "Re-analyzing track with invalid BPM despite preference settings.";
         return true;
     }
-    if (pBeats->findNextBeat(0) <= 0.0) {
+    if (pBeats->findNextBeat(mixxx::FramePos(0)) <= mixxx::FramePos(0.0)) {
         qDebug() << "First beat is 0 for grid so analyzing track to find first beat.";
         return true;
     }
@@ -188,8 +187,8 @@ bool AnalyzerBeats::shouldAnalyze(TrackPointer tio) const {
     // Beat grid exists but version and settings differ
     if (!m_bPreferencesReanalyzeOldBpm) {
         qDebug() << "Beat calculation skips analyzing because the track has"
-                << "a BPM computed by a previous Mixxx version and user"
-                << "preferences indicate we should not change it.";
+                 << "a BPM computed by a previous Mixxx version and user"
+                 << "preferences indicate we should not change it.";
         return false;
     }
 
@@ -213,7 +212,7 @@ void AnalyzerBeats::cleanup() {
     m_pPlugin.reset();
 }
 
-void AnalyzerBeats::storeResults(TrackPointer tio) {
+void AnalyzerBeats::storeResults(TrackPointer pTrack) {
     VERIFY_OR_DEBUG_ASSERT(m_pPlugin) {
         return;
     }
@@ -229,57 +228,58 @@ void AnalyzerBeats::storeResults(TrackPointer tio) {
         QHash<QString, QString> extraVersionInfo = getExtraVersionInfo(
                 m_pluginId, m_bPreferencesFastAnalysis);
         pBeats = BeatFactory::makePreferredBeats(
-                *tio,
+                pTrack,
                 beats,
                 extraVersionInfo,
                 m_bPreferencesFixedTempo,
                 m_bPreferencesOffsetCorrection,
-                m_iSampleRate,
                 m_iTotalSamples,
                 m_iMinBpm,
                 m_iMaxBpm);
         qDebug() << "AnalyzerBeats plugin detected" << beats.size()
-                 << "beats. Average BPM:" << (pBeats ? pBeats->getBpm() : 0.0);
+                 << "beats. Average BPM:" << (pBeats ? pBeats->getBpm().getValue() : 0.0);
     } else {
-        float bpm = m_pPlugin->getBpm();
+        mixxx::Bpm bpm = mixxx::Bpm(m_pPlugin->getBpm());
         qDebug() << "AnalyzerBeats plugin detected constant BPM: " << bpm;
-        pBeats = BeatFactory::makeBeatGrid(*tio, bpm, 0.0f);
+        pBeats = std::make_shared<mixxx::Beats>(pTrack.get());
+        pBeats->setGrid(bpm);
+        pTrack->setBeats(pBeats);
     }
 
-    mixxx::BeatsPointer pCurrentBeats = tio->getBeats();
+    mixxx::BeatsPointer pCurrentBeats = pTrack->getBeats();
 
     // If the track has no beats object then set our newly generated one
     // regardless of beat lock.
     if (!pCurrentBeats) {
-        tio->setBeats(pBeats);
+        pTrack->setBeats(pBeats);
         return;
     }
 
     // If the track received the beat lock while we were analyzing it then we
     // abort setting it.
-    if (tio->isBpmLocked()) {
+    if (pTrack->isBpmLocked()) {
         qDebug() << "Track was BPM-locked as we were analyzing it. Aborting analysis.";
         return;
     }
 
     // If the user prefers to replace old beatgrids with newly generated ones or
     // the old beatgrid has 0-bpm then we replace it.
-    bool zeroCurrentBpm = pCurrentBeats->getBpm() == 0.0;
+    bool zeroCurrentBpm = pCurrentBeats->getBpm().getValue() == 0.0;
     if (m_bPreferencesReanalyzeOldBpm || zeroCurrentBpm) {
         if (zeroCurrentBpm) {
             qDebug() << "Replacing 0-BPM beatgrid with a" << pBeats->getBpm()
                      << "beatgrid.";
         }
-        tio->setBeats(pBeats);
+        pTrack->setBeats(pBeats);
         return;
     }
 
     // If we got here then the user doesn't want to replace the beatgrid but
     // since the first beat is zero we'll apply the offset we just detected.
-    double currentFirstBeat = pCurrentBeats->findNextBeat(0);
-    double newFirstBeat = pBeats->findNextBeat(0);
-    if (currentFirstBeat == 0.0 && newFirstBeat > 0) {
-        pCurrentBeats->translate(newFirstBeat);
+    mixxx::FramePos currentFirstBeat = pCurrentBeats->findNextBeat(mixxx::FramePos(0));
+    mixxx::FramePos newFirstBeat = pBeats->findNextBeat(mixxx::FramePos(0));
+    if (currentFirstBeat == mixxx::FramePos(0.0) && newFirstBeat > mixxx::FramePos(0)) {
+        pCurrentBeats->translate(newFirstBeat - currentFirstBeat);
     }
 }
 

src/analyzer/analyzerbeats.h

@@ -27,13 +27,13 @@ class AnalyzerBeats : public Analyzer {
     static QList<mixxx::AnalyzerPluginInfo> availablePlugins();
     static mixxx::AnalyzerPluginInfo defaultPlugin();
 
-    bool initialize(TrackPointer tio, int sampleRate, int totalSamples) override;
+    bool initialize(TrackPointer pTrack, int sampleRate, int totalSamples) override;
     bool processSamples(const CSAMPLE *pIn, const int iLen) override;
-    void storeResults(TrackPointer tio) override;
+    void storeResults(TrackPointer pTrack) override;
     void cleanup() override;
 
   private:
-    bool shouldAnalyze(TrackPointer tio) const;
+    bool shouldAnalyze(TrackPointer pTrack) const;
     static QHash<QString, QString> getExtraVersionInfo(
             QString pluginId, bool bPreferencesFastAnalysis);
 

src/controllers/controlpickermenu.cpp

@@ -89,6 +89,10 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent)
     addDeckControl("beats_translate_match_alignment", tr("Adjust Beatgrid - Match Alignment"),
                    tr("Adjust beatgrid to match another playing deck."), bpmMenu);
     addDeckAndSamplerControl("quantize", tr("Quantize Mode"), tr("Toggle quantize mode"), bpmMenu);
+    addDeckAndSamplerControl("beats_set_downbeat",
+            tr("Set Downbeat"),
+            tr("Make the current beat a Downbeat"),
+            bpmMenu);
 
     QMenu* syncMenu = addSubmenu(tr("Sync"));
     addDeckAndSamplerControl("sync_enabled", tr("Sync Mode"),