[MPlayer-cvslog] CVS: main cfg-mplayer.h,1.243,1.244

[Ivo van Poorten CVS]

CVS change done by Ivo van Poorten CVS

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

Modified Files:
	cfg-mplayer.h 
Log Message:

Remove -noxv and -forcexv command line options and replace them by
suboptions to -vo sdl. Renamed noxv to nohwaccel to better reflect the
meaning of the option. Updated manual page.

Original patch by < ods15 at ods15 dot dyndns dot org>
Modified by me.



Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- cfg-mplayer.h	1 Mar 2005 01:50:52 -0000	1.243
+++ cfg-mplayer.h	1 Mar 2005 03:51:48 -0000	1.244
@@ -22,12 +22,6 @@
 extern char *dfb_params;
 #endif
 #endif
-#ifdef HAVE_SDL
-//extern char *sdl_driver;
-extern int sdl_noxv;
-extern int sdl_forcexv;
-//extern char *sdl_adriver;
-#endif
 #ifdef USE_FAKE_MONO
 extern int fakemono; // defined in dec_audio.c
 #endif
@@ -199,15 +193,13 @@
 	    CONF_TYPE_PRINT, 0, 0, 0, NULL},
 #endif
 	// -vo sdl only:
-#ifdef HAVE_SDL
-	{"sdl", "Use -vo sdl:driver instead of -vo sdl -sdl driver.\n",
+	{"sdl", "Use -vo sdl:driver=<driver> instead of -vo sdl -sdl driver.\n",
 	    CONF_TYPE_PRINT, 0, 0, 0, NULL},
-	{"noxv", &sdl_noxv, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-	{"forcexv", &sdl_forcexv, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{"noxv", "-noxv is deprecated. Use -vo sdl:nohwaccel instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
+	{"forcexv", "-forcexv is deprecated. Use -vo sdl:forcexv instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
 	// -ao sdl only:
 	{"sdla", "Use -ao sdl:driver instead of -ao sdl -sdla driver.\n",
 	    CONF_TYPE_PRINT, 0, 0, 0, NULL},
-#endif
 
 #if defined(HAVE_FBDEV)||defined(HAVE_VESA) 
        {"monitor-hfreq", &monitor_hfreq_str, CONF_TYPE_STRING, 0, 0, 0, NULL},