diff options
author | wm4 <wm4@nowhere> | 2013-05-15 18:17:18 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-05-26 16:44:18 +0200 |
commit | bf10a4fdfa40cbe519e6ccb7fb895332da2021d1 (patch) | |
tree | 8ff3a3b2601c85291c5531e4d0dc88266a6b7ef6 /video/out/gl_cocoa.c | |
parent | c23bf5311fce3b59e9111e5de646ee57b48be27f (diff) | |
download | mpv-bf10a4fdfa40cbe519e6ccb7fb895332da2021d1.tar.bz2 mpv-bf10a4fdfa40cbe519e6ccb7fb895332da2021d1.tar.xz |
video/out: introduce vo_control for gl_common based VOs
Instead of having separate callbacks for each backend-handled feature
(like MPGLContext.fullscreen, MPGLContext.border, etc.), pass the
VOCTRL responsible for this directly to the backend. This allows
removing a bunch of callbacks, that currently must be set even for
optional/lesser features (like VOCTRL_BORDER).
This requires changes to all VOs using gl_common, as well as all
backends that support gl_common.
Also introduce VOCTRL_CHECK_EVENTS. vo.check_events is now optional.
VO backends can use VOCTRL_CHECK_EVENTS instead to implementing
check_events. This has the advantage that the event handling code in
VOs doesn't have to be duplicated if vo_control() is used.
Diffstat (limited to 'video/out/gl_cocoa.c')
-rw-r--r-- | video/out/gl_cocoa.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/video/out/gl_cocoa.c b/video/out/gl_cocoa.c index dd8b5a865a..7f3b38a422 100644 --- a/video/out/gl_cocoa.c +++ b/video/out/gl_cocoa.c @@ -62,14 +62,9 @@ void mpgl_set_backend_cocoa(MPGLContext *ctx) ctx->releaseGlContext = releaseGlContext_cocoa; ctx->swapGlBuffers = swapGlBuffers_cocoa; ctx->check_events = vo_cocoa_check_events; - ctx->update_xinerama_info = vo_cocoa_update_xinerama_info; - ctx->fullscreen = vo_cocoa_fullscreen; - ctx->ontop = vo_cocoa_ontop; ctx->vo_init = vo_cocoa_init; - ctx->pause = vo_cocoa_pause; - ctx->resume = vo_cocoa_resume; ctx->register_resize_callback = vo_cocoa_register_resize_callback; ctx->vo_uninit = vo_cocoa_uninit; - ctx->set_current = set_current_cocoa; + ctx->vo_control = vo_cocoa_control; ctx->set_current = set_current_cocoa; } |