[Mplayer-cvslog] CVS: main cfg-mplayer.h,1.217,1.218

[Sascha Sommer CVS]

CVS change done by Sascha Sommer CVS

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

Modified Files:
	cfg-mplayer.h 
Log Message:
keepaspect and nokeepaspect are now useable by all vos

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- cfg-mplayer.h	3 Apr 2004 17:14:07 -0000	1.217
+++ cfg-mplayer.h	1 May 2004 14:52:15 -0000	1.218
@@ -64,6 +64,7 @@
 extern int vo_gamma_hue;
 extern char *vo_geometry;
 extern int vo_ontop;
+extern int vo_keepaspect;
 
 extern int opt_screen_size_x;
 extern int opt_screen_size_y;
@@ -77,17 +78,11 @@
 extern char *ao_outputfilename;
 extern int ao_pcm_waveheader;
 
-#ifdef HAVE_DIRECTX
-extern int adapter_num;
-extern int refresh_rate;
-#endif
-
 #ifdef HAVE_X11
 extern char *mDisplayName;
 extern int WinID;
 extern int fs_layer;
 extern int stop_xscreensaver;
-extern int vo_x11_keepaspect;
 extern char **vo_fstype_list;
 extern int vo_nomouse_input;
 #endif
@@ -302,8 +297,6 @@
 	{"stop-xscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"nostop-xscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 1, 0, NULL},
 	{"stop_xscreensaver", "Use -stop-xscreensaver instead, options with _ have been obsoleted.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
-	{"keepaspect", &vo_x11_keepaspect, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-	{"nokeepaspect", &vo_x11_keepaspect, CONF_TYPE_FLAG, 0, 1, 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},
 #endif
@@ -316,6 +309,8 @@
 	{"saturation",&vo_gamma_saturation, CONF_TYPE_INT, CONF_RANGE, -100, 100, NULL},
 	{"contrast",&vo_gamma_contrast, CONF_TYPE_INT, CONF_RANGE, -100, 100, NULL},
 	{"hue",&vo_gamma_hue, CONF_TYPE_INT, CONF_RANGE, -100, 100, NULL},
+	{"keepaspect", &vo_keepaspect, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{"nokeepaspect", &vo_keepaspect, CONF_TYPE_FLAG, 0, 1, 0, NULL},
 
 	// direct rendering (decoding to video out buffer)
 	{"dr", &vo_directrendering, CONF_TYPE_FLAG, 0, 0, 1, NULL},