capacitor-plugin-playlist 0.1.32 → 0.1.33

package/android/local.properties

@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Sat Jan 15 16:11:50 CET 2022
+sdk.dir=/home/phiamo/Android/Sdk

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

@@ -104,14 +104,12 @@ class PlaylistManager(application: Application) :
         currentPosition = 0
         // If the options said to start from a specific position, do so.
         var seekStart: Long = 0
-        if (options.retainPosition) {
-            if (options.playFromPosition > 0) {
-                seekStart = options.playFromPosition
-            } else {
-                val progress = currentProgress
-                if (progress != null) {
-                    seekStart = progress.position
-                }
+        if (options.playFromPosition > 0) {
+            seekStart = options.playFromPosition
+        } else if (options.retainPosition) {
+            val progress = currentProgress
+            if (progress != null) {
+              seekStart = progress.position
             }
         }
 

package/dist/esm/interfaces.d.ts

@@ -15,6 +15,12 @@ export interface PlaylistStatusChangeCallbackArg {
     action: string;
     status: OnStatusCallbackData;
 }
+export interface AudioTrackOptions {
+    playFromPosition: number;
+    startPaused: boolean;
+    retainPosition: boolean;
+    playFromId: string;
+}
 /**
  * Options governing the overall behavior of the audio player plugin
  */

package/ios/Plugin/AVBidirectionalQueuePlayer.swift

@@ -45,11 +45,11 @@ class AVBidirectionalQueuePlayer: AVQueuePlayer {
         // the queue (such as restarting the item).
         currentIndex() == 0
     }
-    
+    /*
     var isAtEnd: Bool {
         guard let currentIndex = currentIndex() else { return true }
         return currentIndex >= (queuedAudioTracks.endIndex - 1)
-    }
+    }*/
     
     var currentAudioTrack: AudioTrack? { currentItem as? AudioTrack }
 
@@ -123,7 +123,7 @@ class AVBidirectionalQueuePlayer: AVQueuePlayer {
         }
     }
     open override func advanceToNextItem() {
-        if currentIndex() == nil || currentIndex()! < items().count - 1{
+        if currentIndex() == nil || currentIndex()! < queuedAudioTracks.count - 1{
             super.advanceToNextItem();
         } else {
             setCurrentIndex(0)
@@ -135,9 +135,6 @@ class AVBidirectionalQueuePlayer: AVQueuePlayer {
     }
     
     func setCurrentIndex(_ newCurrentIndex: Int, completionHandler: @escaping (Bool) -> Void) {
-        // NSUInteger tempNowPlayingIndex = [_itemsForPlayer indexOfObject: self.currentItem];
-
-        // if (tempNowPlayingIndex != NSNotFound){
         let currentrate = rate
         if currentrate > 0 {
             pause()
@@ -155,7 +152,6 @@ class AVBidirectionalQueuePlayer: AVQueuePlayer {
         }
         // Not a typo; see above comment
         seek(to: .zero, toleranceBefore: .zero, toleranceAfter: .zero, completionHandler: completionHandler)
-        // }
     }
     
     func replaceAllItems(with items: [AudioTrack]) {
@@ -189,6 +185,8 @@ class AVBidirectionalQueuePlayer: AVQueuePlayer {
     }
 
     // OVERRIDDEN AVQUEUEPLAYER METHODS
+    /*
+    resolving #9 and 11 and taking this out remove code after stabilize
     override func play() {
         if isAtEnd {
             // we could add a flag here to indicate looping
@@ -196,7 +194,7 @@ class AVBidirectionalQueuePlayer: AVQueuePlayer {
         }
 
         super.play()
-    }
+    }*/
     // This does the same thing as the normal AVQueuePlayer removeAllItems, but clears our collection copy
     override func removeAllItems() {
         print("removeAllItems")
@@ -235,7 +233,7 @@ class AVBidirectionalQueuePlayer: AVQueuePlayer {
         
         if afterItem != nil && queuedAudioTracks.contains(afterItem!) {
             // AfterItem is non-nil
-            if (queuedAudioTracks.firstIndex(of: afterItem!) ?? NSNotFound) < (queuedAudioTracks.count ) - 1 {
+            if (queuedAudioTracks.firstIndex(of: afterItem!) ?? NSNotFound) < (queuedAudioTracks.count - 1) {
                 queuedAudioTracks.insert(item, at: (queuedAudioTracks.firstIndex(of: afterItem!) ?? NSNotFound) + 1)
             } else {
                 queuedAudioTracks.append(item)

package/ios/Plugin/RmxAudioPlayer.swift

@@ -74,11 +74,11 @@ final class RmxAudioPlayer: NSObject {
 
         let startPaused = options["startPaused"] != nil ? (options["startPaused"] as? Bool) ?? false : true
 
-        if retainPosition {
+        if playFromPosition > 0.0 {
+            seekToPosition = playFromPosition
+        }
+        else if retainPosition {
             seekToPosition = getTrackCurrentTime(nil)
-            if playFromPosition > 0.0 {
-                seekToPosition = playFromPosition
-            }
         }
 
         let result = findTrack(byId: playFromId)
@@ -149,8 +149,10 @@ final class RmxAudioPlayer: NSObject {
         guard (0..<avQueuePlayer.queuedAudioTracks.count).contains(index) else {
             throw "Provided index is out of bounds"
         }
-
-        avQueuePlayer.setCurrentIndex(index)
+        
+        if avQueuePlayer.currentIndex() != index {
+            avQueuePlayer.setCurrentIndex(index)
+        }
         playCommand(false)
 
         if positionTime != nil {
@@ -162,13 +164,15 @@ final class RmxAudioPlayer: NSObject {
         guard !avQueuePlayer.queuedAudioTracks.isEmpty else {
             throw "The playlist is empty!"
         }
-        let result = findTrack(byId: trackId)
-        let idx = result?["index"] as? Int ?? -1
-        guard idx >= 0 else {
-            throw "Track ID not found"
+        
+        if avQueuePlayer.currentAudioTrack?.trackId != trackId {
+            let result = findTrack(byId: trackId)
+            let idx = result?["index"] as? Int ?? -1
+            guard idx >= 0 else {
+                throw "Track ID not found"
+            }
+            avQueuePlayer.setCurrentIndex(idx)
         }
-
-        avQueuePlayer.setCurrentIndex(idx)
         playCommand(false)
 
         if positionTime != nil {
@@ -257,14 +261,13 @@ final class RmxAudioPlayer: NSObject {
         if resetStreamOnPause,
            let currentTrack = avQueuePlayer.currentAudioTrack,
            currentTrack.isStream {
+            print( "music-stream-play")
             avQueuePlayer.seek(to: .positiveInfinity, toleranceBefore: .zero, toleranceAfter: .zero)
             currentTrack.seek(to: .positiveInfinity, toleranceBefore: .zero, toleranceAfter: .zero, completionHandler: nil)
         }
 
-        if isCommand {
-            let action = "music-controls-play"
-            print("\(action)")
-        }
+            print( "music-controls-play ")
+        
         avQueuePlayer.play()
     }
 
@@ -529,11 +532,15 @@ final class RmxAudioPlayer: NSObject {
             // only fire on real change!
             let player = object as? AVBidirectionalQueuePlayer
             let playerItem = player?.currentAudioTrack
-            guard lastTrackId != playerItem?.trackId else {
+            if playerItem != nil {
+            guard self.lastTrackId != playerItem?.trackId else {
                 return // todo should call super instead or?
             }
-            lastTrackId = playerItem?.trackId
+            print("observe change currentItem: lastTrackId \(self.lastTrackId) playerItem: \(playerItem?.trackId)")
+            self.lastTrackId = playerItem?.trackId
             handleCurrentItemChanged(playerItem)
+            }
+            
         case "rate":
             guard lastRate != change[.newKey] as? Float else {
                 return // todo should call super instead or?
@@ -594,7 +601,6 @@ final class RmxAudioPlayer: NSObject {
     }
 
     func updateNowPlayingTrackInfo(_ playerItem: AudioTrack?, updateTrackData: Bool) {
-
         let currentItem = playerItem ?? avQueuePlayer.currentAudioTrack
         let nowPlayingInfoCenter = MPNowPlayingInfoCenter.default()
         if updatedNowPlayingInfo == nil {
@@ -638,7 +644,6 @@ final class RmxAudioPlayer: NSObject {
         guard let coverUri = coverUriOrNil else {
             return nil
         }
-
         var coverImage: UIImage? = nil
         if coverUri.hasPrefix("http://") || coverUri.hasPrefix("https://") {
             let coverImageUrl = URL(string: coverUri)!
@@ -754,9 +759,10 @@ final class RmxAudioPlayer: NSObject {
                 isWaitingToStartPlayback = false
                 var errorMsg = ""
                 if playerItem.error != nil {
+                    print("\(playerItem.error)")
                     errorMsg = "Error playing audio track: \((playerItem.error as NSError?)?.localizedFailureReason ?? "")"
                 }
-                print("AVPlayerItemStatusFailed: Error playing audio track: \(errorMsg)")
+                print("AVPlayerItemStatusFailed: \(errorMsg)")
                 let errorParam = createError(withCode: .rmxerr_DECODE, message: errorMsg)
                 onStatus(.rmxstatus_ERROR, trackId: playerItem.trackId, param: errorParam)
             case .unknown:
@@ -989,9 +995,6 @@ final class RmxAudioPlayer: NSObject {
     }
 
     func removeTrackObservers(_ playerItem: AudioTrack?) {
-        playerItem?.removeObserver(self, forKeyPath: "status")
-        playerItem?.removeObserver(self, forKeyPath: "duration")
-        playerItem?.removeObserver(self, forKeyPath: "loadedTimeRanges")
         NotificationCenter.default.removeObserver(self, name: .AVPlayerItemDidPlayToEndTime, object: playerItem)
         NotificationCenter.default.removeObserver(self, name: .AVPlayerItemPlaybackStalled, object: playerItem)
 
@@ -1024,10 +1027,6 @@ final class RmxAudioPlayer: NSObject {
     func observeLifeCycle() {
         let listener = NotificationCenter.default
 
-        // These aren't really needed. the AVQueuePlayer handles this for us.
-        // [listener addObserver:self selector:@selector(handleEnterBackground) name:UIApplicationDidEnterBackgroundNotification object:nil];
-        // [listener addObserver:self selector:@selector(handleEnterForeground) name:UIApplicationWillEnterForegroundNotification object:nil];
-
         // We do need these.
         listener.addObserver(self, selector: #selector(handleAudioSessionInterruption(_:)), name: AVAudioSession.interruptionNotification, object: AVAudioSession.sharedInstance())
 
@@ -1060,11 +1059,6 @@ final class RmxAudioPlayer: NSObject {
 
     /// Cleanup
     func deregisterMusicControlsEventListener() {
-        // We don't use the remote control, and no need to remove observer on
-        // NSNotificationCenter, that is done automatically
-        // [[UIApplication sharedApplication] endReceivingRemoteControlEvents];
-        // [[NSNotificationCenter defaultCenter] removeObserver:self name:@"receivedEvent" object:nil];
-
         let commandCenter = MPRemoteCommandCenter.shared()
         commandCenter.playCommand.removeTarget(self)
         commandCenter.pauseCommand.removeTarget(self)
@@ -1079,7 +1073,6 @@ final class RmxAudioPlayer: NSObject {
 
     func onReset() {
         // Override to cancel any long-running requests when the WebView navigates or refreshes.
-        //super.onReset()
         releaseResources()
     }
 
@@ -1087,9 +1080,6 @@ final class RmxAudioPlayer: NSObject {
         if let playbackTimeObserver = playbackTimeObserver {
             avQueuePlayer.removeTimeObserver(playbackTimeObserver)
         }
-        avQueuePlayer.removeObserver(self as NSObject, forKeyPath: "currentItem")
-        avQueuePlayer.removeObserver(self as NSObject, forKeyPath: "rate")
-        avQueuePlayer.removeObserver(self as NSObject, forKeyPath: "timeControlStatus")
         deregisterMusicControlsEventListener()
 
         removeAllTracks()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-plugin-playlist",
-  "version": "0.1.32",
+  "version": "0.1.33",
   "description": "Playlist ",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",

package/android/.gitignore

@@ -1 +0,0 @@
-/build

package/android/.npmignore

@@ -1 +0,0 @@
-/build