[WIP] Bars phrases and variable bpm in beats class

.pre-commit-config.yaml

@@ -111,14 +111,3 @@ repos:
     - commit
     - push
     - manual
-- repo: local
-  hooks:
-  - id: line-length
-    name: line-length
-    description: Check for lines longer 100 and brakes them before 80.
-    entry: ./scripts/line_length.py
-    stages:
-    - commit
-    - push
-    language: python
-    files: \.(c|cpp|h)$

CMakeLists.txt

@@ -541,8 +541,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
@@ -1024,8 +1022,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

@@ -467,19 +467,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"
 
@@ -37,7 +37,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;
     }
@@ -49,7 +49,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;
@@ -100,8 +100,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) {
@@ -130,7 +129,7 @@ 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;
     int iMaxBpm;
     if (m_bpmSettings.getAllowBpmAboveRange()) {
@@ -141,7 +140,7 @@ bool AnalyzerBeats::shouldAnalyze(TrackPointer tio) const {
         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;
@@ -151,7 +150,7 @@ 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.
-    BeatsPointer pBeats = tio->getBeats();
+    mixxx::BeatsPointer pBeats = pTrack->getBeats();
     if (pBeats) {
         QString version = pBeats->getVersion();
         QString subVersion = pBeats->getSubVersion();
@@ -207,7 +206,7 @@ void AnalyzerBeats::cleanup() {
     m_pPlugin.reset();
 }
 
-void AnalyzerBeats::storeResults(TrackPointer tio) {
+void AnalyzerBeats::storeResults(TrackPointer pTrack) {
     VERIFY_OR_DEBUG_ASSERT(m_pPlugin) {
         return;
     }
@@ -217,13 +216,13 @@ void AnalyzerBeats::storeResults(TrackPointer tio) {
         return;
     }
 
-    BeatsPointer pBeats;
+    mixxx::BeatsPointer pBeats;
     if (m_pPlugin->supportsBeatTracking()) {
         QVector<double> beats = m_pPlugin->getBeats();
         QHash<QString, QString> extraVersionInfo = getExtraVersionInfo(
                 m_pluginId, m_bPreferencesFastAnalysis);
         pBeats = BeatFactory::makePreferredBeats(
-                *tio,
+                pTrack,
                 beats,
                 extraVersionInfo,
                 m_bPreferencesFixedTempo,
@@ -237,21 +236,23 @@ 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>(pTrack.get());
+        pBeats->setGrid(bpm);
+        pTrack->setBeats(pBeats);
     }
 
-    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;
     }
@@ -264,7 +265,7 @@ void AnalyzerBeats::storeResults(TrackPointer tio) {
             qDebug() << "Replacing 0-BPM beatgrid with a" << pBeats->getBpm()
                      << "beatgrid.";
         }
-        tio->setBeats(pBeats);
+        pTrack->setBeats(pBeats);
         return;
     }
 

src/analyzer/analyzerbeats.h

@@ -26,13 +26,13 @@ class AnalyzerBeats : public Analyzer {
 
     static QList<mixxx::AnalyzerPluginInfo> availablePlugins();
 
-    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,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"),