Ticket #12576: lrc_addition.patch

mythtv/libs/libmythmetadata/lyricsdata.cpp

@@ -272 +272 @@
         QDomNode lyricNode = itemList.at(x);
         QString lyric = lyricNode.toElement().text();
 
-        lyrics.append(lyric);
+        if (m_syncronized)
+        {
+            QStringList times;
+            int lastind = 0;
+            while (lyric.indexOf(QRegExp("\\[\\d\\d:\\d\\d\\]"),
+                                 lastind) == lastind ||
+                   lyric.indexOf(QRegExp("\\[\\d\\d:\\d\\d\\.\\d\\d\\]"),
+                                 lastind) == lastind)
+            {
+                if (lyric[lastind+6] == '.')
+                {
+                    times.append(lyric.mid(lastind,10)); 
+                    lastind += 10;
+                }
+                else
+                {
+                    // short version
+                    times.append(lyric.mid(lastind,7)); 
+                    lastind += 7;
+                } 
+            }
+            if (!times.isEmpty())
+            {
+                for (int x = 0; x < times.count(); x++)
+                {
+                    lyrics.append(times.at(x) + lyric.mid(lastind));
+                }
+            }
+            else
+            {
+                lyrics.append(lyric);
+            }
+        }
+        else
+        {
+            lyrics.append(lyric);
+        }
     }
 
     setLyrics(lyrics);
@@ -285 +321 @@
     clearLyrics();
 
     int lastTime = -1;
+    int offset = 0;  // offset in milliseconds
 
     for (int x = 0; x < lyrics.count(); x++)
     {
@@ -292 +329 @@
 
         LyricsLine *line = new LyricsLine;
 
+        if (lyric.startsWith("[offset:"))
+        {
+            offset = lyric.mid(8,lyric.indexOf("]", 8)-8).toInt();
+        }
+
         if (m_syncronized)
         {
             if (!lyric.isEmpty())
             {
-                // does the line start with a time code like [12:34.56]
-                if (lyric.indexOf(QRegExp("\\[\\d\\d:\\d\\d\\.\\d\\d\\]"), 0) == 0)
+                // does the line start with a time code like [12:34] or [12:34.56]
+                if (lyric.indexOf(QRegExp("\\[\\d\\d:\\d\\d\\]"), 0) == 0 ||
+                    lyric.indexOf(QRegExp("\\[\\d\\d:\\d\\d\\.\\d\\d\\]"), 0) == 0)
                 {
                     int minutes = lyric.mid(1, 2).toInt();
                     int seconds = lyric.mid(4, 2).toInt();
-                    int hundredths = lyric.mid(7, 2).toInt();
+                    int hundredths = 0;
+                    if (lyric[6] == '.')
+                    {
+                        hundredths = lyric.mid(7, 2).toInt();
+                        line->Lyric = lyric.mid(10);
+                    }
+                    else
+                    {
+                        line->Lyric = lyric.mid(7);
+                    }
                     line->Time = (minutes * 60 * 1000) + (seconds * 1000) + (hundredths * 10);
-                    line->Lyric = lyric.mid(10);
+                    if (offset > 0)
+                    {
+                        if (offset > line->Time) line->Time = 0;  
+                        else line->Time -= offset;
+                    }
+                    else
+                    {
+                        line->Time -= offset;
+                    }
                     lastTime = line->Time;
                 }
                 else
@@ -332 +392 @@
         // ignore anything that is not a lyric
         if (line->Lyric.startsWith("[ti:") || line->Lyric.startsWith("[al:") || 
             line->Lyric.startsWith("[ar:") || line->Lyric.startsWith("[by:") ||
-            line->Lyric.startsWith("[url:") || line->Lyric.startsWith("[offset:"))
+            line->Lyric.startsWith("[url:") || line->Lyric.startsWith("[offset:") ||
+            line->Lyric.startsWith("[id:") || line->Lyric.startsWith("[length:") ||
+            line->Lyric.startsWith("[au:") || line->Lyric.startsWith("[la:"))
         {
             delete line;
             continue;