diff options
author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2021-03-05 14:40:35 +0100 |
---|---|---|
committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2021-03-05 14:40:35 +0100 |
commit | 20893add4b98176c1ad06df47e0fc922ab5577be (patch) | |
tree | 618ba94fa4f971df95b6dcf0f5c95bcac7744da4 /src/analyzer | |
parent | eff873a190efa9233d33481158af9e31377282c8 (diff) | |
parent | 31557b7d6279b5ce59ba79dd970c1b569ea01eab (diff) |
Merge branch '2.3' of github.com:mixxxdj/mixxx
Diffstat (limited to 'src/analyzer')
-rw-r--r-- | src/analyzer/analyzerbeats.cpp | 28 | ||||
-rw-r--r-- | src/analyzer/analyzerbeats.h | 4 |
2 files changed, 15 insertions, 17 deletions
diff --git a/src/analyzer/analyzerbeats.cpp b/src/analyzer/analyzerbeats.cpp index 67dd45d17f..2036e041fa 100644 --- a/src/analyzer/analyzerbeats.cpp +++ b/src/analyzer/analyzerbeats.cpp @@ -46,7 +46,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; } @@ -58,7 +58,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; @@ -106,8 +106,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) { @@ -136,11 +135,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; @@ -153,7 +152,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. - mixxx::BeatsPointer pBeats = tio->getBeats(); + const mixxx::BeatsPointer pBeats = pTrack->getBeats(); if (!pBeats) { return true; } @@ -221,7 +220,7 @@ void AnalyzerBeats::cleanup() { m_pPlugin.reset(); } -void AnalyzerBeats::storeResults(TrackPointer tio) { +void AnalyzerBeats::storeResults(TrackPointer pTrack) { VERIFY_OR_DEBUG_ASSERT(m_pPlugin) { return; } @@ -237,7 +236,6 @@ void AnalyzerBeats::storeResults(TrackPointer tio) { QHash<QString, QString> extraVersionInfo = getExtraVersionInfo( m_pluginId, m_bPreferencesFastAnalysis); pBeats = BeatFactory::makePreferredBeats( - *tio, beats, extraVersionInfo, m_bPreferencesFixedTempo, @@ -251,21 +249,21 @@ 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 = BeatFactory::makeBeatGrid(m_iSampleRate, bpm, 0.0f); } - 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; } @@ -278,7 +276,7 @@ void AnalyzerBeats::storeResults(TrackPointer tio) { qDebug() << "Replacing 0-BPM beatgrid with a" << pBeats->getBpm() << "beatgrid."; } - tio->setBeats(pBeats); + pTrack->setBeats(pBeats); return; } @@ -287,7 +285,7 @@ void AnalyzerBeats::storeResults(TrackPointer tio) { double currentFirstBeat = pCurrentBeats->findNextBeat(0); double newFirstBeat = pBeats->findNextBeat(0); if (currentFirstBeat == 0.0 && newFirstBeat > 0) { - pCurrentBeats->translate(newFirstBeat); + pTrack->setBeats(pCurrentBeats->translate(newFirstBeat)); } } diff --git a/src/analyzer/analyzerbeats.h b/src/analyzer/analyzerbeats.h index 1169fd0436..4efb2f3075 100644 --- a/src/analyzer/analyzerbeats.h +++ b/src/analyzer/analyzerbeats.h @@ -26,13 +26,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 cleanup() override; private: - bool shouldAnalyze(TrackPointer tio) const; + bool shouldAnalyze(TrackPointer pTrack) const; static QHash<QString, QString> getExtraVersionInfo( const QString& pluginId, bool bPreferencesFastAnalysis); |