summaryrefslogtreecommitdiff
path: root/src/libspucmml
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2004-12-12 22:00:47 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2004-12-12 22:00:47 +0000
commit16b6f9646902e6940a991f1d3577c068573015a8 (patch)
tree05401271b5a9a81668a00ddb079d3db259e4bcee /src/libspucmml
parentec4c867b1a59029166c5efc025966f7886f15c61 (diff)
downloadxine-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/libspucmml')
-rw-r--r--src/libspucmml/xine_decoder.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libspucmml/xine_decoder.c b/src/libspucmml/xine_decoder.c
index c64a873db..ddf3714ae 100644
--- a/src/libspucmml/xine_decoder.c
+++ b/src/libspucmml/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.3 2004/09/12 09:29:28 f1rmb Exp $
+ * $Id: xine_decoder.c,v 1.4 2004/12/12 22:01:10 mroi Exp $
*
*/
@@ -473,13 +473,13 @@ static spu_decoder_t *spucmml_class_open_plugin (spu_decoder_class_t *class_gen,
this->subtitle_size = 1;
this->font = class->xine->config->register_string(class->xine->config,
- "misc.spu_font",
+ "subtitles.separate.font",
"sans",
_("font for external subtitles"),
NULL, 0, update_osd_font, this);
this->vertical_offset = class->xine->config->register_num(class->xine->config,
- "misc.spu_vertical_offset",
+ "subtitles.separate.vertical_offset",
0,
_("subtitle vertical offset (relative window size)"),
NULL, 0, update_vertical_offset, this);
@@ -525,7 +525,7 @@ static void *init_spu_decoder_plugin (xine_t *xine, void *data) {
this->xine = xine;
this->src_encoding = xine->config->register_string(xine->config,
- "misc.spu_src_encoding",
+ "subtitles.separate.src_encoding",
"iso-8859-1",
_("encoding of subtitles"),
NULL, 10, update_src_encoding, this);