[MPlayer-cvslog] r26438 - trunk/libvo/x11_common.c

[Reimar Döffinger]

On Sun, Apr 13, 2008 at 01:12:24PM +0200, attila wrote:
> Author: attila
> Date: Sun Apr 13 13:12:24 2008
> New Revision: 26438
> 
> Log:
> move the #ifdef HAVE_XINERAMA to enclose the whole function
> 
> 
> Modified:
>    trunk/libvo/x11_common.c
> 
> Modified: trunk/libvo/x11_common.c
> ==============================================================================
> --- trunk/libvo/x11_common.c	(original)
> +++ trunk/libvo/x11_common.c	Sun Apr 13 13:12:24 2008
> @@ -367,12 +367,12 @@ static void init_atoms(void)
>  }
>  
>  void update_xinerama_info(void) {
> +#ifdef HAVE_XINERAMA
>      int screen = xinerama_screen;
>      // center coordinates of the window
>      int x = vo_dx + vo_dwidth / 2;
>      int y = vo_dy + vo_dheight / 2;
>      xinerama_x = xinerama_y = 0;
> -#ifdef HAVE_XINERAMA

Like this, xinerama_x and xinerama_y will not be reset to 0.
While this will effect hardly anyone, it is just wrong if e.g. someone
uses MPlayer on windows with X11 support (without xinerama, quite a pain
to get working but it is possible), sample commandline:
mplayer file1 -xineramascreen 1 -vo gl file2 -xineramascreen -2 -vo x11

Greetings,
Reimar Döffinger