mq: Address review comments

mikooomich · mikooomich · commit 16ddc71c31f8 · 2026-04-01T20:20:41.000-04:00
diff --git a/app/src/main/java/org/akanework/gramophone/logic/GramophoneExtensions.kt b/app/src/main/java/org/akanework/gramophone/logic/GramophoneExtensions.kt
@@ -353,13 +353,9 @@ fun MediaController.getInactiveQueues(): List<MultiQueueObject> =
         SessionCommand(SERVICE_QB_GET_INACTIVE, Bundle.EMPTY),
         Bundle.EMPTY
     ).get().extras.run {
-        if (containsKey("allQueues")) {
-            val binder = getBinder("allQueues")!!
-            BundleListRetriever.getList(binder).map {
-                MultiQueueObject.fromBundle(it)
-            }
-        } else {
-            throw IllegalArgumentException("expected allQueues to be set")
+        val binder = getBinder("allQueues")!!
+        BundleListRetriever.getList(binder).map {
+            MultiQueueObject.fromBundle(it)
         }
     }
 
@@ -369,13 +365,9 @@ fun MediaController.getQueue(index: Int = C.INDEX_UNSET): MultiQueueObject? =
             customExtras.putInt("index", index)
         }, Bundle.EMPTY
     ).get().extras.run {
-        if (containsKey("allQueues")) {
-            val binder = getBinder("allQueues")!!
-            BundleListRetriever.getList(binder).map {
-                MultiQueueObject.fromBundle(it)
-            }
-        } else {
-            throw IllegalArgumentException("expected allQueues to be set")
+        val binder = getBinder("allQueues")!!
+        BundleListRetriever.getList(binder).map {
+            MultiQueueObject.fromBundle(it)
         }.firstOrNull()
     }
 
@@ -416,21 +408,17 @@ fun MediaController.getQueueForUi(index: Int = C.INDEX_UNSET): Pair<MutableList<
             customExtras.putInt("index", index)
         }, Bundle.EMPTY
     ).get().extras.run {
-        if (containsKey("allQueues")) {
-            val binder = getBinder("allQueues")!!
-            BundleListRetriever.getList(binder).map {
-                val mq = MultiQueueObject.fromBundle(it)
-                val items = mq.queue
-                val indexes: MutableList<Int> = if (mq.shuffleOrder == null) {
-                    (0 until mq.getSize()).toMutableList()
-                } else {
-                    shuffledIndices(mq.shuffleOrder!!)
-                }
-
-                Pair(indexes, items)
+        val binder = getBinder("allQueues")!!
+        BundleListRetriever.getList(binder).map {
+            val mq = MultiQueueObject.fromBundle(it)
+            val items = mq.queue
+            val indexes: MutableList<Int> = if (mq.shuffleOrder == null) {
+                (0 until mq.getSize()).toMutableList()
+            } else {
+                shuffledIndices(mq.shuffleOrder!!)
             }
-        } else {
-            throw IllegalArgumentException("expected allQueues to be set")
+
+            Pair(indexes, items)
         }.firstOrNull()
     }
 }
diff --git a/app/src/main/java/org/akanework/gramophone/logic/GramophonePlaybackService.kt b/app/src/main/java/org/akanework/gramophone/logic/GramophonePlaybackService.kt
@@ -168,7 +168,7 @@ class GramophonePlaybackService : MediaLibraryService(), MediaSessionService.Lis
     val endedWorkaroundPlayer
         get() = mediaSession?.player as EndedWorkaroundPlayer?
     private var controller: MediaBrowser? = null
-    val qb: QueueBoard = QueueBoard(this)
+    lateinit var qb: QueueBoard
     private val sendLyrics = Runnable { scheduleSendingLyrics(false) }
     var lyrics: SemanticLyrics? = null
         private set
@@ -268,6 +268,7 @@ class GramophonePlaybackService : MediaLibraryService(), MediaSessionService.Lis
     override fun onCreate() {
         Log.i(TAG, "+onCreate()")
         super.onCreate()
+        qb = QueueBoard(this)
         instanceForWidgetAndLyricsOnly = this
         internalPlaybackThread.start()
         playbackHandler = Handler(internalPlaybackThread.looper)
diff --git a/app/src/main/java/org/akanework/gramophone/logic/QueueBoard.kt b/app/src/main/java/org/akanework/gramophone/logic/QueueBoard.kt
@@ -91,7 +91,7 @@ class QueueBoard(
         val new = masterQueues[index]
         masterQueues.remove(new)
         masterQueues.add(new)
-        setCurrQueue(new, false, shouldResume)
+        setCurrQueue(new, true, shouldResume)
     }
 
     fun pinQueue(index: Int) {
@@ -236,17 +236,18 @@ class QueueBoard(
     /**
      * Deletes a queue.
      *
-     * When deleting the active queue,
+     * When deleting the active queue, the last inactive queue is loaded. When the active queue is
+     * the only queue, playback is stopped.
      *
-     * @param mq
+     * @param index
      */
     fun deleteQueue(index: Int): Int {
         if (QUEUE_DEBUG)
             Log.d(TAG, "DELETING QUEUE AT INDEX: $index")
         if (index == masterQueues.lastIndex) {
             masterQueues.removeAt(index)
             if (index <= 0) {
-                player.pauseAllPlayersAndStopSelf() // TODO: correct way to stop playback
+                player.endedWorkaroundPlayer?.removeMediaItems(0, Int.MAX_VALUE)
             } else {
                 commitQueue(index - 1, false)
             }
@@ -353,8 +354,6 @@ class QueueBoard(
             return null
         }
 
-        // I have no idea why this value gets reset to 0 by the end... but ig this works
-        val startPositionMs = if (shouldResume) mq.startPositionMs else C.TIME_UNSET
         val startIndex = mq.startIndex
 
         val mediaItems: MutableList<MediaItem> = mq.queue
@@ -373,20 +372,11 @@ class QueueBoard(
             val playerIndex = plr.currentMediaItemIndex
 
             if (startIndex == 0) {
-                val playerItemCount = plr.mediaItemCount
-                // player.player.replaceMediaItems seems to stop playback so we
-                // remove all songs except the currently playing one and then add the list of new items
-                if (playerIndex < playerItemCount - 1) {
-                    plr.removeMediaItems(
-                        playerIndex + 1,
-                        playerItemCount
-                    )
-                }
+                // remove all songs before the currently playing one and then replace all the items after
                 if (playerIndex > 0) {
                     plr.removeMediaItems(0, playerIndex)
                 }
-                // add all songs except the first one since it is already present and playing
-                plr.addMediaItems(mediaItems.drop(1))
+                plr.replaceMediaItems(1, Int.MAX_VALUE, mediaItems.drop(1))
             } else {
                 // replace items up to current playing, then replace items after current
                 plr.replaceMediaItems(
@@ -400,7 +390,10 @@ class QueueBoard(
             }
         } else {
             Log.d(TAG, "Seamless is not supported. Loading songs in directly")
-            plr.setMediaItems(mediaItems, startIndex, startPositionMs)
+            plr.setMediaItems(
+                mediaItems, startIndex,
+                if (shouldResume) mq.startPositionMs else C.TIME_UNSET
+            )
         }
 
         if (plr.shuffleModeEnabled != mq.shuffleModeEnabled) {
diff --git a/app/src/main/java/org/akanework/gramophone/ui/components/PlaylistQueueSheet.kt b/app/src/main/java/org/akanework/gramophone/ui/components/PlaylistQueueSheet.kt
@@ -171,10 +171,6 @@ class PlaylistQueueSheet(
                                 val durationView: Chronometer = view.findViewById(R.id.duration)
 
                                 val current = (instance?.currentMediaItemIndex ?: 0)
-                                if (current > playlistAdapter.playlist.second.size) {
-                                    // hax to workaround ui loading itself 4 times
-                                    return@AndroidView
-                                }
                                 val elapsedCurrentMs = (instance?.currentPosition ?: 0)
                                 durationView.format =
                                     context.getString(
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -503,5 +503,5 @@
     <string name="actions_query_shuffle_specific">shuffle $item_name</string>
     <string name="please_allow_to_delete">Press allow to delete files</string>
     <string name="choose_sd">Choose %s</string>
-    <string name="settings_mq_preview">Enable multiple queues preview</string>
+    <string name="settings_mq_enabled">Multiple queues</string>
 </resources>
diff --git a/app/src/main/res/xml/settings_experimental.xml b/app/src/main/res/xml/settings_experimental.xml
@@ -77,7 +77,7 @@
             android:defaultValue="false"
             android:key="mq_preview"
             android:layout="@layout/preference_switch"
-            android:title="@string/settings_mq_preview"
+            android:title="@string/settings_mq_enabled"
             android:widgetLayout="@layout/preference_switch_widget"
             app:iconSpaceReserved="false" />
 
