Selectable lyrics import

Author: trig-ger

mscore/importmidi.cpp

@@ -787,23 +787,17 @@ void createNotes(const ReducedFraction &lastTick, QList<MTrack> &tracks, MidiTyp
             }
       }
 
-QList<TrackMeta> getTracksMeta(const std::multimap<int, MTrack> &tracks,
+QList<TrackMeta> getTracksMeta(const QList<MTrack> &tracks,
                                const MidiFile *mf)
 {
       QList<TrackMeta> tracksMeta;
-      int i = 0;
-      for (auto it = tracks.begin(); it != tracks.end(); ++it, ++i) {
-            if (i % 2) {
-                  auto prev = it;
-                  --prev;
-                  if (isSameChannel(prev->second, it->second)) {
-                        TrackMeta lastMeta = tracksMeta.back();
-                        tracksMeta.push_back(lastMeta);
-                        continue;
-                        }
+      for (int i = 0; i < tracks.size(); ++i) {
+            if (i % 2 && isSameChannel(tracks[i - 1], tracks[i])){
+                  TrackMeta lastMeta = tracksMeta.back();
+                  tracksMeta.push_back(lastMeta);
+                  continue;
                   }
-
-            const MTrack &mt = it->second;
+            const MTrack &mt = tracks[i];
             QString trackName;
             for (const auto &ie: mt.mtrack->events()) {
                   const MidiEvent &e = ie.second;
@@ -817,7 +811,11 @@ QList<TrackMeta> getTracksMeta(const std::multimap<int, MTrack> &tracks,
                   midiType = MT_GM;
             const QString instrName = instrumentName(midiType, mt.program,
                                                      mt.mtrack->drumTrack());
-            tracksMeta.push_back({trackName, instrName,  mt.mtrack->drumTrack()});
+            tracksMeta.push_back({trackName,
+                                  instrName,
+                                  mt.mtrack->drumTrack(),
+                                  mt.initLyricTrackIndex
+                                 });
             }
       return tracksMeta;
       }
@@ -844,7 +842,7 @@ void convertMidi(Score *score, const MidiFile *mf)
       createNotes(lastTick, trackList, mf->midiType());
       createTimeSignatures(score);
       score->connectTies();
-      MidiLyrics::extractLyrics(trackList, mf);
+      MidiLyrics::setLyrics(mf, trackList);
       }
 
 void loadMidiData(MidiFile &mf)
@@ -882,9 +880,12 @@ QList<TrackMeta> extractMidiTracksMeta(const QString &fileName)
 
       Score mockScore;
       ReducedFraction lastTick;
-      const auto tracks = createMTrackList(lastTick, mockScore.sigmap(),
-                                           midiData.midiFile(fileName));
-      return getTracksMeta(tracks, midiData.midiFile(fileName));
+      const MidiFile *mf = midiData.midiFile(fileName);
+      const auto tracks = createMTrackList(lastTick, mockScore.sigmap(), mf);
+      QList<MTrack> trackList = prepareTrackList(tracks);
+      MidiLyrics::setInitialIndexes(trackList);
+
+      return getTracksMeta(trackList, mf);
       }
 
 //---------------------------------------------------------

mscore/importmidi_data.cpp

@@ -74,4 +74,19 @@ const MidiFile* MidiData::midiFile(const QString &fileName) const
       return &(it.value().midiFile);
       }
 
+void MidiData::addTrackLyrics(const QString &fileName,
+                              const std::multimap<ReducedFraction, QString> &trackLyrics)
+      {
+      data[fileName].lyricTracks.push_back(trackLyrics);
+      }
+
+const QList<std::multimap<ReducedFraction, QString> >*
+MidiData::getLyrics(const QString &fileName)
+      {
+      const auto it = data.find(fileName);
+      if (it == data.end())
+            return nullptr;
+      return &it.value().lyricTracks;
+      }
+
 } // namespace Ms

mscore/importmidi_data.h

@@ -2,6 +2,7 @@
 #define IMPORTMIDI_DATA_H
 
 #include "midi/midifile.h"
+#include "importmidi_fraction.h"
 
 
 namespace Ms {
@@ -22,13 +23,19 @@ class MidiData
       void setSelectedRow(const QString &fileName, int row);
       void setMidiFile(const QString &fileName, const MidiFile &midiFile);
       const MidiFile *midiFile(const QString &fileName) const;
+                  // lyrics
+      void addTrackLyrics(const QString &fileName,
+                          const std::multimap<ReducedFraction, QString> &trackLyrics);
+      const QList<std::multimap<ReducedFraction, QString> >* getLyrics(const QString &fileName);
 
    private:
       struct MidiDataStore
             {
             QByteArray HHeaderData;
             QByteArray VHeaderData;
             QList<TrackData> tracksData;
+                        // tracks of <tick, lyric fragment> from karaoke files
+            QList<std::multimap<ReducedFraction, QString>> lyricTracks;
             int selectedRow = 0;
             MidiFile midiFile;
             };

mscore/importmidi_inner.h

@@ -2,6 +2,7 @@
 #define IMPORTMIDI_INNER_H
 
 #include "importmidi_fraction.h"
+#include "importmidi_tuplet.h"
 
 
 // ---------------------------------------------------------------------------------------
@@ -42,10 +43,6 @@ enum class DurationType;
 
 } // namespace Meter
 
-namespace MidiTuplet {
-class TupletData;
-}
-
 class Staff;
 class Score;
 class MidiTrack;
@@ -64,6 +61,7 @@ class MTrack {
       bool hasKey = false;
       int indexOfOperation = 0;
       int division = 0;
+      int initLyricTrackIndex = -1;
 
       std::multimap<ReducedFraction, MidiChord> chords;
       std::multimap<ReducedFraction, MidiTuplet::TupletData> tuplets;   // <tupletOnTime, ...>