From 1eca938f68016465f302193f5ee96d7466832ebc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Thu, 11 Feb 2021 13:25:48 +0100
Subject: Dispose now unused EnableOffsetCorrection and MinBpm and MaxBpm.

A small Offset Correction in the range of +-25 ms is always applied. The Analyzer always returns the best Tempo near 120 BPM. This may fail by an interger fraction.
Applying an additional adjustment into a range will make the issue worse.
---
 src/analyzer/analyzerbeats.cpp | 25 +++----------------------
 src/analyzer/analyzerbeats.h   |  2 --
 2 files changed, 3 insertions(+), 24 deletions(-)

(limited to 'src/analyzer')

diff --git a/src/analyzer/analyzerbeats.cpp b/src/analyzer/analyzerbeats.cpp
index 110ff7f318..34ec36a54b 100644
--- a/src/analyzer/analyzerbeats.cpp
+++ b/src/analyzer/analyzerbeats.cpp
@@ -36,14 +36,11 @@ AnalyzerBeats::AnalyzerBeats(UserSettingsPointer pConfig, bool enforceBpmDetecti
           m_bPreferencesReanalyzeOldBpm(false),
           m_bPreferencesReanalyzeImported(false),
           m_bPreferencesFixedTempo(true),
-          m_bPreferencesOffsetCorrection(false),
           m_bPreferencesFastAnalysis(false),
           m_iSampleRate(0),
           m_iTotalSamples(0),
           m_iMaxSamplesToProcess(0),
-          m_iCurrentSample(0),
-          m_iMinBpm(0),
-          m_iMaxBpm(9999) {
+          m_iCurrentSample(0) {
 }
 
 bool AnalyzerBeats::initialize(TrackPointer tio, int sampleRate, int totalSamples) {
@@ -64,11 +61,7 @@ bool AnalyzerBeats::initialize(TrackPointer tio, int sampleRate, int totalSample
         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();
@@ -87,9 +80,7 @@ bool AnalyzerBeats::initialize(TrackPointer tio, int sampleRate, int totalSample
 
     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;
 
@@ -137,9 +128,6 @@ bool AnalyzerBeats::initialize(TrackPointer tio, int sampleRate, int totalSample
 }
 
 bool AnalyzerBeats::shouldAnalyze(TrackPointer tio) const {
-    int iMinBpm = m_bpmSettings.getBpmRangeStart();
-    int iMaxBpm = m_bpmSettings.getBpmRangeEnd();
-
     bool bpmLock = tio->isBpmLocked();
     if (bpmLock) {
         qDebug() << "Track is BpmLocked: Beat calculation will not start";
@@ -178,12 +166,8 @@ bool AnalyzerBeats::shouldAnalyze(TrackPointer tio) const {
             pluginID,
             m_bPreferencesFastAnalysis);
     QString newVersion = BeatFactory::getPreferredVersion(
-            m_bPreferencesOffsetCorrection);
+            m_bPreferencesFixedTempo);
     QString newSubVersion = BeatFactory::getPreferredSubVersion(
-            m_bPreferencesFixedTempo,
-            m_bPreferencesOffsetCorrection,
-            iMinBpm,
-            iMaxBpm,
             extraVersionInfo);
     if (subVersion == mixxx::rekordboxconstants::beatsSubversion) {
         return m_bPreferencesReanalyzeImported;
@@ -241,10 +225,7 @@ void AnalyzerBeats::storeResults(TrackPointer tio) {
                 beats,
                 extraVersionInfo,
                 m_bPreferencesFixedTempo,
-                m_bPreferencesOffsetCorrection,
-                m_iSampleRate,
-                m_iMinBpm,
-                m_iMaxBpm);
+                m_iSampleRate);
         qDebug() << "AnalyzerBeats plugin detected" << beats.size()
                  << "beats. Average BPM:" << (pBeats ? pBeats->getBpm() : 0.0);
     } else {
diff --git a/src/analyzer/analyzerbeats.h b/src/analyzer/analyzerbeats.h
index 1169fd0436..9ccc248948 100644
--- a/src/analyzer/analyzerbeats.h
+++ b/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;
 
     int m_iSampleRate;
     int m_iTotalSamples;
     int m_iMaxSamplesToProcess;
     int m_iCurrentSample;
-    int m_iMinBpm, m_iMaxBpm;
 };
-- 
cgit v1.2.3