This commit fixes two issues: - The event must be posted *after* calling stop, otherwise a race condition can occur and the app never stops - isFinishedLaunching and applicationDidFinishLaunching are not always synchronized, causing sometimes a deadlock on the g_cond_wait never catching the g_cond_signal Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7593>
165 lines
4.5 KiB
Objective-C
165 lines
4.5 KiB
Objective-C
#include "gstmacos.h"
|
|
#include <Cocoa/Cocoa.h>
|
|
|
|
typedef struct _ThreadArgs ThreadArgs;
|
|
|
|
struct _ThreadArgs {
|
|
void* main_func;
|
|
int argc;
|
|
char **argv;
|
|
gpointer user_data;
|
|
gboolean is_simple;
|
|
GMutex nsapp_mutex;
|
|
GCond nsapp_cond;
|
|
gboolean nsapp_running;
|
|
};
|
|
|
|
@interface GstCocoaApplicationDelegate : NSObject <NSApplicationDelegate>
|
|
@property (assign) GMutex *nsapp_mutex;
|
|
@property (assign) GCond *nsapp_cond;
|
|
@property (assign) gboolean *nsapp_running;
|
|
@end
|
|
|
|
@implementation GstCocoaApplicationDelegate
|
|
|
|
- (void)applicationDidFinishLaunching:(NSNotification *)notification
|
|
{
|
|
g_mutex_lock (self.nsapp_mutex);
|
|
*self.nsapp_running = TRUE;
|
|
g_cond_signal (self.nsapp_cond);
|
|
g_mutex_unlock (self.nsapp_mutex);
|
|
}
|
|
|
|
@end
|
|
|
|
int
|
|
gst_thread_func (ThreadArgs *args)
|
|
{
|
|
/* Only proceed once NSApp is running, otherwise we could
|
|
* attempt to call [NSApp: stop] before it's even started. */
|
|
g_mutex_lock (&args->nsapp_mutex);
|
|
while (!args->nsapp_running) {
|
|
g_cond_wait (&args->nsapp_cond, &args->nsapp_mutex);
|
|
}
|
|
g_mutex_unlock (&args->nsapp_mutex);
|
|
|
|
int ret;
|
|
if (args->is_simple) {
|
|
ret = ((GstMainFuncSimple) args->main_func) (args->user_data);
|
|
} else {
|
|
ret = ((GstMainFunc) args->main_func) (args->argc, args->argv, args->user_data);
|
|
}
|
|
|
|
/* Post a message so we'll break out of the message loop */
|
|
NSEvent *event = [NSEvent otherEventWithType: NSEventTypeApplicationDefined
|
|
location: NSZeroPoint
|
|
modifierFlags: 0
|
|
timestamp: 0
|
|
windowNumber: 0
|
|
context: nil
|
|
subtype: NSEventSubtypeApplicationActivated
|
|
data1: 0
|
|
data2: 0];
|
|
|
|
[NSApp stop:nil];
|
|
[NSApp postEvent:event atStart:YES];
|
|
|
|
return ret;
|
|
}
|
|
|
|
int
|
|
run_main_with_nsapp (ThreadArgs args)
|
|
{
|
|
GThread *gst_thread;
|
|
GstCocoaApplicationDelegate* delegate;
|
|
int result;
|
|
|
|
g_mutex_init (&args.nsapp_mutex);
|
|
g_cond_init (&args.nsapp_cond);
|
|
args.nsapp_running = FALSE;
|
|
|
|
[NSApplication sharedApplication];
|
|
delegate = [[GstCocoaApplicationDelegate alloc] init];
|
|
delegate.nsapp_mutex = &args.nsapp_mutex;
|
|
delegate.nsapp_cond = &args.nsapp_cond;
|
|
delegate.nsapp_running = &args.nsapp_running;
|
|
[NSApp setDelegate:delegate];
|
|
|
|
/* This lets us show an icon in the dock and correctly focus opened windows */
|
|
if ([NSApp activationPolicy] == NSApplicationActivationPolicyProhibited) {
|
|
[NSApp setActivationPolicy:NSApplicationActivationPolicyAccessory];
|
|
}
|
|
|
|
gst_thread = g_thread_new ("macos-gst-thread", (GThreadFunc) gst_thread_func, &args);
|
|
[NSApp run];
|
|
result = GPOINTER_TO_INT (g_thread_join (gst_thread));
|
|
|
|
g_mutex_clear (&args.nsapp_mutex);
|
|
g_cond_clear (&args.nsapp_cond);
|
|
|
|
return result;
|
|
}
|
|
|
|
/**
|
|
* gst_macos_main:
|
|
* @main_func: (scope async): pointer to the main function to be called
|
|
* @argc: the amount of arguments passed in @argv
|
|
* @argv: (array length=argc): an array of arguments to be passed to the main function
|
|
* @user_data: (nullable): user data to be passed to the main function
|
|
*
|
|
* Starts an NSApplication on the main thread before calling
|
|
* the provided main() function on a secondary thread.
|
|
*
|
|
* This ensures that GStreamer can correctly perform actions
|
|
* such as creating a GL window, which require a Cocoa main loop
|
|
* to be running on the main thread.
|
|
*
|
|
* Do not call this function more than once - especially while
|
|
* another one is still running - as that will cause unpredictable
|
|
* behaviour and most likely completely fail.
|
|
*
|
|
* Returns: the return value of the provided main_func
|
|
*
|
|
* Since: 1.22
|
|
*/
|
|
int
|
|
gst_macos_main (GstMainFunc main_func, int argc, char **argv, gpointer user_data)
|
|
{
|
|
ThreadArgs args;
|
|
|
|
args.argc = argc;
|
|
args.argv = argv;
|
|
args.main_func = main_func;
|
|
args.user_data = user_data;
|
|
args.is_simple = FALSE;
|
|
|
|
return run_main_with_nsapp (args);
|
|
}
|
|
|
|
/**
|
|
* gst_macos_main_simple:
|
|
* @main_func: (scope async): pointer to the main function to be called
|
|
* @user_data: (nullable): user data to be passed to the main function
|
|
*
|
|
* Simplified variant of gst_macos_main(), meant to be used with bindings
|
|
* for languages which do not have to pass argc and argv like C does.
|
|
* See gst_macos_main() for a more detailed description.
|
|
*
|
|
* Returns: the return value of the provided main_func
|
|
*
|
|
* Since: 1.22
|
|
*/
|
|
int
|
|
gst_macos_main_simple (GstMainFuncSimple main_func, gpointer user_data)
|
|
{
|
|
ThreadArgs args;
|
|
|
|
args.argc = 0;
|
|
args.argv = NULL;
|
|
args.main_func = main_func;
|
|
args.user_data = user_data;
|
|
args.is_simple = TRUE;
|
|
|
|
return run_main_with_nsapp (args);
|
|
}
|