mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 87fe81b890
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-02 (Fri, 02 Dec 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-12-02 23:39:21 +01:00
parent b90ff0ddf1 243909caf8
commit e30d9b012a
41 changed files with 345 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/system/settings.h
View File

@@ -418,6 +418,7 @@ struct SNeutrinoSettings
TIMING_FILEBROWSER = 7,
TIMING_NUMERICZAP = 8,
TIMING_POPUP_MESSAGES = 9,
TIMING_STATIC_MESSAGES = 10,
TIMING_SETTING_COUNT
};
@@ -922,20 +923,22 @@ typedef struct time_settings_t
{
const int default_timing;
const neutrino_locale_t name;
const neutrino_locale_t hint;
} time_settings_struct_t;
const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_COUNT] =
{
{ 180, LOCALE_TIMING_MENU }, //NI
{ 180, LOCALE_TIMING_CHANLIST }, //NI
{ 180, LOCALE_TIMING_EPG }, //NI
{ 6, LOCALE_TIMING_INFOBAR },
{ 0, LOCALE_TIMING_INFOBAR_RADIO },
{ 6, LOCALE_TIMING_INFOBAR_MOVIEPLAYER},
{ 3, LOCALE_TIMING_VOLUMEBAR },
{ 180, LOCALE_TIMING_FILEBROWSER }, //NI
{ 3, LOCALE_TIMING_NUMERICZAP },
{ 6, LOCALE_TIMING_POPUP_MESSAGES}
{ 180, LOCALE_TIMING_MENU, LOCALE_MENU_HINT_OSD_TIMING}, //NI //TODO: add hint locales
{ 180, LOCALE_TIMING_CHANLIST, LOCALE_MENU_HINT_OSD_TIMING}, //NI
{ 180, LOCALE_TIMING_EPG, LOCALE_MENU_HINT_OSD_TIMING}, //NI
{ 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},
{ 3, LOCALE_TIMING_VOLUMEBAR, LOCALE_MENU_HINT_OSD_TIMING},
{ 180, LOCALE_TIMING_FILEBROWSER, LOCALE_MENU_HINT_OSD_TIMING}, //NI
{ 3, LOCALE_TIMING_NUMERICZAP, LOCALE_MENU_HINT_OSD_TIMING},
{ 6, LOCALE_TIMING_POPUP_MESSAGES, LOCALE_MENU_HINT_OSD_TIMING},
{ 180, LOCALE_TIMING_STATIC_MESSAGES, LOCALE_MENU_HINT_TIMEOUTS_STATIC_MESSAGES} //NI
};
// lcdd