[xine-cvs] CVS: xine-lib/src/libsputext demux_sputext.c,1.33,1.34 xine_decoder.c,1.79,1.80

[Michael R. <mr...@us...>]

Update of /cvsroot/xine/xine-lib/src/libsputext
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2730/src/libsputext

Modified Files:
	demux_sputext.c xine_decoder.c 
Log Message:
help strings added for all remaining config entries (so I hope)
please everybody watch out for spelling (and other) errors


Index: demux_sputext.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libsputext/demux_sputext.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- demux_sputext.c	12 Jan 2004 17:35:17 -0000	1.33
+++ demux_sputext.c	26 Apr 2004 17:50:08 -0000	1.34
@@ -1352,8 +1352,10 @@
    */
   this->max_timeout = xine->config->register_num(xine->config, 
                          "misc.sub_timeout", 4, 
-			 _("Default period to hide subtitles in seconds"),
-			 _("Define this to non-zero, if you want automatically hide subtitle after given time. Used only with subtitle formats, where are no end time."),
+			 _("default duration of subtitle display in seconds"),
+			 _("Some subtitle formats do not explicitly give a duration for each subtitle. "
+			   "For these, you can set a default duration here. Setting to zero will result "
+			   "in the subtitle being shown until the next one takes over."),
 			 20, config_timeout_cb, this);
 
   return this;

Index: xine_decoder.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libsputext/xine_decoder.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- xine_decoder.c	7 Apr 2004 18:10:20 -0000	1.79
+++ xine_decoder.c	26 Apr 2004 17:50:08 -0000	1.80
@@ -670,28 +670,44 @@
 			      "misc.spu_subtitle_size", 
 			       1,
 			       subtitle_size_strings,
-			       _("Subtitle size (relative window size)"), 
-			       NULL, 0, update_subtitle_size, this);
+			       _("subtitle size"),
+			       _("You can adjust the subtitle size here. The setting will "
+			         "be evaluated relative to the window size."),
+			       0, update_subtitle_size, this);
   this->vertical_offset  = xine->config->register_num(xine->config,
 			      "misc.spu_vertical_offset", 
 			      0,
-			      _("Subtitle vertical offset (relative window size)"), 
-			      NULL, 0, update_vertical_offset, this);
-  strcpy(this->font,       xine->config->register_string(xine->config, 
-				"misc.spu_font", 
-				"sans", 
-				_("Font for external subtitles"), 
-				NULL, 0, update_osd_font, this));
+			      _("subtitle vertical offset"),
+			      _("You can adjust the vertical position of the subtitle. "
+			        "The setting will be evaluated relative to the window size."),
+			      0, update_vertical_offset, this);
+  strcpy(this->font, xine->config->register_string(xine->config,
+				"misc.spu_font",
+				"sans",
+				_("font for subtitles"),
+				_("A font from the xine font directory to be used for the "
+				  "subtitle text."),
+				10, update_osd_font, this));
   this->src_encoding  = xine->config->register_string(xine->config, 
 				"misc.spu_src_encoding", 
-				"iso-8859-1", 
-				_("Encoding of subtitles"), 
-				NULL, 10, update_src_encoding, this);
-  this->use_unscaled  = xine->config->register_bool(xine->config, 
-			      "misc.spu_use_unscaled_osd", 
+				"iso-8859-1",
+				_("encoding of the subtitles"),
+				_("The encoding of the subtitle text in the stream. This setting "
+				  "is used to render non-ASCII characters correctly. If non-ASCII "
+				  "charachters are not displayed as you expect, ask the "
+				  "creator of the subtitles what encoding was used."),
+				10, update_src_encoding, this);
+  this->use_unscaled  = xine->config->register_bool(xine->config,
+			      "misc.spu_use_unscaled_osd",
 			       1,
-			       _("Use unscaled OSD if possible"), 
-			       NULL, 0, update_use_unscaled, this);
+			       _("use unscaled OSD if possible"),
+			       _("The unscaled OSD will be rendered independently of the video "
+				 "frame and will always be sharp, even if the video is magnified. "
+				 "This will look better, but does not work with all graphics "
+				 "hardware. The alternative is the scaled OSD, which will become "
+				 "blurry, if you enlarge a low resolution video to fullscreen, but "
+				 "it works with all graphics cards."),
+			       10, update_use_unscaled, this);
 
   return &this->class;
 }