working arbitrary track queueing

2026-06-19 23:14:05 +09:00 · 2024-07-08 18:06:44 +09:00
parent 657c8051f8
commit 86c6f008f9
4 changed files with 37 additions and 11 deletions
--- a/src/net/torvald/terrarum/TerrarumMusicPlaylist.kt
+++ b/src/net/torvald/terrarum/TerrarumMusicPlaylist.kt
@@ -84,9 +84,21 @@ class TerrarumMusicPlaylist(
    }

    fun queueNthSong(n: Int): MusicContainer {
-        checkRefill()
-        internalIndices.add(currentIndexCursor, n)
-        currentIndexCursor -= 1
+        if (shuffled) {
+            internalIndices.clear()
+            refillInternalIndices()
+            internalIndices.add(n)
+            refillInternalIndices()
+            currentIndexCursor = musicList.size - 1
+        }
+        else {
+            internalIndices.clear()
+            refillInternalIndices()
+            refillInternalIndices()
+            currentIndexCursor = musicList.size - 1 + n
+            checkRefill()
+        }
+
        return musicList[internalIndices[currentIndexCursor]]
    }