diff options
| -rw-r--r-- | config.c | 14 | ||||
| -rw-r--r-- | config.h | 6 |
2 files changed, 14 insertions, 6 deletions
@@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: config.c,v 1.52 2008-02-19 02:59:46 phintuka Exp $ + * $Id: config.c,v 1.53 2008-02-20 03:25:11 phintuka Exp $ * */ @@ -466,12 +466,14 @@ config_t::config_t() { unscaled_osd_opaque = 0; unscaled_osd_lowresvideo = 1; +#if VDRVERSNUM < 10515 spu_autoshow = 0; memset(spu_lang, 0, sizeof(spu_lang)); - strn0cpy(spu_lang[0], "en", sizeof(spu_lang[0])); - strn0cpy(spu_lang[2], "de", sizeof(spu_lang[2])); - strn0cpy(spu_lang[1], "fi", sizeof(spu_lang[1])); - //strn0cpy(spu_lang[3], "" , sizeof(spu_lang[3])); + strn0cpy(spu_lang[0], "eng", sizeof(spu_lang[0])); + strn0cpy(spu_lang[1], "deu", sizeof(spu_lang[1])); + strn0cpy(spu_lang[2], "fin", sizeof(spu_lang[2])); + strn0cpy(spu_lang[3], "" , sizeof(spu_lang[3])); +#endif extsub_size = -1; alpha_correction = 0; @@ -706,11 +708,13 @@ bool config_t::SetupParse(const char *Name, const char *Value) else if (!strcasecmp(Name, "OSD.AlphaCorrection")) alpha_correction = atoi(Value); else if (!strcasecmp(Name, "OSD.AlphaCorrectionAbs")) alpha_correction_abs = atoi(Value); +#if VDRVERSNUM < 10515 else if (!strcasecmp(Name, "OSD.SpuAutoSelect")) spu_autoshow = atoi(Value); else if (!strcasecmp(Name, "OSD.SpuLang0")) STRN0CPY(spu_lang[0], Value); else if (!strcasecmp(Name, "OSD.SpuLang1")) STRN0CPY(spu_lang[1], Value); else if (!strcasecmp(Name, "OSD.SpuLang2")) STRN0CPY(spu_lang[2], Value); else if (!strcasecmp(Name, "OSD.SpuLang3")) STRN0CPY(spu_lang[3], Value); +#endif else if (!strcasecmp(Name, "OSD.ExtSubSize")) extsub_size = atoi(Value); else if (!strcasecmp(Name, "RemoteMode")) remote_mode = atoi(Value); @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: config.h,v 1.36 2008-02-19 02:59:46 phintuka Exp $ + * $Id: config.h,v 1.37 2008-02-20 03:25:11 phintuka Exp $ * */ @@ -14,6 +14,8 @@ #include <string.h> #include <stdint.h> +#include <vdr/config.h> + // Decoder buffer size #define PES_BUFFERS_CUSTOM 0 #define PES_BUFFERS_TINY_50 1 @@ -241,8 +243,10 @@ class config_t { int extsub_size; /* size of separate subtitles ( -1 = xine default ; 0...6 = { tiny small normal large very large huge } */ // Media player +#if VDRVERSNUM < 10515 int spu_autoshow; // Preferred SPU language(s) for media player char spu_lang[4][4]; +#endif char browse_files_dir[4096]; char browse_music_dir[4096]; char browse_images_dir[4096]; |