Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MU4] Fix build, and warnings too #6925

Merged
merged 1 commit into from
Nov 24, 2020

Conversation

Jojo-Schmitz
Copy link
Contributor

@Jojo-Schmitz Jojo-Schmitz commented Nov 24, 2020

Needs some input from @andreituicu (as this is related to #6343)

#define BRAILLE_TREBLEMENT QString(";6")
#define BRAILLE_INVERTED_MORDENT QString("\"6l")
#define BRAILLE_MORDENT QString("\"6l")
Copy link
Contributor Author

@Jojo-Schmitz Jojo-Schmitz Nov 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These switched roles in SMuFL 1.3, which MuseScore uses since a short while.

//case BarLineType::REVERSE_FINALE: // duplicate of the above, alternative name
case BarLineType::HEAVY:
case BarLineType::DOUBLE_HEAVY:
break; // ToDo ?!
Copy link
Contributor Author

@Jojo-Schmitz Jojo-Schmitz Nov 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@andreituicu how to deal with those? These got added to MuseScore recently.

Actually I don't think we should be ignoring them, at least report them as normal barlines?

case SymId::ornamentMordentInverted:
return BRAILLE_INVERTED_MORDENT;
case SymId::ornamentShortTrill:
return BRAILLE_SHORT_TRILL;
Copy link
Contributor Author

@Jojo-Schmitz Jojo-Schmitz Nov 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As mentioned above, these switched roles in SMuFL 1.3.

@@ -2481,6 +2488,7 @@ QString ExportBraille::brailleMarker(Marker* marker)
case Marker::Type::FINE:
return BRAILLE_FINE;
case Marker::Type::TOCODA:
case Marker::Type::TOCODASYM:
Copy link
Contributor Author

@Jojo-Schmitz Jojo-Schmitz Nov 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got added recently, I guess it is OK to treat it the same as the 'normal' "To Coda", @andreituicu

@igorkorsukov
Copy link
Contributor

needs fix code style

@Jojo-Schmitz
Copy link
Contributor Author

done

@igorkorsukov
Copy link
Contributor

@Jojo-Schmitz needs fix mtest (or turn off it)
<diff -u /home/runner/work/MuseScore/MuseScore/mtest/braille/testOrnaments_Example_16.5_MBC2015_ref.brf testOrnaments_Example_16.5_MBC2015.brf failed

vtests expectedly has broken

@Jojo-Schmitz
Copy link
Contributor Author

Jojo-Schmitz commented Nov 24, 2020

OK, mtests passed, vtests not. Squashing ...

@igorkorsukov igorkorsukov merged commit be7177d into musescore:master Nov 24, 2020
@Jojo-Schmitz Jojo-Schmitz deleted the fix-build branch November 24, 2020 12:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants