make public drawable.

shogo4405 · Dec 3, 2023 · 1660479 · 1660479
1 parent a3a4f5d
commit 1660479
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 27 deletions.
diff --git a/Sources/IO/MTHKView.swift b/Sources/IO/MTHKView.swift
@@ -65,13 +65,10 @@ public class MTHKView: MTKView {
     }
 
     private weak var currentStream: NetStream? {
-        willSet {
-            currentStream?.setNetStreamDrawable(nil)
-        }
         didSet {
             currentStream.map {
                 $0.context = CIContext(mtlDevice: device!)
-                $0.setNetStreamDrawable(self)
+                $0.drawable = self
             }
         }
     }

diff --git a/Sources/IO/PiPHKView.swift b/Sources/IO/PiPHKView.swift
@@ -65,11 +65,8 @@ public class PiPHKView: UIView {
     #endif
 
     private weak var currentStream: NetStream? {
-        willSet {
-            currentStream?.setNetStreamDrawable(nil)
-        }
         didSet {
-            currentStream?.setNetStreamDrawable(self)
+            currentStream?.drawable = self
         }
     }
 
@@ -195,11 +192,8 @@ public class PiPHKView: NSView {
     }
 
     private weak var currentStream: NetStream? {
-        willSet {
-            currentStream?.setNetStreamDrawable(nil)
-        }
         didSet {
-            currentStream?.setNetStreamDrawable(self)
+            currentStream?.drawable = self
         }
     }
 

diff --git a/Sources/Net/NetStream.swift b/Sources/Net/NetStream.swift
@@ -255,9 +255,29 @@ open class NetStream: NSObject {
     /// The number of frames per second being displayed.
     @objc public internal(set) dynamic var currentFPS: UInt16 = 0
 
-    /// Specifies the delegate..
+    /// Specifies the delegate.
     public weak var delegate: (any NetStreamDelegate)?
 
+    /// Specifies the drawable.
+    public var drawable: (any NetStreamDrawable)? {
+        get {
+            mixer.videoIO.drawable
+        }
+        set {
+            mixer.videoIO.drawable = newValue
+            guard #available(tvOS 17.0, *) else {
+                return
+            }
+            lockQueue.async {
+                #if os(iOS) || os(tvOS) || os(macOS)
+                if self.mixer.videoIO.hasDevice {
+                    self.mixer.session.startRunning()
+                }
+                #endif
+            }
+        }
+    }
+
     /// The current state of the stream.
     public var readyState: ReadyState = .initialized {
         willSet {
@@ -438,20 +458,6 @@ open class NetStream: NSObject {
         }
     }
 
-    func setNetStreamDrawable(_ drawable: (any NetStreamDrawable)?) {
-        lockQueue.async {
-            self.mixer.videoIO.drawable = drawable
-            guard #available(tvOS 17.0, *) else {
-                return
-            }
-            #if os(iOS) || os(tvOS) || os(macOS)
-            if self.mixer.videoIO.hasDevice {
-                self.mixer.session.startRunning()
-            }
-            #endif
-        }
-    }
-
     #if os(iOS) || os(tvOS)
     @objc
     private func didEnterBackground(_ notification: Notification) {