curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-21 16:04:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

y u no call back :(

Browse Source
This commit is contained in:
minjaesong
2024-07-06 02:04:27 +09:00
parent 68ed16aa5a
commit ff433703f4
10 changed files with 380 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/net/torvald/terrarum/TerrarumMusicPlaylist.kt
View File

@@ -47,14 +47,19 @@ class TerrarumMusicPlaylist(
fun getCurrent(): MusicContainer {
checkRefill()
return musicList[currentIndexCursor]
return musicList[internalIndices[currentIndexCursor]]
}
fun getNext(): MusicContainer {
checkRefill()
currentIndexCursor += 1
return musicList[currentIndexCursor]
return musicList[internalIndices[currentIndexCursor]]
}
fun peekNext(): MusicContainer {
checkRefill()
return musicList[internalIndices[currentIndexCursor + 1]]
}
fun getPrev(): MusicContainer {
@@ -75,7 +80,7 @@ class TerrarumMusicPlaylist(
currentIndexCursor -= 1
return musicList[currentIndexCursor]
return musicList[internalIndices[currentIndexCursor]]
}
@@ -92,6 +97,8 @@ class TerrarumMusicPlaylist(
}
companion object {
private val validMusicExtensions = hashSetOf("mp3", "wav", "ogg")
/**
* Adding songFinishedHook to the songs is a responsibility of the caller.
*/
@@ -104,7 +111,7 @@ class TerrarumMusicPlaylist(
val playlistName = musicDir.substringAfterLast('/')
val playlist = File(musicDir).listFiles()?.sortedBy { it.name }?.mapNotNull {
val playlist = File(musicDir).listFiles()?.sortedBy { it.name }?.filter { Companion.validMusicExtensions.contains(it.extension.lowercase()) }?.mapNotNull {
printdbg(this, "Music: ${it.absolutePath}")
try {
MusicContainer(