more av versioning

yury · Nov 19, 2024 · e5b1a07 · e5b1a07
1 parent 3df9dca
commit e5b1a07
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 12 deletions.
diff --git a/cidre/pomace/av/av.h b/cidre/pomace/av/av.h
@@ -92,7 +92,7 @@ static void av_initializer(void)
 
 #if TARGET_OS_VISION
 #else
-        AV_CAPTURE_METADATA_OUTPUT = [AVCaptureMetadataOutput class];
+        AV_CAPTURE_METADATA_OUTPUT = NSClassFromString(@"AVCaptureMetadataOutput");
         AV_CAPTURE_DEVICE_DISCOVERY_SESSION = [AVCaptureDeviceDiscoverySession class];
         AV_CAPTURE_AUDIO_DATA_OUTPUT = [AVCaptureAudioDataOutput class];
         AV_CAPTURE_VIDEO_PREVIEW_LAYER = [AVCaptureVideoPreviewLayer class];
@@ -104,11 +104,11 @@ static void av_initializer(void)
 #else
 #if TARGET_OS_VISION
 #else
-                AV_CAPTURE_DEVICE_ROTATION_COORDINATOR = [AVCaptureDeviceRotationCoordinator class];
+    AV_CAPTURE_DEVICE_ROTATION_COORDINATOR = NSClassFromString(@"AVCaptureDeviceRotationCoordinator");
 #endif
 
-    AV_SAMPLE_BUFFER_VIDEO_RENDERER = [AVSampleBufferVideoRenderer class];
-    AV_AUDIO_APPLICATION = [AVAudioApplication class];
+    AV_SAMPLE_BUFFER_VIDEO_RENDERER = NSClassFromString(@"AVSampleBufferVideoRenderer");
+    AV_AUDIO_APPLICATION = NSClassFromString(@"AVAudioApplication");
 #endif
         } else {
 #if TARGET_OS_WATCH

diff --git a/cidre/src/av/audio/application.rs b/cidre/src/av/audio/application.rs
@@ -1,4 +1,4 @@
-use crate::{arc, av, blocks, define_cls, define_obj_type, ns, objc};
+use crate::{api, arc, av, blocks, define_obj_type, ns, objc};
 
 #[doc(alias = "AVAudioApplicationRecordPermission")]
 #[derive(Debug, Eq, PartialEq, Copy, Clone)]
@@ -41,6 +41,14 @@ pub enum MicInjectionPermission {
 impl ns::NotificationName {
     #[doc(alias = "AVAudioApplicationInputMuteStateChangeNotification")]
     #[inline]
+    #[api::available(
+        macos = 14.0,
+        ios = 17.0,
+        maccatalyst = 17.0,
+        tvos = 17.0,
+        visionos = 1.0,
+        watchos = 10.0
+    )]
     pub fn audio_app_input_mute_state_change() -> &'static Self {
         unsafe { AVAudioApplicationInputMuteStateChangeNotification }
     }
@@ -52,18 +60,42 @@ define_obj_type!(
 );
 
 impl App {
-    define_cls!(AV_AUDIO_APPLICATION);
+    #[api::available(
+        macos = 14.0,
+        ios = 17.0,
+        maccatalyst = 17.0,
+        tvos = 17.0,
+        visionos = 1.0,
+        watchos = 10.0
+    )]
+    crate::define_cls!(AV_AUDIO_APPLICATION);
 
     #[doc(alias = "AVAudioApplicationInputMuteStateChangeNotification")]
     #[doc(alias = "AVAudioApplication.inputMuteStateChangeNotification")]
     #[inline]
+    #[api::available(
+        macos = 14.0,
+        ios = 17.0,
+        maccatalyst = 17.0,
+        tvos = 17.0,
+        visionos = 1.0,
+        watchos = 10.0
+    )]
     pub fn input_change_notification() -> &'static ns::NotificationName {
-        ns::NotificationName::audio_app_input_mute_state_change()
+        unsafe { AVAudioApplicationInputMuteStateChangeNotification }
     }
 
     #[doc(alias = "AVAudioApplicationMuteStateKey")]
     #[doc(alias = "AVAudioApplication.muteStateKey")]
     #[inline]
+    #[api::available(
+        macos = 14.0,
+        ios = 17.0,
+        maccatalyst = 17.0,
+        tvos = 17.0,
+        visionos = 1.0,
+        watchos = 10.0
+    )]
     pub fn mute_state_key() -> &'static ns::String {
         unsafe { AVAudioApplicationMuteStateKey }
     }
@@ -141,8 +173,26 @@ impl App {
 }
 
 #[link(name = "AVFAudio", kind = "framework")]
+#[api::weak]
 extern "C" {
+    #[api::available(
+        macos = 14.0,
+        ios = 17.0,
+        maccatalyst = 17.0,
+        tvos = 17.0,
+        visionos = 1.0,
+        watchos = 10.0
+    )]
     static AVAudioApplicationInputMuteStateChangeNotification: &'static ns::NotificationName;
+
+    #[api::available(
+        macos = 14.0,
+        ios = 17.0,
+        maccatalyst = 17.0,
+        tvos = 17.0,
+        visionos = 1.0,
+        watchos = 10.0
+    )]
     static AVAudioApplicationMuteStateKey: &'static ns::String;
 }
 

diff --git a/cidre/src/av/capture/device.rs b/cidre/src/av/capture/device.rs
@@ -2142,8 +2142,10 @@ impl arc::A<RotationCoordinator> {
 }
 
 impl RotationCoordinator {
-    define_cls!(AV_CAPTURE_DEVICE_ROTATION_COORDINATOR);
+    #[api::available(macos = 14.0, ios = 17.0, maccatalyst = 17.0, tvos = 17.0)]
+    crate::define_cls!(AV_CAPTURE_DEVICE_ROTATION_COORDINATOR);
 
+    #[api::available(macos = 14.0, ios = 17.0, maccatalyst = 17.0, tvos = 17.0)]
     pub fn with_device_preview_layer(
         device: &Device,
         preview_layer: Option<&ca::Layer>,

diff --git a/cidre/src/av/capture/metadata_output.rs b/cidre/src/av/capture/metadata_output.rs
@@ -1,4 +1,4 @@
-use crate::{arc, av, cg, define_obj_type, dispatch, ns, objc};
+use crate::{api, arc, av, cg, define_obj_type, dispatch, ns, objc};
 
 use super::Output;
 
@@ -24,7 +24,8 @@ define_obj_type!(
     /// adding it as an output to an [`av::CaptureSession`] object.
     #[doc(alias = "AVCaptureMetadataOutput")]
     pub MetadataOutput(Output),
-    AV_CAPTURE_METADATA_OUTPUT
+    AV_CAPTURE_METADATA_OUTPUT,
+    #[api::available(macos = 13.0, ios = 6.0, maccatalyst = 14.0, tvos = 17.0)]
 );
 
 impl MetadataOutput {

diff --git a/cidre/src/av/sample_buffer/video_renderer.rs b/cidre/src/av/sample_buffer/video_renderer.rs
@@ -1,6 +1,11 @@
-use crate::{arc, av, define_obj_type, ns, objc};
+use crate::{api, arc, av, define_obj_type, ns, objc};
 
-define_obj_type!(pub VideoRenderer(ns::Id), AV_SAMPLE_BUFFER_VIDEO_RENDERER);
+define_obj_type!(
+    #[doc(alias = "AVSampleBufferVideoRenderer")]
+    pub VideoRenderer(ns::Id),
+    AV_SAMPLE_BUFFER_VIDEO_RENDERER,
+    #[api::available(macos = 14.0, ios = 17.0, maccatalyst = 17.0, tvos = 17.0, visionos = 1.0)]
+);
 
 impl av::QueuedSampleBufRendering for VideoRenderer {}