refactoring

Author: swiftuiux

Sources/swiftui-loop-videoplayer/protocol/player/AbstractPlayer.swift

@@ -38,6 +38,9 @@ public protocol AbstractPlayer: AnyObject {
     /// The queue player that plays the video items.
     var player: AVQueuePlayer? { get set }
 
+    /// Observes the status property of the new player item.
+    var statusObserver: NSKeyValueObservation? { get set }
+    
     // Playback control methods
 
     /// Initiates or resumes playback of the video.
@@ -178,14 +181,17 @@ extension AbstractPlayer{
             self.loop()
         }
 
+        if let statusObserver{
+            statusObserver.invalidate()
+        }
+        
         if let callback{
-            var token: NSKeyValueObservation?
-            token = newItem.observe(\.status, options: [.new, .old]) { item, change in
-                if item.status == .readyToPlay {
-                    callback()
-                    token?.invalidate() // Invalidate token to stop observing
-                    token = nil
-                }
+            statusObserver = newItem.observe(\.status, options: [.new, .old]) { [weak self] item, change in
+                guard item.status == .readyToPlay else { return }
+                 callback()
+                 self?.statusObserver?.invalidate()
+                 self?.statusObserver = nil
+                print("statusObserver")
             }
         }
 
@@ -200,6 +206,7 @@ extension AbstractPlayer{
     /// - Parameter time: The target time to seek to in the video timeline.
     func seek(to time: Double) {
         guard let player = player, let duration = player.currentItem?.duration else {
+            print(player?.currentItem, "player.currentItem")
             delegate?.didSeek(value: false, currentTime: time)
             return
         }
@@ -459,7 +466,14 @@ extension AbstractPlayer{
 ///   - player: A reference to the AVQueuePlayer to be cleaned up. Modified directly to deallocate resources.
 ///   - playerLooper: A reference to the AVPlayerLooper associated with the player. It's disabled and set to nil.
 ///   - errorObserver: A reference to an NSKeyValueObservation monitoring the player, which is invalidated and set to nil.
-internal func cleanUp(player: inout AVQueuePlayer?, playerLooper: inout AVPlayerLooper?, errorObserver: inout NSKeyValueObservation?, timeObserverToken: inout Any?) {
+internal func cleanUp(
+    player: inout AVQueuePlayer?,
+    playerLooper: inout AVPlayerLooper?,
+    errorObserver: inout NSKeyValueObservation?,
+    statusObserver: inout NSKeyValueObservation?,
+    timeObserver: inout Any?
+) {
+    
     errorObserver?.invalidate()
     errorObserver = nil
 
@@ -473,9 +487,9 @@ internal func cleanUp(player: inout AVQueuePlayer?, playerLooper: inout AVPlayer
         player?.remove(item)
     }
 
-    if let observerToken = timeObserverToken {
+    if let observerToken = timeObserver {
         player?.removeTimeObserver(observerToken)
-        timeObserverToken = nil
+        timeObserver = nil
     }
 
     player = nil

Sources/swiftui-loop-videoplayer/protocol/player/LoopingPlayerProtocol.swift

@@ -35,7 +35,7 @@ public protocol LoopingPlayerProtocol: AbstractPlayer, LayerMakerProtocol{
     var errorObserver: NSKeyValueObservation? { get set }
 
     /// Declare a variable to hold the time observer token outside the if statement
-    var timeObserverToken: Any? { get set }
+    var timeObserver: Any? { get set }
 
     /// Initializes a new player view with specified video asset and configurations.
     ///
@@ -114,7 +114,7 @@ internal extension LoopingPlayerProtocol {
         compositeLayer.frame = CGRect(x: 0, y: 0, width: bounds.width, height: bounds.height)
 
         if let timePublishing{
-            timeObserverToken = player.addPeriodicTimeObserver(forInterval: timePublishing, queue: .main) { [weak self] time in
+            timeObserver = player.addPeriodicTimeObserver(forInterval: timePublishing, queue: .main) { [weak self] time in
                 guard let self = self else{ return }
 
                 self.delegate?.didPassedTime(seconds: time.seconds)

Sources/swiftui-loop-videoplayer/view/player/ios/LoopingPlayerUIView.swift

@@ -40,11 +40,14 @@ class LoopingPlayerUIView: UIView, LoopingPlayerProtocol {
     internal var player: AVQueuePlayer?
 
     /// Declare a variable to hold the time observer token outside the if statement
-    internal var timeObserverToken: Any?
+    internal var timeObserver: Any?
 
     /// Observer for errors from the AVQueuePlayer.
     internal var errorObserver: NSKeyValueObservation?
 
+    /// Observes the status property of the new player item.
+    internal var statusObserver: NSKeyValueObservation?
+    
     /// The delegate to be notified about errors encountered by the player.
     weak var delegate: PlayerDelegateProtocol?
 
@@ -77,7 +80,7 @@ class LoopingPlayerUIView: UIView, LoopingPlayerProtocol {
     /// This method invalidates the status and error observers to prevent memory leaks,
     /// pauses the player, and clears out player-related references to assist in clean deinitialization.
     deinit {
-        cleanUp(player: &player, playerLooper: &playerLooper, errorObserver: &errorObserver, timeObserverToken: &timeObserverToken)
+        cleanUp(player: &player, playerLooper: &playerLooper, errorObserver: &errorObserver, statusObserver: &statusObserver, timeObserver: &timeObserver)
     }
 }
 #endif

Sources/swiftui-loop-videoplayer/view/player/mac/LoopingPlayerNSView.swift

@@ -42,11 +42,14 @@ class LoopingPlayerNSView: NSView, LoopingPlayerProtocol {
     internal var player: AVQueuePlayer?
 
     /// Declare a variable to hold the time observer token outside the if statement
-    internal var timeObserverToken: Any?
+    internal var timeObserver: Any?
 
     /// Observer for errors from the AVQueuePlayer.
     internal var errorObserver: NSKeyValueObservation?
 
+    /// Observes the status property of the new player item.
+    internal var statusObserver: NSKeyValueObservation?
+    
     /// The delegate to be notified about errors encountered by the player.
     weak var delegate: PlayerDelegateProtocol?
 
@@ -79,7 +82,7 @@ class LoopingPlayerNSView: NSView, LoopingPlayerProtocol {
     /// This method invalidates the status and error observers to prevent memory leaks,
     /// pauses the player, and clears out player-related references to assist in clean deinitialization.
     deinit {
-        cleanUp(player: &player, playerLooper: &playerLooper, errorObserver: &errorObserver, timeObserverToken: &timeObserverToken)
+        cleanUp(player: &player, playerLooper: &playerLooper, errorObserver: &errorObserver, statusObserver: &statusObserver, timeObserver: &timeObserver)
     }
 }
 #endif