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

[Diego Biurrun]

Alex Beregszaszi writes:
 > > Any other suggestions?
 > Never ever use underscores in config options!

Shall we change these then:

cfg-common.h:	{"fribidi_charset", &fribidi_charset, CONF_TYPE_STRING, 0, 0, 0, NULL},
cfg-common.h:	{"flip_hebrew", &flip_hebrew, CONF_TYPE_FLAG, 0, 0, 1, NULL},
cfg-common.h:	{"noflip_hebrew", &flip_hebrew, CONF_TYPE_FLAG, 0, 1, 0, NULL},

cfg-mplayer.h:	{"stop_xscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 0, 1, NULL},
cfg-mplayer.h:	{"nostop_xscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 1, 0, NULL},

Patch attached.

Diego

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.205
diff -u -r1.205 cfg-mplayer.h
--- cfg-mplayer.h	21 Sep 2003 14:21:10 -0000	1.205
+++ cfg-mplayer.h	2 Oct 2003 00:18:26 -0000
@@ -287,8 +287,8 @@
 	{"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},
 	{"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: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.112
diff -u -r1.112 cfg-common.h
--- cfg-common.h	6 Sep 2003 00:23:44 -0000	1.112
+++ cfg-common.h	2 Oct 2003 00:18:27 -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: DOCS/en/mplayer.1
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/en/mplayer.1,v
retrieving revision 1.444
diff -u -r1.444 mplayer.1
--- DOCS/en/mplayer.1	1 Oct 2003 20:54:00 -0000	1.444
+++ DOCS/en/mplayer.1	2 Oct 2003 00:18:32 -0000
@@ -1099,7 +1099,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 +1127,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
@@ -1798,7 +1798,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 \ \ \