Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

playback: fix add to queue again

Browse source
This commit is contained in:
Alexander Capehart 2024-02-28 23:08:09 -07:00
parent b43586c1ea
commit c42da2240c
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/org/oxycblt/auxio/playback/system/BetterShuffleOrder.kt
View file

@ -68,6 +68,9 @@ class BetterShuffleOrder(private val shuffled: IntArray) : ShuffleOrder {
return BetterShuffleOrder(insertionCount, -1) return BetterShuffleOrder(insertionCount, -1)
} }
// TODO: Fix this scuffed hacky logic
// TODO: Play next ordering needs to persist in unshuffle
val newShuffled = IntArray(shuffled.size + insertionCount) val newShuffled = IntArray(shuffled.size + insertionCount)
val pivot: Int = val pivot: Int =
if (insertionIndex < shuffled.size) { if (insertionIndex < shuffled.size) {
@ -87,9 +90,15 @@ class BetterShuffleOrder(private val shuffled: IntArray) : ShuffleOrder {
newShuffled[i + insertionCount] = currentIndex newShuffled[i + insertionCount] = currentIndex
} }
} }
if (insertionIndex < shuffled.size) {
for (i in 0 until insertionCount) { for (i in 0 until insertionCount) {
newShuffled[pivot + i + 1] = insertionIndex + i + 1 newShuffled[pivot + i + 1] = insertionIndex + i + 1
} }
} else {
for (i in 0 until insertionCount) {
newShuffled[pivot + i] = insertionIndex + i
}
}
return BetterShuffleOrder(newShuffled) return BetterShuffleOrder(newShuffled)
} }