Fixing mac catalyst build issues by using availability checks (#20)

* Added mac catalyst availability checks. * Fixed declaration errors.
MetalPetal · Jun 3, 2021 · d3bb659 · d3bb659
1 parent b3fcb5b
commit d3bb659
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 0 deletions.
diff --git a/Sources/VideoIO/Camera+AudioQueueCapture.swift b/Sources/VideoIO/Camera+AudioQueueCapture.swift
@@ -10,6 +10,7 @@ import Foundation
 @available(iOS 10.0, macOS 10.15, *)
 @available(tvOS, unavailable)
 @available(macOS, unavailable)
+@available(macCatalyst 14.0, *)
 extension Camera {
     public func enableAudioQueueCaptureDataOutput(on queue: DispatchQueue = .main, delegate: AudioQueueCaptureSessionDelegate) throws {
         assert(self.audioDataOutput == nil)

diff --git a/Sources/VideoIO/Camera+FocusExposure.swift b/Sources/VideoIO/Camera+FocusExposure.swift
@@ -10,6 +10,7 @@ import AVFoundation
 
 @available(iOS 10.0, macOS 10.15, *)
 @available(tvOS, unavailable)
+@available(macCatalyst 14.0, *)
 extension Camera {
     @available(macOS, unavailable)
     public func setFocusExposurePointOfInterest(to devicePoint: CGPoint, focusMode: AVCaptureDevice.FocusMode = .continuousAutoFocus, exposureMode: AVCaptureDevice.ExposureMode = .continuousAutoExposure, shouldMonitorSubjectAreaChange: Bool = false) throws {

diff --git a/Sources/VideoIO/Camera+PhotoCapture.swift b/Sources/VideoIO/Camera+PhotoCapture.swift
@@ -10,9 +10,11 @@ import AVFoundation
 
 @available(macOS 10.15, *)
 @available(tvOS, unavailable)
+@available(macCatalyst 14.0, *)
 extension Camera {
 
     @available(iOS 11.0, *)
+    @available(macCatalyst 14.0, *)
     private class PhotoCaptureDelegateHandler: NSObject, AVCapturePhotoCaptureDelegate {
         var willBeginCaptureHandler: ((AVCaptureResolvedPhotoSettings) -> Void)?
         var didFinishProcessingHandler: ((Result<AVCapturePhoto, Swift.Error>) -> Void)?
@@ -29,6 +31,7 @@ extension Camera {
     }
 
     @available(iOS 11.0, *)
+    @available(macCatalyst 14.0, *)
     public func capturePhoto(with settings: AVCapturePhotoSettings,
                              willBeginCaptureHandler: ((AVCaptureResolvedPhotoSettings) -> Void)? = nil,
                              didFinishProcessingHandler: @escaping (Result<AVCapturePhoto, Swift.Error>) -> Void) {

diff --git a/Sources/VideoIO/Camera.swift b/Sources/VideoIO/Camera.swift
@@ -10,6 +10,7 @@ import AVFoundation
 
 @available(iOS 10.0, macOS 10.15, *)
 @available(tvOS, unavailable)
+@available(macCatalyst 14.0, *)
 public class Camera {
     public enum Error: Swift.Error {
         case noDeviceFound
@@ -289,6 +290,7 @@ public class Camera {
 
     private var _outputSynchronizer: Any?
     @available(iOS 11.0, *)
+    @available(macCatalyst 14.0, *)
     private var outputSynchronizer: AVCaptureDataOutputSynchronizer? {
         get {
             return _outputSynchronizer as? AVCaptureDataOutputSynchronizer
@@ -299,12 +301,14 @@ public class Camera {
     }
 
     @available(iOS 11.0, *)
+    @available(macCatalyst 14.0, *)
     public var depthCaptureConnection: AVCaptureConnection? {
         return self.depthDataOutput?.connection(with: .depthData)
     }
 
     private var _depthDataOutput: Any?
     @available(iOS 11.0, *)
+    @available(macCatalyst 14.0, *)
     public private(set) var depthDataOutput: AVCaptureDepthDataOutput? {
         get {
             return _depthDataOutput as? AVCaptureDepthDataOutput
@@ -315,6 +319,7 @@ public class Camera {
     }
 
     @available(iOS 11.0, *)
+    @available(macCatalyst 14.0, *)
     public func enableSynchronizedVideoAndDepthDataOutput(on queue: DispatchQueue, delegate: AVCaptureDataOutputSynchronizerDelegate) throws {
         assert(self.videoDataOutput == nil)
         assert(self.outputSynchronizer == nil)
@@ -356,6 +361,7 @@ public class Camera {
     }
 
     @available(iOS 11.0, *)
+    @available(macCatalyst 14.0, *)
     public func disableSynchronizedVideoAndDepthDataOutput() {
         self.captureSession.beginConfiguration()
 

diff --git a/Sources/VideoIO/DeviceOrientationTracker.swift b/Sources/VideoIO/DeviceOrientationTracker.swift
@@ -12,11 +12,13 @@ import CoreMotion
 import UIKit
 import AVFoundation
 
+@available(macCatalyst 14.0, *)
 public protocol DeviceOrientationTrackerDelegate: AnyObject {
     func deviceOrientationUpdated(tracker: DeviceOrientationTracker, orientation: UIDeviceOrientation)
 }
 
 @available(macOS, unavailable)
+@available(macCatalyst 14.0, *)
 public class DeviceOrientationTracker {
 
     private let motionManager = CMMotionManager()

diff --git a/Sources/VideoIO/VideoOrientationUtilities.swift b/Sources/VideoIO/VideoOrientationUtilities.swift
@@ -12,6 +12,7 @@ import CoreGraphics
 public struct VideoOrientationUtilities {
 
     @available(tvOS, unavailable)
+    @available(macCatalyst 14.0, *)
     public static func exifOrientationToApply(from captureOrientation: AVCaptureVideoOrientation, to targetOrientation: AVCaptureVideoOrientation, shouldMirror: Bool) -> CGImagePropertyOrientation {
         switch captureOrientation {
         case .landscapeLeft: