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
fix compiler warnings, seen in MinGW and MSVC #4221
Conversation
mscore/musescore.cpp
Outdated
@@ -6406,6 +6406,7 @@ bool MuseScore::saveMp3(Score* score, const QString& name) | |||
|
|||
bool MuseScore::saveMp3(Score* score, QIODevice* device, bool& wasCanceled) | |||
{ | |||
Q_UNUSED(wasCanceled); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure that not using this variable is a correct behavior. wasCancelled
should be processed when exporting mp3. Maybe it is done in another method with the same name.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We'd need @lasconic to comment on this, the code dealing with wasCancelled
had been removed by him
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But yes, I guess that parameter should get used to remove an obsolete mp3 when the generation gets canceled
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@lasconic: Mind to look into this saveMp3()
issue?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in #4327
libmscore/hairpin.cpp
Outdated
if (autoplace() && !score()->isPalette()) { | ||
// Try to fit between adjacent dynamics | ||
if (isSingleType() || isBeginType()) { | ||
Segment* start = hairpin()->startSegment(); | ||
Dynamic* sd = start ? toDynamic(start->findAnnotation(ElementType::DYNAMIC, _track, _track)) : nullptr; | ||
Dynamic* sd = start ? toDynamic(start->findAnnotation(ElementType::DYNAMIC, _trck, _trck)) : nullptr; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
or _track
and _trck
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the local _trck
rather than the global _track
, at least that is what gets taken without that change. @dmitrio95 ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, _trck
is good, here should be the value returned by track()
call. Not sure which is the other global _track
variable though.
a199196
to
b1cb31e
Compare
9f5b528
to
6e53a55
Compare
6e53a55
to
88d3736
Compare
No description provided.