[MPlayer-cvslog] CVS: main/libvo video_out.h, 1.60, 1.61 vo_directx.c, 1.54, 1.55 vo_ggi.c, 1.36, 1.37 vo_gif89a.c, 1.14, 1.15 vo_quartz.c, 1.55, 1.56 vo_svga.c, 1.80, 1.81 vo_winvidix.c, 1.9, 1.10 vo_xvmc.c, 1.23, 1.24 x11_common.c, 1.194, 1.195 x11_common.h, 1.42, 1.43

[Attila Kinali]

On Sun, 21 Aug 2005 03:20:34 +0200 (CEST)
syncmail at mplayerhq.hu (Reimar D_ffinger CVS) wrote:

> 
> Update of /cvsroot/mplayer/main/libvo
> In directory mail:/var2/tmp/cvs-serv6065/libvo
> 
> Modified Files:
> 	video_out.h vo_directx.c vo_ggi.c vo_gif89a.c vo_quartz.c 
> 	vo_svga.c vo_winvidix.c vo_xvmc.c x11_common.c x11_common.h 
> Log Message:
> remove extern for variables that are already in headers.
> 
> 
> Index: video_out.h
> ===================================================================
> RCS file: /cvsroot/mplayer/main/libvo/video_out.h,v
> retrieving revision 1.60
> retrieving revision 1.61
> diff -u -r1.60 -r1.61
> --- video_out.h	5 Aug 2005 01:24:36 -0000	1.60
> +++ video_out.h	21 Aug 2005 01:20:31 -0000	1.61
> @@ -201,6 +201,7 @@
>  extern int vo_refresh_rate;
>  extern int vo_keepaspect;
>  extern int vo_rootwin;
> +extern int vo_ontop;
[...]
> Index: x11_common.h
> ===================================================================
> RCS file: /cvsroot/mplayer/main/libvo/x11_common.h,v
> retrieving revision 1.42
> retrieving revision 1.43
> diff -u -r1.42 -r1.43
> --- x11_common.h	30 Jun 2005 10:16:35 -0000	1.42
> +++ x11_common.h	21 Aug 2005 01:20:31 -0000	1.43
> @@ -21,27 +21,17 @@
>  #define _NET_WM_STATE_TOGGLE        2    /* toggle property  */
>  
>  extern int metacity_hack;
> -extern int vo_fsmode;
>  
> -extern int vo_depthonscreen;
> -extern int vo_screenwidth;
> -extern int vo_screenheight;
> -extern int vo_dwidth;
> -extern int vo_dheight;
> -extern int vo_fs;
>  extern int vo_fs_layer;
>  extern int vo_wm_type;
>  extern int vo_fs_type;
>  extern char** vo_fstype_list;
> -extern int vo_ontop;
> -extern int vo_rootwin;


The move of these variables breaks compilation of the gui:
---
wm/ws.c: In function `wsFullScreen':
wm/ws.c:814: error: `vo_ontop' undeclared (first use in this function)
wm/ws.c:814: error: (Each undeclared identifier is reported only once
wm/ws.c:814: error: for each function it appears in.)
wm/ws.c:819: error: `vo_fsmode' undeclared (first use in this function)
wm/ws.c: At top level:
../postproc/rgb2rgb.h:133: warning: `yuv2rgb' defined but not used
../postproc/rgb2rgb.h:137: warning: `yuv2rgb_init' defined but not used
make[1]: *** [wm/ws.o] Error 1
make[1]: Leaving directory `/tmp/main/Gui'
---

I'd fix it myself, but i don't know whether it is safe
to include video_out.h in Gui/wm/ws.c 


				Attila Kinali

-- 
心をこめて聞け心をこめて話せ