summaryrefslogtreecommitdiffstats
path: root/src/analyzer
diff options
context:
space:
mode:
authorJan Holthuis <jholthuis@mixxx.org>2021-07-01 23:53:18 +0200
committerJan Holthuis <jholthuis@mixxx.org>2021-07-06 13:04:58 +0200
commit9145ff8e92af3759f6469f5afd61a1a93a02e5bb (patch)
treef5364616e8163b5b8a45c2d7621dd60623786c94 /src/analyzer
parentc14ba706e4678c1eff9265502c12e34c75269d54 (diff)
Beats: Return mixxx::Bpm type instead of double from all bpm methods
Diffstat (limited to 'src/analyzer')
-rw-r--r--src/analyzer/analyzerbeats.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/analyzer/analyzerbeats.cpp b/src/analyzer/analyzerbeats.cpp
index 1b7dcb0939..04491794ac 100644
--- a/src/analyzer/analyzerbeats.cpp
+++ b/src/analyzer/analyzerbeats.cpp
@@ -143,7 +143,7 @@ bool AnalyzerBeats::shouldAnalyze(TrackPointer pTrack) const {
if (!pBeats) {
return true;
}
- if (!mixxx::Bpm::isValidValue(pBeats->getBpm())) {
+ if (!pBeats->getBpm().hasValue()) {
// Tracks with an invalid bpm <= 0 should be re-analyzed,
// independent of the preference settings. We expect that
// all tracks have a bpm > 0 when analyzed. Users that want
@@ -228,7 +228,7 @@ void AnalyzerBeats::storeResults(TrackPointer pTrack) {
m_bPreferencesFixedTempo,
m_sampleRate);
qDebug() << "AnalyzerBeats plugin detected" << beats.size()
- << "beats. Average BPM:" << (pBeats ? pBeats->getBpm() : 0.0);
+ << "beats. Average BPM:" << (pBeats ? pBeats->getBpm() : mixxx::Bpm());
} else {
mixxx::Bpm bpm = m_pPlugin->getBpm();
qDebug() << "AnalyzerBeats plugin detected constant BPM: " << bpm;