@mustafaj/capacitor-plugin-playlist 0.9.0 → 0.9.2

package/CHANGELOG.md

@@ -0,0 +1,9 @@
+# Changelog
+
+## 0.9.0
+
+### Breaking Changes
+
+- Low-level `Playlist.removeItem()` and `Playlist.removeItems()` now accept only `id` / `index`.
+- If you were calling the raw Capacitor plugin API with `trackId` / `trackIndex`, update those calls to `id` / `index`.
+- The higher-level `RmxAudioPlayer` wrapper still accepts `trackId` / `trackIndex` and maps them to the canonical plugin contract.

package/{CapacitorPluginPlaylist.podspec → MustafajCapacitorPluginPlaylist.podspec}

@@ -3,7 +3,7 @@ require 'json'
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
 Pod::Spec.new do |s|
-  s.name = 'CapacitorPluginPlaylist'
+  s.name = 'MustafajCapacitorPluginPlaylist'
   s.version = package['version']
   s.summary = package['description']
   s.license = package['license']
@@ -13,5 +13,5 @@ Pod::Spec.new do |s|
   s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
   s.ios.deployment_target = '15.0'
   s.dependency 'Capacitor'
-  s.swift_version = '5.3'
+  s.swift_version = '5.9'
 end

package/Package.swift

@@ -0,0 +1,27 @@
+// swift-tools-version: 5.9
+import PackageDescription
+
+let package = Package(
+    name: "CapacitorPluginPlaylist",
+    platforms: [.iOS(.v15)],
+    products: [
+        .library(
+            name: "CapacitorPluginPlaylist",
+            targets: ["Plugin"]
+        )
+    ],
+    dependencies: [
+        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "8.0.0")
+    ],
+    targets: [
+        .target(
+            name: "Plugin",
+            dependencies: [
+                .product(name: "Capacitor", package: "capacitor-swift-pm"),
+                .product(name: "Cordova", package: "capacitor-swift-pm")
+            ],
+            path: "ios/Plugin",
+            publicHeadersPath: "."
+        )
+    ]
+)

package/README.md

@@ -60,34 +60,16 @@ architect => build => options:
     ]
 ```
 
-##### AndroidManifest.xml:
+##### Android manifest
 
-```
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <application
-        android:name="org.dwbn.plugins.playlist.App"
-    >
-        <service android:enabled="true" android:exported="false"
-                 android:name="org.dwbn.plugins.playlist.service.MediaService">
-        </service>
-    </application>
-```
+The plugin now ships its own merged Android manifest entries for:
 
-**Note**: Starting with Android 14, you now need to specify the `foregroundServiceType` and request the appropriate permission:
+- `WAKE_LOCK`
+- `FOREGROUND_SERVICE`
+- `FOREGROUND_SERVICE_MEDIA_PLAYBACK`
+- `org.dwbn.plugins.playlist.service.MediaService`
 
-```
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
-    <application
-        android:name="org.dwbn.plugins.playlist.App"
-    >
-        <service android:enabled="true" android:exported="false"
-                 android:foregroundServiceType="mediaPlayback"
-                 android:name="org.dwbn.plugins.playlist.service.MediaService">
-        </service>
-    </application>
-```
+You do not need to replace your app's `Application` class to use the plugin.
 
 ##### Gradle Configuration (Gradle 9+)
 
@@ -141,7 +123,6 @@ also see https://guides.codepath.com/android/Displaying-Images-with-the-Glide-Li
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>audio</string>
-		<string>fetch</string>
 	</array>
 ```
 

package/android/build.gradle

@@ -25,7 +25,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    lintOptions {
+    lint {
         abortOnError = false
     }
     compileOptions {

package/android/src/main/AndroidManifest.xml

@@ -1,4 +1,14 @@
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
+
+    <application>
+        <service
+            android:name="org.dwbn.plugins.playlist.service.MediaService"
+            android:enabled="true"
+            android:exported="false"
+            android:foregroundServiceType="mediaPlayback" />
+    </application>
 </manifest>

package/android/src/main/java/org/dwbn/plugins/playlist/PlaylistPlugin.kt

@@ -19,7 +19,7 @@ public class PlaylistPlugin : Plugin(), OnStatusReportListener {
     private var resetStreamOnPause = true
 
     override fun load() {
-        audioPlayerImpl = RmxAudioPlayer(this, (this.context.applicationContext as App))
+        audioPlayerImpl = RmxAudioPlayer(this, this.context.applicationContext)
     }
 
     @PluginMethod

package/android/src/main/java/org/dwbn/plugins/playlist/PlaylistRuntime.kt

@@ -0,0 +1,27 @@
+package org.dwbn.plugins.playlist
+
+import android.app.Application
+import android.content.Context
+import org.dwbn.plugins.playlist.manager.PlaylistManager
+
+object PlaylistRuntime {
+    private var playlistManager: PlaylistManager? = null
+
+    @JvmStatic
+    fun getPlaylistManager(context: Context): PlaylistManager {
+        synchronized(this) {
+            if (playlistManager == null) {
+                playlistManager = PlaylistManager(context.applicationContext as Application)
+            }
+            return playlistManager!!
+        }
+    }
+
+    @JvmStatic
+    fun resetPlaylistManager(context: Context): PlaylistManager {
+        synchronized(this) {
+            playlistManager = PlaylistManager(context.applicationContext as Application)
+            return playlistManager!!
+        }
+    }
+}

package/android/src/main/java/org/dwbn/plugins/playlist/RmxAudioPlayer.java

@@ -1,5 +1,6 @@
 package org.dwbn.plugins.playlist;
 
+import android.content.Context;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
@@ -46,9 +47,9 @@ public class RmxAudioPlayer implements PlaybackStatusListener<AudioTrack>,
     private boolean resetStreamOnPause = true;
     private String pendingSelectionTrackId = null;
     private boolean suppressSelectionPlaybackEvents = false;
-    private final App app;
+    private final Context context;
 
-    public RmxAudioPlayer(@NonNull OnStatusReportListener statusListener, App context) {
+    public RmxAudioPlayer(@NonNull OnStatusReportListener statusListener, @NonNull Context context) {
         // AudioPlayerPlugin and RmxAudioPlayer are separate classes in order to increase
         // the portability of this code.
         // Because AudioPlayerPlugin itself holds a strong reference to this class,
@@ -56,10 +57,9 @@ public class RmxAudioPlayer implements PlaybackStatusListener<AudioTrack>,
         // but these two objects will always live together (And the plugin couldn't function
         // at all if this one gets garbage collected).
         this.statusListener = statusListener;
-        this.app = context;
+        this.context = context.getApplicationContext();
 
-        app.resetPlaylistManager();
-        getPlaylistManager();
+        playlistManager = PlaylistRuntime.resetPlaylistManager(this.context);
         playlistManager.setId(PLAYLIST_ID);
         playlistManager.setPlaybackStatusListener(this);
         playlistManager.setOnErrorListener(this);
@@ -67,7 +67,7 @@ public class RmxAudioPlayer implements PlaybackStatusListener<AudioTrack>,
     }
 
     public PlaylistManager getPlaylistManager() {
-        playlistManager = app.getPlaylistManager();
+        playlistManager = PlaylistRuntime.getPlaylistManager(context);
         return playlistManager;
     }
 
@@ -81,7 +81,7 @@ public class RmxAudioPlayer implements PlaybackStatusListener<AudioTrack>,
     }
 
     public void setOptions(JSONObject val) {
-        Options options = new Options(app, val);
+        Options options = new Options(context, val);
         getPlaylistManager().setOptions(options);
     }
 

package/android/src/main/java/org/dwbn/plugins/playlist/manager/Options.kt

@@ -72,6 +72,6 @@ class Options {
 
     companion object {
         // Default icon path
-        private const val DEFAULT_ICON = "icon"
+        private const val DEFAULT_ICON = "ic_notification_icon"
     }
-}
+}

package/android/src/main/java/org/dwbn/plugins/playlist/manager/PlaylistManager.kt

@@ -205,9 +205,24 @@ class PlaylistManager(application: Application) :
         val progress = currentProgress
         val seekPosition: Long = if (progress != null) progress.position else 0
 
+        val snapshot = audioTracks.toList()
+        val resolvedIndices = LinkedHashSet<Int>()
         for (item in its) {
-            val resolvedIndex = resolveItemPosition(item.trackIndex, item.trackId)
+            val resolvedIndex =
+                if (item.trackIndex >= 0 && item.trackIndex < snapshot.size) {
+                    item.trackIndex
+                } else if (item.trackId.isNotEmpty()) {
+                    snapshot.indexOfFirst { it.trackId == item.trackId }
+                } else {
+                    -1
+                }
             if (resolvedIndex >= 0) {
+                resolvedIndices.add(resolvedIndex)
+            }
+        }
+
+        for (resolvedIndex in resolvedIndices.sortedDescending()) {
+            if (resolvedIndex in audioTracks.indices) {
                 val foundItem = audioTracks[resolvedIndex]
                 if (foundItem == currentItem) {
                     removingCurrent = true

package/android/src/main/java/org/dwbn/plugins/playlist/service/MediaImageProvider.kt

@@ -66,10 +66,12 @@ class MediaImageProvider(
     private inner class RemoteViewImageTarget : CustomTarget<Bitmap>() {
         override fun onResourceReady(resource: Bitmap, transition: Transition<in Bitmap>?) {
             artworkImage = resource
+            onImageUpdatedListener.onImageUpdated()
         }
 
         override fun onLoadCleared(placeholder: android.graphics.drawable.Drawable?) {
-            // No cleanup needed
+            artworkImage = null
+            onImageUpdatedListener.onImageUpdated()
         }
     }
 
@@ -80,4 +82,4 @@ class MediaImageProvider(
             fakeR.getId("drawable", options.icon)
         )
     }
-}
+}

package/android/src/main/java/org/dwbn/plugins/playlist/service/MediaService.kt

@@ -8,7 +8,7 @@ import android.os.Build
 import android.util.Log
 import com.devbrackets.android.playlistcore.components.playlisthandler.PlaylistHandler
 import com.devbrackets.android.playlistcore.service.BasePlaylistService
-import org.dwbn.plugins.playlist.App
+import org.dwbn.plugins.playlist.PlaylistRuntime
 import org.dwbn.plugins.playlist.data.AudioTrack
 import org.dwbn.plugins.playlist.manager.PlaylistManager
 import org.dwbn.plugins.playlist.playlist.AudioApi
@@ -78,7 +78,7 @@ class MediaService : BasePlaylistService<AudioTrack, PlaylistManager>() {
     }
 
     override val playlistManager: PlaylistManager
-        get() = (applicationContext as App).playlistManager
+        get() = PlaylistRuntime.getPlaylistManager(applicationContext)
 
     override fun newPlaylistHandler(): PlaylistHandler<AudioTrack> {
         val imageProvider = MediaImageProvider(applicationContext, object : OnImageUpdatedListener {
@@ -95,4 +95,4 @@ class MediaService : BasePlaylistService<AudioTrack, PlaylistManager>() {
             null
         ).build()
     }
-}
+}

package/ios/Plugin/AVBidirectionalQueuePlayer.swift

@@ -35,6 +35,7 @@ let AVBidirectionalQueueCleared = "AVBidirectionalQueuePlayer.Cleared"
 
 class AVBidirectionalQueuePlayer: AVQueuePlayer {
     var queuedAudioTracks: [AudioTrack] = []
+    var wrapsWhenAtEnd = false
 
     var isPlaying: Bool {
         timeControlStatus == .playing
@@ -126,7 +127,7 @@ class AVBidirectionalQueuePlayer: AVQueuePlayer {
     open override func advanceToNextItem() {
         if currentIndex() == nil || currentIndex()! < queuedAudioTracks.count - 1{
             super.advanceToNextItem();
-        } else {
+        } else if wrapsWhenAtEnd {
             setCurrentIndex(0)
         }
     }

package/ios/Plugin/Plugin.m

@@ -21,7 +21,6 @@ CAP_PLUGIN(PlaylistPlugin, "Playlist",
    CAP_PLUGIN_METHOD(seekTo, CAPPluginReturnPromise);
    CAP_PLUGIN_METHOD(playTrackByIndex, CAPPluginReturnPromise);
    CAP_PLUGIN_METHOD(playTrackById, CAPPluginReturnPromise);
-   CAP_PLUGIN_METHOD(playTrackByIndex, CAPPluginReturnPromise);
    CAP_PLUGIN_METHOD(selectTrackByIndex, CAPPluginReturnPromise);
    CAP_PLUGIN_METHOD(selectTrackById, CAPPluginReturnPromise);
    CAP_PLUGIN_METHOD(setPlaybackVolume, CAPPluginReturnPromise);

package/ios/Plugin/RmxAudioPlayer.swift

@@ -27,6 +27,8 @@ final class RmxAudioPlayer: NSObject {
     private var isReplacingItems = false
     private var isWaitingToStartPlayback = false
     private var loop = false
+    private var queueObserversRegistered = false
+    private var observedTrackItems: Set<ObjectIdentifier> = []
 
     let avQueuePlayer = AVBidirectionalQueuePlayer(items: [])
 
@@ -52,9 +54,7 @@ final class RmxAudioPlayer: NSObject {
         print("RmxAudioPlayer.execute=initialize")
 
         avQueuePlayer.actionAtItemEnd = .advance
-        avQueuePlayer.addObserver(self, forKeyPath: "currentItem", options: .new, context: nil)
-        avQueuePlayer.addObserver(self, forKeyPath: "rate", options: .new, context: nil)
-        avQueuePlayer.addObserver(self, forKeyPath: "timeControlStatus", options: .new, context: nil)
+        registerQueueObservers()
 
         let interval = CMTimeMakeWithSeconds(Float64(1.0), preferredTimescale: Int32(Double(NSEC_PER_SEC)))
         playbackTimeObserver = avQueuePlayer.addPeriodicTimeObserver(forInterval: interval, queue: .main, using: { [weak self] time in
@@ -114,24 +114,26 @@ final class RmxAudioPlayer: NSObject {
 
         var removed = 0
         if items.count > 0 {
+            let snapshot = avQueuePlayer.queuedAudioTracks
+            var indices = Set<Int>()
             for item in items {
                 guard let item = item as? [String: Any] else {
                     continue
                 }
 
-                if let id = item["id"] as? String {
-                    do {
-                        try removeItem(id)
-                        removed += 1
-                    } catch {}
-                }
-                else if let index = (item["index"] as? NSNumber)?.intValue {
-                    do {
-                        try removeItem(index)
-                        removed += 1
-                    } catch {}
+                if let index = (item["index"] as? NSNumber)?.intValue, snapshot.indices.contains(index) {
+                    indices.insert(index)
+                } else if let id = item["id"] as? String,
+                          let index = snapshot.firstIndex(where: { $0.trackId == id }) {
+                    indices.insert(index)
                 }
+            }
 
+            for index in indices.sorted(by: >) {
+                do {
+                    try removeItem(index)
+                    removed += 1
+                } catch {}
             }
         }
 
@@ -189,6 +191,7 @@ final class RmxAudioPlayer: NSObject {
 
     func setLoopAll(_ loop: Bool) {
         self.loop = loop
+        avQueuePlayer.wrapsWhenAtEnd = loop
 
         print("RmxAudioPlayer.execute=setLoopAll, \(loop)")
     }
@@ -213,12 +216,14 @@ final class RmxAudioPlayer: NSObject {
         guard !avQueuePlayer.queuedAudioTracks.isEmpty else {
             throw "Queue is Empty"
         }
-        let result = findTrack(byId: id)
-        let idx = (result?["index"] as? NSNumber)?.intValue ?? 0
-
-        if idx >= 0 {
-            avQueuePlayer.setCurrentIndex(idx)
+        guard
+            let result = findTrack(byId: id),
+            let idx = (result["index"] as? NSNumber)?.intValue,
+            idx >= 0
+        else {
+            throw "Track ID not found"
         }
+        avQueuePlayer.setCurrentIndex(idx)
     }
 
     func removeItem(_ index: Int) throws {
@@ -232,20 +237,18 @@ final class RmxAudioPlayer: NSObject {
     }
 
     func removeItem(_ id: String) throws {
-        let result = findTrack(byId: id)
-        let idx = (result?["index"] as? NSNumber)?.intValue ?? 0
-        let track = result?["track"] as? AudioTrack
-
-        guard idx >= 0 else {
-            throw "Could not find track by id" + id
+        guard
+            let result = findTrack(byId: id),
+            let idx = (result["index"] as? NSNumber)?.intValue,
+            let track = result["track"] as? AudioTrack,
+            idx >= 0
+        else {
+            throw "Could not find track by id " + id
         }
-        // AudioTrack* item = [self avQueuePlayer].itemsForPlayer[idx];
-        removeTrackObservers(track)
 
-        if let track = track {
-            avQueuePlayer.remove(track)
-        }
-        onStatus(.rmxstatus_ITEM_REMOVED, trackId: track?.trackId, param: track?.toDict())
+        removeTrackObservers(track)
+        avQueuePlayer.remove(track)
+        onStatus(.rmxstatus_ITEM_REMOVED, trackId: track.trackId, param: track.toDict())
     }
 
     // MARK: - player actions
@@ -390,7 +393,9 @@ final class RmxAudioPlayer: NSObject {
     }
 
     func setTracks(_ tracks: [AudioTrack], startIndex: Int, startPosition: Float) {
-        avQueuePlayer.removeAllTrackObservers()
+        for item in avQueuePlayer.queuedAudioTracks {
+            removeTrackObservers(item)
+        }
         
         isReplacingItems = true
         print("RmxAudioPlayer[setTracks] replacing tracks ")
@@ -662,13 +667,11 @@ final class RmxAudioPlayer: NSObject {
                 updatedNowPlayingInfo![MPMediaItemPropertyTitle] = currentItem?.title
                 updatedNowPlayingInfo![MPMediaItemPropertyAlbumTitle] = currentItem?.album
 
-                if let mediaItemArtwork = createCoverArtwork(currentItem?.albumArt?.absoluteString) {
-                    updatedNowPlayingInfo![MPMediaItemPropertyArtwork] = mediaItemArtwork
-                }
+                updateNowPlayingArtwork(currentItem?.albumArt?.absoluteString)
             }
             updatedNowPlayingInfo![MPMediaItemPropertyPlaybackDuration] = duration ?? 0.0
             updatedNowPlayingInfo![MPNowPlayingInfoPropertyElapsedPlaybackTime] = currentTime ?? 0.0
-            updatedNowPlayingInfo![MPNowPlayingInfoPropertyPlaybackRate] = 1.0
+            updatedNowPlayingInfo![MPNowPlayingInfoPropertyPlaybackRate] = avQueuePlayer.rate != 0.0 ? avQueuePlayer.rate : 0.0
 
             MPNowPlayingInfoCenter.default().nowPlayingInfo = updatedNowPlayingInfo
         }
@@ -678,24 +681,47 @@ final class RmxAudioPlayer: NSObject {
         commandCenter.previousTrackCommand.isEnabled = !avQueuePlayer.isAtBeginning
     }
 
-    func createCoverArtwork(_ coverUriOrNil: String?) -> MPMediaItemArtwork? {
+    func updateNowPlayingArtwork(_ coverUriOrNil: String?) {
         guard let coverUri = coverUriOrNil else {
-            return nil
+            updatedNowPlayingInfo?.removeValue(forKey: MPMediaItemPropertyArtwork)
+            return
         }
-        var coverImage: UIImage? = nil
-        if coverUri.hasPrefix("http://") || coverUri.hasPrefix("https://") {
-            let coverImageUrl = URL(string: coverUri)!
 
-            do {
-                let coverImageData = try Data(contentsOf: coverImageUrl)
-                coverImage = UIImage(data: coverImageData)
-            } catch {
-                print("Error creating the coverImageData");
+        if coverUri.hasPrefix("http://") || coverUri.hasPrefix("https://") {
+            guard let coverImageUrl = URL(string: coverUri) else {
+                updatedNowPlayingInfo?.removeValue(forKey: MPMediaItemPropertyArtwork)
+                return
             }
-        } else {
-            if FileManager.default.fileExists(atPath: coverUri) {
-                coverImage = UIImage(contentsOfFile: coverUri)
+            downloadImage(url: coverImageUrl) { [weak self] image in
+                guard
+                    let self = self,
+                    self.isCoverImageValid(image)
+                else {
+                    return
+                }
+                let artwork = MPMediaItemArtwork(boundsSize: image!.size) { _ in image! }
+                self.nowPlayingInfoQueue.sync {
+                    self.updatedNowPlayingInfo?[MPMediaItemPropertyArtwork] = artwork
+                    MPNowPlayingInfoCenter.default().nowPlayingInfo = self.updatedNowPlayingInfo
+                }
             }
+            return
+        }
+
+        if let mediaItemArtwork = createCoverArtwork(coverUri) {
+            updatedNowPlayingInfo?[MPMediaItemPropertyArtwork] = mediaItemArtwork
+        } else {
+            updatedNowPlayingInfo?.removeValue(forKey: MPMediaItemPropertyArtwork)
+        }
+    }
+
+    func createCoverArtwork(_ coverUriOrNil: String?) -> MPMediaItemArtwork? {
+        guard let coverUri = coverUriOrNil else {
+            return nil
+        }
+        var coverImage: UIImage? = nil
+        if FileManager.default.fileExists(atPath: coverUri) {
+            coverImage = UIImage(contentsOfFile: coverUri)
         }
 
         if isCoverImageValid(coverImage) {
@@ -1033,10 +1059,19 @@ final class RmxAudioPlayer: NSObject {
     }
 
     func addTrackObservers(_ playerItem: AudioTrack?) {
+        guard let playerItem = playerItem else {
+            return
+        }
+        let trackId = ObjectIdentifier(playerItem)
+        guard !observedTrackItems.contains(trackId) else {
+            return
+        }
+        observedTrackItems.insert(trackId)
+
         let options: NSKeyValueObservingOptions = [.old, .new]
-        playerItem?.addObserver(self, forKeyPath: "status", options: options, context: nil)
-        playerItem?.addObserver(self, forKeyPath: "duration", options: options, context: nil)
-        playerItem?.addObserver(self, forKeyPath: "loadedTimeRanges", options: options, context: nil)
+        playerItem.addObserver(self, forKeyPath: "status", options: options, context: nil)
+        playerItem.addObserver(self, forKeyPath: "duration", options: options, context: nil)
+        playerItem.addObserver(self, forKeyPath: "loadedTimeRanges", options: options, context: nil)
 
         // We don't need this one because we get the currentItem notification from the queue.
         // But we will wire it up anyway...
@@ -1045,7 +1080,7 @@ final class RmxAudioPlayer: NSObject {
         // Subscribe to the AVPlayerItem's PlaybackStalledNotification notification.
         listener.addObserver(self, selector: #selector(itemStalledPlaying(_:)), name: .AVPlayerItemPlaybackStalled, object: playerItem)
 
-        onStatus(.rmxstatus_ITEM_ADDED, trackId: playerItem?.trackId, param: playerItem?.toDict())
+        onStatus(.rmxstatus_ITEM_ADDED, trackId: playerItem.trackId, param: playerItem.toDict())
     }
 
     @objc func queueCleared(_ notification: Notification?) {
@@ -1055,22 +1090,52 @@ final class RmxAudioPlayer: NSObject {
     }
 
     func removeTrackObservers(_ playerItem: AudioTrack?) {
-        avQueuePlayer.removeTrackObservers(playerItem)
+        guard let playerItem = playerItem else {
+            return
+        }
+        let trackId = ObjectIdentifier(playerItem)
+        guard observedTrackItems.remove(trackId) != nil else {
+            return
+        }
+
+        playerItem.removeObserver(self, forKeyPath: "status")
+        playerItem.removeObserver(self, forKeyPath: "duration")
+        playerItem.removeObserver(self, forKeyPath: "loadedTimeRanges")
+
+        let listener = NotificationCenter.default
+        listener.removeObserver(self, name: .AVPlayerItemDidPlayToEndTime, object: playerItem)
+        listener.removeObserver(self, name: .AVPlayerItemPlaybackStalled, object: playerItem)
+    }
+
+    func registerQueueObservers() {
+        guard !queueObserversRegistered else {
+            return
+        }
+        avQueuePlayer.addObserver(self, forKeyPath: "currentItem", options: .new, context: nil)
+        avQueuePlayer.addObserver(self, forKeyPath: "rate", options: .new, context: nil)
+        avQueuePlayer.addObserver(self, forKeyPath: "timeControlStatus", options: .new, context: nil)
+        queueObserversRegistered = true
+    }
+
+    func unregisterQueueObservers() {
+        guard queueObserversRegistered else {
+            return
+        }
+        avQueuePlayer.removeObserver(self, forKeyPath: "currentItem")
+        avQueuePlayer.removeObserver(self, forKeyPath: "rate")
+        avQueuePlayer.removeObserver(self, forKeyPath: "timeControlStatus")
+        queueObserversRegistered = false
     }
 
     func activateAudioSession() {
         let avSession = AVAudioSession.sharedInstance()
 
-        // If no devices are connected, play audio through the default speaker (rather than the earpiece).
-        var options: AVAudioSession.CategoryOptions = .defaultToSpeaker
-
-        // If both Bluetooth streaming options are enabled, the low quality stream is preferred; enable A2DP only.
-        options.insert(.allowBluetoothA2DP)
+        let options: AVAudioSession.CategoryOptions = [.allowBluetoothA2DP]
 
         do {
             // Always set category first, even if session is already active
             // This ensures we have the correct category after video player exits
-            try avSession.setCategory(.playAndRecord, options: options)
+            try avSession.setCategory(.playback, options: options)
         } catch {
             print("Error setting category! \(error.localizedDescription)")
         }
@@ -1140,6 +1205,7 @@ final class RmxAudioPlayer: NSObject {
         if let playbackTimeObserver = playbackTimeObserver {
             avQueuePlayer.removeTimeObserver(playbackTimeObserver)
         }
+        unregisterQueueObservers()
         deregisterMusicControlsEventListener()
 
         removeAllTracks()