summaryrefslogtreecommitdiffstats
path: root/libvo/gl_common.c
diff options
context:
space:
mode:
Diffstat (limited to 'libvo/gl_common.c')
-rw-r--r--libvo/gl_common.c29
1 files changed, 25 insertions, 4 deletions
diff --git a/libvo/gl_common.c b/libvo/gl_common.c
index 3e9263c9e9..ce65873349 100644
--- a/libvo/gl_common.c
+++ b/libvo/gl_common.c
@@ -32,6 +32,7 @@
#include <string.h>
#include <ctype.h>
#include <math.h>
+#include "old_vo_defines.h"
#include "gl_common.h"
#include "csputils.h"
@@ -1752,6 +1753,26 @@ static void swapGlBuffers_x11(MPGLContext *ctx) {
static int x11_check_events(void) {
return vo_x11_check_events(mDisplay);
}
+
+static void gl_update_xinerama_info(void)
+{
+ update_xinerama_info(global_vo);
+}
+
+static void gl_border(void)
+{
+ vo_x11_border();
+}
+
+static void gl_fullscreen(void)
+{
+ vo_x11_fullscreen();
+}
+
+static void gl_ontop(void)
+{
+ vo_x11_ontop();
+}
#endif
int init_mpglcontext(MPGLContext *ctx, enum MPGLType type) {
@@ -1775,11 +1796,11 @@ int init_mpglcontext(MPGLContext *ctx, enum MPGLType type) {
ctx->setGlWindow = setGlWindow_x11;
ctx->releaseGlContext = releaseGlContext_x11;
ctx->swapGlBuffers = swapGlBuffers_x11;
- ctx->update_xinerama_info = update_xinerama_info;
- ctx->border = vo_x11_border;
+ ctx->update_xinerama_info = gl_update_xinerama_info;
+ ctx->border = gl_border;
ctx->check_events = x11_check_events;
- ctx->fullscreen = vo_x11_fullscreen;
- ctx->ontop = vo_x11_ontop;
+ ctx->fullscreen = gl_fullscreen;
+ ctx->ontop = gl_ontop;
return vo_init();
#endif
default: