[MPlayer-dev-eng] [PATCH] Forced subtitles[corrected]

[Diego Biurrun]

Diego Biurrun writes:
 > Diego Biurrun writes:
 >  > Alex Beregszaszi writes:
 >  >  > > Any other suggestions?
 >  >  > Never ever use underscores in config options!
 >  > Patch attached.
 > 
 > Here is a better one, I had missed the monitor_* options.
 > 
 > OK to commit?

Here is an improved version that prints out a warning for
-stop_xscreensaver (should be the only one commonly used) as suggested
by Alex.  I'll commit in a few days if nobody objects.

Diego


Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.113
diff -u -r1.113 cfg-common.h
--- cfg-common.h	14 Oct 2003 10:15:35 -0000	1.113
+++ cfg-common.h	14 Oct 2003 14:18:55 -0000
@@ -200,13 +200,13 @@
 #ifdef USE_SUB
 	{"sub", &sub_name, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
 #ifdef USE_FRIBIDI
-	{"fribidi_charset", &fribidi_charset, CONF_TYPE_STRING, 0, 0, 0, NULL},
-	{"flip_hebrew", &flip_hebrew, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-	{"noflip_hebrew", &flip_hebrew, CONF_TYPE_FLAG, 0, 1, 0, NULL},
+	{"fribidi-charset", &fribidi_charset, CONF_TYPE_STRING, 0, 0, 0, NULL},
+	{"flip-hebrew", &flip_hebrew, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{"noflip-hebrew", &flip_hebrew, CONF_TYPE_FLAG, 0, 1, 0, NULL},
 #else 
-	{"fribidi_charset", "MPlayer wasn't compiled with FriBiDi support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-	{"flip_hebrew", "MPlayer wasn't compiled with FriBiDi support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-	{"noflip_hebrew", "MPlayer wasn't compiled with FriBiDi support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+	{"fribidi-charset", "MPlayer wasn't compiled with FriBiDi support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+	{"flip-hebrew", "MPlayer wasn't compiled with FriBiDi support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+	{"noflip-hebrew", "MPlayer wasn't compiled with FriBiDi support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif
 #ifdef USE_ICONV
 	{"subcp", &sub_cp, CONF_TYPE_STRING, 0, 0, 0, NULL},
Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.207
diff -u -r1.207 cfg-mplayer.h
--- cfg-mplayer.h	17 Oct 2003 09:08:08 -0000	1.207
+++ cfg-mplayer.h	19 Oct 2003 23:35:45 -0000
@@ -230,9 +230,9 @@
 #endif
 
 #if defined(HAVE_FBDEV)||defined(HAVE_VESA) 
-       {"monitor_hfreq", &monitor_hfreq_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, 
-       {"monitor_vfreq", &monitor_vfreq_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, 
-       {"monitor_dotclock", &monitor_dotclock_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, 
+       {"monitor-hfreq", &monitor_hfreq_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, 
+       {"monitor-vfreq", &monitor_vfreq_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, 
+       {"monitor-dotclock", &monitor_dotclock_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, 
 #endif 
 
 #ifdef HAVE_FBDEV
@@ -289,8 +289,9 @@
 	{"wid", &WinID, CONF_TYPE_INT, 0, 0, 0, NULL},
 	{"rootwin", &WinID, CONF_TYPE_FLAG, 0, -1, 0, NULL},
 	{"icelayer", "Use -fstype layer:<number> instead. -icelayer was obsoleted\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},
+	{"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},
Index: DOCS/man/en/mplayer.1
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/man/en/mplayer.1,v
retrieving revision 1.451
diff -u -r1.451 mplayer.1
--- DOCS/man/en/mplayer.1	14 Oct 2003 13:55:25 -0000	1.451
+++ DOCS/man/en/mplayer.1	14 Oct 2003 14:18:57 -0000
@@ -1099,7 +1104,7 @@
 .PD 1
 .
 .TP
-.B \-flip_hebrew
+.B \-flip-hebrew
 Turns on flipping subtitles using FriBiDi.
 .TP
 .B \-font <path\ to\ font.desc\ file>
@@ -1127,7 +1132,7 @@
 Display only "forced subtitles" for the DVD subtitle stream selected by e.g.
 \-slang.
 .TP
-.B \-fribidi_charset <charset\ name>
+.B \-fribidi-charset <charset\ name>
 Specifies the charset that will be passed to FriBiDi when decoding a non-UTF8
 subtitles. Default is "ISO8859-8".
 .TP
@@ -1747,13 +1752,13 @@
 .PD 1
 .
 .TP
-.B \-monitor_dotclock <dotclock\ (or\ pixelclock) range> (fbdev and vesa only)
+.B \-monitor-dotclock <dotclock\ (or\ pixelclock) range> (fbdev and vesa only)
 Look into etc/\:example.conf for further information and in
 DOCS/\:HTML/\:en/\:devices.html#video-dev.
 .TP
-.B \-monitor_hfreq <horizontal frequency range> (fbdev and vesa only)
+.B \-monitor-hfreq <horizontal frequency range> (fbdev and vesa only)
 .TP
-.B \-monitor_vfreq <vertical frequency range> (fbdev and vesa only)
+.B \-monitor-vfreq <vertical frequency range> (fbdev and vesa only)
 .TP
 .B \-monitoraspect <ratio>
 Set aspect ratio of your monitor or TV screen.
@@ -1802,7 +1807,7 @@
 (fbdev/\:x11 and/\:or TVout) this is where you can specify the horizontal and
 vertical resolution.
 .TP
-.B \-stop_xscreensaver
+.B \-stop-xscreensaver
 Turns off xscreensaver at startup and turns it on again on exit.
 .TP
 .B \-vm \ \ \