[MPlayer-cvslog] r31394 - in trunk: gui/interface.c libvo/x11_common.c

[reimar]

Author: reimar
Date: Mon Jun 14 00:38:15 2010
New Revision: 31394

Log:
Remove more gui-related code from libvo.

Modified:
   trunk/gui/interface.c
   trunk/libvo/x11_common.c

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Sun Jun 13 21:10:37 2010	(r31393)
+++ trunk/gui/interface.c	Mon Jun 14 00:38:15 2010	(r31394)
@@ -232,8 +232,6 @@ void guiInit( void )
  mplMenuInit();
  mplPBInit();
 
- vo_setwindow( appMPlayer.subWindow.WindowID, appMPlayer.subWindow.wGC );
-
 // i=wsHideFrame|wsMaxSize|wsHideWindow;
 // if ( appMPlayer.mainDecoration ) i=wsShowFrame|wsMaxSize|wsHideWindow;
  i=wsShowFrame|wsMaxSize|wsHideWindow;

Modified: trunk/libvo/x11_common.c
==============================================================================
--- trunk/libvo/x11_common.c	Sun Jun 13 21:10:37 2010	(r31393)
+++ trunk/libvo/x11_common.c	Mon Jun 14 00:38:15 2010	(r31394)
@@ -749,14 +749,6 @@ GC vo_gc = NULL;
 GC f_gc = NULL;
 XSizeHints vo_hint;
 
-#ifdef CONFIG_GUI
-void vo_setwindow(Window w, GC g)
-{
-    vo_window = w;
-    vo_gc = g;
-}
-#endif
-
 void vo_x11_uninit(void)
 {
     saver_on(mDisplay);
@@ -768,10 +760,6 @@ void vo_x11_uninit(void)
         XFreeGC(mDisplay, f_gc);
         f_gc = NULL;
     }
-#ifdef CONFIG_GUI
-    /* destroy window only if it's not controlled by the GUI */
-    if (!use_gui)
-#endif
     {
         if (vo_gc)
         {
@@ -1658,11 +1646,7 @@ void vo_vm_switch(void)
 
 void vo_vm_close(void)
 {
-#ifdef CONFIG_GUI
-    if (vidmodes != NULL && vo_window != None)
-#else
     if (vidmodes != NULL)
-#endif
     {
         int i, modecount;