reuse endTick()

Author: RomanPudashkin

src/engraving/compat/midi/pausemap.cpp

@@ -60,7 +60,7 @@ void PauseMap::calculate(const Score* s)
 
     for (const RepeatSegment* rs : s->repeatList()) {
         int startTick  = rs->tick;
-        int endTick    = startTick + rs->len();
+        int endTick    = rs->endTick();
         int tickOffset = rs->utick - rs->tick;
 
         auto se = tempomap->lower_bound(startTick);

src/engraving/dom/repeatlist.cpp

@@ -210,8 +210,9 @@ void RepeatList::updateTempo()
         s->utime      = t;
         double ct      = tl->tick2time(s->tick);
         s->timeOffset = t - ct;
-        utick        += s->len();
-        t            += tl->tick2time(s->tick + s->len()) - ct;
+        int len       = s->len();
+        utick        += len;
+        t            += tl->tick2time(s->tick + len) - ct;
     }
 }
 
@@ -250,7 +251,7 @@ int RepeatList::tick2utick(int tick) const
         return 0;
     }
     for (const RepeatSegment* s : *this) {
-        if (tick >= s->tick && tick < (s->tick + s->len())) {
+        if (tick >= s->tick && tick < s->endTick()) {
             return s->utick + (tick - s->tick);
         }
     }

src/engraving/dom/score.cpp

@@ -5138,7 +5138,7 @@ String Score::extractLyrics()
         const RepeatList& rlist = repeatList();
         for (const RepeatSegment* rs : rlist) {
             Fraction startTick  = Fraction::fromTicks(rs->tick);
-            Fraction endTick    = startTick + Fraction::fromTicks(rs->len());
+            Fraction endTick    = Fraction::fromTicks(rs->endTick());
             for (Measure* m = tick2measure(startTick); m; m = m->nextMeasure()) {
                 size_t playCount = m->playbackCount();
                 for (Segment* seg = m->first(st); seg; seg = seg->next(st)) {

src/engraving/dom/unrollrepeats.cpp

@@ -150,7 +150,7 @@ MasterScore* MasterScore::unrollRepeats()
     bool first = true;
     for (const RepeatSegment* rs: original->repeatList()) {
         Fraction startTick = Fraction::fromTicks(rs->tick);
-        Fraction endTick   = Fraction::fromTicks(rs->tick + rs->len());
+        Fraction endTick   = Fraction::fromTicks(rs->endTick());
 
         // first segment left from clone, everything past that removed
         if (first) {

src/engraving/playback/playbackcontext.cpp

@@ -317,9 +317,7 @@ void PlaybackContext::update(const ID partId, const Score* score, bool expandRep
             }
         }
 
-        handleSpanners(partId, score, repeatSegment->tick,
-                       repeatSegment->tick + repeatSegment->len(), tickPositionOffset);
-
+        handleSpanners(partId, score, repeatSegment->tick, repeatSegment->endTick(), tickPositionOffset);
         handleMeasureRepeats(measureRepeats, tickPositionOffset);
     }
 

src/engraving/playback/playbackmodel.cpp

@@ -576,7 +576,7 @@ void PlaybackModel::updateEvents(const int tickFrom, const int tickTo, const tra
     for (const RepeatSegment* repeatSegment : repeatList()) {
         int tickPositionOffset = repeatSegment->utick - repeatSegment->tick;
         int repeatStartTick = repeatSegment->tick;
-        int repeatEndTick = repeatStartTick + repeatSegment->len();
+        int repeatEndTick = repeatSegment->endTick();
 
         if (repeatStartTick > tickTo || repeatEndTick <= tickFrom) {
             continue;
@@ -831,7 +831,7 @@ void PlaybackModel::clearExpiredEvents(const int tickFrom, const int tickTo, con
     for (const RepeatSegment* repeatSegment : repeatList()) {
         int tickPositionOffset = repeatSegment->utick - repeatSegment->tick;
         int repeatStartTick = repeatSegment->tick;
-        int repeatEndTick = repeatStartTick + repeatSegment->len();
+        int repeatEndTick = repeatSegment->endTick();
 
         if (repeatStartTick > tickTo || repeatEndTick <= tickFrom) {
             continue;

src/engraving/tests/repeat_tests.cpp

@@ -52,7 +52,7 @@ void Engraving_RepeatTests::repeat(const char* path, const String& ref)
 
     for (const RepeatSegment* rs : score->repeatList()) {
         int startTick = rs->tick;
-        int endTick   = startTick + rs->len();
+        int endTick   = rs->endTick();
 
         for (const Measure* m = score->tick2measure(Fraction::fromTicks(startTick)); m; m = m->nextMeasure()) {
             sl.append(String::number(m->no() + 1));

src/importexport/midi/internal/midiexport/exportmidi.cpp

@@ -84,7 +84,7 @@ void ExportMidi::writeHeader(const CompatMidiRendererInternal::Context& context)
     TimeSigMap* sigmap = m_score->sigmap();
     for (const RepeatSegment* rs : m_score->repeatList()) {
         int startTick  = rs->tick;
-        int endTick    = startTick + rs->len();
+        int endTick    = rs->endTick();
         int tickOffset = rs->utick - rs->tick;
 
         auto bs = sigmap->lower_bound(startTick);
@@ -361,8 +361,7 @@ bool ExportMidi::write(QIODevice* device, bool midiExpandRepeats, bool exportRPN
 
         // Export lyrics and RehearsalMarks as Meta events
         for (const RepeatSegment* rs : m_score->repeatList()) {
-            int startTick  = rs->tick;
-            int endTick    = startTick + rs->len();
+            int endTick    = rs->endTick();
             int tickOffset = rs->utick - rs->tick;
 
             // export Lyrics

src/notation/internal/positionswriter.cpp

@@ -238,7 +238,7 @@ void PositionsWriter::writeEventsPositions(deprecated::XmlWriter& writer, const
 
     for (const mu::engraving::RepeatSegment* repeatSegment : score->repeatList()) {
         int startTick = repeatSegment->tick;
-        int endTick = startTick + repeatSegment->len();
+        int endTick = repeatSegment->endTick();
         int tickOffset = repeatSegment->utick - repeatSegment->tick;
         for (Measure* measure = score->tick2measureMM(Fraction::fromTicks(startTick)); measure; measure = measure->nextMeasureMM()) {
             if (m_elementType == ElementType::SEGMENT) {