Mercurial > mplayer.hg
changeset 18949:51aeef9ada52
Improve windows gui support
| author | reimar |
|---|---|
| date | Sat, 08 Jul 2006 15:00:37 +0000 |
| parents | c2aee29c80b6 |
| children | a943bc3f26c8 |
| files | libvo/vo_gl.c libvo/vo_gl2.c |
| diffstat | 2 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/vo_gl.c Sat Jul 08 14:57:25 2006 +0000 +++ b/libvo/vo_gl.c Sat Jul 08 15:00:37 2006 +0000 @@ -334,7 +334,9 @@ vo_dwidth = d_width; vo_dheight= d_height; guiGetEvent(guiSetShVideo, 0); +#ifndef GL_WIN32 goto glconfig; +#endif } #endif #ifdef GL_WIN32
--- a/libvo/vo_gl2.c Sat Jul 08 14:57:25 2006 +0000 +++ b/libvo/vo_gl2.c Sat Jul 08 15:00:37 2006 +0000 @@ -731,6 +731,7 @@ return 0; } +#endif #ifdef HAVE_NEW_GUI static int config_glx_gui(uint32_t d_width, uint32_t d_height) { @@ -741,8 +742,6 @@ } #endif -#endif - static int initGl(uint32_t d_width, uint32_t d_height) { fragprog = lookupTex = 0; @@ -821,11 +820,14 @@ vo_dx += xinerama_x; vo_dy += xinerama_y; -#if defined(HAVE_NEW_GUI) && !defined(GL_WIN32) +#ifdef HAVE_NEW_GUI if (use_gui) { if (config_glx_gui(d_width, d_height) == -1) return -1; - } else + } +#ifndef GL_WIN32 + else +#endif #endif #ifdef GL_WIN32 if (config_w32(width, height, d_width, d_height, flags, title, format) == -1)