diff options
| author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-05-13 23:25:35 +0200 |
|---|---|---|
| committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-05-13 23:41:03 +0200 |
| commit | d2960d2e964304b597665470898b4819cd02c673 (patch) | |
| tree | c004809e427fe8aaa5997ecb8c0c5d8f58243ff1 /video | |
| parent | 4878be02ada77abdce716c39a1d6e1711a21f969 (diff) | |
| download | mpv-d2960d2e964304b597665470898b4819cd02c673.tar.bz2 mpv-d2960d2e964304b597665470898b4819cd02c673.tar.xz | |
cocoa_common: don't use recursive locking
This was in the original change set for the threadsafety changes but I forgot
to squash it in.
Diffstat (limited to 'video')
| -rw-r--r-- | video/out/cocoa_common.m | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m index 988b03e38f..837542811d 100644 --- a/video/out/cocoa_common.m +++ b/video/out/cocoa_common.m @@ -177,7 +177,7 @@ struct vo_cocoa_state { CGFloat accumulated_scroll; - NSRecursiveLock *lock; + NSLock *lock; bool enable_resize_redraw; void (*resize_redraw)(struct vo *vo, int w, int h); @@ -202,7 +202,7 @@ static struct vo_cocoa_state *vo_cocoa_init_state(struct vo *vo) .vo_cursor_autohide_delay = vo->opts->cursor_autohide_delay, .power_mgmt_assertion = kIOPMNullAssertionID, .accumulated_scroll = 0, - .lock = [[NSRecursiveLock alloc] init], + .lock = [[NSLock alloc] init], .input_queue = vo_cocoa_input_queue_init(s), .enable_resize_redraw = NO, }; |