diff options
| -rw-r--r-- | config.c | 4 | ||||
| -rw-r--r-- | config.h | 5 | ||||
| -rw-r--r-- | setup_menu.c | 11 |
3 files changed, 16 insertions, 4 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.65 2008-05-20 10:06:20 phintuka Exp $ + * $Id: config.c,v 1.66 2008-06-11 23:08:44 phintuka Exp $ * */ @@ -481,6 +481,7 @@ config_t::config_t() { strn0cpy(spu_lang[3], "" , sizeof(spu_lang[3])); #endif extsub_size = -1; + dvb_subtitles = 0; alpha_correction = 0; alpha_correction_abs = 0; @@ -720,6 +721,7 @@ bool config_t::SetupParse(const char *Name, const char *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, "OSD.DvbSubtitles")) dvb_subtitles = atoi(Value); else if (!strcasecmp(Name, "RemoteMode")) remote_mode = atoi(Value); else if (!strcasecmp(Name, "Remote.ListenPort")) listen_port = 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.47 2008-05-18 19:42:33 phintuka Exp $ + * $Id: config.h,v 1.48 2008-06-11 23:08:44 phintuka Exp $ * */ @@ -256,7 +256,8 @@ class config_t { int osd_blending_lowresvideo; // Use hardware blending for low-resolution video int alpha_correction; int alpha_correction_abs; - int extsub_size; /* size of separate subtitles ( -1 = xine default ; 0...6 = { tiny small normal large very large huge } */ + int extsub_size; // size of separate subtitles ( -1 = xine default ; 0...6 = { tiny small normal large very large huge } + int dvb_subtitles; // send DVB subtitles in data stream (decode+display using xine-lib or external media player) // Media player #if VDRVERSNUM < 10515 diff --git a/setup_menu.c b/setup_menu.c index 5f0a1176..47573eb0 100644 --- a/setup_menu.c +++ b/setup_menu.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: setup_menu.c,v 1.58 2008-04-29 12:44:25 phintuka Exp $ + * $Id: setup_menu.c,v 1.59 2008-06-11 23:08:44 phintuka Exp $ * */ @@ -951,6 +951,13 @@ void cMenuSetupOSD::Set(void) Add(new cMenuEditStraI18nItem(tr("External subtitle size"), &newconfig.extsub_size, SUBTITLESIZE_count, xc.s_subtitleSizes)); +#if VDRVERSNUM >= 10510 + Add(new cMenuEditBoolItem(tr("DVB subtitle decoder"), + &newconfig.dvb_subtitles, + "VDR", + "frontend")); +#endif + if(current<1) current=1; /* first item is not selectable */ SetCurrent(Get(current)); //SetCurrent(Get(1)); @@ -1024,6 +1031,8 @@ void cMenuSetupOSD::Store(void) SetupStore("OSD.SpuLang2", xc.spu_lang[2]); SetupStore("OSD.SpuLang3", xc.spu_lang[3]); #endif + SetupStore("OSD.DvbSubtitles", xc.dvb_subtitles); + Setup.Save(); } |