fix #271616: Fermata tempo is not applied when importing 2.X->3.0 score #3926
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
Contributor
handrok
commented
Sep 6, 2018
handrok
commented
- Add reading timeStretch for feramta from mscz
- Add calculating ticks for segments before first using fermata
anatoly-os
reviewed
Sep 6, 2018
libmscore/layout.cpp
Outdated
| @@ -2455,6 +2455,10 @@ void Score::getNextMeasure(LayoutContext& lc) | |||
| } | |||
|
|
|||
| for (Segment& segment : measure->segments()) { | |||
| Segment* ns = segment.nextEnabled(); | |||
There was a problem hiding this comment.
Let's call it nextSegment. The code becomes clearer.
There was a problem hiding this comment.
nextEnabled() is not a new method. And it doesn't return nextSegment. It return next enabled segment.
libmscore/layout.cpp
Outdated
| @@ -3857,6 +3861,7 @@ void Score::doLayoutRange(int stick, int etick) | |||
|
|
|||
| lc.prevMeasure = 0; | |||
|
|
|||
| fixTicks(); | |||
There was a problem hiding this comment.
We need to reset applied tempo. Because tempo is setted in layout. And if we don't reset tempo new timeStretch is applied to the last applied timeStretch. It lead to twice timeStretch, next triple e.t.c
There was a problem hiding this comment.
It is worth adding this info to the comment placed one line above calling this method in code.
handrok
force-pushed
the
fix#271616-Fermata_tempo
branch
2 times, most recently
from
f536e18
to
aad2a15
Compare
handrok
force-pushed
the
fix#271616-Fermata_tempo
branch
from
aad2a15
to
8422a7d
Compare
anatoly-os
added a commit
that referenced
this pull request
Sep 8, 2018
This reverts commit cb6a5c9. These changes crash MuseScore when open some 2.06 scores.
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.