diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-04-24 22:34:38 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-04-24 22:34:38 +0000 |
| commit | 37da18aaf96541418f1dc55d7aeaf2cc125309a3 (patch) | |
| tree | 52f6cd058451277d5e89ebf0756ee1b8275cc93e /libvo | |
| parent | f81cd34fe0f145702ac225f13c5de7007b9d7320 (diff) | |
| download | mpv-37da18aaf96541418f1dc55d7aeaf2cc125309a3.tar.bz2 mpv-37da18aaf96541418f1dc55d7aeaf2cc125309a3.tar.xz | |
Slightly more correct ifdefs for vo_gl2.
Compiling with both win32 and x11 backend still will not work though.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31069 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_gl2.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c index a1d0506a99..61339dcbce 100644 --- a/libvo/vo_gl2.c +++ b/libvo/vo_gl2.c @@ -476,8 +476,9 @@ static int config_w32(uint32_t width, uint32_t height, uint32_t d_width, uint32_ return 0; } -#else +#endif +#ifdef CONFIG_GL_X11 static int choose_glx_visual(Display *dpy, int scr, XVisualInfo *res_vi) { XVisualInfo template, *vi_list; @@ -641,7 +642,8 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin #endif #ifdef CONFIG_GL_WIN32 if (config_w32(width, height, d_width, d_height, flags, title, format) == -1) -#else +#endif +#ifdef CONFIG_GL_X11 if (config_glx(width, height, d_width, d_height, flags, title, format) == -1) #endif return -1; @@ -689,7 +691,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin return 0; } -#ifndef CONFIG_GL_WIN32 +#ifdef CONFIG_GL_X11 static int gl_handlekey(int key) { if(key=='a'||key=='A') { @@ -706,7 +708,7 @@ static int gl_handlekey(int key) static void check_events(void) { int e; -#ifndef CONFIG_GL_WIN32 +#ifdef CONFIG_GL_X11 XEvent Event; char buf[100]; KeySym keySym; @@ -887,7 +889,8 @@ static int preinit(const char *arg) if (use_yuv == -1) { #ifdef CONFIG_GL_WIN32 if (config_w32(320, 200, 320, 200, VOFLAG_HIDDEN, "", 0) == -1) -#else +#endif +#ifdef CONFIG_GL_X11 if (config_glx(320, 200, 320, 200, VOFLAG_HIDDEN, "", 0) == -1) #endif goto err_out; @@ -930,7 +933,7 @@ static int control(uint32_t request, void *data, ...) case VOCTRL_SET_PANSCAN: resize(vo_dwidth, vo_dheight); return VO_TRUE; -#ifndef CONFIG_GL_WIN32 +#ifdef CONFIG_GL_X11 case VOCTRL_SET_EQUALIZER: { va_list ap; |