[Mplayer-cvslog] CVS: main cfg-mplayer.h,1.222,1.223

[Nicolas Plourde]

> CVS change done by Nicolas Plourde CVS
>
> Update of /cvsroot/mplayer/main
> In directory mail:/var2/tmp/cvs-serv23689
>
> Modified Files:
> 	cfg-mplayer.h
> Log Message:
> add rootwin cmd to mac osx
>
> Index: cfg-mplayer.h
> ===================================================================
> RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
> retrieving revision 1.222
> retrieving revision 1.223
> diff -u -r1.222 -r1.223
> --- cfg-mplayer.h	14 Jul 2004 09:25:47 -0000	1.222
> +++ cfg-mplayer.h	23 Jul 2004 13:00:16 -0000	1.223
> @@ -80,13 +80,16 @@
>
>  #ifdef HAVE_X11
>  extern char *mDisplayName;
> -extern int WinID;
>  extern int fs_layer;
>  extern int stop_xscreensaver;
>  extern char **vo_fstype_list;
>  extern int vo_nomouse_input;
>  #endif
>
> +#if defined(HAVE_X11) || defined(MACOSX)
> +extern int WinID;
> +#endif
> +
>  #ifdef HAVE_AA
>  extern int vo_aa_parseoption(m_option_t* conf, char *opt, char * 
> param);
>  extern void vo_aa_revertoption(m_option_t* opt,char* param);
> @@ -292,7 +295,6 @@
>  #ifdef HAVE_X11
>  	// x11,xv,xmga,xvidix
>  	{"wid", &WinID, CONF_TYPE_INT, 0, 0, 0, NULL},
> -	{"rootwin", &WinID, CONF_TYPE_FLAG, 0, -1, 0, NULL},
>  	{"icelayer", "-icelayer is obsolete. Use -fstype layer:<number> 
> instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
>  	{"stop-xscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 0, 1, 
> NULL},
>  	{"nostop-xscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 1, 0, 
> NULL},
> @@ -301,6 +303,10 @@
>  	{"nomouseinput", &vo_nomouse_input, CONF_TYPE_FLAG,0,0,-1,NULL},
>  #endif
>
> +#if defined(HAVE_X11) || defined(MACOSX)
> +	{"rootwin", &WinID, CONF_TYPE_FLAG, 0, -1, 0, NULL},
> +#endif
> +
>  #ifdef HAVE_XINERAMA
>  	{"xineramascreen", &xinerama_screen, CONF_TYPE_INT, CONF_RANGE, 0, 
> 32, NULL},
>  #endif

commited