Support for multi person word-by-word lyrics

Lambada10 · Sep 20, 2024 · 775a5c3 · 775a5c3
1 parent 75d0f7e
commit 775a5c3
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/app/src/main/java/pl/lambada/songsync/data/remote/lyrics_providers/others/AppleAPI.kt b/app/src/main/java/pl/lambada/songsync/data/remote/lyrics_providers/others/AppleAPI.kt
@@ -75,14 +75,33 @@ class AppleAPI {
                 for (line in lines) {
                     syncedLyrics.append("[${line.timestamp.toLrcTimestamp()}]")
 
+                    syncedLyrics.append(
+                        if (line.oppositeTurn) "v2: " else "v1: "
+                    )
+
                     for (syllable in line.text) {
                         syncedLyrics.append("<${syllable.timestamp!!.toLrcTimestamp()}>${syllable.text}")
                         if (!syllable.part) {
                             syncedLyrics.append(" ")
                         }
                     }
 
-                    syncedLyrics.append("<${line.endtime.toLrcTimestamp()}>\n")
+                    if (line.background) {
+                        syncedLyrics.append("<${line.text.last().endtime?.toLrcTimestamp()}>\n")
+
+                        syncedLyrics.append("[bg: ")
+
+                        for (syllable in line.backgroundText) {
+                            syncedLyrics.append("<${syllable.timestamp!!.toLrcTimestamp()}>${syllable.text}")
+                            if (!syllable.part) {
+                                syncedLyrics.append(" ")
+                            }
+                        }
+
+                        syncedLyrics.append("<${line.endtime.toLrcTimestamp()}>]\n")
+                    } else {
+                        syncedLyrics.append("<${line.endtime.toLrcTimestamp()}>\n")
+                    }
                 }
             }
 

diff --git a/app/src/main/java/pl/lambada/songsync/domain/model/lyrics_providers/others/Apple.kt b/app/src/main/java/pl/lambada/songsync/domain/model/lyrics_providers/others/Apple.kt
@@ -27,12 +27,16 @@ data class AppleLyricsResponse(
 data class AppleLyrics(
     val text: List<AppleLyricsLineDetails>,
     val timestamp: Int,
+    val oppositeTurn: Boolean,
+    val background: Boolean,
+    val backgroundText: List<AppleLyricsLineDetails>,
     val endtime: Int
 )
 
 @Serializable
 data class AppleLyricsLineDetails(
     val text: String,
     val part: Boolean,
-    val timestamp: Int?
+    val timestamp: Int?,
+    val endtime: Int?
 )