From cd3124be2e2d3085d2d53def94e5f31dcf648b80 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Wed, 6 Oct 2021 09:09:53 +0200 Subject: [PATCH] Set only mainloop req only on macOS SDL, GL and NDI required mainloop only on macOS. --- src/video_display/gl.cpp | 4 ++++ src/video_display/ndi.c | 4 ++++ src/video_display/sdl.cpp | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/src/video_display/gl.cpp b/src/video_display/gl.cpp index 48db15d48..3a659367c 100644 --- a/src/video_display/gl.cpp +++ b/src/video_display/gl.cpp @@ -1964,7 +1964,11 @@ static const struct video_display_info display_gl_info = { display_gl_get_property, display_gl_put_audio_frame, display_gl_reconfigure_audio, +#ifdef __APPLE__ DISPLAY_NEEDS_MAINLOOP, +#else + DISPLAY_DOESNT_NEED_MAINLOOP, +#endif }; REGISTER_MODULE(gl, &display_gl_info, LIBRARY_CLASS_VIDEO_DISPLAY, VIDEO_DISPLAY_ABI_VERSION); diff --git a/src/video_display/ndi.c b/src/video_display/ndi.c index 931b28769..bc76e7901 100644 --- a/src/video_display/ndi.c +++ b/src/video_display/ndi.c @@ -391,7 +391,11 @@ static const struct video_display_info display_ndi_info = { display_ndi_get_property, display_ndi_put_audio_frame, display_ndi_reconfigure_audio, +#ifdef __APPLE__ DISPLAY_NEEDS_MAINLOOP, +#else + DISPLAY_DOESNT_NEED_MAINLOOP, +#endif }; REGISTER_MODULE(ndi, &display_ndi_info, LIBRARY_CLASS_VIDEO_DISPLAY, VIDEO_DISPLAY_ABI_VERSION); diff --git a/src/video_display/sdl.cpp b/src/video_display/sdl.cpp index 008ada2d6..156393326 100644 --- a/src/video_display/sdl.cpp +++ b/src/video_display/sdl.cpp @@ -806,7 +806,11 @@ static const struct video_display_info display_sdl_info = { display_sdl_get_property, display_sdl_put_audio_frame, display_sdl_reconfigure_audio, +#ifdef __APPLE__ DISPLAY_NEEDS_MAINLOOP, +#else + DISPLAY_DOESNT_NEED_MAINLOOP, +#endif }; REGISTER_MODULE(sdl, &display_sdl_info, LIBRARY_CLASS_VIDEO_DISPLAY, VIDEO_DISPLAY_ABI_VERSION);