diff options
author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-09-02 08:35:21 +0200 |
---|---|---|
committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-09-02 08:35:21 +0200 |
commit | 39a69aeb890c2e0afc1daa73cfd19a13c6dcc1af (patch) | |
tree | 4fa60207d7e8c134e21782b218678382b62b21ef | |
parent | 694654e38368c2f33be2c8e3be2f3b8ab3dcfa77 (diff) | |
download | mpv-39a69aeb890c2e0afc1daa73cfd19a13c6dcc1af.tar.bz2 mpv-39a69aeb890c2e0afc1daa73cfd19a13c6dcc1af.tar.xz |
cocoa_common: remove unlocking from fullscreen function
This was added in the past to prevent a deadlock, but is not needed
anymore.
-rw-r--r-- | video/out/cocoa_common.m | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m index edf683b049..200ceeafc7 100644 --- a/video/out/cocoa_common.m +++ b/video/out/cocoa_common.m @@ -523,22 +523,10 @@ int vo_cocoa_check_events(struct vo *vo) void vo_cocoa_fullscreen(struct vo *vo) { - if (![NSThread isMainThread] && resize_callback_registered(vo)) { - // This is the secondary thread, unlock since we are going to invoke a - // method synchronously on the GUI thread using Cocoa. - vo_cocoa_set_current_context(vo, false); - } - struct vo_cocoa_state *s = vo->cocoa; [s->window performSelectorOnMainThread:@selector(fullscreen) withObject:nil waitUntilDone:YES]; - - - if (![NSThread isMainThread] && resize_callback_registered(vo)) { - // Now lock again! - vo_cocoa_set_current_context(vo, true); - } } int vo_cocoa_control(struct vo *vo, int *events, int request, void *arg) |