Fix a bunch of different issue connected to local time signatures #26100
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
mike-spa
changed the title
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Jan 16, 2025
Resolves: musescore#18089 Backport of musescore#26100, commit 3, TODO
Jojo-Schmitz
added a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Jan 16, 2025
Resolves: musescore#26001 Resolves the freeze that occurs when opening the corrupted file. Also resolves the problem which causes the corruption in the first place. Backport of musescore#26100, commit 4
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Jan 16, 2025
Resolves: musescore#25110 Backport of musescore#26100, plus some more
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Jan 16, 2025
Resolves: musescore#25110 Backport of musescore#26100, commit 3 plus some more
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Jan 16, 2025
Resolves: musescore#26001 Resolves the freeze that occurs when opening the corrupted file. Also resolves the problem which causes the corruption in the first place. Backport of musescore#26100, commit 4
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Jan 16, 2025
Resolves: musescore#23411 Backport of musescore#26100, commit 2
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Jan 16, 2025
Resolves: musescore#23411 Backport of musescore#26100, 2nd commit
This comment was marked as spam.
This comment was marked as spam.
mike-spa
force-pushed
the
fixLocalTimeSigIssues
branch
from
59af940 to
3d899f0
Compare
oktophonie
approved these changes
Jan 16, 2025
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Jan 16, 2025
Resolves: musescore#18089 Backport of musescore#26100, commit 3, TODO
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Jan 16, 2025
Resolves: musescore#26001 Resolves the freeze that occurs when opening the corrupted file. Also resolves the problem which causes the corruption in the first place. Backport of musescore#26100, commit 4
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Jan 16, 2025
Resolves: musescore#25110 Backport of musescore#26100, commit 5 plus some more
8 tasks
Jojo-Schmitz
added a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Jan 17, 2025
reg.: overrides a member function but is not marked 'override' [-Winconsistent-missing-override] (Also fixed in musescore#26100)
Jojo-Schmitz
added a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Jan 17, 2025
reg.: overrides a member function but is not marked 'override' [-Winconsistent-missing-override] (Also fixed in musescore#26100)
Jojo-Schmitz
added a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Jan 17, 2025
reg.: overrides a member function but is not marked 'override' [-Winconsistent-missing-override] (Also fixed in musescore#26100)
miiizen
reviewed
Jan 17, 2025
| @@ -683,9 +683,10 @@ void Score::expandVoice(Segment* s, track_idx_t track) | |||
| // | |||
| Measure* m = s->measure(); | |||
| Fraction stick = ps ? ps->tick() : m->tick(); | |||
| Fraction stretch = staff(track2staff(track))->timeStretch(stick); | |||
There was a problem hiding this comment.
A small thought about neatness - it might be worthwhile having a corresponding actualTicks() method wherever we have a ticks() method. This stretch calculation comes up often enough for segments.
There was a problem hiding this comment.
Good point. It's tricky to do for segments though, because a segment spans all staves, whereas the "stretch" (i.e. the ratio between the global and local time signature) is specific of one single stave. But I agree it'd be best to come up with something general, I'll do it in a next PR 👍
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Jan 18, 2025
Resolves: musescore#18089 Backport of musescore#26100, commit 3, TODO
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Jan 18, 2025
Resolves: musescore#26001 Resolves the freeze that occurs when opening the corrupted file. Also resolves the problem which causes the corruption in the first place. Backport of musescore#26100, commit 4
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Jan 18, 2025
Resolves: musescore#25110 Backport of musescore#26100, commit 5 plus some more
Resolves: musescore#26001 Resolves the freeze that occurs when opening the corrupted file. Also resolves the problem which causes the corruption in the first place.
mike-spa
force-pushed
the
fixLocalTimeSigIssues
branch
from
3d899f0 to
c55afd0
Compare
miiizen
approved these changes
Jan 24, 2025
pacebes
pushed a commit
to pacebes/MuseScore
that referenced
this pull request
Jan 24, 2025
Fix a bunch of different issue connected to local time signatures
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: #23411
Resolves: #18089
Resolves: #26001
Resolves: #25110