diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-12-12 22:00:47 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-12-12 22:00:47 +0000 |
| commit | 16b6f9646902e6940a991f1d3577c068573015a8 (patch) | |
| tree | 05401271b5a9a81668a00ddb079d3db259e4bcee /src/libspucc | |
| parent | ec4c867b1a59029166c5efc025966f7886f15c61 (diff) | |
| download | xine-lib-16b6f9646902e6940a991f1d3577c068573015a8.tar.gz xine-lib-16b6f9646902e6940a991f1d3577c068573015a8.tar.bz2 | |
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.
CVS patchset: 7233
CVS date: 2004/12/12 22:00:47
Diffstat (limited to 'src/libspucc')
| -rw-r--r-- | src/libspucc/xine_decoder.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/libspucc/xine_decoder.c b/src/libspucc/xine_decoder.c index 8e3f88dea..ae23ed43d 100644 --- a/src/libspucc/xine_decoder.c +++ b/src/libspucc/xine_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.c,v 1.30 2004/05/05 17:36:48 mroi Exp $ + * $Id: xine_decoder.c,v 1.31 2004/12/12 22:01:10 mroi Exp $ * * closed caption spu decoder. receive data by events. * @@ -151,7 +151,7 @@ static void spucc_font_change(void *this_gen, xine_cfg_entry_t *value) 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 @@ static void spucc_num_change(void *this_gen, xine_cfg_entry_t *value) 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 @@ static void spucc_register_cfg_vars(spucc_class_t *this, 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 @@ static void spucc_register_cfg_vars(spucc_class_t *this, 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."), |