github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-05 03:06:28 +01:00
Code Releases Activity

Improve windows gui support

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18954 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2006-07-08 15:00:37 +00:00
parent 4ccabac9ba
commit 01d5289203
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libvo/vo_gl.c
View File

@ -334,7 +334,9 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
vo_dwidth = d_width;
vo_dheight= d_height;
guiGetEvent(guiSetShVideo, 0);
#ifndef GL_WIN32
goto glconfig;
#endif
}
#endif
#ifdef GL_WIN32

10
libvo/vo_gl2.c
View File

@ -731,6 +731,7 @@ static int config_glx(uint32_t width, uint32_t height, uint32_t d_width, uint32_
return 0;
}
#endif
#ifdef HAVE_NEW_GUI
static int config_glx_gui(uint32_t d_width, uint32_t d_height) {
@ -741,8 +742,6 @@ static int config_glx_gui(uint32_t d_width, uint32_t d_height) {
}
#endif
#endif
static int initGl(uint32_t d_width, uint32_t d_height)
{
fragprog = lookupTex = 0;
@ -821,11 +820,14 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
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)