From 790c5b66f61ac6fb8715685dbc8f9cf18c31d845 Mon Sep 17 00:00:00 2001 From: PatTheMav Date: Sun, 24 Jul 2022 19:43:20 +0200 Subject: [PATCH] mac-capture: Fix availability on macOS 12.5 Whereas the `availability` checks will correctly detect macOS 12.5, the `__MAC_OS_X_VERSION_MAX_ALLOWED` macro is dependent on the platform SDK. The most current platform SDK is 12.3, hence why this version needs to be checked for. --- plugins/mac-capture/mac-screen-capture.m | 8 ++++++-- plugins/mac-capture/plugin-main.c | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/plugins/mac-capture/mac-screen-capture.m b/plugins/mac-capture/mac-screen-capture.m index f36bcc9df..cae0982c0 100644 --- a/plugins/mac-capture/mac-screen-capture.m +++ b/plugins/mac-capture/mac-screen-capture.m @@ -3,10 +3,14 @@ bool is_screen_capture_available(void) { - return (NSClassFromString(@"SCStream") != NULL); + if (@available(macOS 12.5, *)) { + return true; + } else { + return false; + } } -#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 120500 // __MAC_12_5 +#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 120300 // __MAC_12_3 #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wunguarded-availability-new" diff --git a/plugins/mac-capture/plugin-main.c b/plugins/mac-capture/plugin-main.c index 537ca5c83..d43d8e5f8 100644 --- a/plugins/mac-capture/plugin-main.c +++ b/plugins/mac-capture/plugin-main.c @@ -18,7 +18,7 @@ bool obs_module_load(void) { obs_register_source(&coreaudio_input_capture_info); obs_register_source(&coreaudio_output_capture_info); -#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 120500 // __MAC_12_5 +#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 120300 // __MAC_12_3 if (is_screen_capture_available()) { extern struct obs_source_info screen_capture_info; obs_register_source(&screen_capture_info);