[WIP] Bars phrases and variable bpm in beats class

CMakeLists.txt

@@ -544,8 +544,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
@@ -1035,8 +1033,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

res/skins/Tango/style.qss

@@ -457,19 +457,24 @@ WWidgetGroup {
 #BeatgridSlower,
 #BeatgridFaster,
 #BeatgridEarlier,
-#BeatgridLater {
+#BeatgridLater,
+#BeatgridSetBarBeat {
   background-color: #333;
   }
   #BeatgridCurpos:hover,
   #BeatgridSlower:hover,
   #BeatgridFaster:hover,
   #BeatgridEarlier:hover,
-  #BeatgridLater:hover {
+  #BeatgridLater:hover,
+  #BeatgridSetBarBeat: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>
@@ -131,7 +132,7 @@ Variables:
         <Layout>vertical</Layout>
         <!-- Horizontal size is 82px and we'll add the WaveformContainer's negative margin
             (shifts waveform center mark) so that all buttons are visible -->
-        <Size>82f,50me</Size>
+        <Size>107f,50me</Size>
         <Children>
           <WidgetGroup><Size>1me,0me</Size></WidgetGroup>
           <WidgetGroup><Size>1me,1f</Size></WidgetGroup>
@@ -149,6 +150,28 @@ Variables:
                 <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beats_translate_match_alignment</SetVariable>
               </Template>
 
+              <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_bar_beat</SetVariable>
+                    <SetVariable name="ObjectName">BeatgridSetBarBeat</SetVariable>
+                    <SetVariable name="Size">28f,24f</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="group"/>,beats_set_bar_beat</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><Size>1min,1f</Size></WidgetGroup>
 
               <WidgetGroup><!-- beats earlier & faster -->

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"
 
@@ -97,7 +97,6 @@ bool AnalyzerBeats::initialize(TrackPointer tio, int sampleRate, int totalSample
     // if we can load a stored track don't reanalyze it
     bool bShouldAnalyze = shouldAnalyze(tio);
 
-
     DEBUG_ASSERT(!m_pPlugin);
     if (bShouldAnalyze) {
         if (m_pluginId == mixxx::AnalyzerQueenMaryBeats::pluginInfo().id) {
@@ -211,7 +210,7 @@ void AnalyzerBeats::storeResults(TrackPointer tio) {
         QHash<QString, QString> extraVersionInfo = getExtraVersionInfo(
                 m_pluginId, m_bPreferencesFastAnalysis);
         pBeats = BeatFactory::makePreferredBeats(
-                *tio,
+                tio,
                 beats,
                 extraVersionInfo,
                 m_bPreferencesFixedTempo,
@@ -225,7 +224,9 @@ void AnalyzerBeats::storeResults(TrackPointer tio) {
     } else {
         float bpm = m_pPlugin->getBpm();
         qDebug() << "AnalyzerBeats plugin detected constant BPM: " << bpm;
-        pBeats = BeatFactory::makeBeatGrid(*tio, bpm, 0.0f);
+        pBeats = std::make_shared<mixxx::Beats>(tio.get());
+        pBeats->setGrid(bpm);
+        tio->setBeats(pBeats);
     }
 
     mixxx::BeatsPointer pCurrentBeats = tio->getBeats();

src/controllers/controlpickermenu.cpp

@@ -89,6 +89,8 @@ 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_bar_beat", tr("Set Bar Beat"),
+                   tr("Make the current beat a Bar beat"), bpmMenu);
 
     QMenu* syncMenu = addSubmenu(tr("Sync"));
     addDeckAndSamplerControl("sync_enabled", tr("Sync Mode"),

src/engine/controls/bpmcontrol.cpp

@@ -48,9 +48,9 @@ BpmControl::BpmControl(QString group,
     m_dSyncTargetBeatDistance.setValue(0.0);
     m_dUserOffset.setValue(0.0);
 
-    m_pPlayButton = new ControlProxy(group, "play", this);
-    m_pReverseButton = new ControlProxy(group, "reverse", this);
-    m_pRateRatio = new ControlProxy(group, "rate_ratio", this);
+    m_pPlayButton = std::make_unique<ControlProxy>(group, "play", this);
+    m_pReverseButton = std::make_unique<ControlProxy>(group, "reverse", this);
+    m_pRateRatio = std::make_unique<ControlProxy>(group, "rate_ratio", this);
     m_pRateRatio->connectValueChanged(this, &BpmControl::slotUpdateEngineBpm,
                                       Qt::DirectConnection);
 
@@ -59,9 +59,9 @@ BpmControl::BpmControl(QString group,
     m_pPrevBeat.reset(new ControlProxy(group, "beat_prev"));
     m_pNextBeat.reset(new ControlProxy(group, "beat_next"));
 
-    m_pLoopEnabled = new ControlProxy(group, "loop_enabled", this);
-    m_pLoopStartPosition = new ControlProxy(group, "loop_start_position", this);
-    m_pLoopEndPosition = new ControlProxy(group, "loop_end_position", this);
+    m_pLoopEnabled = std::make_unique<ControlProxy>(group, "loop_enabled", this);
+    m_pLoopStartPosition = std::make_unique<ControlProxy>(group, "loop_start_position", this);
+    m_pLoopEndPosition = std::make_unique<ControlProxy>(group, "loop_end_position", this);
 
     m_pLocalBpm = new ControlObject(ConfigKey(group, "local_bpm"));
     m_pAdjustBeatsFaster = new ControlPushButton(ConfigKey(group, "beats_adjust_faster"), false);
@@ -80,6 +80,10 @@ BpmControl::BpmControl(QString group,
     connect(m_pTranslateBeatsLater, &ControlObject::valueChanged,
             this, &BpmControl::slotTranslateBeatsLater,
             Qt::DirectConnection);
+    m_pBeatsSetBarBeat = new ControlPushButton(ConfigKey(group, "beats_set_bar_beat"));
+    connect(m_pBeatsSetBarBeat, &ControlObject::valueChanged,
+            this, &BpmControl::slotSetDownbeatOnClosestBeat,
+            Qt::DirectConnection);
 
     // Pick a wide range (kBpmRangeMin to kBpmRangeMax) and allow out of bounds sets. This lets you
     // map a soft-takeover MIDI knob to the BPM. This also creates bpm_up and
@@ -134,8 +138,8 @@ BpmControl::BpmControl(QString group,
             Qt::DirectConnection);
 
     // Measures distance from last beat in percentage: 0.5 = half-beat away.
-    m_pThisBeatDistance = new ControlProxy(group, "beat_distance", this);
-    m_pSyncMode = new ControlProxy(group, "sync_mode", this);
+    m_pThisBeatDistance = std::make_unique<ControlProxy>(group, "beat_distance", this);
+    m_pSyncMode = std::make_unique<ControlProxy>(group, "sync_mode", this);
 }
 
 BpmControl::~BpmControl() {
@@ -151,6 +155,7 @@ BpmControl::~BpmControl() {
     delete m_pTranslateBeatsLater;
     delete m_pAdjustBeatsFaster;
     delete m_pAdjustBeatsSlower;
+    delete m_pBeatsSetBarBeat;
 }
 
 double BpmControl::getBpm() const {
@@ -194,6 +199,12 @@ void BpmControl::slotTranslateBeatsLater(double v) {
     }
 }
 
+void BpmControl::slotSetDownbeatOnClosestBeat(double v) {
+    if (v > 0 && m_pBeats) {
+        m_pBeats->setDownBeat(getSampleOfTrack().current);
+    }
+}
+
 void BpmControl::slotBpmTap(double v) {
     if (v > 0) {
         m_tapFilter.tap();
@@ -221,7 +232,7 @@ void BpmControl::slotTapFilter(double averageLength, int numSamples) {
     // (60 seconds per minute) * (1000 milliseconds per second) / (X millis per
     // beat) = Y beats/minute
     double averageBpm = 60.0 * 1000.0 / averageLength / rateRatio;
-    pBeats->setBpm(averageBpm);
+    m_pBeats->setBpm(averageBpm);
 }
 
 void BpmControl::slotControlBeatSyncPhase(double v) {
@@ -432,7 +443,8 @@ double BpmControl::calcSyncAdjustment(bool userTweakingSync) {
         kLogger.trace() << m_group << "****************";
         kLogger.trace() << "master beat distance:" << syncTargetBeatDistance;
         kLogger.trace() << "my     beat distance:" << thisBeatDistance;
-        kLogger.trace() << "error               :" << (shortest_distance - m_dUserOffset.getValue());
+        kLogger.trace() << "error               :"
+                        << (shortest_distance - m_dUserOffset.getValue());
         kLogger.trace() << "user offset         :" << m_dUserOffset.getValue();
     }
 
@@ -1025,7 +1037,7 @@ void BpmControl::collectFeatures(GroupFeatureState* pGroupFeatures) const {
         if (sotPerSec != 0.0) {
             pGroupFeatures->beat_length_sec = dThisBeatLength / sotPerSec;
             pGroupFeatures->has_beat_length_sec = true;
-	} else {
+        } else {
             pGroupFeatures->has_beat_length_sec = false;
         }
 

src/engine/controls/bpmcontrol.h

@@ -93,6 +93,7 @@ class BpmControl : public EngineControl {
     void slotUpdateEngineBpm(double v = 0.0);
     void slotBeatsTranslate(double);
     void slotBeatsTranslateMatchAlignment(double);
+    void slotSetDownbeatOnClosestBeat(double);
 
   private:
     SyncMode getSyncMode() const {
@@ -107,20 +108,21 @@ class BpmControl : public EngineControl {
     friend class SyncControl;
 
     // ControlObjects that come from EngineBuffer
-    ControlProxy* m_pPlayButton;
+    std::unique_ptr<ControlProxy> m_pPlayButton;
     QAtomicInt m_oldPlayButton;
-    ControlProxy* m_pReverseButton;
-    ControlProxy* m_pRateRatio;
+    std::unique_ptr<ControlProxy> m_pReverseButton;
+    std::unique_ptr<ControlProxy> m_pRateRatio;
     ControlObject* m_pQuantize;
 
     // ControlObjects that come from QuantizeControl
-    QScopedPointer<ControlProxy> m_pNextBeat;
-    QScopedPointer<ControlProxy> m_pPrevBeat;
+    std::unique_ptr<ControlProxy> m_pNextBeat;
+    std::unique_ptr<ControlProxy> m_pPrevBeat;
+    std::unique_ptr<ControlProxy> m_pClosestBeat;
 
     // ControlObjects that come from LoopingControl
-    ControlProxy* m_pLoopEnabled;
-    ControlProxy* m_pLoopStartPosition;
-    ControlProxy* m_pLoopEndPosition;
+    std::unique_ptr<ControlProxy> m_pLoopEnabled;
+    std::unique_ptr<ControlProxy> m_pLoopStartPosition;
+    std::unique_ptr<ControlProxy> m_pLoopEndPosition;
 
     // The average bpm around the current playposition;
     ControlObject* m_pLocalBpm;
@@ -145,12 +147,14 @@ class BpmControl : public EngineControl {
     ControlPushButton* m_pTranslateBeats;
     // Button that translates beats to match another playing deck
     ControlPushButton* m_pBeatsTranslateMatchAlignment;
+    // Button to set the nearest beat as a bar beat
+    ControlPushButton* m_pBeatsSetBarBeat;
 
-    ControlProxy* m_pThisBeatDistance;
+    std::unique_ptr<ControlProxy> m_pThisBeatDistance;
     ControlValueAtomic<double> m_dSyncTargetBeatDistance;
     ControlValueAtomic<double> m_dUserOffset;
     QAtomicInt m_resetSyncAdjustment;
-    ControlProxy* m_pSyncMode;
+    std::unique_ptr<ControlProxy> m_pSyncMode;
 
     TapFilter m_tapFilter; // threadsafe
 

src/engine/controls/quantizecontrol.cpp

@@ -40,7 +40,7 @@ void QuantizeControl::trackLoaded(TrackPointer pNewTrack) {
         lookupBeatPositions(0.0);
         updateClosestBeat(0.0);
     } else {
-        m_pBeats.clear();
+        m_pBeats.reset();
         m_pCOPrevBeat->set(-1);
         m_pCONextBeat->set(-1);
         m_pCOClosestBeat->set(-1);

src/library/banshee/bansheeplaylistmodel.cpp

@@ -294,7 +294,8 @@ TrackPointer BansheePlaylistModel::getTrack(const QModelIndex& index) const {
         pTrack->setComposer(getFieldString(index, CLM_COMPOSER));
         // If the track has a BPM, then give it a static beatgrid.
         if (bpm > 0) {
-            mixxx::BeatsPointer pBeats = BeatFactory::makeBeatGrid(*pTrack, bpm, 0.0);
+            mixxx::BeatsPointer pBeats = std::make_shared<mixxx::Beats>(mixxx::Beats(pTrack.get()));
+            pBeats->setGrid(bpm);
             pTrack->setBeats(pBeats);
         }