summaryrefslogtreecommitdiffstats
path: root/libvo/vo_xv.c
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-05-05 18:16:27 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-05-05 18:16:27 +0000
commit2d3655ed7138f946294d49ed020596f495f4ced3 (patch)
tree3bc8de3e769860eb5618efb71342e9596cda1f49 /libvo/vo_xv.c
parent816258171c2096545c5483175dcaca37c8812afc (diff)
downloadmpv-2d3655ed7138f946294d49ed020596f495f4ced3.tar.bz2
mpv-2d3655ed7138f946294d49ed020596f495f4ced3.tar.xz
the Right Fix for gui window setup
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5986 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_xv.c')
-rw-r--r--libvo/vo_xv.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c
index 8dc55f461d..ae5658cce4 100644
--- a/libvo/vo_xv.c
+++ b/libvo/vo_xv.c
@@ -361,9 +361,11 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32
aspect_save_screenres(vo_screenwidth,vo_screenheight);
#ifdef HAVE_NEW_GUI
- if ( vo_window == None )
- {
+ if(use_gui)
+ guiGetEvent( guiSetShVideo,0 ); // let the GUI to setup/resize our window
+ else
#endif
+ {
hint.x = 0;
hint.y = 0;
hint.width = d_width;
@@ -453,9 +455,7 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32
XSetInputFocus(mDisplay, vo_window, RevertToNone, CurrentTime);
}
#endif
-#ifdef HAVE_NEW_GUI
- } else if(use_gui) guiGetEvent( guiSetShVideo,0 );
-#endif
+ }
mp_msg(MSGT_VO,MSGL_V, "using Xvideo port %d for hw scaling\n",xv_port );