LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix #291146: Swing prevents midi rendering of tied notes

Browse source
This commit is contained in:
Matt McClinch 2019-06-22 09:42:32 -04:00
parent 7d0a9179b9
commit 7c3fef8a55
3 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libmscore/articulation.cpp
View file

@ -601,6 +601,30 @@ bool Articulation::isLuteFingering() const
|| _symId == SymId::luteFingeringRHThird;
}
//---------------------------------------------------------
// isOrnament
//---------------------------------------------------------
bool Articulation::isOrnament() const
{
return _symId == SymId::ornamentTurn
|| _symId == SymId::ornamentTurnInverted
|| _symId == SymId::ornamentTrill
|| _symId == SymId::brassMuteClosed
|| _symId == SymId::ornamentMordentInverted
|| _symId == SymId::ornamentMordent
|| _symId == SymId::ornamentTremblement
|| _symId == SymId::ornamentPrallMordent
|| _symId == SymId::ornamentLinePrall
|| _symId == SymId::ornamentUpPrall
|| _symId == SymId::ornamentUpMordent
|| _symId == SymId::ornamentPrecompMordentUpperPrefix
|| _symId == SymId::ornamentDownMordent
|| _symId == SymId::ornamentPrallUp
|| _symId == SymId::ornamentPrallDown
|| _symId == SymId::ornamentPrecompSlide;
}
//---------------------------------------------------------
// accessibleInfo
//---------------------------------------------------------

1
libmscore/articulation.h
View file

@ -139,6 +139,7 @@ class Articulation final : public Element {
bool isAccent() const;
bool isMarcato() const;
bool isLuteFingering() const;
bool isOrnament() const;
void doAutoplace();
};

8
libmscore/rendermidi.cpp
View file

@ -2162,14 +2162,16 @@ void renderChordArticulation(Chord* chord, QList<NoteEventList> & ell, int & gat
static bool shouldRenderNote(Note* n)
{
int dist = 0;
while (n->tieBack()) {
n = n->tieBack()->startNote();
++dist;
if (n && n->playEvents().offtime() > (dist * NoteEvent::NOTE_LENGTH)) {
if (findFirstTrill(n->chord()))
// The previous tied note probably has events for this note too.
// That is, we don't need to render this note separately.
return false;
for (Articulation* a : n->chord()->articulations()) {
if (a->isOrnament()) {
return false;
}
}
}
return true;