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 neutrino-apollo

Browse Source
This commit is contained in:
[CST] Bas
2013-01-16 11:31:47 +08:00
committed by [CST] Focus
parent 570b902dcb
commit 1adc51c0b8
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/locale/english.locale
View File

@@ -1792,6 +1792,8 @@ videomenu.analog_sd_rgb_cinch RGB on cinch (SD)
videomenu.analog_sd_rgb_scart RGB on scart (SD) videomenu.analog_sd_rgb_scart RGB on scart (SD)
videomenu.analog_sd_yprpb_cinch YPbPr on cinch (SD) videomenu.analog_sd_yprpb_cinch YPbPr on cinch (SD)
videomenu.analog_sd_yprpb_scart YPbPr on scart (SD) videomenu.analog_sd_yprpb_scart YPbPr on scart (SD)
videomenu.analog_auto AUTO
videomenu.analog_cvbs CVBS
videomenu.analog_hd_rgb RGB (HD) videomenu.analog_hd_rgb RGB (HD)
videomenu.analog_hd_yprpb YPbPr(HD) videomenu.analog_hd_yprpb YPbPr(HD)
videomenu.analog_sd_rgb RGB (SD) videomenu.analog_sd_rgb RGB (SD)

14
src/gui/videosettings.cpp
View File

@@ -118,13 +118,15 @@ const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD1_OPTIONS[VIDEOMENU_VID
{ ANALOG_MODE(CINCH,HD,YPRPB), LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_CINCH } { ANALOG_MODE(CINCH,HD,YPRPB), LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_CINCH }
}; };
#define VIDEOMENU_VIDEOSIGNAL_TANK_OPTION_COUNT 4 #define VIDEOMENU_VIDEOSIGNAL_TANK_OPTION_COUNT 6
const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_TANK_OPTIONS[VIDEOMENU_VIDEOSIGNAL_TANK_OPTION_COUNT] = const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_TANK_OPTIONS[VIDEOMENU_VIDEOSIGNAL_TANK_OPTION_COUNT] =
{ {
{ ANALOG_MODE(BOTH ,SD,RGB ), LOCALE_VIDEOMENU_ANALOG_SD_RGB }, /* Scart and Cinch */ { ANALOG_MODE(BOTH ,xD,AUTO ),LOCALE_VIDEOMENU_ANALOG_AUTO }, /* Encoder automatically adjusts based on content */
{ ANALOG_MODE(BOTH ,SD,YPRPB), LOCALE_VIDEOMENU_ANALOG_SD_YPRPB }, /* */ { ANALOG_MODE(BOTH ,xD,CVBS ),LOCALE_VIDEOMENU_ANALOG_CVBS }, /* CVBS on SCART (disables fastblank, un-used dacs) */
{ ANALOG_MODE(BOTH ,HD,RGB ), LOCALE_VIDEOMENU_ANALOG_HD_RGB }, /* */ { ANALOG_MODE(BOTH ,SD,RGB ), LOCALE_VIDEOMENU_ANALOG_SD_RGB }, /* SD RGB on Cinch and SCART */
{ ANALOG_MODE(BOTH ,HD,YPRPB), LOCALE_VIDEOMENU_ANALOG_HD_YPRPB }, /* */ { ANALOG_MODE(BOTH ,SD,YPRPB), LOCALE_VIDEOMENU_ANALOG_SD_YPRPB }, /* SD YPrPb on Cinch and SCART */
{ ANALOG_MODE(BOTH ,HD,RGB ), LOCALE_VIDEOMENU_ANALOG_HD_RGB }, /* HD RGB on Cinch and SCART */
{ ANALOG_MODE(BOTH ,HD,YPRPB), LOCALE_VIDEOMENU_ANALOG_HD_YPRPB }, /* HD YPrPb on Cinch and SCART */
}; };
#define VIDEOMENU_VIDEOSIGNAL_HD1PLUS_SCART_OPTION_COUNT 4 #define VIDEOMENU_VIDEOSIGNAL_HD1PLUS_SCART_OPTION_COUNT 4
@@ -230,8 +232,8 @@ int CVideoSettings::showVideoSetup()
} }
else if (system_rev > 0x06) else if (system_rev > 0x06)
{ {
if (system_rev == 9) {
#ifdef ANALOG_MODE #ifdef ANALOG_MODE
if (system_rev == 9 || system_rev == 11) { // Tank, Trinity.
vs_analg_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_ANALOG_MODE, &g_settings.analog_mode1, VIDEOMENU_VIDEOSIGNAL_TANK_OPTIONS, VIDEOMENU_VIDEOSIGNAL_TANK_OPTION_COUNT, true, this); vs_analg_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_ANALOG_MODE, &g_settings.analog_mode1, VIDEOMENU_VIDEOSIGNAL_TANK_OPTIONS, VIDEOMENU_VIDEOSIGNAL_TANK_OPTION_COUNT, true, this);
vs_analg_ch->setHint("", LOCALE_MENU_HINT_VIDEO_ANALOG_MODE); vs_analg_ch->setHint("", LOCALE_MENU_HINT_VIDEO_ANALOG_MODE);
#endif #endif

2
src/system/locals.h
View File

@@ -1819,6 +1819,8 @@ typedef enum
LOCALE_VIDEOMENU_ANALOG_SD_RGB_SCART, LOCALE_VIDEOMENU_ANALOG_SD_RGB_SCART,
LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_CINCH, LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_CINCH,
LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_SCART, LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_SCART,
LOCALE_VIDEOMENU_ANALOG_AUTO,
LOCALE_VIDEOMENU_ANALOG_CVBS,
LOCALE_VIDEOMENU_ANALOG_HD_RGB, LOCALE_VIDEOMENU_ANALOG_HD_RGB,
LOCALE_VIDEOMENU_ANALOG_HD_YPRPB, LOCALE_VIDEOMENU_ANALOG_HD_YPRPB,
LOCALE_VIDEOMENU_ANALOG_SD_RGB, LOCALE_VIDEOMENU_ANALOG_SD_RGB,

2
src/system/locals_intern.h
View File

@@ -1819,6 +1819,8 @@ const char * locale_real_names[] =
"videomenu.analog_sd_rgb_scart", "videomenu.analog_sd_rgb_scart",
"videomenu.analog_sd_yprpb_cinch", "videomenu.analog_sd_yprpb_cinch",
"videomenu.analog_sd_yprpb_scart", "videomenu.analog_sd_yprpb_scart",
"videomenu.analog_auto",
"videomenu.analog_cvbs",
"videomenu.analog_hd_rgb", "videomenu.analog_hd_rgb",
"videomenu.analog_hd_yprpb", "videomenu.analog_hd_yprpb",
"videomenu.analog_sd_rgb", "videomenu.analog_sd_rgb",