[MPlayer-cvslog] r34113 - in trunk/libvo: vo_dxr2.c vo_xover.c vo_xvidix.c x11_common.c x11_common.h

[reimar]

Author: reimar
Date: Tue Sep 20 00:11:12 2011
New Revision: 34113

Log:
Get rid of X11_FULLSCREEN.

It seems likely the code does not compile when it is not defined anyway,
it is unclear what its purpose is, and lastly vos changing there
behaviour depending on whether some otherwise completely unrelated
vo (e.g. vo_gl) is enabled seems like really bad idea.

Modified:
   trunk/libvo/vo_dxr2.c
   trunk/libvo/vo_xover.c
   trunk/libvo/vo_xvidix.c
   trunk/libvo/x11_common.c
   trunk/libvo/x11_common.h

Modified: trunk/libvo/vo_dxr2.c
==============================================================================
--- trunk/libvo/vo_dxr2.c	Tue Sep 20 00:03:36 2011	(r34112)
+++ trunk/libvo/vo_dxr2.c	Tue Sep 20 00:11:12 2011	(r34113)
@@ -805,7 +805,6 @@ static void check_events(void)
 {
   // I'd like to have this done in an x11 independent way
   // It's because of this that we are limited to vo_x11 for windowed overlay :-(
-#ifdef X11_FULLSCREEN
   if(sub_vo && sub_vo_win) {
     int e=vo_x11_check_events(mDisplay);
     if ( !(e&VO_EVENT_RESIZE) && !(e&VO_EVENT_EXPOSE) ) return;
@@ -813,7 +812,6 @@ static void check_events(void)
     XClearWindow(mDisplay, vo_window);
     dxr2_set_overlay_window();
   }
-#endif
 }
 
 static int preinit(const char *arg) {

Modified: trunk/libvo/vo_xover.c
==============================================================================
--- trunk/libvo/vo_xover.c	Tue Sep 20 00:03:36 2011	(r34112)
+++ trunk/libvo/vo_xover.c	Tue Sep 20 00:11:12 2011	(r34113)
@@ -107,7 +107,6 @@ static void set_window(int force_update)
       drwcX=drwX=vo_dx; drwcY=drwY=vo_dy; drwWidth=vo_dwidth; drwHeight=vo_dheight;
     }
 
-#if X11_FULLSCREEN
   if (vo_fs)
     {
       aspect(&dwidth,&dheight,A_ZOOM);
@@ -120,7 +119,6 @@ static void set_window(int force_update)
       mp_msg(MSGT_VO, MSGL_V, "[xvidix-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",
 	     drwcX, drwcY, drwX, drwY, drwWidth, drwHeight);
     }
-#endif
 
   vo_dwidth=drwWidth; vo_dheight=drwHeight;
 
@@ -274,9 +272,7 @@ static int config(uint32_t width, uint32
     {
 #endif
 
-#ifdef X11_FULLSCREEN
       if ( ( flags&VOFLAG_FULLSCREEN )||(flags & VOFLAG_SWSCALE) ) aspect(&d_width, &d_height, A_ZOOM);
-#endif
       dwidth = d_width;
       dheight = d_height;
       /* Make the window */

Modified: trunk/libvo/vo_xvidix.c
==============================================================================
--- trunk/libvo/vo_xvidix.c	Tue Sep 20 00:03:36 2011	(r34112)
+++ trunk/libvo/vo_xvidix.c	Tue Sep 20 00:11:12 2011	(r34113)
@@ -110,7 +110,6 @@ static void set_window(int force_update)
         drwHeight = vo_dheight;
     }
 
-#if X11_FULLSCREEN
     if (vo_fs)
     {
         aspect(&dwidth, &dheight, A_ZOOM);
@@ -129,7 +128,6 @@ static void set_window(int force_update)
                "[xvidix-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",
                drwcX, drwcY, drwX, drwY, drwWidth, drwHeight);
     }
-#endif
 
     vo_dwidth = drwWidth;
     vo_dheight = drwHeight;
@@ -247,10 +245,8 @@ static int config(uint32_t width, uint32
     }
     mp_msg(MSGT_VO, MSGL_V, "Using colorkey: %x\n", colorkey);
 
-#ifdef X11_FULLSCREEN
         if ((flags & VOFLAG_FULLSCREEN) || (flags & VOFLAG_SWSCALE))
             aspect(&d_width, &d_height, A_ZOOM);
-#endif
         dwidth = d_width;
         dheight = d_height;
         /* Make the window */

Modified: trunk/libvo/x11_common.c
==============================================================================
--- trunk/libvo/x11_common.c	Tue Sep 20 00:03:36 2011	(r34112)
+++ trunk/libvo/x11_common.c	Tue Sep 20 00:11:12 2011	(r34113)
@@ -28,8 +28,6 @@
 #include "libavutil/common.h"
 #include "x11_common.h"
 
-#ifdef X11_FULLSCREEN
-
 #include <string.h>
 #include <unistd.h>
 #include <assert.h>
@@ -1688,8 +1686,6 @@ void vo_vm_close(void)
 }
 #endif
 
-#endif                          /* X11_FULLSCREEN */
-
 
 /*
  * Scan the available visuals on this Display/Screen.  Try to find

Modified: trunk/libvo/x11_common.h
==============================================================================
--- trunk/libvo/x11_common.h	Tue Sep 20 00:03:36 2011	(r34112)
+++ trunk/libvo/x11_common.h	Tue Sep 20 00:11:12 2011	(r34113)
@@ -25,12 +25,6 @@
 
 #include "config.h"
 
-#if defined(CONFIG_GL) || defined(CONFIG_X11) || defined(CONFIG_XV)
-#define X11_FULLSCREEN 1
-#endif
-
-#ifdef X11_FULLSCREEN
-
 #define vo_wm_LAYER 1
 #define vo_wm_FULLSCREEN 2
 #define vo_wm_STAYS_ON_TOP 4
@@ -90,7 +84,6 @@ void vo_x11_ontop(void);
 void vo_x11_border(void);
 void vo_x11_ewmh_fullscreen( Window win, int action );
 
-#endif
 
 extern Window     vo_window;
 extern GC         vo_gc;