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

Merge pull request #1479 from MarcSabatella/35661-breath-tick

Browse source 
fix #35661: bad breath position if no tick tag
This commit is contained in:
Werner Schweer 2014-11-27 16:06:40 +01:00
commit ec8a69439d
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libmscore/measure.cpp
View file

@ -1794,11 +1794,18 @@ void Measure::read(XmlReader& e, int staffIdx)
Staff* staff = score()->staff(staffIdx);
Fraction timeStretch(staff->timeStretch(tick()));
// keep track of tick of previous element
// this allows markings that need to apply to previous element to do so
// even though we may have already advanced to next tick position
int lastTick = e.tick();
while (e.readNextStartElement()) {
const QStringRef& tag(e.name());
if (tag == "tick")
if (tag == "tick") {
e.initTick(e.readInt());
lastTick = e.tick();
}
else if (tag == "BarLine") {
BarLine* barLine = new BarLine(score());
barLine->setTrack(e.track());
@ -1911,6 +1918,7 @@ void Measure::read(XmlReader& e, int staffIdx)
tremolo->setParent(chord);
}
}
lastTick = e.tick();
e.incTick(crticks);
}
}
@ -1926,13 +1934,19 @@ void Measure::read(XmlReader& e, int staffIdx)
if (!rest->duration().isValid()) // hack
rest->setDuration(timesig()/timeStretch);
lastTick = e.tick();
e.incTick(rest->actualTicks());
}
else if (tag == "Breath") {
Breath* breath = new Breath(score());
breath->setTrack(e.track());
int tick = e.tick();
breath->read(e);
segment = getSegment(Segment::Type::Breath, e.tick());
if (e.tick() < tick)
tick = e.tick(); // use our own tick if we explicitly reset to earlier position
else
tick = lastTick; // otherwise use last tick (of previous tick, chord, or rest tag)
segment = getSegment(Segment::Type::Breath, tick);
segment->add(breath);
}
else if (tag == "endSpanner") {
@ -1998,6 +2012,7 @@ void Measure::read(XmlReader& e, int staffIdx)
rm->read(e);
segment = getSegment(Segment::Type::ChordRest, e.tick());
segment->add(rm);
lastTick = e.tick();
e.incTick(ticks());
}
else if (tag == "Clef") {