[Mplayer-cvslog] CVS: main cfg-mplayer.h,1.224,1.225

[Nicolas Plourde CVS]

CVS change done by Nicolas Plourde CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv12554

Modified Files:
	cfg-mplayer.h 
Log Message:
-rootwin switch use vo_rootwin var for all vo

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- cfg-mplayer.h	29 Jul 2004 14:58:11 -0000	1.224
+++ cfg-mplayer.h	8 Aug 2004 23:19:49 -0000	1.225
@@ -65,6 +65,7 @@
 extern char *vo_geometry;
 extern int vo_ontop;
 extern int vo_keepaspect;
+extern int vo_rootwin;
 
 extern int opt_screen_size_x;
 extern int opt_screen_size_y;
@@ -87,10 +88,6 @@
 extern int WinID;
 #endif
 
-#ifdef MACOSX
-extern int vo_rootwin;
-#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);
@@ -187,6 +184,7 @@
 	{"nofixed-vo", &fixed_vo, CONF_TYPE_FLAG,CONF_GLOBAL, 0, 0, NULL},
 	{"ontop", &vo_ontop, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"noontop", &vo_ontop, CONF_TYPE_FLAG, 0, 1, 0, NULL},
+	{"rootwin", &vo_rootwin, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 
 	{"aop", ao_plugin_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
 	{"dsp", "Use -ao oss:dsp_path.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
@@ -302,11 +300,6 @@
 	{"stop_xscreensaver", "Use -stop-xscreensaver instead, options with _ have been obsoleted.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
 	{"fstype", &vo_fstype_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
 	{"nomouseinput", &vo_nomouse_input, CONF_TYPE_FLAG,0,0,-1,NULL},
-	{"rootwin", &WinID, CONF_TYPE_FLAG, 0, -1, 0, NULL},
-#endif
-
-#ifdef MACOSX
-	{"rootwin", &vo_rootwin, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 #endif
 
 #ifdef HAVE_XINERAMA