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 branch 'master' into multituner

Browse Source
This commit is contained in:
[CST] Focus
2012-01-16 17:48:19 +04:00
parent 04ef64b0ab fe1fcbe426
commit 475f4d9893
20 changed files with 277 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/system/locals.h
View File

@@ -610,14 +610,24 @@ typedef enum
LOCALE_KEYBINDINGMENU_HEAD,
LOCALE_KEYBINDINGMENU_LASTCHANNEL,
LOCALE_KEYBINDINGMENU_MISC,
LOCALE_KEYBINDINGMENU_MODE_LEFT_RIGHT_KEY_TV,
LOCALE_KEYBINDINGMENU_MODE_LEFT_RIGHT_KEY_TV_INFOBAR,
LOCALE_KEYBINDINGMENU_MODE_LEFT_RIGHT_KEY_TV_VOLUME,
LOCALE_KEYBINDINGMENU_MODE_LEFT_RIGHT_KEY_TV_VZAP,
LOCALE_KEYBINDINGMENU_MODE_LEFT_RIGHT_KEY_TV_ZAP,
LOCALE_KEYBINDINGMENU_MODECHANGE,
LOCALE_KEYBINDINGMENU_PAGEDOWN,
LOCALE_KEYBINDINGMENU_PAGEUP,
LOCALE_KEYBINDINGMENU_POWEROFF,
LOCALE_KEYBINDINGMENU_QUICKZAP,
LOCALE_KEYBINDINGMENU_REMOTECONTROL,
LOCALE_KEYBINDINGMENU_REMOTECONTROL_NEO1,
LOCALE_KEYBINDINGMENU_REMOTECONTROL_STANDARD,
LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE,
LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_COOLSTREAM,
LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_DBOX,
LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_MSG_PART1,
LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_MSG_PART2,
LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_MSG_PART3,
LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_PHILIPS,
LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_TRIPLEDRAGON,
LOCALE_KEYBINDINGMENU_REPEATBLOCK,
LOCALE_KEYBINDINGMENU_REPEATBLOCKGENERIC,
LOCALE_KEYBINDINGMENU_SORT,
@@ -754,7 +764,6 @@ typedef enum
LOCALE_MISCSETTINGS_SHUTDOWN_REAL,
LOCALE_MISCSETTINGS_SHUTDOWN_REAL_RCDELAY,
LOCALE_MISCSETTINGS_SLEEPTIMER,
LOCALE_MISCSETTINGS_VIRTUAL_ZAP_MODE,
LOCALE_MISCSETTINGS_ZAPTO_PRE_TIME,
LOCALE_MOTORCONTROL_CALC_POSITIONS,
LOCALE_MOTORCONTROL_DISABLE_LIMIT,

17
src/system/locals_intern.h
View File

@@ -610,14 +610,24 @@ const char * locale_real_names[] =
"keybindingmenu.head",
"keybindingmenu.lastchannel",
"keybindingmenu.misc",
"keybindingmenu.mode_left_right_key_tv",
"keybindingmenu.mode_left_right_key_tv_infobar",
"keybindingmenu.mode_left_right_key_tv_volume",
"keybindingmenu.mode_left_right_key_tv_vzap",
"keybindingmenu.mode_left_right_key_tv_zap",
"keybindingmenu.modechange",
"keybindingmenu.pagedown",
"keybindingmenu.pageup",
"keybindingmenu.poweroff",
"keybindingmenu.quickzap",
"keybindingmenu.remotecontrol",
"keybindingmenu.remotecontrol_neo1",
"keybindingmenu.remotecontrol_standard",
"keybindingmenu.remotecontrol_hardware",
"keybindingmenu.remotecontrol_hardware_coolstream",
"keybindingmenu.remotecontrol_hardware_dbox",
"keybindingmenu.remotecontrol_hardware_msg_part1",
"keybindingmenu.remotecontrol_hardware_msg_part2",
"keybindingmenu.remotecontrol_hardware_msg_part3",
"keybindingmenu.remotecontrol_hardware_philips",
"keybindingmenu.remotecontrol_hardware_tripledragon",
"keybindingmenu.repeatblock",
"keybindingmenu.repeatblockgeneric",
"keybindingmenu.sort",
@@ -754,7 +764,6 @@ const char * locale_real_names[] =
"miscsettings.shutdown_real",
"miscsettings.shutdown_real_rcdelay",
"miscsettings.sleeptimer",
"miscsettings.virtual_zap_mode",
"miscsettings.zapto_pre_time",
"motorcontrol.calc_positions",
"motorcontrol.disable_limit",

11
src/system/settings.h
View File

@@ -379,7 +379,16 @@ struct SNeutrinoSettings
int cacheTXT;
int minimode;
int mode_clock;
int virtual_zap_mode;
enum MODE_LEFT_RIGHT_KEY_TV_SETTINGS
{
ZAP = 0,
VZAP = 1,
VOLUME = 2,
INFOBAR = 3
};
int mode_left_right_key_tv;
int spectrum;
int pip_width;
int pip_height;