RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

macosx_application: use @autoreleasepool 

I don't even want to know how this worked. It scares me a lot.
This commit is contained in:
Stefano Pigozzi 2013-05-29 21:43:21 +02:00
parent 0057aa4769
commit 1d11db6596
2 changed files with 23 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osdep/macosx_application.h
View File

@ -41,8 +41,6 @@ void cocoa_register_menu_item_action(MPMenuKey key, void* action);
// initializes Cocoa application
void init_cocoa_application(void);
void terminate_cocoa_application(void);
void cocoa_autorelease_pool_alloc(void);
void cocoa_autorelease_pool_drain(void);
// Runs the Cocoa Main Event Loop
void cocoa_run_runloop(void);

54
osdep/macosx_application.m
View File

@ -28,7 +28,6 @@
#include "video/out/osx_common.h"
static Application *app;
static NSAutoreleasePool *pool;
static pthread_t playback_thread_id;
@interface Application (PrivateMethods)
@ -258,31 +257,35 @@ struct playback_thread_ctx {
static void *playback_thread(void *ctx_obj)
{
struct playback_thread_ctx *ctx = (struct playback_thread_ctx*) ctx_obj;
ctx->mpv_main(*ctx->argc, *ctx->argv);
cocoa_stop_runloop();
pthread_exit(NULL);
@autoreleasepool {
struct playback_thread_ctx *ctx = (struct playback_thread_ctx*) ctx_obj;
ctx->mpv_main(*ctx->argc, *ctx->argv);
cocoa_stop_runloop();
pthread_exit(NULL);
}
}
int cocoa_main(mpv_main_fn mpv_main, int argc, char *argv[])
{
struct playback_thread_ctx ctx = {0};
ctx.mpv_main = mpv_main;
ctx.argc = &argc;
ctx.argv = &argv;
@autoreleasepool {
struct playback_thread_ctx ctx = {0};
ctx.mpv_main = mpv_main;
ctx.argc = &argc;
ctx.argv = &argv;
init_cocoa_application();
macosx_finder_args_preinit(&argc, &argv);
pthread_create(&playback_thread_id, NULL, playback_thread, &ctx);
cocoa_run_runloop();
init_cocoa_application();
macosx_finder_args_preinit(&argc, &argv);
pthread_create(&playback_thread_id, NULL, playback_thread, &ctx);
cocoa_run_runloop();
// This should never be reached: cocoa_run_runloop blocks until the process
// is quit
mp_msg(MSGT_CPLAYER, MSGL_ERR, "There was either a problem initializing "
"Cocoa or the Runloop was stopped unexpectedly. Please report this "
"issues to a developer.\n");
pthread_join(playback_thread_id, NULL);
return 1;
// This should never be reached: cocoa_run_runloop blocks until the
// process is quit
mp_msg(MSGT_CPLAYER, MSGL_ERR, "There was either a problem "
"initializing Cocoa or the Runloop was stopped unexpectedly. "
"Please report this issues to a developer.\n");
pthread_join(playback_thread_id, NULL);
return 1;
}
}
void cocoa_register_menu_item_action(MPMenuKey key, void* action)
@ -312,17 +315,6 @@ void terminate_cocoa_application(void)
[NSApp terminate:app];
}
void cocoa_autorelease_pool_alloc(void)
{
pool = [[NSAutoreleasePool alloc] init];
}
void cocoa_autorelease_pool_drain(void)
{
[pool drain];
}
void cocoa_run_runloop()
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];