mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 10:21:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

infobar: rework infobar timeout behavior

Browse Source 
Options were sometimes described ambiguously and previous behavior was no longer available.
Now the descriptions should be more plausible for current behavior.
This commit is contained in:
Thilo Graf
2018-04-10 10:25:24 +02:00
parent 6f02799b03
commit 557805bc40
12 changed files with 91 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/system/settings.h
View File

@@ -416,10 +416,6 @@ struct SNeutrinoSettings
TIMING_MENU = 0,
TIMING_CHANLIST,
TIMING_EPG,
TIMING_INFOBAR,
TIMING_INFOBAR_RADIO,
TIMING_INFOBAR_MEDIA_AUDIO,
TIMING_INFOBAR_MEDIA_VIDEO,
TIMING_VOLUMEBAR,
TIMING_FILEBROWSER,
TIMING_NUMERICZAP,
@@ -431,6 +427,19 @@ struct SNeutrinoSettings
int timing [TIMING_SETTING_COUNT];
//timing/handling infobar
enum HANDLING_INFOBAR_SETTINGS
{
HANDLING_INFOBAR,
HANDLING_INFOBAR_RADIO,
HANDLING_INFOBAR_MEDIA_AUDIO,
HANDLING_INFOBAR_MEDIA_VIDEO,
HANDLING_INFOBAR_SETTING_COUNT
};
int handling_infobar[HANDLING_INFOBAR_SETTING_COUNT];
//widget settings
int widget_fade;
@@ -900,6 +909,8 @@ struct SNeutrinoSettings
extern const struct personalize_settings_t personalize_settings[SNeutrinoSettings::P_SETTINGS_MAX];
// timeout modes
typedef struct time_settings_t
{
const int default_timing;
@@ -907,15 +918,12 @@ typedef struct time_settings_t
const neutrino_locale_t hint;
} time_settings_struct_t;
// osd timing modes
const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_COUNT] =
{
{ 240, LOCALE_TIMING_MENU, LOCALE_MENU_HINT_OSD_TIMING},//TODO: add hint locales
{ 240, LOCALE_TIMING_MENU, LOCALE_MENU_HINT_OSD_TIMING},
{ 60, LOCALE_TIMING_CHANLIST, LOCALE_MENU_HINT_OSD_TIMING},
{ 240, LOCALE_TIMING_EPG, LOCALE_MENU_HINT_OSD_TIMING},
{ 6, LOCALE_TIMING_INFOBAR, LOCALE_MENU_HINT_OSD_TIMING},
{ 0, LOCALE_TIMING_INFOBAR_RADIO, LOCALE_MENU_HINT_OSD_TIMING},
{ 0, LOCALE_TIMING_INFOBAR_MEDIA_AUDIO, LOCALE_MENU_HINT_OSD_TIMING},
{ 6, LOCALE_TIMING_INFOBAR_MEDIA_VIDEO, LOCALE_MENU_HINT_OSD_TIMING},
{ 3, LOCALE_TIMING_VOLUMEBAR, LOCALE_MENU_HINT_OSD_TIMING},
{ 60, LOCALE_TIMING_FILEBROWSER, LOCALE_MENU_HINT_OSD_TIMING},
{ 3, LOCALE_TIMING_NUMERICZAP, LOCALE_MENU_HINT_OSD_TIMING},
@@ -923,6 +931,15 @@ const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_CO
{ 60, LOCALE_TIMING_STATIC_MESSAGES, LOCALE_MENU_HINT_TIMEOUTS_STATIC_MESSAGES}
};
// infobar osd modes
const time_settings_struct_t handling_infobar_setting[SNeutrinoSettings::HANDLING_INFOBAR_SETTING_COUNT] =
{
{ 6, LOCALE_TIMING_INFOBAR_TV, LOCALE_MENU_HINT_OSD_BEHAVIOR_INFOBAR},
{ 0, LOCALE_TIMING_INFOBAR_RADIO, LOCALE_MENU_HINT_OSD_BEHAVIOR_INFOBAR},
{ 0, LOCALE_TIMING_INFOBAR_MEDIA_AUDIO, LOCALE_MENU_HINT_OSD_BEHAVIOR_INFOBAR},
{ 6, LOCALE_TIMING_INFOBAR_MEDIA_VIDEO, LOCALE_MENU_HINT_OSD_BEHAVIOR_INFOBAR}
};
// lcdd
#define DEFAULT_VFD_BRIGHTNESS 15
#define DEFAULT_VFD_STANDBYBRIGHTNESS 5