Mercurial > mplayer.hg
changeset 31027:bbe66cf05445
Slightly more correct ifdefs for vo_gl2.
Compiling with both win32 and x11 backend still will not work though.
| author | reimar |
|---|---|
| date | Sat, 24 Apr 2010 22:34:38 +0000 |
| parents | 0b0266c8ec53 |
| children | 747ac0043bd5 |
| files | libvo/vo_gl2.c |
| diffstat | 1 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/vo_gl2.c Sat Apr 24 22:13:57 2010 +0000 +++ b/libvo/vo_gl2.c Sat Apr 24 22:34:38 2010 +0000 @@ -476,8 +476,9 @@ 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 @@ #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 @@ 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 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 @@ 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 @@ 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;