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

- multiformat audioplayer: add separate timeout for infobar

Browse Source 
Conflicts:
	src/gui/infoviewer.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2017-10-28 19:13:46 +02:00
committed by Thilo Graf
parent c7d863a809
commit 21f6ec5944
8 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/system/settings.h
View File

@@ -413,17 +413,18 @@ struct SNeutrinoSettings
//timing
enum TIMING_SETTINGS
{
TIMING_MENU = 0,
TIMING_CHANLIST = 1,
TIMING_EPG = 2,
TIMING_INFOBAR = 3,
TIMING_INFOBAR_RADIO = 4,
TIMING_INFOBAR_MOVIE = 5,
TIMING_VOLUMEBAR = 6,
TIMING_FILEBROWSER = 7,
TIMING_NUMERICZAP = 8,
TIMING_POPUP_MESSAGES = 9,
TIMING_STATIC_MESSAGES = 10,
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,
TIMING_POPUP_MESSAGES,
TIMING_STATIC_MESSAGES,
TIMING_SETTING_COUNT
};
@@ -911,7 +912,8 @@ const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_CO
{ 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},
{ 6, LOCALE_TIMING_INFOBAR_MOVIEPLAYER, 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},