Ironing beats

src/analyzer/analyzerbeats.cpp

@@ -36,13 +36,10 @@ AnalyzerBeats::AnalyzerBeats(UserSettingsPointer pConfig, bool enforceBpmDetecti
           m_bPreferencesReanalyzeOldBpm(false),
           m_bPreferencesReanalyzeImported(false),
           m_bPreferencesFixedTempo(true),
-          m_bPreferencesOffsetCorrection(false),
           m_bPreferencesFastAnalysis(false),
           m_totalSamples(0),
           m_iMaxSamplesToProcess(0),
-          m_iCurrentSample(0),
-          m_iMinBpm(0),
-          m_iMaxBpm(9999) {
+          m_iCurrentSample(0) {
 }
 
 bool AnalyzerBeats::initialize(TrackPointer pTrack, int sampleRate, int totalSamples) {
@@ -63,11 +60,7 @@ bool AnalyzerBeats::initialize(TrackPointer pTrack, int sampleRate, int totalSam
         return false;
     }
 
-    m_iMinBpm = m_bpmSettings.getBpmRangeStart();
-    m_iMaxBpm = m_bpmSettings.getBpmRangeEnd();
-
     m_bPreferencesFixedTempo = m_bpmSettings.getFixedTempoAssumption();
-    m_bPreferencesOffsetCorrection = m_bpmSettings.getFixedTempoOffsetCorrection();
     m_bPreferencesReanalyzeOldBpm = m_bpmSettings.getReanalyzeWhenSettingsChange();
     m_bPreferencesReanalyzeImported = m_bpmSettings.getReanalyzeImported();
     m_bPreferencesFastAnalysis = m_bpmSettings.getFastAnalysis();
@@ -86,9 +79,7 @@ bool AnalyzerBeats::initialize(TrackPointer pTrack, int sampleRate, int totalSam
 
     qDebug() << "AnalyzerBeats preference settings:"
              << "\nPlugin:" << m_pluginId
-             << "\nMin/Max BPM:" << m_iMinBpm << m_iMaxBpm
              << "\nFixed tempo assumption:" << m_bPreferencesFixedTempo
-             << "\nOffset correction:" << m_bPreferencesOffsetCorrection
              << "\nRe-analyze when settings change:" << m_bPreferencesReanalyzeOldBpm
              << "\nFast analysis:" << m_bPreferencesFastAnalysis;
 
@@ -135,9 +126,6 @@ bool AnalyzerBeats::initialize(TrackPointer pTrack, int sampleRate, int totalSam
 }
 
 bool AnalyzerBeats::shouldAnalyze(TrackPointer pTrack) const {
-    int iMinBpm = m_bpmSettings.getBpmRangeStart();
-    int iMaxBpm = m_bpmSettings.getBpmRangeEnd();
-
     bool bpmLock = pTrack->isBpmLocked();
     if (bpmLock) {
         qDebug() << "Track is BpmLocked: Beat calculation will not start";
@@ -182,12 +170,8 @@ bool AnalyzerBeats::shouldAnalyze(TrackPointer pTrack) const {
             pluginID,
             m_bPreferencesFastAnalysis);
     QString newVersion = BeatFactory::getPreferredVersion(
-            m_bPreferencesOffsetCorrection);
+            m_bPreferencesFixedTempo);
     QString newSubVersion = BeatFactory::getPreferredSubVersion(
-            m_bPreferencesFixedTempo,
-            m_bPreferencesOffsetCorrection,
-            iMinBpm,
-            iMaxBpm,
             extraVersionInfo);
 
     if (version == newVersion && subVersion == newSubVersion) {
@@ -242,11 +226,7 @@ void AnalyzerBeats::storeResults(TrackPointer pTrack) {
                 beats,
                 extraVersionInfo,
                 m_bPreferencesFixedTempo,
-                m_bPreferencesOffsetCorrection,
-                m_sampleRate,
-                m_totalSamples,
-                m_iMinBpm,
-                m_iMaxBpm);
+                m_sampleRate);
         qDebug() << "AnalyzerBeats plugin detected" << beats.size()
                  << "beats. Average BPM:" << (pBeats ? pBeats->getBpm() : 0.0);
     } else {

src/analyzer/analyzerbeats.h

@@ -43,12 +43,10 @@ class AnalyzerBeats : public Analyzer {
     bool m_bPreferencesReanalyzeOldBpm;
     bool m_bPreferencesReanalyzeImported;
     bool m_bPreferencesFixedTempo;
-    bool m_bPreferencesOffsetCorrection;
     bool m_bPreferencesFastAnalysis;
 
     mixxx::audio::SampleRate m_sampleRate;
     SINT m_totalSamples;
     int m_iMaxSamplesToProcess;
     int m_iCurrentSample;
-    int m_iMinBpm, m_iMaxBpm;
 };

src/analyzer/plugins/analyzerqueenmarybeats.cpp

@@ -105,7 +105,9 @@ bool AnalyzerQueenMaryBeats::finalize() {
 
     m_resultBeats.reserve(static_cast<int>(beats.size()));
     for (size_t i = 0; i < beats.size(); ++i) {
-        double result = (beats.at(i) * m_stepSize) - m_stepSize / 2;
+        // we add the halve m_stepSize here, because the beat
+        // is detected between the two samples.
+        double result = (beats.at(i) * m_stepSize) + m_stepSize / 2;
         m_resultBeats.push_back(result);
     }
 

src/preferences/beatdetectionsettings.h

@@ -14,31 +14,20 @@
 // BPM_CONFIG_KEY Preferences
 #define BPM_DETECTION_ENABLED "BPMDetectionEnabled"
 #define BPM_FIXED_TEMPO_ASSUMPTION "BeatDetectionFixedTempoAssumption"
-#define BPM_FIXED_TEMPO_OFFSET_CORRECTION "FixedTempoOffsetCorrection"
 #define BPM_REANALYZE_WHEN_SETTINGS_CHANGE "ReanalyzeWhenSettingsChange"
 #define BPM_REANALYZE_IMPORTED "ReanalyzeImported"
 #define BPM_FAST_ANALYSIS_ENABLED "FastAnalysisEnabled"
 
-#define BPM_RANGE_START "BPMRangeStart"
-#define BPM_RANGE_END "BPMRangeEnd"
-
 class BeatDetectionSettings {
   public:
     BeatDetectionSettings(UserSettingsPointer pConfig) : m_pConfig(pConfig) {}
 
     DEFINE_PREFERENCE_HELPERS(BpmDetectionEnabled, bool,
                               BPM_CONFIG_KEY, BPM_DETECTION_ENABLED, true);
 
-    DEFINE_PREFERENCE_HELPERS(BpmRangeStart, int, BPM_CONFIG_KEY, BPM_RANGE_START, 70);
-
-    DEFINE_PREFERENCE_HELPERS(BpmRangeEnd, int, BPM_CONFIG_KEY, BPM_RANGE_END, 140);
-
     DEFINE_PREFERENCE_HELPERS(FixedTempoAssumption, bool,
                               BPM_CONFIG_KEY, BPM_FIXED_TEMPO_ASSUMPTION, true);
 
-    DEFINE_PREFERENCE_HELPERS(FixedTempoOffsetCorrection, bool,
-                              BPM_CONFIG_KEY, BPM_FIXED_TEMPO_OFFSET_CORRECTION, true);
-
     DEFINE_PREFERENCE_HELPERS(ReanalyzeWhenSettingsChange, bool,
                               BPM_CONFIG_KEY, BPM_REANALYZE_WHEN_SETTINGS_CHANGE, false);
 

src/preferences/dialog/dlgprefbeats.cpp

@@ -8,11 +8,8 @@
 DlgPrefBeats::DlgPrefBeats(QWidget* parent, UserSettingsPointer pConfig)
         : DlgPreferencePage(parent),
           m_bpmSettings(pConfig),
-          m_minBpm(m_bpmSettings.getBpmRangeStartDefault()),
-          m_maxBpm(m_bpmSettings.getBpmRangeEndDefault()),
           m_bAnalyzerEnabled(m_bpmSettings.getBpmDetectionEnabledDefault()),
           m_bFixedTempoEnabled(m_bpmSettings.getFixedTempoAssumptionDefault()),
-          m_bOffsetEnabled(m_bpmSettings.getFixedTempoOffsetCorrectionDefault()),
           m_bFastAnalysisEnabled(m_bpmSettings.getFastAnalysisDefault()),
           m_bReanalyze(m_bpmSettings.getReanalyzeWhenSettingsChangeDefault()),
           m_bReanalyzeImported(m_bpmSettings.getReanalyzeImportedDefault()) {
@@ -38,27 +35,15 @@ DlgPrefBeats::DlgPrefBeats(QWidget* parent, UserSettingsPointer pConfig)
             &QCheckBox::stateChanged,
             this,
             &DlgPrefBeats::fixedtempoEnabled);
-    connect(checkBoxOffsetCorr,
-            &QCheckBox::stateChanged,
-            this,
-            &DlgPrefBeats::offsetEnabled);
     connect(checkBoxFastAnalysis,
             &QCheckBox::stateChanged,
             this,
             &DlgPrefBeats::fastAnalysisEnabled);
-    connect(txtMinBpm,
-            QOverload<int>::of(&QSpinBox::valueChanged),
-            this,
-            &DlgPrefBeats::minBpmRangeChanged);
-    connect(txtMaxBpm,
-            QOverload<int>::of(&QSpinBox::valueChanged),
-            this,
-            &DlgPrefBeats::maxBpmRangeChanged);
-    connect(checkBoxReanalyse,
+    connect(checkBoxReanalyze,
             &QCheckBox::stateChanged,
             this,
             &DlgPrefBeats::slotReanalyzeChanged);
-    connect(checkBoxReanalyseImported,
+    connect(checkBoxReanalyzeImported,
             &QCheckBox::stateChanged,
             this,
             &DlgPrefBeats::slotReanalyzeImportedChanged);
@@ -75,14 +60,9 @@ void DlgPrefBeats::loadSettings() {
     m_selectedAnalyzerId = m_bpmSettings.getBeatPluginId();
     m_bAnalyzerEnabled = m_bpmSettings.getBpmDetectionEnabled();
     m_bFixedTempoEnabled = m_bpmSettings.getFixedTempoAssumption();
-    m_bOffsetEnabled = m_bpmSettings.getFixedTempoOffsetCorrection();
     m_bReanalyze =  m_bpmSettings.getReanalyzeWhenSettingsChange();
     m_bFastAnalysisEnabled = m_bpmSettings.getFastAnalysis();
 
-    // TODO(rryan): Above range enabled is not exposed?
-    m_minBpm = m_bpmSettings.getBpmRangeStart();
-    m_maxBpm = m_bpmSettings.getBpmRangeEnd();
-
     slotUpdate();
 }
 
@@ -92,12 +72,9 @@ void DlgPrefBeats::slotResetToDefaults() {
     }
     m_bAnalyzerEnabled = m_bpmSettings.getBpmDetectionEnabledDefault();
     m_bFixedTempoEnabled = m_bpmSettings.getFixedTempoAssumptionDefault();
-    m_bOffsetEnabled = m_bpmSettings.getFixedTempoOffsetCorrectionDefault();
     m_bFastAnalysisEnabled = m_bpmSettings.getFastAnalysisDefault();
     m_bReanalyze = m_bpmSettings.getReanalyzeWhenSettingsChangeDefault();
-    // TODO(rryan): Above range enabled is not exposed?
-    m_minBpm = m_bpmSettings.getBpmRangeStartDefault();
-    m_maxBpm = m_bpmSettings.getBpmRangeEndDefault();
+
     slotUpdate();
 }
 
@@ -119,32 +96,14 @@ void DlgPrefBeats::fixedtempoEnabled(int i) {
     slotUpdate();
 }
 
-void DlgPrefBeats::offsetEnabled(int i) {
-    m_bOffsetEnabled = static_cast<bool>(i);
-    slotUpdate();
-}
-
-void DlgPrefBeats::minBpmRangeChanged(int value) {
-    m_minBpm = value;
-    slotUpdate();
-}
-
-void DlgPrefBeats::maxBpmRangeChanged(int value) {
-    m_maxBpm = value;
-    slotUpdate();
-}
-
 void DlgPrefBeats::slotUpdate() {
     checkBoxFixedTempo->setEnabled(m_bAnalyzerEnabled);
-    checkBoxOffsetCorr->setEnabled((m_bAnalyzerEnabled && m_bFixedTempoEnabled));
     comboBoxBeatPlugin->setEnabled(m_bAnalyzerEnabled);
     checkBoxAnalyzerEnabled->setChecked(m_bAnalyzerEnabled);
     // Fast analysis cannot be combined with non-constant tempo beatgrids.
     checkBoxFastAnalysis->setEnabled(m_bAnalyzerEnabled && m_bFixedTempoEnabled);
-    txtMaxBpm->setEnabled(m_bAnalyzerEnabled && m_bFixedTempoEnabled);
-    txtMinBpm->setEnabled(m_bAnalyzerEnabled && m_bFixedTempoEnabled);
-    checkBoxReanalyse->setEnabled(m_bAnalyzerEnabled);
-    checkBoxReanalyseImported->setEnabled(m_bReanalyzeImported);
+    checkBoxReanalyze->setEnabled(m_bAnalyzerEnabled);
+    checkBoxReanalyzeImported->setEnabled(m_bAnalyzerEnabled);
 
     if (!m_bAnalyzerEnabled) {
         return;
@@ -159,7 +118,6 @@ void DlgPrefBeats::slotUpdate() {
                 comboBoxBeatPlugin->setCurrentIndex(i);
                 if (!m_availablePlugins[i].constantTempoSupported) {
                     checkBoxFixedTempo->setEnabled(false);
-                    checkBoxOffsetCorr->setEnabled(false);
                 }
                 break;
             }
@@ -171,13 +129,11 @@ void DlgPrefBeats::slotUpdate() {
     }
 
     checkBoxFixedTempo->setChecked(m_bFixedTempoEnabled);
-    checkBoxOffsetCorr->setChecked(m_bOffsetEnabled);
     // Fast analysis cannot be combined with non-constant tempo beatgrids.
     checkBoxFastAnalysis->setChecked(m_bFastAnalysisEnabled && m_bFixedTempoEnabled);
 
-    txtMaxBpm->setValue(m_maxBpm);
-    txtMinBpm->setValue(m_minBpm);
-    checkBoxReanalyse->setChecked(m_bReanalyze);
+    checkBoxReanalyze->setChecked(m_bReanalyze);
+    checkBoxReanalyzeImported->setChecked(m_bReanalyzeImported);
 }
 
 void DlgPrefBeats::slotReanalyzeChanged(int value) {
@@ -199,10 +155,7 @@ void DlgPrefBeats::slotApply() {
     m_bpmSettings.setBeatPluginId(m_selectedAnalyzerId);
     m_bpmSettings.setBpmDetectionEnabled(m_bAnalyzerEnabled);
     m_bpmSettings.setFixedTempoAssumption(m_bFixedTempoEnabled);
-    m_bpmSettings.setFixedTempoOffsetCorrection(m_bOffsetEnabled);
     m_bpmSettings.setReanalyzeWhenSettingsChange(m_bReanalyze);
     m_bpmSettings.setReanalyzeImported(m_bReanalyzeImported);
     m_bpmSettings.setFastAnalysis(m_bFastAnalysisEnabled);
-    m_bpmSettings.setBpmRangeStart(m_minBpm);
-    m_bpmSettings.setBpmRangeEnd(m_maxBpm);
 }

src/preferences/dialog/dlgprefbeats.h

@@ -28,10 +28,7 @@ class DlgPrefBeats : public DlgPreferencePage, public Ui::DlgBeatsDlg {
     void pluginSelected(int i);
     void analyzerEnabled(int i);
     void fixedtempoEnabled(int i);
-    void offsetEnabled(int i);
     void fastAnalysisEnabled(int i);
-    void minBpmRangeChanged(int value);
-    void maxBpmRangeChanged(int value);
     void slotReanalyzeChanged(int value);
     void slotReanalyzeImportedChanged(int value);
 
@@ -41,11 +38,8 @@ class DlgPrefBeats : public DlgPreferencePage, public Ui::DlgBeatsDlg {
     BeatDetectionSettings m_bpmSettings;
     QList<mixxx::AnalyzerPluginInfo> m_availablePlugins;
     QString m_selectedAnalyzerId;
-    int m_minBpm;
-    int m_maxBpm;
     bool m_bAnalyzerEnabled;
     bool m_bFixedTempoEnabled;
-    bool m_bOffsetEnabled;
     bool m_bFastAnalysisEnabled;
     bool m_bReanalyze;
     bool m_bReanalyzeImported;