summaryrefslogtreecommitdiffstats
path: root/video/out
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2014-04-28 21:50:38 +0200
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2014-04-28 21:51:04 +0200
commit9d0c1d691320d0b7a739af4302c2b951668013a4 (patch)
treeaee09e3b9f54be9ac0cbd1313e5ac251f4ac1cb4 /video/out
parentfbc8ba585535f5452d67d9e4b66b53ba171e8e5a (diff)
downloadmpv-9d0c1d691320d0b7a739af4302c2b951668013a4.tar.bz2
mpv-9d0c1d691320d0b7a739af4302c2b951668013a4.tar.xz
cocoa: refactor sync scheduling to a function
This extracts the scheduling logic to a single function which is nicer to keep it consistent. Additionally make sure we don't schedule sync operations from a sync operation itself since that could cause deadlocks (even if it should not be happening with the current code).
Diffstat (limited to 'video/out')
-rw-r--r--video/out/cocoa_common.m32
1 files changed, 18 insertions, 14 deletions
diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m
index d947eee525..bbee03b498 100644
--- a/video/out/cocoa_common.m
+++ b/video/out/cocoa_common.m
@@ -84,6 +84,20 @@ struct vo_cocoa_state {
id fs_icc_changed_ns_observer;
};
+static void dispatch_on_main_thread(struct vo *vo, void(^block)(void))
+{
+ struct vo_cocoa_state *s = vo->cocoa;
+ if (!s->inside_sync_section) {
+ dispatch_sync(dispatch_get_main_queue(), ^{
+ s->inside_sync_section = true;
+ block();
+ s->inside_sync_section = false;
+ });
+ } else {
+ block();
+ }
+}
+
void *vo_cocoa_glgetaddr(const char *s)
{
void *ret = NULL;
@@ -422,8 +436,7 @@ int vo_cocoa_config_window(struct vo *vo, uint32_t width, uint32_t height,
struct vo_cocoa_state *s = vo->cocoa;
__block int ctxok = 0;
- dispatch_sync(dispatch_get_main_queue(), ^{
- s->inside_sync_section = true;
+ dispatch_on_main_thread(vo, ^{
s->enable_resize_redraw = false;
bool reset_size = s->old_dwidth != width || s->old_dheight != height;
@@ -461,7 +474,6 @@ int vo_cocoa_config_window(struct vo *vo, uint32_t width, uint32_t height,
cocoa_add_fs_screen_profile_observer(vo);
}
- s->inside_sync_section = false;
s->enable_resize_redraw = true;
});
@@ -524,14 +536,10 @@ int vo_cocoa_check_events(struct vo *vo)
static void vo_cocoa_fullscreen_sync(struct vo *vo)
{
- dispatch_sync(dispatch_get_main_queue(), ^{
- vo->cocoa->inside_sync_section = true;
+ dispatch_on_main_thread(vo, ^{
vo->cocoa->enable_resize_redraw = false;
-
vo_cocoa_fullscreen(vo);
-
vo->cocoa->enable_resize_redraw = true;
- vo->cocoa->inside_sync_section = false;
});
}
@@ -682,21 +690,17 @@ int vo_cocoa_control(struct vo *vo, int *events, int request, void *arg)
return VO_TRUE;
case VOCTRL_GET_WINDOW_SIZE: {
int *s = arg;
- dispatch_sync(dispatch_get_main_queue(), ^{
- vo->cocoa->inside_sync_section = true;
+ dispatch_on_main_thread(vo, ^{
NSSize size = [vo->cocoa->view frame].size;
s[0] = size.width;
s[1] = size.height;
- vo->cocoa->inside_sync_section = false;
});
return VO_TRUE;
}
case VOCTRL_SET_WINDOW_SIZE: {
- dispatch_sync(dispatch_get_main_queue(), ^{
- vo->cocoa->inside_sync_section = true;
+ dispatch_on_main_thread(vo, ^{
int *s = arg;
[vo->cocoa->window queueNewVideoSize:NSMakeSize(s[0], s[1])];
- vo->cocoa->inside_sync_section = false;
});
return VO_TRUE;
}