justinzeus/Wholphin
1
0
Fork 0
mirror of https://github.com/JustinZeus/Wholphin.git synced 2026-07-09 16:11:20 +02:00
Code Issues Projects Packages Wiki Activity Actions

UI improvements & bug fixes for queuing

Browse source
This commit is contained in:
Damontecres 2026-02-28 17:47:01 -05:00
parent 49adae9365
commit 82f8a63c86
No known key found for this signature in database
7 changed files with 267 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

40
app/src/main/java/com/github/damontecres/wholphin/services/MusicService.kt
View file

@ -99,7 +99,7 @@ class MusicService
player.shuffleModeEnabled = shuffled
player.play()
}
addAllToQueue(items)
addAllToQueue(items, startIndex)
}
suspend fun setQueue(
@ -140,16 +140,26 @@ class MusicService
}
}
suspend fun addAllToQueue(list: BlockingList<BaseItem?>) {
suspend fun addAllToQueue(
list: BlockingList<BaseItem?>,
startIndex: Int,
) {
var remaining = startIndex
list.indices
.chunked(25)
.forEach {
val mediaItems =
it.mapNotNull {
list
.getBlocking(it)
?.takeIf { it.type == BaseItemKind.AUDIO }
?.let(::convert)
if (remaining == 0) {
list
.getBlocking(it)
?.takeIf { it.type == BaseItemKind.AUDIO }
?.let(::convert)
} else {
Timber.v("Skipping $remaining")
remaining--
null
}
}
onMain { player.addMediaItems(mediaItems) }
}
@ -243,18 +253,24 @@ private class MusicPlayerListener(
timeline: Timeline,
reason: Int,
) {
Timber.v("MusicPlayerListener onTimelineChanged")
// Timber.v("MusicPlayerListener onTimelineChanged")
if (reason == Player.TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED) {
updateCurrentIndex()
}
}
private fun updateCurrentIndex() {
state.update {
it.copy(
currentIndex = player.currentMediaItemIndex,
currentItemId = player.getMediaItemAt(player.currentMediaItemIndex).mediaId.toUUIDOrNull(),
)
state.update { state ->
player.currentMediaItemIndex.takeIf { it >= 0 }?.let { currentMediaItemIndex ->
if (currentMediaItemIndex in (0..<player.mediaItemCount)) {
state.copy(
currentIndex = currentMediaItemIndex,
currentItemId = player.getMediaItemAt(currentMediaItemIndex).mediaId.toUUIDOrNull(),
)
} else {
state
}
} ?: state
}
}
}