Additional optimizations and updated tests results to comparte with

Author: pacebes

src/importexport/lyricsexport/internal/lrcwriter.cpp

@@ -121,11 +121,10 @@ std::map<double, QString> LRCWriter::collectLyrics(const mu::engraving::Score* s
     std::map<double, QString> lyrics;
     const RepeatList& repeats = score->repeatList();
 
-    staff_idx_t lyricsStaff;
-    voice_idx_t lyricsVoice;
+    track_idx_t trackNumber;
     int lyricNumber;
 
-    findStaffVoiceAndLyricToExport(score, lyricsStaff, lyricsVoice, lyricNumber);
+    findTrackAndLyricToExport(score, trackNumber, lyricNumber);
 
     for (const RepeatSegment* rs : repeats) {
         const int tickOffset = rs->utick - rs->tick;
@@ -151,7 +150,7 @@ std::map<double, QString> LRCWriter::collectLyrics(const mu::engraving::Score* s
                             continue;
                         }
 
-                        if ((lyricsStaff == e->staffIdx()) && (lyricsVoice == e->voice()) && (lyricNumber == l->subtype())) {
+                        if ((trackNumber == e->track()) && (lyricNumber == l->subtype())) {
                             const double time = score->utick2utime(l->tick().ticks() + tickOffset) * 1000;
                             lyrics.insert_or_assign(time, l->plainText());
                         }
@@ -172,18 +171,16 @@ QString LRCWriter::formatTimestamp(double ms) const
            .arg(static_cast<int>(ms) % 1000 / 10, 2, 10, QLatin1Char('0'));
 }
 
-void LRCWriter::findStaffVoiceAndLyricToExport(const mu::engraving::Score* score, mu::engraving::staff_idx_t& staff,
-                                               mu::engraving::voice_idx_t& voice, int& lyricNumber)
+void LRCWriter::findTrackAndLyricToExport(const engraving::Score* score, mu::engraving::track_idx_t& trackNumber, int& lyricNumber)
 {
     bool lyricsFound = false;
-    staff = 0;
-    voice = 0;
+    trackNumber = 0;
     lyricNumber = 0;
 
     const RepeatList& repeats = score->repeatList();
 
     for (const RepeatSegment* rs : repeats) {
-        for (const MeasureBase* mb = rs->firstMeasure(); mb; mb = mb->next()) {
+        for (const MeasureBase* mb : rs->measureList()) {
             if (!mb->isMeasure()) {
                 continue;
             }
@@ -206,27 +203,21 @@ void LRCWriter::findStaffVoiceAndLyricToExport(const mu::engraving::Score* score
 
                         if (!lyricsFound) {
                             lyricsFound = true;
-                            staff = e->staffIdx();
-                            voice = e->voice();
+                            trackNumber = e->track();
                             lyricNumber = l->subtype();
                             continue;
                         }
 
-                        if (staff > e->staffIdx()) {
-                            staff = e->staffIdx();
-                            voice = e->voice();
+                        // We check if we have a better option
+                        if (trackNumber > e->track()) {
+                            trackNumber = e->track();
                             lyricNumber = l->subtype();
-                        } else if (staff == e->staffIdx()) {
-                            if (voice > e->voice()) {
-                                voice = e->voice();
-                                lyricNumber = l->subtype();
-                            } else if (voice == e->voice()) {
-                                lyricNumber = std::min(lyricNumber, l->subtype());
-                            }
+                        } else if (trackNumber == e->track()) {
+                            lyricNumber = std::min(lyricNumber, l->subtype());
                         }
                     }
                     // If we have already chosen the lowest/prioritized option we can return (no better option available)
-                    if (lyricsFound && (staff == 0) && (voice == 0) && (lyricNumber == 0)) {
+                    if (lyricsFound && (trackNumber == 0) && (lyricNumber == 0)) {
                         return;
                     }
                 }

src/importexport/lyricsexport/internal/lrcwriter.h

@@ -52,7 +52,6 @@ class LRCWriter : public project::INotationWriter
     // Core lyric functionality
     std::map<double, QString> collectLyrics(const mu::engraving::Score*);
     QString formatTimestamp(double ms) const;
-    void findStaffVoiceAndLyricToExport(const engraving::Score* score, engraving::staff_idx_t& staff, engraving::voice_idx_t& voice,
-                                        int& lyricNumber);
+    void findTrackAndLyricToExport(const engraving::Score* score, mu::engraving::track_idx_t& trackNumber, int& lyricNumber);
 };
 } // namespace mu::iex::lrcexport

src/importexport/lyricsexport/tests/data/lrc_enhanced_test1_ref.lrc

@@ -112,15 +112,3 @@
 [00:54.50] <00:54.50> SOneVOne-most
 [00:55.00] <00:55.00> SOneVOne-nights,
 [00:55.50] <00:55.50> SOneVOne-End
-[00:56.00] <00:56.00> SOneVOne-of
-[00:56.50] <00:56.50> SOneVOne-rather
-[00:57.00] <00:57.00> SOneVOne-more
-[00:57.50] <00:57.50> SOneVOne-beef
-[00:58.00] <00:58.00> SOneVOne-than
-[00:58.50] <00:58.50> SOneVOne-mutton
-[00:59.00] <00:59.00> SOneVOne-a
-[00:59.50] <00:59.50> SOneVOne-salad
-[01:00.00] <01:00.00> SOneVOne-on
-[01:00.50] <01:00.50> SOneVOne-most
-[01:01.00] <01:01.00> SOneVOne-nights,
-[01:01.50] <01:01.50> SOneVOne-End

src/importexport/lyricsexport/tests/data/lrc_enhanced_test3_ref.lrc

@@ -8,10 +8,6 @@
 [00:10.50] <00:10.50> SOneVOne-one
 [00:11.00] <00:11.00> SOneVOne-of
 [00:11.50] <00:11.50> SOneVOne-those
-[00:12.00] <00:12.00> SOneVOne-gentlement
-[00:12.50] <00:12.50> SOneVOne-that
-[00:13.00] <00:13.00> SOneVOne-keep
-[00:13.50] <00:13.50> SOneVOne-a
 [00:14.00] <00:14.00> SOneVOne-mind,-SOneVOne-there
 [00:14.50] <00:14.50> SOneVOne-lived
 [00:15.00] <00:15.00> SOneVOne-not
@@ -44,14 +40,6 @@
 [00:28.50] <00:28.50> SOneVOne-rather
 [00:29.00] <00:29.00> SOneVOne-more
 [00:29.50] <00:29.50> SOneVOne-beef
-[00:30.00] <00:30.00> SOneVOne-than
-[00:30.50] <00:30.50> SOneVOne-mutton
-[00:31.00] <00:31.00> SOneVOne-a
-[00:31.50] <00:31.50> SOneVOne-salad
-[00:32.00] <00:32.00> SOneVOne-on
-[00:32.50] <00:32.50> SOneVOne-most
-[00:33.00] <00:33.00> SOneVOne-nights,
-[00:33.50] <00:33.50> SOneVOne-End
 [00:36.00] <00:36.00> SOneVOne-mind,-SOneVOne-there
 [00:36.50] <00:36.50> SOneVOne-lived
 [00:37.00] <00:37.00> SOneVOne-not
@@ -60,10 +48,6 @@
 [00:38.50] <00:38.50> SOneVOne-one
 [00:39.00] <00:39.00> SOneVOne-of
 [00:39.50] <00:39.50> SOneVOne-those
-[00:40.00] <00:40.00> SOneVOne-gentlement
-[00:40.50] <00:40.50> SOneVOne-that
-[00:41.00] <00:41.00> SOneVOne-keep
-[00:41.50] <00:41.50> SOneVOne-a
 [00:42.00] <00:42.00> SOneVOne-mind,-SOneVOne-there
 [00:42.50] <00:42.50> SOneVOne-lived
 [00:43.00] <00:43.00> SOneVOne-not
@@ -92,15 +76,3 @@
 [00:54.50] <00:54.50> SOneVOne-most
 [00:55.00] <00:55.00> SOneVOne-nights,
 [00:55.50] <00:55.50> SOneVOne-End
-[00:56.00] <00:56.00> SOneVOne-of
-[00:56.50] <00:56.50> SOneVOne-rather
-[00:57.00] <00:57.00> SOneVOne-more
-[00:57.50] <00:57.50> SOneVOne-beef
-[00:58.00] <00:58.00> SOneVOne-than
-[00:58.50] <00:58.50> SOneVOne-mutton
-[00:59.00] <00:59.00> SOneVOne-a
-[00:59.50] <00:59.50> SOneVOne-salad
-[01:00.00] <01:00.00> SOneVOne-on
-[01:00.50] <01:00.50> SOneVOne-most
-[01:01.00] <01:01.00> SOneVOne-nights,
-[01:01.50] <01:01.50> SOneVOne-End

src/importexport/lyricsexport/tests/data/lrc_enhanced_test4_ref.lrc

@@ -57,9 +57,6 @@
 [00:28.50] <00:28.50> STwoVOne-rather
 [00:29.00] <00:29.00> STwoVOne-more
 [00:29.50] <00:29.50> STwoVOne-beef
-[00:30.00] <00:30.00> STwoVOne-than
-[00:30.50] <00:30.50> STwoVOne-mutton
-[00:31.00] <00:31.00> STwoVOne-a
 [00:31.50] <00:31.50> STwoVOne-of
 [00:32.00] <00:32.00> STwoVOne-which
 [00:32.50] <00:32.50> STwoVOne-I
@@ -109,15 +106,3 @@
 [00:54.50] <00:54.50> STwoVOne-most
 [00:55.00] <00:55.00> STwoVOne-nights,
 [00:55.50] <00:55.50> STwoVOne-End
-[00:56.00] <00:56.00> STwoVOne-of
-[00:56.50] <00:56.50> STwoVOne-rather
-[00:57.00] <00:57.00> STwoVOne-more
-[00:57.50] <00:57.50> STwoVOne-beef
-[00:58.00] <00:58.00> STwoVOne-than
-[00:58.50] <00:58.50> STwoVOne-mutton
-[00:59.00] <00:59.00> STwoVOne-a
-[00:59.50] <00:59.50> STwoVOne-salad
-[01:00.00] <01:00.00> STwoVOne-on
-[01:00.50] <01:00.50> STwoVOne-most
-[01:01.00] <01:01.00> STwoVOne-nights,
-[01:01.50] <01:01.50> STwoVOne-End

src/importexport/lyricsexport/tests/data/lrc_enhanced_test5_ref.lrc

@@ -112,15 +112,3 @@
 [00:54.50] <00:54.50> SThreeVOne-most
 [00:55.00] <00:55.00> SThreeVOne-nights,
 [00:55.50] <00:55.50> SThreeVOne-End
-[00:56.00] <00:56.00> SThreeVOne-of
-[00:56.50] <00:56.50> SThreeVOne-rather
-[00:57.00] <00:57.00> SThreeVOne-more
-[00:57.50] <00:57.50> SThreeVOne-beef
-[00:58.00] <00:58.00> SThreeVOne-than
-[00:58.50] <00:58.50> SThreeVOne-mutton
-[00:59.00] <00:59.00> SThreeVOne-a
-[00:59.50] <00:59.50> SThreeVOne-salad
-[01:00.00] <01:00.00> SThreeVOne-on
-[01:00.50] <01:00.50> SThreeVOne-most
-[01:01.00] <01:01.00> SThreeVOne-nights,
-[01:01.50] <01:01.50> SThreeVOne-End

src/importexport/lyricsexport/tests/data/lrc_simple_test1_ref.lrc

@@ -112,15 +112,3 @@
 [00:54.50]SOneVOne most
 [00:55.00]SOneVOne nights,
 [00:55.50]SOneVOne End
-[00:56.00]SOneVOne of
-[00:56.50]SOneVOne rather
-[00:57.00]SOneVOne more
-[00:57.50]SOneVOne beef
-[00:58.00]SOneVOne than
-[00:58.50]SOneVOne mutton
-[00:59.00]SOneVOne a
-[00:59.50]SOneVOne salad
-[01:00.00]SOneVOne on
-[01:00.50]SOneVOne most
-[01:01.00]SOneVOne nights,
-[01:01.50]SOneVOne End

src/importexport/lyricsexport/tests/data/lrc_simple_test3_ref.lrc

@@ -8,10 +8,6 @@
 [00:10.50]SOneVOne one
 [00:11.00]SOneVOne of
 [00:11.50]SOneVOne those
-[00:12.00]SOneVOne gentlement
-[00:12.50]SOneVOne that
-[00:13.00]SOneVOne keep
-[00:13.50]SOneVOne a
 [00:14.00]SOneVOne mind, SOneVOne there
 [00:14.50]SOneVOne lived
 [00:15.00]SOneVOne not
@@ -44,14 +40,6 @@
 [00:28.50]SOneVOne rather
 [00:29.00]SOneVOne more
 [00:29.50]SOneVOne beef
-[00:30.00]SOneVOne than
-[00:30.50]SOneVOne mutton
-[00:31.00]SOneVOne a
-[00:31.50]SOneVOne salad
-[00:32.00]SOneVOne on
-[00:32.50]SOneVOne most
-[00:33.00]SOneVOne nights,
-[00:33.50]SOneVOne End
 [00:36.00]SOneVOne mind, SOneVOne there
 [00:36.50]SOneVOne lived
 [00:37.00]SOneVOne not
@@ -60,10 +48,6 @@
 [00:38.50]SOneVOne one
 [00:39.00]SOneVOne of
 [00:39.50]SOneVOne those
-[00:40.00]SOneVOne gentlement
-[00:40.50]SOneVOne that
-[00:41.00]SOneVOne keep
-[00:41.50]SOneVOne a
 [00:42.00]SOneVOne mind, SOneVOne there
 [00:42.50]SOneVOne lived
 [00:43.00]SOneVOne not
@@ -92,15 +76,3 @@
 [00:54.50]SOneVOne most
 [00:55.00]SOneVOne nights,
 [00:55.50]SOneVOne End
-[00:56.00]SOneVOne of
-[00:56.50]SOneVOne rather
-[00:57.00]SOneVOne more
-[00:57.50]SOneVOne beef
-[00:58.00]SOneVOne than
-[00:58.50]SOneVOne mutton
-[00:59.00]SOneVOne a
-[00:59.50]SOneVOne salad
-[01:00.00]SOneVOne on
-[01:00.50]SOneVOne most
-[01:01.00]SOneVOne nights,
-[01:01.50]SOneVOne End

src/importexport/lyricsexport/tests/data/lrc_simple_test4_ref.lrc

@@ -57,9 +57,6 @@
 [00:28.50]STwoVOne rather
 [00:29.00]STwoVOne more
 [00:29.50]STwoVOne beef
-[00:30.00]STwoVOne than
-[00:30.50]STwoVOne mutton
-[00:31.00]STwoVOne a
 [00:31.50]STwoVOne of
 [00:32.00]STwoVOne which
 [00:32.50]STwoVOne I
@@ -109,15 +106,3 @@
 [00:54.50]STwoVOne most
 [00:55.00]STwoVOne nights,
 [00:55.50]STwoVOne End
-[00:56.00]STwoVOne of
-[00:56.50]STwoVOne rather
-[00:57.00]STwoVOne more
-[00:57.50]STwoVOne beef
-[00:58.00]STwoVOne than
-[00:58.50]STwoVOne mutton
-[00:59.00]STwoVOne a
-[00:59.50]STwoVOne salad
-[01:00.00]STwoVOne on
-[01:00.50]STwoVOne most
-[01:01.00]STwoVOne nights,
-[01:01.50]STwoVOne End

src/importexport/lyricsexport/tests/data/lrc_simple_test5_ref.lrc

@@ -112,15 +112,3 @@
 [00:54.50]SThreeVOne most
 [00:55.00]SThreeVOne nights,
 [00:55.50]SThreeVOne End
-[00:56.00]SThreeVOne of
-[00:56.50]SThreeVOne rather
-[00:57.00]SThreeVOne more
-[00:57.50]SThreeVOne beef
-[00:58.00]SThreeVOne than
-[00:58.50]SThreeVOne mutton
-[00:59.00]SThreeVOne a
-[00:59.50]SThreeVOne salad
-[01:00.00]SThreeVOne on
-[01:00.50]SThreeVOne most
-[01:01.00]SThreeVOne nights,
-[01:01.50]SThreeVOne End