@@ -1582,7 +1582,7 @@ std::vector<Measure*> findFollowingRepeatMeasures(const Measure* measure)
1582
1582
const MasterScore* master = measure->masterScore ();
1583
1583
const Score* score = measure->score ();
1584
1584
1585
- const MeasureBase* masterMeasureBase = master->measure (measure->index ());
1585
+ const MeasureBase* masterMeasureBase = master->tick2measure (measure->tick ());
1586
1586
const Measure* masterMeasure = masterMeasureBase && masterMeasureBase->isMeasure () ? toMeasure (masterMeasureBase) : nullptr ;
1587
1587
1588
1588
const RepeatList& repeatList = master->repeatList (true , false );
@@ -1599,7 +1599,7 @@ std::vector<Measure*> findFollowingRepeatMeasures(const Measure* measure)
1599
1599
// Get next segment
1600
1600
const RepeatSegment* nextSeg = *nextSegIt;
1601
1601
const Measure* firstMasterMeasure = nextSeg->firstMeasure ();
1602
- MeasureBase* firstMeasureBase = firstMasterMeasure ? score->measure (firstMasterMeasure->index ()) : nullptr ;
1602
+ MeasureBase* firstMeasureBase = firstMasterMeasure ? score->tick2measure (firstMasterMeasure->tick ()) : nullptr ;
1603
1603
Measure* firstMeasure = firstMeasureBase && firstMeasureBase->isMeasure () ? toMeasure (firstMeasureBase) : nullptr ;
1604
1604
if (!firstMeasure) {
1605
1605
continue ;
@@ -1616,7 +1616,7 @@ std::vector<Measure*> findPreviousRepeatMeasures(const Measure* measure)
1616
1616
const MasterScore* master = measure->masterScore ();
1617
1617
const Score* score = measure->score ();
1618
1618
1619
- const MeasureBase* masterMeasureBase = master->measure (measure->index ());
1619
+ const MeasureBase* masterMeasureBase = master->tick2measure (measure->tick ());
1620
1620
const Measure* masterMeasure = masterMeasureBase && masterMeasureBase->isMeasure () ? toMeasure (masterMeasureBase) : nullptr ;
1621
1621
1622
1622
const RepeatList& repeatList = master->repeatList (true , false );
@@ -1633,7 +1633,7 @@ std::vector<Measure*> findPreviousRepeatMeasures(const Measure* measure)
1633
1633
// Get next segment
1634
1634
const RepeatSegment* prevSeg = *prevSegIt;
1635
1635
const Measure* lastMasterMeasure = prevSeg->lastMeasure ();
1636
- MeasureBase* lastMeasureBase = lastMasterMeasure ? score->measure (lastMasterMeasure->index ()) : nullptr ;
1636
+ MeasureBase* lastMeasureBase = lastMasterMeasure ? score->tick2measure (lastMasterMeasure->tick ()) : nullptr ;
1637
1637
Measure* lastMeasure = lastMeasureBase && lastMeasureBase->isMeasure () ? toMeasure (lastMeasureBase) : nullptr ;
1638
1638
if (!lastMeasure) {
1639
1639
continue ;
@@ -1677,10 +1677,10 @@ bool segmentsAreAdjacentInRepeatStructure(const Segment* firstSeg, const Segment
1677
1677
return true ;
1678
1678
}
1679
1679
1680
- const MeasureBase* firstMasterMeasureBase = master->measure (firstMeasure->index ());
1680
+ const MeasureBase* firstMasterMeasureBase = master->tick2measure (firstMeasure->tick ());
1681
1681
const Measure* firstMasterMeasure = firstMasterMeasureBase
1682
1682
&& firstMasterMeasureBase->isMeasure () ? toMeasure (firstMasterMeasureBase) : nullptr ;
1683
- const MeasureBase* secondMasterMeasureBase = master->measure (secondMeasure->index ());
1683
+ const MeasureBase* secondMasterMeasureBase = master->tick2measure (secondMeasure->tick ());
1684
1684
const Measure* secondMasterMeasure = secondMasterMeasureBase
1685
1685
&& secondMasterMeasureBase->isMeasure () ? toMeasure (secondMasterMeasureBase) : nullptr ;
1686
1686
@@ -1738,10 +1738,10 @@ bool segmentsAreInDifferentRepeatSegments(const Segment* firstSeg, const Segment
1738
1738
return false ;
1739
1739
}
1740
1740
1741
- const MeasureBase* firstMasterMeasureBase = master->measure (firstMeasure->index ());
1741
+ const MeasureBase* firstMasterMeasureBase = master->tick2measureBase (firstMeasure->tick ());
1742
1742
const Measure* firstMasterMeasure = firstMasterMeasureBase
1743
1743
&& firstMasterMeasureBase->isMeasure () ? toMeasure (firstMasterMeasureBase) : nullptr ;
1744
- const MeasureBase* secondMasterMeasureBase = master->measure (secondMeasure->index ());
1744
+ const MeasureBase* secondMasterMeasureBase = master->tick2measureBase (secondMeasure->tick ());
1745
1745
const Measure* secondMasterMeasure = secondMasterMeasureBase
1746
1746
&& secondMasterMeasureBase->isMeasure () ? toMeasure (secondMasterMeasureBase) : nullptr ;
1747
1747
0 commit comments