diff --git a/plugins/mac-capture/mac-sck-audio-capture.m b/plugins/mac-capture/mac-sck-audio-capture.m index 595e46b7261b22..0b7a2662b10586 100644 --- a/plugins/mac-capture/mac-sck-audio-capture.m +++ b/plugins/mac-capture/mac-sck-audio-capture.m @@ -13,9 +13,7 @@ MACCAP_ERR("destroy_audio_screen_stream: Failed to stop stream with error %s\n", [[error localizedFailureReason] cStringUsingEncoding:NSUTF8StringEncoding]); } - os_event_signal(sc->disp_finished); }]; - os_event_wait(sc->disp_finished); } if (sc->stream_properties) { @@ -28,7 +26,6 @@ sc->disp = NULL; } - os_event_destroy(sc->disp_finished); os_event_destroy(sc->stream_start_completed); } @@ -152,7 +149,6 @@ sc->disp = NULL; return !did_add_output; } - os_event_init(&sc->disp_finished, OS_EVENT_TYPE_MANUAL); os_event_init(&sc->stream_start_completed, OS_EVENT_TYPE_MANUAL); __block BOOL did_stream_start = false; diff --git a/plugins/mac-capture/mac-sck-common.h b/plugins/mac-capture/mac-sck-common.h index 6bbd0a6e822694..9c9ee0890f60e7 100644 --- a/plugins/mac-capture/mac-sck-common.h +++ b/plugins/mac-capture/mac-sck-common.h @@ -52,7 +52,6 @@ struct API_AVAILABLE(macos(12.5)) screen_capture { SCShareableContent *shareable_content; ScreenCaptureDelegate *capture_delegate; - os_event_t *disp_finished; os_event_t *stream_start_completed; os_sem_t *shareable_content_available; IOSurfaceRef current, prev; diff --git a/plugins/mac-capture/mac-sck-video-capture.m b/plugins/mac-capture/mac-sck-video-capture.m index 2b34851e959f8d..ebafb252fd38f4 100644 --- a/plugins/mac-capture/mac-sck-video-capture.m +++ b/plugins/mac-capture/mac-sck-video-capture.m @@ -9,9 +9,7 @@ MACCAP_ERR("destroy_screen_stream: Failed to stop stream with error %s\n", [[error localizedFailureReason] cStringUsingEncoding:NSUTF8StringEncoding]); } - os_event_signal(sc->disp_finished); }]; - os_event_wait(sc->disp_finished); } if (sc->stream_properties) { @@ -41,7 +39,6 @@ sc->disp = NULL; } - os_event_destroy(sc->disp_finished); os_event_destroy(sc->stream_start_completed); } @@ -110,7 +107,6 @@ MACCAP_ERR("init_screen_stream: Invalid target display ID: %u\n", sc->display); os_sem_post(sc->shareable_content_available); sc->disp = NULL; - os_event_init(&sc->disp_finished, OS_EVENT_TYPE_MANUAL); os_event_init(&sc->stream_start_completed, OS_EVENT_TYPE_MANUAL); return true; } @@ -152,7 +148,6 @@ MACCAP_ERR("init_screen_stream: Invalid target window ID: %u\n", sc->window); os_sem_post(sc->shareable_content_available); sc->disp = NULL; - os_event_init(&sc->disp_finished, OS_EVENT_TYPE_MANUAL); os_event_init(&sc->stream_start_completed, OS_EVENT_TYPE_MANUAL); return true; } else { @@ -172,7 +167,6 @@ MACCAP_ERR("init_screen_stream: Invalid target display ID: %u\n", sc->display); os_sem_post(sc->shareable_content_available); sc->disp = NULL; - os_event_init(&sc->disp_finished, OS_EVENT_TYPE_MANUAL); os_event_init(&sc->stream_start_completed, OS_EVENT_TYPE_MANUAL); return true; } @@ -217,7 +211,6 @@ if (sc->capture_type != ScreenCaptureWindowStream) { sc->disp = NULL; [content_filter release]; - os_event_init(&sc->disp_finished, OS_EVENT_TYPE_MANUAL); os_event_init(&sc->stream_start_completed, OS_EVENT_TYPE_MANUAL); return true; } @@ -250,7 +243,6 @@ return !did_add_output; } } - os_event_init(&sc->disp_finished, OS_EVENT_TYPE_MANUAL); os_event_init(&sc->stream_start_completed, OS_EVENT_TYPE_MANUAL); __block BOOL did_stream_start = NO;