From ac188227372ab4197d42c13bb64e2d285602e8b0 Mon Sep 17 00:00:00 2001 From: thilo Date: Sat, 4 Jun 2011 20:52:13 +0000 Subject: [PATCH] *neutrino osd timeouts: add extra setting for movieplayer timeout timeout for movieplayer was set default to 6 sec, now it's possible to set it's own timeout git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1509 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- data/locale/deutsch.locale | 1 + data/locale/english.locale | 1 + src/gui/infoviewer.cpp | 3 +++ src/system/locals.h | 1 + src/system/locals_intern.h | 1 + src/system/settings.h | 8 ++++---- 6 files changed, 11 insertions(+), 4 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 9ce69a80e..7bca91b26 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1399,6 +1399,7 @@ timing.filebrowser Filebrowser timing.hint_1 Einblendzeit in Sek., die das OSD timing.hint_2 auf dem TV angezeigt wird timing.infobar Infobar +timing.infobar_movieplayer Infobar (Filmwiedergabe) timing.infobar_radio Infobar (Radiobetrieb) timing.menu Menü timing.numericzap Umschalten mit Zifferntasten diff --git a/data/locale/english.locale b/data/locale/english.locale index c0ec445c5..31c175f72 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1399,6 +1399,7 @@ timing.filebrowser Filebrowser timing.hint_1 Time in sec. After this time the timing.hint_2 infobar will be faded out. timing.infobar Infobar +timing.infobar_movieplayer Infobar (movie mode) timing.infobar_radio Infobar (radio mode) timing.menu Menu timing.numericzap Numeric Zap diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index 2a216bd0c..9ef66b7a8 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -772,6 +772,9 @@ void CInfoViewer::loop(int fadeValue, bool show_dot ,bool fadeIn) case NeutrinoMessages::mode_radio: timeoutEnd = CRCInput::calcTimeoutEnd (g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_RADIO] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_RADIO]); break; + case NeutrinoMessages::mode_ts: + timeoutEnd = CRCInput::calcTimeoutEnd (g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_MOVIE] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_MOVIE]); + break; default: timeoutEnd = CRCInput::calcTimeoutEnd(6); break; diff --git a/src/system/locals.h b/src/system/locals.h index 0d45669e1..d892db853 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1426,6 +1426,7 @@ typedef enum LOCALE_TIMING_HINT_1, LOCALE_TIMING_HINT_2, LOCALE_TIMING_INFOBAR, + LOCALE_TIMING_INFOBAR_MOVIEPLAYER, LOCALE_TIMING_INFOBAR_RADIO, LOCALE_TIMING_MENU, LOCALE_TIMING_NUMERICZAP, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 51cabe90b..c17a0ee19 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1426,6 +1426,7 @@ const char * locale_real_names[] = "timing.hint_1", "timing.hint_2", "timing.infobar", + "timing.infobar_movieplayer", "timing.infobar_radio", "timing.menu", "timing.numericzap", diff --git a/src/system/settings.h b/src/system/settings.h index 8ee4ffc03..468d3c7bb 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -135,10 +135,10 @@ struct SNeutrinoSettings TIMING_EPG = 2, TIMING_INFOBAR = 3, TIMING_INFOBAR_RADIO = 4, -// TIMING_INFOBAR_MOVIEPLAYER, + TIMING_INFOBAR_MOVIE = 5, // TIMING_VOLUMEBAR, - TIMING_FILEBROWSER = 5, - TIMING_NUMERICZAP = 6, + TIMING_FILEBROWSER = 6, + TIMING_NUMERICZAP = 7, TIMING_SETTING_COUNT }; @@ -530,7 +530,7 @@ const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_CO { 240, LOCALE_TIMING_EPG }, { 6, LOCALE_TIMING_INFOBAR }, { 0, LOCALE_TIMING_INFOBAR_RADIO }, -// { 6, LOCALE_TIMING_INFOBAR_MOVIEPLAYER}, + { 6, LOCALE_TIMING_INFOBAR_MOVIEPLAYER}, // { 3, LOCALE_TIMING_VOLUMEBAR }, { 60, LOCALE_TIMING_FILEBROWSER }, { 3, LOCALE_TIMING_NUMERICZAP }