Beat map assert fix, single beats #3694
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
reviewed
Mar 11, 2021
src/track/beatmap.cpp
Outdated
| @@ -269,7 +269,7 @@ QString BeatMap::getSubVersion() const { | |||
| } | |||
|
|
|||
| bool BeatMap::isValid() const { | |||
| return m_sampleRate.isValid() && m_beats.size() > 0; | |||
| return m_sampleRate.isValid() && m_beats.size() > 1; | |||
There was a problem hiding this comment.
Why is a beatgrid invalid if it has one beat?
There was a problem hiding this comment.
Because it has no tempo.
There was a problem hiding this comment.
I suppose this is worth a comment. Better: Introduce a constant constexpr int kMinNumberOfBeats = 2 and place the comment there.
There was a problem hiding this comment.
Verify class invariant?
DEBUG_ASSERT(m_beats.isEmpty() || m_beats.size() >= kMinNumberOfBeats);
Holzhaus
reviewed
Mar 14, 2021
src/track/beatmap.cpp
Outdated
| @@ -269,7 +270,7 @@ QString BeatMap::getSubVersion() const { | |||
| } | |||
|
|
|||
| bool BeatMap::isValid() const { | |||
| return m_sampleRate.isValid() && m_beats.size() > 0; | |||
| return m_sampleRate.isValid() && m_beats.size() >= kMinNumberOfBeats); | |||
There was a problem hiding this comment.
Suggested change
| return m_sampleRate.isValid() && m_beats.size() >= kMinNumberOfBeats); | |
| return m_sampleRate.isValid() && m_beats.size() >= kMinNumberOfBeats; |
uklotzde
approved these changes
Mar 14, 2021
This was referenced Aug 23, 2022
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.
This fixed a debug assertion with one of my artificial test tracks which has one beat only.