multiqueue: Enqueue next now starts playback after player is dismissed

* Move init/deinit of queue to their own functions
DD3Boh · Jan 12, 2025 · faf4dc3 · faf4dc3
1 parent 29b10d7
commit faf4dc3
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 33 deletions.
diff --git a/app/src/main/java/com/dd3boh/outertune/models/QueueBoard.kt b/app/src/main/java/com/dd3boh/outertune/models/QueueBoard.kt
@@ -85,6 +85,7 @@ class QueueBoard(queues: MutableList<MultiQueueObject> = ArrayList()) {
     private val masterQueues: MutableList<MultiQueueObject> = queues
     private var masterIndex = masterQueues.size - 1 // current queue index
     var detachedHead = false
+    var initialized = false
 
 
     /**

diff --git a/app/src/main/java/com/dd3boh/outertune/playback/MusicService.kt b/app/src/main/java/com/dd3boh/outertune/playback/MusicService.kt
@@ -387,27 +387,45 @@ class MusicService : MediaLibraryService(),
             }
         }
 
+        initQueue()
+        CoroutineScope(Dispatchers.Main).launch {
+            val queuePos = queueBoard.setCurrQueue(this@MusicService, false)
+            if (queuePos != null) {
+                player.seekTo(queuePos, dataStore.get(LastPosKey, C.TIME_UNSET))
+                dataStore.edit { settings ->
+                    settings[LastPosKey] = C.TIME_UNSET
+                }
+            }
+        }
+    }
+
+    fun initQueue() {
         if (dataStore.get(PersistentQueueKey, true)) {
             queueBoard = QueueBoard(database.readQueue().toMutableList())
             isShuffleEnabled.value = queueBoard.getCurrentQueue()?.shuffled ?: false
             if (queueBoard.getAllQueues().isNotEmpty()) {
                 val queue = queueBoard.getCurrentQueue()
                 if (queue != null) {
                     isShuffleEnabled.value = queue.shuffled
-                    CoroutineScope(Dispatchers.Main).launch {
-                        val queuePos = queueBoard.setCurrQueue(this@MusicService, false)
-                        if (queuePos != null) {
-                            player.seekTo(queuePos, dataStore.get(LastPosKey, C.TIME_UNSET))
-                            dataStore.edit { settings ->
-                                settings[LastPosKey] = C.TIME_UNSET
-                            }
-                        }
-                    }
+                    queueBoard.initialized = true
                 }
             }
         }
     }
 
+    fun deInitQueue() {
+        if (dataStore.get(PersistentQueueKey, true)) {
+            saveQueueToDisk()
+            scope.launch {
+                dataStore.edit { settings ->
+                    settings[LastPosKey] = player.currentPosition
+                }
+            }
+        }
+        // do not replace the object. Can lead to entire queue being deleted even though it is supposed to be saved already
+        queueBoard.initialized = false
+    }
+
     fun updateNotification() {
         mediaSession.setCustomLayout(
             listOf(
@@ -488,6 +506,9 @@ class MusicService : MediaLibraryService(),
      * If both are unspecified, the title will default to "Queue".
      */
     fun playQueue(queue: Queue, playWhenReady: Boolean = true, replace: Boolean = false, title: String? = null) {
+        if (!queueBoard.initialized) {
+            initQueue()
+        }
         queueTitle = title
         queuePlaylistId = queue.playlistId
 
@@ -533,18 +554,23 @@ class MusicService : MediaLibraryService(),
      * Add items to queue, right after current playing item
      */
     fun enqueueNext(items: List<MediaItem>) {
-        val currentQueue = queueBoard.getCurrentQueue()
-        if (currentQueue == null) {
+        if (!queueBoard.initialized) {
+            // when enqueuing next when player isn't active, play as a new song
             if (items.isNotEmpty()) {
-                playQueue(
-                    ListQueue(
-                        title = items.first().mediaMetadata.title.toString(),
-                        items = items.mapNotNull { it.metadata }
+                CoroutineScope(Dispatchers.Main).launch {
+                    playQueue(
+                        ListQueue(
+                            title = items.first().mediaMetadata.title.toString(),
+                            items = items.mapNotNull { it.metadata }
+                        )
                     )
-                )
+                }
             }
         } else {
-            queueBoard.addSongsToQueue(currentQueue, player.currentMediaItemIndex + 1, items.mapNotNull { it.metadata }, this)
+            // enqueue next
+            queueBoard.getCurrentQueue()?.let {
+                queueBoard.addSongsToQueue(it, player.currentMediaItemIndex + 1, items.mapNotNull { it.metadata }, this)
+            }
         }
     }
 
@@ -829,14 +855,7 @@ class MusicService : MediaLibraryService(),
     }
 
     override fun onDestroy() {
-        if (dataStore.get(PersistentQueueKey, true)) {
-            saveQueueToDisk()
-            scope.launch {
-                dataStore.edit { settings ->
-                    settings[LastPosKey] = player.currentPosition
-                }
-            }
-        }
+        deInitQueue()
         mediaSession.release()
         player.removeListener(this)
         player.removeListener(sleepTimer)
@@ -847,14 +866,7 @@ class MusicService : MediaLibraryService(),
     override fun onBind(intent: Intent?) = super.onBind(intent) ?: binder
 
     override fun onTaskRemoved(rootIntent: Intent?) {
-        if (dataStore.get(PersistentQueueKey, true)) {
-            saveQueueToDisk()
-            scope.launch {
-                dataStore.edit { settings ->
-                    settings[LastPosKey] = player.currentPosition
-                }
-            }
-        }
+        deInitQueue()
 
         super.onTaskRemoved(rootIntent)
     }

diff --git a/app/src/main/java/com/dd3boh/outertune/ui/player/Player.kt b/app/src/main/java/com/dd3boh/outertune/ui/player/Player.kt
@@ -103,6 +103,7 @@ import com.dd3boh.outertune.extensions.toggleRepeatMode
 import com.dd3boh.outertune.models.MediaMetadata
 import com.dd3boh.outertune.models.isShuffleEnabled
 import com.dd3boh.outertune.playback.PlayerConnection
+import com.dd3boh.outertune.playback.PlayerConnection.Companion.queueBoard
 import com.dd3boh.outertune.ui.component.AsyncLocalImage
 import com.dd3boh.outertune.ui.component.BottomSheet
 import com.dd3boh.outertune.ui.component.BottomSheetState
@@ -230,6 +231,7 @@ fun BottomSheetPlayer(
         onDismiss = {
             playerConnection.player.stop()
             playerConnection.player.clearMediaItems()
+            playerConnection.service.deInitQueue()
         },
         collapsedContent = {
             MiniPlayer(