diff options
author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2014-10-04 11:47:17 +0200 |
---|---|---|
committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2014-10-04 11:47:17 +0200 |
commit | d1bdf9ea1195c5f81906631ab789cb741a96968c (patch) | |
tree | 50f5eb9218907dd07df3a6f7f15a8bbca9f8a99f /video/out/gl_video.c | |
parent | d10b8c7e84c8073ccf64d1371168f54b1c0db1f1 (diff) | |
download | mpv-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/gl_video.c')
-rw-r--r-- | video/out/gl_video.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/video/out/gl_video.c b/video/out/gl_video.c index 5923a697e9..5608b48938 100644 --- a/video/out/gl_video.c +++ b/video/out/gl_video.c @@ -2388,18 +2388,6 @@ static int validate_scaler_opt(struct mp_log *log, const m_option_t *opt, return handle_scaler_opt(s) ? 1 : M_OPT_INVALID; } -// Resize and redraw the contents of the window without further configuration. -// Intended to be used in situations where the frontend can't really be -// involved with reconfiguring the VO properly. -// gl_video_resize() should be called when user interaction is done. -void gl_video_resize_redraw(struct gl_video *p, int w, int h) -{ - p->gl->Viewport(p->vp_x, p->vp_y, w, h); - p->vp_w = w; - p->vp_h = h; - gl_video_render_frame(p); -} - void gl_video_set_hwdec(struct gl_video *p, struct gl_hwdec *hwdec) { p->hwdec = hwdec; |