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_x11.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_x11.c')
-rw-r--r-- | video/out/gl_x11.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/video/out/gl_x11.c b/video/out/gl_x11.c index 7833a2bc41..d780df967e 100644 --- a/video/out/gl_x11.c +++ b/video/out/gl_x11.c @@ -307,11 +307,8 @@ void mpgl_set_backend_x11(MPGLContext *ctx) ctx->config_window = config_window_x11; ctx->releaseGlContext = releaseGlContext_x11; ctx->swapGlBuffers = swapGlBuffers_x11; - ctx->update_xinerama_info = vo_x11_update_screeninfo; - ctx->border = vo_x11_border; ctx->check_events = vo_x11_check_events; - ctx->fullscreen = vo_x11_fullscreen; - ctx->ontop = vo_x11_ontop; ctx->vo_init = vo_x11_init; ctx->vo_uninit = vo_x11_uninit; + ctx->vo_control = vo_x11_control; } |