nick is going to kill me

Author: mikooomich

app/src/main/java/org/akanework/gramophone/logic/GramophoneExtensions.kt

@@ -92,6 +92,7 @@ import org.akanework.gramophone.logic.utils.AudioFormatDetector
 import org.akanework.gramophone.logic.utils.AudioTrackInfo
 import org.akanework.gramophone.logic.utils.BtCodecInfo
 import org.akanework.gramophone.logic.utils.CalculationUtils
+import org.akanework.gramophone.logic.utils.CircularShuffleOrder
 import org.akanework.gramophone.logic.utils.ReplayGainUtil
 import org.akanework.gramophone.logic.utils.SemanticLyrics
 import org.akanework.gramophone.ui.MainActivity
@@ -415,7 +416,7 @@ fun MediaController.getQueueForUi(index: Int = C.INDEX_UNSET): Pair<MutableList<
             val indexes: MutableList<Int> = if (mq.shuffleOrder == null) {
                 (0 until mq.getSize()).toMutableList()
             } else {
-                shuffledIndices(mq.shuffleOrder!!)
+                getIntArray("shuffleIndexes")!!.toMutableList()
             }
 
             Pair(indexes, items)

app/src/main/java/org/akanework/gramophone/logic/GramophonePlaybackService.kt

@@ -901,6 +901,17 @@ class GramophonePlaybackService : MediaLibraryService(), MediaSessionService.Lis
                         val queueList: List<MultiQueueObject> = qb.getQueue(index)
                         val binder = BundleListRetriever(queueList.map { it.toBundle() })
                         res.extras.putBinder("allQueues", binder)
+
+                        // assume ui does not expect shuffleIndexes if shuffle is off
+                        if (!queueList.isEmpty()) {
+                            val mq = queueList.first()
+                            val factory =
+                                CircularShuffleOrder.Persistent.deserialize(mq.shuffleOrder)
+                                    .toFactory()
+                            val shuffleOrder = factory(0, mq.getSize(), endedWorkaroundPlayer!!)
+                            val shuffleIndexesList: List<Int> = shuffledIndices(shuffleOrder)
+                            res.extras.putIntArray("shuffleIndexes", shuffleIndexesList.toIntArray())
+                        }
                     }
                 }
 

app/src/main/java/org/akanework/gramophone/logic/QueueBoard.kt

@@ -371,6 +371,13 @@ class QueueBoard(
             TAG,
             "Setting current queue; $mq; ids: ${plr.currentMediaItem?.mediaId}, ${mediaItems[startIndex].mediaId}"
         )
+
+        val seed = try {
+            CircularShuffleOrder.Persistent.deserialize(mq.shuffleOrder)
+        } catch (e: Exception) {
+            plr.nextShuffleOrder = null
+            throw e
+        }
         /**
          * current playing == jump target, do seamlessly
          */
@@ -380,6 +387,7 @@ class QueueBoard(
             Log.d(TAG, "Trying seamless queue switch. Is first song?: ${startIndex == 0}")
             val playerIndex = plr.currentMediaItemIndex
 
+            plr.replaceMediaItem(playerIndex, mediaItems[playerIndex]) // update current's metadata
             if (startIndex == 0) {
                 // remove all songs before the currently playing one and then replace all the items after
                 if (playerIndex > 0) {
@@ -397,28 +405,29 @@ class QueueBoard(
                     mediaItems.subList(startIndex + 1, mediaItems.size)
                 )
             }
+
+            plr.exoPlayer.setShuffleOrder(seed.toFactory()(mq.startIndex, mq.getSize(), plr))
         } else {
             Log.d(TAG, "Seamless is not supported. Loading songs in directly")
+
+            if (plr.shuffleModeEnabled && mq.shuffleOrder == null)
+                Log.w(TAG, "Shuffle mode is enabled but no shuffle order is provided")
+
+            if (plr.nextShuffleOrder != null)
+                throw IllegalStateException("shuffleFactory was found orphaned")
+
+            plr.nextShuffleOrder = seed.toFactory()
+
             plr.setMediaItems(
                 mediaItems, startIndex,
                 if (shouldResume) mq.startPositionMs else C.TIME_UNSET
             )
+            if (plr.nextShuffleOrder != null)
+                throw IllegalStateException("shuffleFactory was not consumed during restore")
         }
 
-        if (plr.shuffleModeEnabled != mq.shuffleModeEnabled) {
-            if (plr.shuffleModeEnabled && mq.shuffleOrder == null) {
-                Log.w(TAG, "Shuffle mode is enabled but no shuffle order is provided")
-            }
-            plr.shuffleModeEnabled = mq.shuffleModeEnabled
-            mq.shuffleOrder?.let {
-                if (it != plr.exoPlayer.shuffleOrder) {
-                    plr.exoPlayer.setShuffleOrder(it)
-                }
-            }
-        }
-        if (plr.repeatMode != mq.repeatMode) {
-            plr.repeatMode = mq.repeatMode
-        }
+        plr.shuffleModeEnabled = mq.shuffleModeEnabled
+        plr.repeatMode = mq.repeatMode
 
         return startIndex
     }
@@ -441,13 +450,21 @@ class QueueBoard(
         return items
     }
 
+    /**
+     * Update the queue in QueueBoard with player attributes
+     */
     private fun syncQueueFromPlayer(mq: MultiQueueObject) {
         val plr = player.endedWorkaroundPlayer!!
         mq.startIndex = plr.currentMediaItemIndex
         mq.startPositionMs = plr.currentPosition
         mq.repeatMode = plr.repeatMode
         mq.shuffleModeEnabled = plr.shuffleModeEnabled
-        mq.shuffleOrder = plr.exoPlayer.shuffleOrder as CircularShuffleOrder
+        val persistent = if (mq.shuffleModeEnabled) {
+            CircularShuffleOrder.Persistent(plr.exoPlayer.shuffleOrder as CircularShuffleOrder)
+        } else {
+            null
+        }
+        mq.shuffleOrder = persistent?.toString()
         mq.queue.clear()
         mq.queue.addAll(dumpPlaylist())
     }
@@ -487,7 +504,7 @@ data class MultiQueueObject(
     var repeatMode: Int = 0,
     var shuffleModeEnabled: Boolean = false,
 
-    var shuffleOrder: CircularShuffleOrder? = null,
+    var shuffleOrder: String? = null,
     var ended: Boolean = false,
 ) {
     override fun toString() =
@@ -513,11 +530,6 @@ data class MultiQueueObject(
         return queue.fastFirstOrNull { it.mediaId == mediaId }
     }
 
-    fun setCurrentQueuePos(index: Int) {
-        // TODO: uhhh figure out shffle
-        startIndex = index
-    }
-
     /**
      * Retrieve the total duration of all songs
      *
@@ -552,8 +564,7 @@ data class MultiQueueObject(
             putInt("repeatMode", repeatMode)
             putBoolean("shuffleModeEnabled", shuffleModeEnabled)
             putBoolean("ended", ended)
-
-//              TODO:  shuffleOrder 
+            putString("shuffleOrder", shuffleOrder)
         }
 
     companion object {
@@ -576,8 +587,7 @@ data class MultiQueueObject(
                 repeatMode = bundle.getInt("repeatMode", REPEAT_MODE_OFF),
                 shuffleModeEnabled = bundle.getBoolean("shuffleModeEnabled"),
                 ended = bundle.getBoolean("ended"),
-
-//              TODO:  shuffleOrder =
+                shuffleOrder = bundle.getString("shuffleOrder"),
             )
         }
     }

app/src/main/java/org/akanework/gramophone/ui/components/ComposeComponentsTemp.kt

@@ -23,6 +23,8 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.rounded.List
 import androidx.compose.material.icons.rounded.DragHandle
+import androidx.compose.material.icons.rounded.ExpandLess
+import androidx.compose.material.icons.rounded.ExpandMore
 import androidx.compose.material.icons.rounded.MusicNote
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -198,7 +200,7 @@ fun MqContent(
                     modifier = Modifier.padding(vertical = 6.dp)
                 ) {
                     Icon(
-                        painter = painterResource(if (mqExpand) R.drawable.baseline_arrow_upward_24 else R.drawable.ic_expand_more),
+                        imageVector = if (mqExpand) Icons.Rounded.ExpandLess else Icons.Rounded.ExpandMore,
                         contentDescription = null,
                     )
                 }