playback: fix parent restore

A single missed savedState access blew up parent restore silently, and
in some other cases with non-destructive queue restores would also not
restore the parent.

app/src/main/java/org/oxycblt/auxio/playback/service/ExoPlaybackStateHolder.kt

@@ -367,7 +367,13 @@ class ExoPlaybackStateHolder(
         rawQueue: RawQueue,
         ack: StateAck.NewPlayback?
     ) {
+        logD("Applying saved state")
+        var sendEvent = false
+        if (this.parent != parent) {
             this.parent = parent
+            sendEvent = true
+        }
+        if (rawQueue != resolveQueue()) {
             player.setMediaItems(rawQueue.heap.map { it.toMediaItem(context, null) })
             if (rawQueue.isShuffled) {
                 player.shuffleModeEnabled = true
@@ -377,8 +383,13 @@ class ExoPlaybackStateHolder(
             }
             player.seekTo(rawQueue.heapIndex, C.TIME_UNSET)
             player.prepare()
+            player.pause()
+            sendEvent = true
+        }
+        if (sendEvent) {
             ack?.let { playbackManager.ack(this, it) }
         }
+    }
 
     override fun endSession() {
         // This session has ended, so we need to reset this flag for when the next

app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt

@@ -795,15 +795,8 @@ class PlaybackStateManagerImpl @Inject constructor() : PlaybackStateManager {
                         index
                     })
 
-        // Valid state where something needs to be played, direct the stateholder to apply
+        stateHolder.applySavedState(savedState.parent, rawQueue, StateAck.NewPlayback)
-        // this new state.
-        val oldStateMirror = stateMirror
-        if (oldStateMirror.rawQueue != rawQueue) {
-            logD("Queue changed, must reload player")
-            stateHolder.playing(false)
-            stateHolder.applySavedState(parent, rawQueue, StateAck.NewPlayback)
         stateHolder.seekTo(savedState.positionMs)
-        }
         stateHolder.repeatMode(savedState.repeatMode)
 
         isInitialized = true