From 557805bc402540b4fbde1b53e29cb7d55d8fabb9 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Tue, 10 Apr 2018 10:25:24 +0200 Subject: [PATCH] infobar: rework infobar timeout behavior Options were sometimes described ambiguously and previous behavior was no longer available. Now the descriptions should be more plausible for current behavior. --- data/locale/deutsch.locale | 15 +++++++++------ data/locale/english.locale | 15 +++++++++------ src/driver/vfd.cpp | 4 ++-- src/gui/channellist.cpp | 9 +++++---- src/gui/infoviewer.cpp | 8 ++++---- src/gui/lua/lua_hintbox.cpp | 2 +- src/gui/osd_setup.cpp | 19 +++++++++++++++++-- src/gui/test_menu.cpp | 2 +- src/neutrino.cpp | 14 +++++++++++--- src/system/locals.h | 3 +++ src/system/locals_intern.h | 3 +++ src/system/settings.h | 35 ++++++++++++++++++++++++++--------- 12 files changed, 91 insertions(+), 38 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index cce4934c9..f99dfc566 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -331,7 +331,7 @@ colormenu.osd_resolution OSD-Auflösung colormenu.shadow_color Schattenfarbe colormenu.textcolor Textfarbe colormenu.themeselect Theme auswählen -colormenu.timing Timeouts +colormenu.timing Timeouts, Anzeigeverhalten colormenusetup.menucontent Fensterinhalt colormenusetup.menucontent_inactive Fensterinhalt deaktiviert colormenusetup.menucontent_selected Fensterinhalt selektiert @@ -1253,10 +1253,11 @@ menu.hint_opkg_feed_addresses_edit Bearbeiten von Feed-Adressen menu.hint_opkg_install_local_package Paket von USB-Stick, SD, Freigabe oder lokalem Ordner installieren. menu.hint_opkg_upgrade Aktualisiert alle installierten Pakete auf die neueste verfügbare Version menu.hint_osd Farben, Schriftarten, Anzeigegröße, Ansichtsoptionen der Menüs usw. +menu.hint_osd_behavior_infobar Infobar nach Zeitvorgabe oder manuell ein- oder ausblenden. menu.hint_osd_language Wählen Sie ihre Menü-Sprache menu.hint_osd_preset Wählen Sie zwischen Röhren-TV (CRT) oder Flachbildschirm (LCD) menu.hint_osd_resolution Wählen Sie eine OSD-Auflösung -menu.hint_osd_timing Einblendzeit, die das OSD auf dem TV angezeigt wird +menu.hint_osd_timing OSD-Element nach Zeitvorgabe oder manuell ein- oder ausblenden. menu.hint_other_fonts Ändern Sie andere Schriftgrößen menu.hint_parentallock_changepin Geben Sie den 4-stelligen PIN-Code ein, der dann ggf. abgefragt wird menu.hint_parentallock_lockage Legen Sie fest, bei welcher Altersklasse die Abfrage der PIN erfolgt @@ -1444,7 +1445,7 @@ menu.hint_streaminfo Aktuelle Sender-Informationen über PIDs, SNR-Verhältnis, menu.hint_subchannel_pos Wählen Sie die Anzeigeposition der Unterkanäle aus menu.hint_sw_update System aktualisieren, Image sichern und wiederherstellen menu.hint_theme Wählen Sie ein vordefiniertes Farbschema, speichern oder laden Sie ihre eigenen Farbschemata -menu.hint_timeouts Anzeigedauer für Menüs oder Infofenster, die sich automatisch schließen (0 deaktiviert) +menu.hint_timeouts Anpassen von Timeouts und Anzeigeverhalten für Meldungen, Fenster, Menüs, Infobar usw. menu.hint_timeouts_static_messages Anzeigedauer für bestimmte Meldungen mit Benutzerinteraktion menu.hint_timer_followscreenings Zeige weitere Termine für Timerprogrammierung. menu.hint_timers Hinzufügen, entfernen und bearbeiten geplanter Aufnahmen oder anderer Timer @@ -2409,11 +2410,13 @@ timing.chanlist Kanalliste timing.epg EPG timing.filebrowser Filebrowser timing.infobar Infobar -timing.infobar_media_audio Infobar (Mediaplayer Audio) -timing.infobar_media_video Infobar (Mediaplayer Video) -timing.infobar_radio Infobar (Radiobetrieb) +timing.infobar_media_audio Audiowiedergabe +timing.infobar_media_video Videowiedergabe +timing.infobar_radio Radio-Modus +timing.infobar_tv TV-Modus timing.menu Menü timing.numericzap Umschalten mit Zifferntasten +timing.off manuell, ohne Timeout timing.popup_messages Popup Meldungen timing.static_messages Interaktive Meldungen timing.volumebar Lautstärkeanzeige diff --git a/data/locale/english.locale b/data/locale/english.locale index 12ce6f45f..57cc4c1ac 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -331,7 +331,7 @@ colormenu.osd_resolution OSD resolution colormenu.shadow_color Shadow Color colormenu.textcolor Text color colormenu.themeselect Select theme -colormenu.timing Timeouts +colormenu.timing Timeouts, display behavior colormenusetup.menucontent Content colormenusetup.menucontent_inactive Content inactive colormenusetup.menucontent_selected Content selected @@ -1253,10 +1253,11 @@ menu.hint_opkg_feed_addresses_edit Edit feed addresses menu.hint_opkg_install_local_package Install package from USB, SD, share or local directory. menu.hint_opkg_upgrade Updates all installed packages to the most recent version available menu.hint_osd Colors, fonts, screen size\nGUI look and feel options +menu.hint_osd_behavior_infobar Show infobar depending on time set or manually on or off. menu.hint_osd_language Select OSD language menu.hint_osd_preset Pre-configured screen margins for CRT and LCD TV menu.hint_osd_resolution Change OSD resolution -menu.hint_osd_timing After this time the OSD will be faded out +menu.hint_osd_timing Show OSD element depending on time set or manually on or off. menu.hint_other_fonts Change other font sizes menu.hint_parentallock_changepin Change PIN code menu.hint_parentallock_lockage Select age allowed to watch @@ -1444,7 +1445,7 @@ menu.hint_streaminfo Current channel info: pids, signal and noise ratio\nBitrate menu.hint_subchannel_pos Select subchannels menu position menu.hint_sw_update Update software menu.hint_theme Select pre-defined color theme\nSave or load theme from files -menu.hint_timeouts Configure time to hide GUI windows\nin seconds +menu.hint_timeouts Customize display behavior and timeouts for messages, windows, menus, infobar, etc. menu.hint_timeouts_static_messages Timeout for specific messages with user interaction menu.hint_timer_followscreenings Show selection with followscreenings for timer programming menu.hint_timers Add/Remove/Edit scheduled\nrecording, reminders etc. @@ -2409,11 +2410,13 @@ timing.chanlist Channellist timing.epg Epg timing.filebrowser Filebrowser timing.infobar Infobar -timing.infobar_media_audio Infobar (Mediaplayer audio) -timing.infobar_media_video Infobar (Mediaplayer video) -timing.infobar_radio Infobar (radio mode) +timing.infobar_media_audio Audio +timing.infobar_media_video Video +timing.infobar_radio Radio +timing.infobar_tv TV timing.menu Menu timing.numericzap Numeric Zap +timing.off manual, without timeout timing.popup_messages Popup messages timing.static_messages Interactive messages timing.volumebar Volume bar diff --git a/src/driver/vfd.cpp b/src/driver/vfd.cpp index 6adf582d0..c5be40cf7 100644 --- a/src/driver/vfd.cpp +++ b/src/driver/vfd.cpp @@ -164,7 +164,7 @@ void CVFD::wake_up() { else setPower(1); if(g_settings.lcd_info_line){ - switch_name_time_cnt = g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR] + 10; + switch_name_time_cnt = g_settings.handling_infobar[SNeutrinoSettings::HANDLING_INFOBAR] + 10; } } @@ -609,7 +609,7 @@ void CVFD::setMode(const MODES m, const char * const title) showServicename(servicename); showclock = true; if(g_settings.lcd_info_line) - switch_name_time_cnt = g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR] + 10; + switch_name_time_cnt = g_settings.handling_infobar[SNeutrinoSettings::HANDLING_INFOBAR] + 10; break; case MODE_AUDIO: { diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index c7784f02c..ae4242bed 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -1412,8 +1412,8 @@ int CChannelList::numericZap(int key) if (doZap) { int mode = CNeutrinoApp::getInstance()->getMode(); if ( - ((mode == NeutrinoModes::mode_tv || mode == NeutrinoModes::mode_webtv) && g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR] == 0) || - ((mode == NeutrinoModes::mode_radio || mode == NeutrinoModes::mode_webradio) && g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_RADIO] == 0) + ((mode == NeutrinoModes::mode_tv || mode == NeutrinoModes::mode_webtv) && g_settings.timing[SNeutrinoSettings::HANDLING_INFOBAR] == 0) || + ((mode == NeutrinoModes::mode_radio || mode == NeutrinoModes::mode_webradio) && g_settings.timing[SNeutrinoSettings::HANDLING_INFOBAR_RADIO] == 0) ) g_InfoViewer->killTitle(); @@ -1538,10 +1538,11 @@ void CChannelList::virtual_zap_mode(bool up) if (doZap) { int mode = CNeutrinoApp::getInstance()->getMode(); if ( - ((mode == NeutrinoModes::mode_tv || mode == NeutrinoModes::mode_webtv) && g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR] == 0) || - ((mode == NeutrinoModes::mode_radio || mode == NeutrinoModes::mode_webradio) && g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_RADIO] == 0) + ((mode == NeutrinoModes::mode_tv || mode == NeutrinoModes::mode_webtv) && g_settings.timing[SNeutrinoSettings::HANDLING_INFOBAR] == 0) || + ((mode == NeutrinoModes::mode_radio || mode == NeutrinoModes::mode_webradio) && g_settings.timing[SNeutrinoSettings::HANDLING_INFOBAR_RADIO] == 0) ) g_InfoViewer->killTitle(); + if(channel && SameTP(channel)) zapToChannel(channel); else diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index 409197abf..c75c010a0 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -925,18 +925,18 @@ void CInfoViewer::setInfobarTimeout(int timeout_ext) { case NeutrinoModes::mode_radio: case NeutrinoModes::mode_webradio: - timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_RADIO] + timeout_ext); + timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.handling_infobar[SNeutrinoSettings::HANDLING_INFOBAR_RADIO] + timeout_ext); break; case NeutrinoModes::mode_ts: if (CMoviePlayerGui::getInstance().IsAudioPlaying()) - timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_MEDIA_AUDIO] + timeout_ext); + timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.handling_infobar[SNeutrinoSettings::HANDLING_INFOBAR_MEDIA_AUDIO] + timeout_ext); else - timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_MEDIA_VIDEO] + timeout_ext); + timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.handling_infobar[SNeutrinoSettings::HANDLING_INFOBAR_MEDIA_VIDEO] + timeout_ext); break; case NeutrinoModes::mode_tv: case NeutrinoModes::mode_webtv: default: - timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR] + timeout_ext); + timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.handling_infobar[SNeutrinoSettings::HANDLING_INFOBAR] + timeout_ext); break; } } diff --git a/src/gui/lua/lua_hintbox.cpp b/src/gui/lua/lua_hintbox.cpp index f7609ab4d..deaaf26bc 100644 --- a/src/gui/lua/lua_hintbox.cpp +++ b/src/gui/lua/lua_hintbox.cpp @@ -136,7 +136,7 @@ int CLuaInstHintbox::HintboxExec(lua_State *L) neutrino_msg_data_t data; if ( timeout == -1 ) timeout = 5; /// default timeout 5 sec - //timeout = g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR]; + //timeout = g_settings.handling_infobar[SNeutrinoSettings::HANDLING_INFOBAR]; uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout); diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 78200e811..74b96d714 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -362,6 +362,9 @@ int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey) return res; } else if(actionKey=="osd.def") { + for (int i = 0; i < SNeutrinoSettings::HANDLING_INFOBAR_SETTING_COUNT; i++) + g_settings.handling_infobar[i] = handling_infobar_setting[i].default_timing; + for (int i = 0; i < SNeutrinoSettings::TIMING_SETTING_COUNT; i++) g_settings.timing[i] = timing_setting[i].default_timing; return res; @@ -1071,16 +1074,28 @@ void COsdSetup::showOsdTimeoutSetup(CMenuWidget* menu_timeout) std::string nf("%d "); nf += g_Locale->getText(LOCALE_UNIT_SHORT_SECOND); + CMenuOptionNumberChooser *ch = NULL; for (int i = 0; i < SNeutrinoSettings::TIMING_SETTING_COUNT; i++) { - CMenuOptionNumberChooser *ch = new CMenuOptionNumberChooser(timing_setting[i].name, &g_settings.timing[i], true, 0, 240); + ch = new CMenuOptionNumberChooser(timing_setting[i].name, &g_settings.timing[i], true, 0, 240); ch->setNumberFormat(nf); - ch->setLocalizedValue(0, LOCALE_OPTIONS_OFF); + ch->setLocalizedValue(0, LOCALE_TIMING_OFF); ch->setHint("", timing_setting[i].hint); menu_timeout->addItem(ch); } + menu_timeout->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_TIMING_INFOBAR)); + + for (int i = 0; i < SNeutrinoSettings::HANDLING_INFOBAR_SETTING_COUNT; i++) + { + ch = new CMenuOptionNumberChooser(handling_infobar_setting[i].name, &g_settings.handling_infobar[i], true, 0, 240); + ch->setNumberFormat(nf); + ch->setLocalizedValue(0, LOCALE_TIMING_OFF); + ch->setHint("", handling_infobar_setting[i].hint); + menu_timeout->addItem(ch); + } + menu_timeout->addItem(GenericMenuSeparatorLine); menu_timeout->addItem(new CMenuForwarder(LOCALE_OPTIONS_DEFAULT, true, NULL, this, "osd.def", CRCInput::RC_red)); } diff --git a/src/gui/test_menu.cpp b/src/gui/test_menu.cpp index c4459b070..239f54445 100644 --- a/src/gui/test_menu.cpp +++ b/src/gui/test_menu.cpp @@ -912,7 +912,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey) } else if (actionKey == "msgbox_test_cancel"){ CMsgBox * msgBox = new CMsgBox("Testmenu: MsgBox exit test", "Please press key"); -// msgBox->setTimeOut(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR]); + // msgBox->setTimeOut(g_settings.handling_infobar[SNeutrinoSettings::HANDLING_INFOBAR]); msgBox->paint(); res = msgBox->exec(); msgBox->hide(); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 791134f6c..46eb4515d 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -850,6 +850,9 @@ int CNeutrinoApp::loadSetup(const char * fname) for (int i = 0; i < SNeutrinoSettings::TIMING_SETTING_COUNT; i++) g_settings.timing[i] = configfile.getInt32(locale_real_names[timing_setting[i].name], timing_setting[i].default_timing); + for (int i = 0; i < SNeutrinoSettings::HANDLING_INFOBAR_SETTING_COUNT; i++) + g_settings.handling_infobar[i] = configfile.getInt32(locale_real_names[handling_infobar_setting[i].name], handling_infobar_setting[i].default_timing); + for (int i = 0; i < SNeutrinoSettings::LCD_SETTING_COUNT; i++) g_settings.lcd_setting[i] = configfile.getInt32(lcd_setting[i].name, lcd_setting[i].default_value); g_settings.lcd_setting_dim_time = configfile.getString("lcd_dim_time","0"); @@ -1474,6 +1477,10 @@ void CNeutrinoApp::saveSetup(const char * fname) for (int i = 0; i < SNeutrinoSettings::TIMING_SETTING_COUNT; i++) configfile.setInt32(locale_real_names[timing_setting[i].name], g_settings.timing[i]); + //timing/handling infobar + for (int i = 0; i < SNeutrinoSettings::HANDLING_INFOBAR_SETTING_COUNT; i++) + configfile.setInt32(locale_real_names[handling_infobar_setting[i].name], g_settings.handling_infobar[i]); + for (int i = 0; i < SNeutrinoSettings::LCD_SETTING_COUNT; i++) configfile.setInt32(lcd_setting[i].name, g_settings.lcd_setting[i]); configfile.setString("lcd_dim_time", g_settings.lcd_setting_dim_time); @@ -2860,10 +2867,10 @@ void CNeutrinoApp::RealRun() else if( ( msg == CRCInput::RC_help ) || ( msg == CRCInput::RC_info) || ( msg == NeutrinoMessages::SHOW_INFOBAR ) ) { -#if 0 +#if 1 bool enabled_by_timing = ( - ((mode == NeutrinoModes::mode_tv || mode == NeutrinoModes::mode_webtv) && g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR] != 0) - || ((mode == NeutrinoModes::mode_radio || mode == NeutrinoModes::mode_webradio) && g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_RADIO] != 0) + ((mode == NeutrinoModes::mode_tv || mode == NeutrinoModes::mode_webtv) && g_settings.handling_infobar[SNeutrinoSettings::HANDLING_INFOBAR] != 0) || + ((mode == NeutrinoModes::mode_radio || mode == NeutrinoModes::mode_webradio) && g_settings.handling_infobar[SNeutrinoSettings::HANDLING_INFOBAR_RADIO] != 0) ); bool show_info = ((msg != NeutrinoMessages::SHOW_INFOBAR) || (g_InfoViewer->is_visible || enabled_by_timing)); #else @@ -5180,6 +5187,7 @@ static struct __key_rename key_rename[] = { { NULL, NULL } }; + /* actually do the migration of the config entries */ void CNeutrinoApp::migrateConfig(const char *fname) { diff --git a/src/system/locals.h b/src/system/locals.h index 0e16fafe6..f2e5a8ce3 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1280,6 +1280,7 @@ typedef enum LOCALE_MENU_HINT_OPKG_INSTALL_LOCAL_PACKAGE, LOCALE_MENU_HINT_OPKG_UPGRADE, LOCALE_MENU_HINT_OSD, + LOCALE_MENU_HINT_OSD_BEHAVIOR_INFOBAR, LOCALE_MENU_HINT_OSD_LANGUAGE, LOCALE_MENU_HINT_OSD_PRESET, LOCALE_MENU_HINT_OSD_RESOLUTION, @@ -2439,8 +2440,10 @@ typedef enum LOCALE_TIMING_INFOBAR_MEDIA_AUDIO, LOCALE_TIMING_INFOBAR_MEDIA_VIDEO, LOCALE_TIMING_INFOBAR_RADIO, + LOCALE_TIMING_INFOBAR_TV, LOCALE_TIMING_MENU, LOCALE_TIMING_NUMERICZAP, + LOCALE_TIMING_OFF, LOCALE_TIMING_POPUP_MESSAGES, LOCALE_TIMING_STATIC_MESSAGES, LOCALE_TIMING_VOLUMEBAR, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 6fda4a0b4..d606c0c16 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1280,6 +1280,7 @@ const char * locale_real_names[] = "menu.hint_opkg_install_local_package", "menu.hint_opkg_upgrade", "menu.hint_osd", + "menu.hint_osd_behavior_infobar", "menu.hint_osd_language", "menu.hint_osd_preset", "menu.hint_osd_resolution", @@ -2439,8 +2440,10 @@ const char * locale_real_names[] = "timing.infobar_media_audio", "timing.infobar_media_video", "timing.infobar_radio", + "timing.infobar_tv", "timing.menu", "timing.numericzap", + "timing.off", "timing.popup_messages", "timing.static_messages", "timing.volumebar", diff --git a/src/system/settings.h b/src/system/settings.h index ee9e71bd7..01486f208 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -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