summaryrefslogtreecommitdiffstats
path: root/video/out/vo_opengl.c
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2014-10-04 11:47:17 +0200
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2014-10-04 11:47:17 +0200
commitd1bdf9ea1195c5f81906631ab789cb741a96968c (patch)
tree50f5eb9218907dd07df3a6f7f15a8bbca9f8a99f /video/out/vo_opengl.c
parentd10b8c7e84c8073ccf64d1371168f54b1c0db1f1 (diff)
downloadmpv-d1bdf9ea1195c5f81906631ab789cb741a96968c.tar.bz2
mpv-d1bdf9ea1195c5f81906631ab789cb741a96968c.tar.xz
cocoa: move to a simpler threading model
Unfortunately using dispatch_sync for synchronization turned out to be really bad for us. It caused a wide array of race conditions, deadlocks, etc. Moving to a very simple mutex. It's not clear to me how to do liveresizing with this, for now it just flickers with is unacceptable (maybe I'll draw black instead). This should fix all the threading cocoa bugs. Reopen if it's not the case! Fixes #751 Fixes #1129
Diffstat (limited to 'video/out/vo_opengl.c')
-rw-r--r--video/out/vo_opengl.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c
index 3b6e3a2e43..1acd6ef466 100644
--- a/video/out/vo_opengl.c
+++ b/video/out/vo_opengl.c
@@ -203,13 +203,6 @@ static bool config_window(struct gl_priv *p, int flags)
return mpgl_config_window(p->glctx, mpgl_caps, flags);
}
-static void video_resize_redraw_callback(struct vo *vo, int w, int h)
-{
- struct gl_priv *p = vo->priv;
- gl_video_resize_redraw(p->renderer, w, h);
-
-}
-
static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
{
struct gl_priv *p = vo->priv;
@@ -221,10 +214,6 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
return -1;
}
- if (p->glctx->register_resize_callback) {
- p->glctx->register_resize_callback(vo, video_resize_redraw_callback);
- }
-
gl_video_config(p->renderer, params);
p->vo_flipped = !!(flags & VOFLAG_FLIPPING);