"<mm:dd.ss>" in the lyric store the absolute time, not the relative t…

…ime.
karaoke-dev · Jul 28, 2024 · a7c6aed · a7c6aed
1 parent 85cc166
commit a7c6aed
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/LrcParser.Tests/Parser/Lrc/LrcParserTest.cs b/LrcParser.Tests/Parser/Lrc/LrcParserTest.cs
@@ -14,7 +14,7 @@ public void TestDecode()
     {
         var lrcText = new[]
         {
-            "[00:17.00] <00:00.00>帰<00:01.00>り<00:02.00>道<00:03.00>は<00:04.00>",
+            "[00:17.00] <00:17.00>帰<00:18.00>り<00:19.00>道<00:20.00>は<00:21.00>",
         };
 
         var song = new Song
@@ -65,7 +65,7 @@ public void TestEncode()
 
         var lrcText = new[]
         {
-            "[00:17.00] <00:00.00>帰<00:01.00>り<00:02.00>道<00:03.00>は<00:04.00>",
+            "[00:17.00] <00:17.00>帰<00:18.00>り<00:19.00>道<00:20.00>は<00:21.00>",
         };
 
         checkEncode(song, lrcText);

diff --git a/LrcParser/Parser/Lrc/LrcParser.cs b/LrcParser/Parser/Lrc/LrcParser.cs
@@ -37,13 +37,13 @@ static IEnumerable<Lyric> convertLyric(LrcLyric lrcLyric)
                 {
                     Text = lrcLyric.Text,
                     StartTime = startTime,
-                    TimeTags = getTimeTags(lrcLyric.TimeTags, startTime),
+                    TimeTags = getTimeTags(lrcLyric.TimeTags),
                 };
             }
         }
 
-        static SortedDictionary<TextIndex, int?> getTimeTags(SortedDictionary<TextIndex, int> timeTags, int offsetTime)
-            => new(timeTags.ToDictionary(k => k.Key, v => v.Value + offsetTime as int?));
+        static SortedDictionary<TextIndex, int?> getTimeTags(SortedDictionary<TextIndex, int> timeTags)
+            => new(timeTags.ToDictionary(k => k.Key, v => v.Value as int?));
     }
 
     protected override IEnumerable<object> PreProcess(Song song)
@@ -58,7 +58,7 @@ protected override IEnumerable<object> PreProcess(Song song)
             {
                 Text = lyric.Text,
                 StartTimes = [lyric.StartTime],
-                TimeTags = getTimeTags(lyric.TimeTags, -lyric.StartTime),
+                TimeTags = getTimeTags(lyric.TimeTags),
             };
         }
 
@@ -72,7 +72,7 @@ protected override IEnumerable<object> PreProcess(Song song)
 
         yield break;
 
-        static SortedDictionary<TextIndex, int> getTimeTags(SortedDictionary<TextIndex, int?> timeTags, int offsetTime = 0)
-            => new(timeTags.Where(x => x.Value.HasValue).ToDictionary(k => k.Key, v => v.Value!.Value + offsetTime));
+        static SortedDictionary<TextIndex, int> getTimeTags(SortedDictionary<TextIndex, int?> timeTags)
+            => new(timeTags.Where(x => x.Value.HasValue).ToDictionary(k => k.Key, v => v.Value!.Value));
     }
 }
diff --git a/LrcParser/Parser/Lrc/Metadata/LrcLyric.cs b/LrcParser/Parser/Lrc/Metadata/LrcLyric.cs
@@ -24,7 +24,7 @@ public LrcLyric()
 
     /// <summary>
     /// Time tags.
-    /// It's the relative time from the start time.
+    /// It's the absolute time.
     /// </summary>
     public SortedDictionary<TextIndex, int> TimeTags { get; set; } = new();