[Mplayer-cvslog] CVS: main/libvo vo_xv.c,1.81,1.82 vo_xmga.c,1.62,1.63

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv14645

Modified Files:
	vo_xv.c vo_xmga.c 
Log Message:
the Right Fix for gui window setup

Index: vo_xv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- vo_xv.c	5 May 2002 15:33:50 -0000	1.81
+++ vo_xv.c	5 May 2002 18:16:27 -0000	1.82
@@ -360,9 +360,11 @@
  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;
@@ -452,9 +454,7 @@
       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 );
        

Index: vo_xmga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xmga.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- vo_xmga.c	4 May 2002 22:34:47 -0000	1.62
+++ vo_xmga.c	5 May 2002 18:16:27 -0000	1.63
@@ -250,10 +250,13 @@
   inited=1;
 
  aspect(&vo_dwidth,&vo_dheight,A_NOZOOM);
+
 #ifdef HAVE_NEW_GUI
- if ( vo_window == None )
-  {
+  if(use_gui)
+    guiGetEvent( guiSetShVideo,0 ); // the GUI will set up / resize the window
+  else
 #endif
+  {
    if ( vo_fs )
     {
      vo_dwidth=vo_screenwidth;
@@ -298,9 +301,7 @@
    vo_x11_xinerama_move(mDisplay,vo_window);
 #endif
    vo_gc=XCreateGC( mDisplay,vo_window,GCForeground,&wGCV );
-#ifdef HAVE_NEW_GUI
-  } else if(use_gui) guiGetEvent( guiSetShVideo,0 );
-#endif
+  }
 
  set_window();