mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 17:01:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into dvbsi++

Browse Source
This commit is contained in:
[CST] Focus
2012-02-19 13:20:19 +04:00
parent b9ee0b2148 19f717fd3e
commit e9430aec0d
46 changed files with 392 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/system/locals.h
View File

@@ -360,6 +360,7 @@ typedef enum
LOCALE_EXTRA_FEC_S2_QPSK_7_8,
LOCALE_EXTRA_FEC_S2_QPSK_8_9,
LOCALE_EXTRA_FEC_S2_QPSK_9_10,
LOCALE_EXTRA_KEY_CURRENT_TRANSPONDER,
LOCALE_EXTRA_KEY_LIST_END,
LOCALE_EXTRA_KEY_LIST_START,
LOCALE_EXTRA_KEY_PLUGIN,
@@ -920,10 +921,8 @@ typedef enum
LOCALE_MOVIEPLAYER_BOOKMARKNAME_HINT1,
LOCALE_MOVIEPLAYER_BOOKMARKNAME_HINT2,
LOCALE_MOVIEPLAYER_DEFPLUGIN,
LOCALE_MOVIEPLAYER_DVDPLAYBACK,
LOCALE_MOVIEPLAYER_FILEPLAYBACK,
LOCALE_MOVIEPLAYER_HEAD,
LOCALE_MOVIEPLAYER_PESPLAYBACK,
LOCALE_MOVIEPLAYER_TOOMANYBOOKMARKS,
LOCALE_MOVIEPLAYER_TSHELP1,
LOCALE_MOVIEPLAYER_TSHELP10,
@@ -938,7 +937,6 @@ typedef enum
LOCALE_MOVIEPLAYER_TSHELP8,
LOCALE_MOVIEPLAYER_TSHELP9,
LOCALE_MOVIEPLAYER_TSPLAYBACK,
LOCALE_MOVIEPLAYER_VCDPLAYBACK,
LOCALE_MPKEY_AUDIO,
LOCALE_MPKEY_BOOKMARK,
LOCALE_MPKEY_FORWARD,
@@ -1052,6 +1050,7 @@ typedef enum
LOCALE_PERSONALIZE_NOTPROTECTED,
LOCALE_PERSONALIZE_NOTVISIBLE,
LOCALE_PERSONALIZE_PIN,
LOCALE_PERSONALIZE_PIN_IN_USE,
LOCALE_PERSONALIZE_PINCODE,
LOCALE_PERSONALIZE_PINHINT,
LOCALE_PERSONALIZE_PINPROTECT,
@@ -1230,7 +1229,15 @@ typedef enum
LOCALE_SCREENSETUP_LOWERRIGHT,
LOCALE_SCREENSETUP_UPPERLEFT,
LOCALE_SCREENSHOT_COUNT,
LOCALE_SCREENSHOT_COVER,
LOCALE_SCREENSHOT_DEFDIR,
LOCALE_SCREENSHOT_FORMAT,
LOCALE_SCREENSHOT_INFO,
LOCALE_SCREENSHOT_MENU,
LOCALE_SCREENSHOT_OSD,
LOCALE_SCREENSHOT_SCALE,
LOCALE_SCREENSHOT_TV,
LOCALE_SCREENSHOT_VIDEO,
LOCALE_SERVICEMENU_GETPLUGINS,
LOCALE_SERVICEMENU_GETPLUGINS_HINT,
LOCALE_SERVICEMENU_HEAD,

13
src/system/locals_intern.h
View File

@@ -360,6 +360,7 @@ const char * locale_real_names[] =
"extra.fec_s2_qpsk_7_8",
"extra.fec_s2_qpsk_8_9",
"extra.fec_s2_qpsk_9_10",
"extra.key_current_transponder",
"extra.key_list_end",
"extra.key_list_start",
"extra.key_plugin",
@@ -920,10 +921,8 @@ const char * locale_real_names[] =
"movieplayer.bookmarkname_hint1",
"movieplayer.bookmarkname_hint2",
"movieplayer.defplugin",
"movieplayer.dvdplayback",
"movieplayer.fileplayback",
"movieplayer.head",
"movieplayer.pesplayback",
"movieplayer.toomanybookmarks",
"movieplayer.tshelp1",
"movieplayer.tshelp10",
@@ -938,7 +937,6 @@ const char * locale_real_names[] =
"movieplayer.tshelp8",
"movieplayer.tshelp9",
"movieplayer.tsplayback",
"movieplayer.vcdplayback",
"mpkey.audio",
"mpkey.bookmark",
"mpkey.forward",
@@ -1052,6 +1050,7 @@ const char * locale_real_names[] =
"personalize.notprotected",
"personalize.notvisible",
"personalize.pin",
"personalize.pin_in_use",
"personalize.pincode",
"personalize.pinhint",
"personalize.pinprotect",
@@ -1230,7 +1229,15 @@ const char * locale_real_names[] =
"screensetup.lowerright",
"screensetup.upperleft",
"screenshot.count",
"screenshot.cover",
"screenshot.defdir",
"screenshot.format",
"screenshot.info",
"screenshot.menu",
"screenshot.osd",
"screenshot.scale",
"screenshot.tv",
"screenshot.video",
"servicemenu.getplugins",
"servicemenu.getplugins_hint",
"servicemenu.head",

4
src/system/settings.cpp
View File

@@ -44,8 +44,8 @@ const struct personalize_settings_t personalize_settings[SNeutrinoSettings::P_SE
{"personalize_timer" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE},
{"personalize_media" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE},
{"personalize_games" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE},
{"personalize_scripts" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE},
{"personalize_games" , CPersonalizeGui::PERSONALIZE_MODE_NOTVISIBLE},
{"personalize_scripts" , CPersonalizeGui::PERSONALIZE_MODE_NOTVISIBLE},
{"personalize_settings" , CPersonalizeGui::PERSONALIZE_PROTECT_MODE_NOT_PROTECTED},
{"personalize_service" , CPersonalizeGui::PERSONALIZE_PROTECT_MODE_NOT_PROTECTED},
{"personalize_sleeptimer" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE},

10
src/system/settings.h
View File

@@ -372,9 +372,17 @@ struct SNeutrinoSettings
int key_plugin;
int key_unlock;
int key_screenshot;
int screenshot_count;
int screenshot_format;
int screenshot_cover;
int screenshot_mode;
int screenshot_video;
int screenshot_scale;
std::string screenshot_dir;
int key_current_transponder;
int cacheTXT;
int minimode;
@@ -569,6 +577,8 @@ struct SNeutrinoSettings
ITEM_BOXINFO = 17,
ITEM_CAM = 18,
ITEM_CLOCK = 19,
ITEM_GAMES = 20,
ITEM_SCRIPTS = 21,
#if 0
ITEM_MOVIEPLAYER_TS,
#endif