[xine-cvs] CVS: xine-lib/src/libspucc xine_decoder.c,1.30,1.31

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

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

Modified Files:
	xine_decoder.c 
Log Message:
huge patch ahead: reorganizing config entries with automatic conversion
and backwards compatible translation

Sorry, I got a litte tired proof-reading the patch, so their might be
bugs lurking around. I will give it some further examination and
(as necessary) fixing tomorrow.


Index: xine_decoder.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libspucc/xine_decoder.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- xine_decoder.c	5 May 2004 17:36:48 -0000	1.30
+++ xine_decoder.c	12 Dec 2004 22:01:10 -0000	1.31
@@ -151,7 +151,7 @@
   cc_config_t *cc_cfg = &this->cc_cfg;
   char *font;
   
-  if (strcmp(value->key, "misc.cc_font") == 0)
+  if (strcmp(value->key, "subtitles.closedcaption.font") == 0)
     font = cc_cfg->font;
   else
     font = cc_cfg->italic_font;
@@ -170,7 +170,7 @@
   cc_config_t *cc_cfg = &this->cc_cfg;
   int *num;
   
-  if (strcmp(value->key, "misc.cc_font_size") == 0)
+  if (strcmp(value->key, "subtitles.closedcaption.font_size") == 0)
     num = &cc_cfg->font_size;
   else
     num = &cc_cfg->center;
@@ -188,14 +188,14 @@
   cc_config_t *cc_vars = &this->cc_cfg;
 
   cc_vars->cc_enabled = xine_cfg->register_bool(xine_cfg,
-						"misc.cc_enabled", 0,
+						"subtitles.closedcaption.enabled", 0,
 						_("display closed captions in MPEG-2 streams"),
 						_("Closed Captions are subtitles mostly meant "
 						  "to help the hearing impaired."),
 						0, spucc_cfg_enable_change, this);
   
   cc_vars->cc_scheme = xine_cfg->register_enum(xine_cfg,
-					       "misc.cc_scheme", 0,
+					       "subtitles.closedcaption.scheme", 0,
 					       cc_schemes,
 					       _("closed-captioning foreground/background scheme"),
 					       _("Choose your favourite rendering of the closed "
@@ -203,26 +203,26 @@
 					       10, spucc_cfg_scheme_change, this);
   
   copy_str(cc_vars->font, 
-	   xine_cfg->register_string(xine_cfg, "misc.cc_font", "cc",
+	   xine_cfg->register_string(xine_cfg, "subtitles.closedcaption.font", "cc",
 				     _("standard closed captioning font"),
 				     _("Choose the font for standard closed captions text."),
 				     20, spucc_font_change, this),
 	   CC_FONT_MAX);
   
   copy_str(cc_vars->italic_font,
-	   xine_cfg->register_string(xine_cfg, "misc.cc_italic_font", "cci",
+	   xine_cfg->register_string(xine_cfg, "subtitles.closedcaption.italic_font", "cci",
 				     _("italic closed captioning font"),
 				     _("Choose the font for italic closed captions text."),
 				     20, spucc_font_change, this),
 	   CC_FONT_MAX);
   
-  cc_vars->font_size = xine_cfg->register_num(xine_cfg, "misc.cc_font_size",
+  cc_vars->font_size = xine_cfg->register_num(xine_cfg, "subtitles.closedcaption.font_size",
 					      24,
 					      _("closed captioning font size"),
 					      _("Choose the font size for closed captions text."),
 					      10, spucc_num_change, this);
   
-  cc_vars->center = xine_cfg->register_bool(xine_cfg, "misc.cc_center", 1,
+  cc_vars->center = xine_cfg->register_bool(xine_cfg, "subtitles.closedcaption.center", 1,
 					    _("center-adjust closed captions"),
 					    _("When enabled, closed captions will be positioned "
 					      "by the center of the individual lines."),