Use mixxx::Bpm for some Beats functions Pt. 2 #4045
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Holzhaus
force-pushed
the
bpm-pt2
branch
2 times, most recently
from
11d316f
to
90e68fc
Compare
|
I rebased on latest main. The added validity checks from #4044 uncovered two more code locations where the bpm value may be invalid, in EngineBuffer and SyncControl. To keep the changes small and leave the business logic unchanged, I added FIXMEs and just used |
uklotzde
reviewed
Jul 6, 2021
src/engine/sync/synccontrol.cpp
Outdated
| @@ -516,7 +516,7 @@ void SyncControl::notifySeek(double dNewPlaypos) { | |||
| double SyncControl::fileBpm() const { | |||
| mixxx::BeatsPointer pBeats = m_pBeats; | |||
| if (pBeats) { | |||
| return pBeats->getBpm(); | |||
| return pBeats->getBpm().getValue(); | |||
| } | |||
| return 0.0; | |||
There was a problem hiding this comment.
return mixxx::Bpm::kValueUndefined instead of 0.0?
src/track/beatmap.cpp
Outdated
| if (!isValid()) { | ||
| return -1; | ||
| return mixxx::Bpm(); |
There was a problem hiding this comment.
Either return mixxx::Bpm() or {} but not a mixture of both in various places. I would prefer the latter, because we don't need to repeat the return type multiple times.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Follow up to #4044.