refactoring

Author: swiftuiux

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

@@ -7,14 +7,28 @@
 
 import AVFoundation
 import Foundation
-
+#if canImport(UIKit)
+import UIKit
+#elseif canImport(AppKit)
+import AppKit
+#endif
 /// A protocol defining the requirements for a looping video player.
 ///
 /// Conforming types are expected to manage a video player that can loop content continuously,
 /// handle errors, and notify a delegate of important events.
 @available(iOS 14, macOS 11, tvOS 14, *)
 @MainActor
 public protocol LoopingPlayerProtocol: AnyObject {
+    
+    var playerLayer : AVPlayerLayer { get }
+    
+    #if canImport(UIKit)
+        var layer : CALayer { get }
+    #elseif canImport(AppKit)
+        var layer : CALayer? { get set }
+        var wantsLayer : Bool { get set }
+    #endif
+    
     /// The looper responsible for continuous video playback.
     var playerLooper: AVPlayerLooper? { get set }
 
@@ -123,6 +137,33 @@ extension LoopingPlayerProtocol {
         setupObservers(for: item, player: player)
     }
 
+    /// Configures the provided AVQueuePlayer with specific properties for video playback.
+    ///
+    /// This method sets the video gravity and muted state of the player, and assigns it to a player layer.
+    /// It is intended to set up the player with the necessary configuration for video presentation based on the given gravity.
+    /// - Parameters:
+    ///   - player: The AVQueuePlayer to be configured.
+    ///   - gravity: The AVLayerVideoGravity determining how the video content should be scaled or fit within the player layer.
+    internal func configurePlayer(_ player: AVQueuePlayer, gravity: AVLayerVideoGravity) {
+        player.isMuted = true
+        playerLayer.player = player
+        playerLayer.videoGravity = gravity
+        #if canImport(UIKit)
+        playerLayer.backgroundColor = UIColor.clear.cgColor
+        layer.addSublayer(playerLayer)
+        #elseif canImport(AppKit)
+        playerLayer.backgroundColor = NSColor.clear.cgColor
+        layer = CALayer()
+        layer?.addSublayer(playerLayer)
+        wantsLayer = true
+        #endif
+        
+        if let firstItem = player.items().first {
+            playerLooper = AVPlayerLooper(player: player, templateItem: firstItem)
+        }
+        player.play()
+    }
+    
     /// Sets up observers on the player item and the player to track their status and error states.
     ///
     /// - Parameters:

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

@@ -19,7 +19,7 @@ import UIKit
 class LoopingPlayerUIView: UIView, LoopingPlayerProtocol {
 
     /// The AVPlayerLayer that displays the video content.
-    private let playerLayer = AVPlayerLayer()
+    internal let playerLayer = AVPlayerLayer()
 
     /// The looper responsible for continuous video playback.
     internal var playerLooper: AVPlayerLooper?
@@ -50,26 +50,6 @@ class LoopingPlayerUIView: UIView, LoopingPlayerProtocol {
         fatalError("init(coder:) has not been implemented")
     }
 
-    /// Configures the provided AVQueuePlayer with specific properties for video playback.
-    ///
-    /// This method sets the video gravity and muted state of the player, and assigns it to a player layer.
-    /// It is intended to set up the player with the necessary configuration for video presentation based on the given gravity.
-    /// - Parameters:
-    ///   - player: The AVQueuePlayer to be configured.
-    ///   - gravity: The AVLayerVideoGravity determining how the video content should be scaled or fit within the player layer.
-    internal func configurePlayer(_ player: AVQueuePlayer, gravity: AVLayerVideoGravity) {
-        player.isMuted = true
-        playerLayer.player = player
-        playerLayer.videoGravity = gravity
-        playerLayer.backgroundColor = UIColor.clear.cgColor
-        layer.addSublayer(playerLayer)
-        
-        if let firstItem = player.items().first {
-            playerLooper = AVPlayerLooper(player: player, templateItem: firstItem)
-        }
-        player.play()
-    }
-
     /// Lays out subviews and adjusts the frame of the player layer to match the view's bounds.
     override func layoutSubviews() {
         super.layoutSubviews()
@@ -86,6 +66,3 @@ class LoopingPlayerUIView: UIView, LoopingPlayerProtocol {
     }
 }
 #endif
-
-
-

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

@@ -21,7 +21,7 @@ import AppKit
 class LoopingPlayerNSView: NSView, LoopingPlayerProtocol {
 
     /// The AVPlayerLayer that displays the video content.
-    private let playerLayer = AVPlayerLayer()
+    internal let playerLayer = AVPlayerLayer()
 
     /// The looper responsible for continuous video playback.
     internal var playerLooper: AVPlayerLooper?
@@ -51,28 +51,6 @@ class LoopingPlayerNSView: NSView, LoopingPlayerProtocol {
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-
-    /// Configures the player with settings for looping, muted playback, and visual layout.
-    ///
-    /// This method sets the video gravity and muted state of the player, and assigns it to a player layer.
-    /// It is intended to set up the player with the necessary configuration for video presentation based on the given gravity.
-    /// - Parameters:
-    ///   - player: The AVQueuePlayer to be configured.
-    ///   - gravity: The AVLayerVideoGravity determining how the video content should be scaled or fit within the player layer.
-    internal func configurePlayer(_ player: AVQueuePlayer, gravity: AVLayerVideoGravity) {
-        player.isMuted = true
-        playerLayer.player = player
-        playerLayer.videoGravity = gravity
-        playerLayer.backgroundColor = NSColor.clear.cgColor
-        layer = CALayer()
-        layer?.addSublayer(playerLayer)
-        wantsLayer = true
-        
-        if let firstItem = player.items().first {
-            playerLooper = AVPlayerLooper(player: player, templateItem: firstItem)
-        }
-        player.play()
-    }
 
     /// Lays out subviews and adjusts the frame of the player layer to match the view's bounds.
     override func layout() {