diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 19:22:56 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 19:23:32 +0300 |
commit | f38efd166e43f5cae783f38f9913d2859557143e (patch) | |
tree | 38f49af429d4147e390f0b52384294b2e35b9d6f /libvo/vo_gl2.c | |
parent | 7a33e76943ecc3f2ba185a1bea56c8416b74d6dd (diff) | |
parent | 4e853e19ef349a453ef069d76b830a3dbfa444c3 (diff) | |
download | mpv-f38efd166e43f5cae783f38f9913d2859557143e.tar.bz2 mpv-f38efd166e43f5cae783f38f9913d2859557143e.tar.xz |
Merge svn changes up to r31097
Diffstat (limited to 'libvo/vo_gl2.c')
-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 dafaa1e60a..4fb126d5c5 100644 --- a/libvo/vo_gl2.c +++ b/libvo/vo_gl2.c @@ -473,8 +473,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; @@ -620,7 +621,8 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin #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; @@ -668,7 +670,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') { @@ -685,7 +687,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; @@ -866,7 +868,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; @@ -907,7 +910,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: { struct voctrl_set_equalizer_args *args = data; |