RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
reimar 2010-04-24 22:34:38 +00:00
parent f81cd34fe0
commit 37da18aaf9
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libvo/vo_gl2.c
View File

@ -476,8 +476,9 @@ static int config_w32(uint32_t width, uint32_t height, uint32_t d_width, uint32_
return 0; return 0;
} }
#else #endif
#ifdef CONFIG_GL_X11
static int choose_glx_visual(Display *dpy, int scr, XVisualInfo *res_vi) static int choose_glx_visual(Display *dpy, int scr, XVisualInfo *res_vi)
{ {
XVisualInfo template, *vi_list; 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 #endif
#ifdef CONFIG_GL_WIN32 #ifdef CONFIG_GL_WIN32
if (config_w32(width, height, d_width, d_height, flags, title, format) == -1) 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) if (config_glx(width, height, d_width, d_height, flags, title, format) == -1)
#endif #endif
return -1; return -1;
@ -689,7 +691,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
return 0; return 0;
} }
#ifndef CONFIG_GL_WIN32 #ifdef CONFIG_GL_X11
static int gl_handlekey(int key) static int gl_handlekey(int key)
{ {
if(key=='a'||key=='A') { if(key=='a'||key=='A') {
@ -706,7 +708,7 @@ static int gl_handlekey(int key)
static void check_events(void) static void check_events(void)
{ {
int e; int e;
#ifndef CONFIG_GL_WIN32 #ifdef CONFIG_GL_X11
XEvent Event; XEvent Event;
char buf[100]; char buf[100];
KeySym keySym; KeySym keySym;
@ -887,7 +889,8 @@ static int preinit(const char *arg)
if (use_yuv == -1) { if (use_yuv == -1) {
#ifdef CONFIG_GL_WIN32 #ifdef CONFIG_GL_WIN32
if (config_w32(320, 200, 320, 200, VOFLAG_HIDDEN, "", 0) == -1) 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) if (config_glx(320, 200, 320, 200, VOFLAG_HIDDEN, "", 0) == -1)
#endif #endif
goto err_out; goto err_out;
@ -930,7 +933,7 @@ static int control(uint32_t request, void *data, ...)
case VOCTRL_SET_PANSCAN: case VOCTRL_SET_PANSCAN:
resize(vo_dwidth, vo_dheight); resize(vo_dwidth, vo_dheight);
return VO_TRUE; return VO_TRUE;
#ifndef CONFIG_GL_WIN32 #ifdef CONFIG_GL_X11
case VOCTRL_SET_EQUALIZER: case VOCTRL_SET_EQUALIZER:
{ {
va_list ap; va_list ap;