diff options
author | Jan Holthuis <jholthuis@mixxx.org> | 2021-07-06 14:43:37 +0200 |
---|---|---|
committer | Jan Holthuis <jholthuis@mixxx.org> | 2021-07-06 14:43:37 +0200 |
commit | 603d3253ceba37c894fcffc304ef934a667e0437 (patch) | |
tree | 68807a9d0e43cd0b6a9cb017be10fcc83607e052 | |
parent | 4cd4614c31fd7b1ddf230bb420395cf04f6c98c8 (diff) |
Return {} instead of mixxx::Bpm() to avoid return type repetition
-rw-r--r-- | src/analyzer/plugins/analyzerplugin.h | 2 | ||||
-rw-r--r-- | src/track/beatmap.cpp | 6 | ||||
-rw-r--r-- | src/track/beatutils.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/analyzer/plugins/analyzerplugin.h b/src/analyzer/plugins/analyzerplugin.h index 5ebc6ef62a..f1fb18c594 100644 --- a/src/analyzer/plugins/analyzerplugin.h +++ b/src/analyzer/plugins/analyzerplugin.h @@ -71,7 +71,7 @@ class AnalyzerBeatsPlugin : public AnalyzerPlugin { virtual bool supportsBeatTracking() const = 0; virtual mixxx::Bpm getBpm() const { - return mixxx::Bpm(); + return {}; } virtual QVector<mixxx::audio::FramePos> getBeats() const { return {}; diff --git a/src/track/beatmap.cpp b/src/track/beatmap.cpp index fa4b4e1db5..e515f718f9 100644 --- a/src/track/beatmap.cpp +++ b/src/track/beatmap.cpp @@ -149,7 +149,7 @@ mixxx::Bpm calculateNominalBpm(const BeatList& beats, mixxx::audio::SampleRate s } if (beatvect.size() < 2) { - return mixxx::Bpm(); + return {}; } return BeatUtils::calculateBpm(beatvect, mixxx::audio::SampleRate(sampleRate)); @@ -524,7 +524,7 @@ bool BeatMap::hasBeatInRange(double startSample, double stopSample) const { mixxx::Bpm BeatMap::getBpm() const { if (!isValid()) { - return mixxx::Bpm(); + return {}; } return m_nominalBpm; } @@ -532,7 +532,7 @@ mixxx::Bpm BeatMap::getBpm() const { // Note: Also called from the engine thread mixxx::Bpm BeatMap::getBpmAroundPosition(double curSample, int n) const { if (!isValid()) { - return mixxx::Bpm(); + return {}; } // To make sure we are always counting n beats, iterate backward to the diff --git a/src/track/beatutils.cpp b/src/track/beatutils.cpp index a744a56c22..c934995544 100644 --- a/src/track/beatutils.cpp +++ b/src/track/beatutils.cpp @@ -29,7 +29,7 @@ mixxx::Bpm BeatUtils::calculateAverageBpm(int numberOfBeats, mixxx::audio::FrameDiff_t frames = upperFrame - lowerFrame; DEBUG_ASSERT(frames > 0); if (numberOfBeats < 1) { - return mixxx::Bpm(); + return {}; } return mixxx::Bpm(60.0 * numberOfBeats * sampleRate / frames); } @@ -38,7 +38,7 @@ mixxx::Bpm BeatUtils::calculateBpm( const QVector<mixxx::audio::FramePos>& beats, mixxx::audio::SampleRate sampleRate) { if (beats.size() < 2) { - return mixxx::Bpm(); + return {}; } // If we don't have enough beats for our regular approach, just divide the # |