Skip to content

Commit

Permalink
fix #276227 MusicXML import causes corruption, attempts to fix causes…
Browse files Browse the repository at this point in the history 
… crash
  • Loading branch information
@lvinken
lvinken committed Dec 3, 2018
1 parent a4e6ad8 commit 2d88e02
Show file tree
Hide file tree
Showing 4 changed files with 1,063 additions and 34 deletions.
115 changes: 81 additions & 34 deletions mscore/importmxmlpass2.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1039,6 +1039,53 @@ static bool isTupletFilled(Tuplet* t, TDuration normalType)
}
}

//---------------------------------------------------------
// handleTupletStart
//---------------------------------------------------------

static void handleTupletStart(const ChordRest* const cr, Tuplet*& tuplet,
const int actualNotes, const int normalNotes,
const MusicXmlTupletDesc& tupletDesc)
{
tuplet = new Tuplet(cr->score());
tuplet->setTrack(cr->track());
tuplet->setRatio(Fraction(actualNotes, normalNotes));
tuplet->setTick(cr->tick());
tuplet->setBracketType(tupletDesc.bracket);
tuplet->setNumberType(tupletDesc.shownumber);
// TODO type, placement, bracket
tuplet->setParent(cr->measure());
}

//---------------------------------------------------------
// handleTupletStop
//---------------------------------------------------------

static void handleTupletStop(Tuplet*& tuplet, const int normalNotes)
{
// allow handleTupletStop to be called w/o error of no tuplet active
if (!tuplet) return;

// set baselen
TDuration td = determineTupletBaseLen(tuplet);
//qDebug("stop tuplet %p basetype %d", tuplet, td.ticks());
tuplet->setBaseLen(td);
Fraction f(normalNotes, td.fraction().denominator());
f.reduce();
tuplet->setDuration(f);
// TODO determine usefulness of following check
int totalDuration = 0;
foreach (DurationElement* de, tuplet->elements()) {
if (de->type() == ElementType::CHORD || de->type() == ElementType::REST) {
totalDuration+=de->globalDuration().ticks();
}
}
if (!(totalDuration && normalNotes)) {
qDebug("MusicXML::import: tuplet stop but bad duration"); // TODO
}
tuplet = 0;
}

//---------------------------------------------------------
// addTupletToChord
//---------------------------------------------------------
Expand All @@ -1062,12 +1109,13 @@ void addTupletToChord(ChordRest* cr, Tuplet*& tuplet, bool& tuplImpl,

// check for obvious errors
if (tupletDesc.type == MxmlStartStop::START && tuplet) {
qDebug("tuplet already started"); // TODO
// TODO: how to recover ?
qDebug("tuplet already started");
// recover by simply stopping the current tuplet first
handleTupletStop(tuplet, normalNotes);
}
if (tupletDesc.type == MxmlStartStop::STOP && !tuplet) {
qDebug("tuplet stop but no tuplet started"); // TODO
// TODO: how to recover ?
// recovery handled later (automatically, no special case needed)
}

// Tuplet are either started by the tuplet start
Expand All @@ -1083,14 +1131,7 @@ void addTupletToChord(ChordRest* cr, Tuplet*& tuplet, bool& tuplImpl,
else
tuplImpl = false;
// create a new tuplet
tuplet = new Tuplet(cr->score());
tuplet->setTrack(cr->track());
tuplet->setRatio(Fraction(actualNotes, normalNotes));
tuplet->setTick(cr->tick());
tuplet->setBracketType(tupletDesc.bracket);
tuplet->setNumberType(tupletDesc.shownumber);
// TODO type, placement, bracket
tuplet->setParent(cr->measure());
handleTupletStart(cr, tuplet, actualNotes, normalNotes, tupletDesc);
}
}

Expand All @@ -1112,24 +1153,7 @@ void addTupletToChord(ChordRest* cr, Tuplet*& tuplet, bool& tuplImpl,
if (tupletDesc.type == MxmlStartStop::STOP
|| (tuplImpl && isTupletFilled(tuplet, normalType))
|| (actualNotes == 1 && normalNotes == 1)) {
// set baselen
TDuration td = determineTupletBaseLen(tuplet);
// qDebug("stop tuplet %p basetype %d", tuplet, tupletType);
tuplet->setBaseLen(td);
Fraction f(normalNotes, td.fraction().denominator());
f.reduce();
tuplet->setDuration(f);
// TODO determine usefulness of following check
int totalDuration = 0;
foreach (DurationElement* de, tuplet->elements()) {
if (de->type() == ElementType::CHORD || de->type() == ElementType::REST) {
totalDuration+=de->globalDuration().ticks();
}
}
if (!(totalDuration && normalNotes)) {
qDebug("MusicXML::import: tuplet stop but bad duration"); // TODO
}
tuplet = 0;
handleTupletStop(tuplet, normalNotes);
}
}
}
Expand Down Expand Up @@ -1415,6 +1439,22 @@ MusicXMLParserPass2::MusicXMLParserPass2(Score* score, MusicXMLParserPass1& pass
// nothing
}

//---------------------------------------------------------
// resetTuplets
//---------------------------------------------------------

static void resetTuplets(QVector<Tuplet*>& tuplets, QVector<bool>& tuplImpls)
{
for (auto& tuplet : tuplets) {
if (tuplet) {
qDebug("tuplet not stopped at end of measure");
handleTupletStop(tuplet, 2);
}
tuplet = nullptr;
}
for (auto& tuplImpl : tuplImpls) tuplImpl = false;
}

//---------------------------------------------------------
// initPartState
//---------------------------------------------------------
Expand Down Expand Up @@ -2127,6 +2167,9 @@ void MusicXMLParserPass2::measure(const QString& partId,
measure->setBreakMultiMeasureRest(true);
}

// prevent tuplets from crossing measure boundaries
resetTuplets(_tuplets, _tuplImpls);

Q_ASSERT(_e.isEndElement() && _e.name() == "measure");
}

Expand Down Expand Up @@ -4507,14 +4550,18 @@ Note* MusicXMLParserPass2::note(const QString& partId,
if (!chord && !grace) {
// do tuplet if valid time-modification is not 1/1 and is not 1/2 (tremolo)
auto timeMod = mnd.timeMod();
// find part-relative track
auto part = _pass1.getPart(partId);
Q_ASSERT(part);
auto scoreRelStaff = _score->staffIdx(part); // zero-based number of parts first staff in the score
auto partRelTrack = msTrack + msVoice - scoreRelStaff * VOICES;
if (timeMod.isValid() && timeMod != Fraction(1, 1) && timeMod != Fraction(1, 2)) {
// find part-relative track
Part* part = _pass1.getPart(partId);
Q_ASSERT(part);
int scoreRelStaff = _score->staffIdx(part); // zero-based number of parts first staff in the score
int partRelTrack = msTrack + msVoice - scoreRelStaff * VOICES;
addTupletToChord(cr, _tuplets[partRelTrack], _tuplImpls[partRelTrack], timeMod, tupletDesc, mnd.normalType());
}
else if (_tuplets[partRelTrack]) {
// stop any still incomplete tuplet
handleTupletStop(_tuplets[partRelTrack], 2);
}
}
}

Expand Down

0 comments on commit 2d88e02

Please sign in to comment.