Write location before spanner end on score end #20107
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
oktophonie
approved these changes
Nov 21, 2023
| prevLoc.setStaff(s->staffIdx()); | ||
|
|
||
| spannerEndLoc.toRelative(prevLoc); | ||
| if (spannerEndLoc.frac() != Fraction(0, 1)) { |
There was a problem hiding this comment.
Shouldn't this condition better get moved up to the first if?
if (frac == s->score()->endTick() && frac != Fraction(0,1)) {Or ever the other way round?
There was a problem hiding this comment.
No, as spannerEndLoc has been made relative to the previous location by this point. This is checking if spannerEndLoc is the same as the previous location written to the file (difference between fractions is 0). If so, we don't need to bother writing to the file.
There was a problem hiding this comment.
I see, thanks for explaining
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Nov 21, 2023
mike-spa
approved these changes
Nov 21, 2023
cbjeukendrup
approved these changes
Nov 21, 2023
|
@DmitryArefiev Since #17646 seems also related to playback, does this also need to be tested by you? |
|
@cbjeukendrup I've tested #17646 on Win10 - looks fine, but #17646 also doesn't occur in 4.2 latest master (and happens in 4.1.1) |
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Nov 22, 2023
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.
Resolves: #19082
Resolves: #17646
This PR writes a location tag before any spanner which ends at the end of the score. Ususally, these spanners would be written to the beginning of the following bar. Instead they are written to the end of the bar, but when reading the file the location is ambiguous. The location tag ensures the location is updated to the end tick of the file when reading the spanner end.