summaryrefslogtreecommitdiffstats
path: root/video/out/gl_common.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-01-26 22:37:47 +0100
committerwm4 <wm4@nowhere>2013-01-27 13:30:53 +0100
commita243acb1deccd9526f3867d9a6500743dc190f95 (patch)
treeb33cac6a373bc42f6c685d6f9a0281acffcd5007 /video/out/gl_common.c
parent9747227e47326851c41fceb386d72f498fba7f87 (diff)
downloadmpv-a243acb1deccd9526f3867d9a6500743dc190f95.tar.bz2
mpv-a243acb1deccd9526f3867d9a6500743dc190f95.tar.xz
x11: cleanup, refactor
Move things that are used by vo_xv only into vo_xv, same for vo_x11. Rename some functions exported by x11_common, like vo_init to vo_x11_common. Make functions not used outsode of x11_common.c private to that file. Eliminate all global variables defined by x11_common (except error handler and colormap stuff). There shouldn't be any functional changes, and only code is moved around. There are some minor simplifications in the X11 init code, as we completely remove the ability to initialize X11 and X11+VO separately (see commit b4d9647 "mplayer: do not create X11 state in player frontend"), and the respective functions are conflated into vo_x11_init() and vo_x11_uninit().
Diffstat (limited to 'video/out/gl_common.c')
-rw-r--r--video/out/gl_common.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/video/out/gl_common.c b/video/out/gl_common.c
index dc249f4a73..887195bf18 100644
--- a/video/out/gl_common.c
+++ b/video/out/gl_common.c
@@ -1392,12 +1392,12 @@ MPGLContext *mpgl_init(enum MPGLType type, struct vo *vo)
ctx->create_window_gl3 = create_window_x11_gl3;
ctx->releaseGlContext = releaseGlContext_x11;
ctx->swapGlBuffers = swapGlBuffers_x11;
- ctx->update_xinerama_info = update_xinerama_info;
+ 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_init;
+ ctx->vo_init = vo_x11_init;
ctx->vo_uninit = vo_x11_uninit;
break;
#endif