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

- videosettings: formatting code using astyle; some manual code nicenings

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2021-12-06 05:18:19 +01:00
committed by Thilo Graf
parent cef336bafe
commit 59ec65cce2
2 changed files with 246 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
src/gui/videosettings.cpp
View File

@@ -139,10 +139,10 @@ const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_TD_OPTIONS[VIDEOMENU_VIDE
#define VIDEOMENU_VIDEOSIGNAL_HD1_OPTION_COUNT 8 #define VIDEOMENU_VIDEOSIGNAL_HD1_OPTION_COUNT 8
const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD1_OPTIONS[VIDEOMENU_VIDEOSIGNAL_HD1_OPTION_COUNT] = const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD1_OPTIONS[VIDEOMENU_VIDEOSIGNAL_HD1_OPTION_COUNT] =
{ {
{ ANALOG_MODE(SCART,SD,RGB ), LOCALE_VIDEOMENU_ANALOG_SD_RGB_SCART }, /* composite + RGB (for both SCART and Cinch) */ { ANALOG_MODE(SCART, SD, RGB), LOCALE_VIDEOMENU_ANALOG_SD_RGB_SCART }, // composite + RGB (for both SCART and Cinch)
{ ANALOG_MODE(CINCH,SD,RGB ), LOCALE_VIDEOMENU_ANALOG_SD_RGB_CINCH }, /* composite + RGB (for both SCART and Cinch) */ { ANALOG_MODE(CINCH, SD, RGB), LOCALE_VIDEOMENU_ANALOG_SD_RGB_CINCH }, // composite + RGB (for both SCART and Cinch)
{ ANALOG_MODE(SCART,SD,YPRPB), LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_SCART }, /* YPbPr SCART (with wrongly connected Cinch) */ { ANALOG_MODE(SCART, SD, YPRPB), LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_SCART }, // YPbPr SCART (with wrongly connected Cinch)
{ ANALOG_MODE(CINCH,SD,YPRPB), LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_CINCH }, /* YPbPr Cinch (with wrongly connected SCART) */ { ANALOG_MODE(CINCH, SD, YPRPB), LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_CINCH }, // YPbPr Cinch (with wrongly connected SCART)
{ ANALOG_MODE(SCART, HD, RGB), LOCALE_VIDEOMENU_ANALOG_HD_RGB_SCART }, { ANALOG_MODE(SCART, HD, RGB), LOCALE_VIDEOMENU_ANALOG_HD_RGB_SCART },
{ ANALOG_MODE(CINCH, HD, RGB), LOCALE_VIDEOMENU_ANALOG_HD_RGB_CINCH }, { ANALOG_MODE(CINCH, HD, RGB), LOCALE_VIDEOMENU_ANALOG_HD_RGB_CINCH },
{ ANALOG_MODE(SCART, HD, YPRPB), LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_SCART }, { ANALOG_MODE(SCART, HD, YPRPB), LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_SCART },
@@ -152,19 +152,19 @@ const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD1_OPTIONS[VIDEOMENU_VID
#define VIDEOMENU_VIDEOSIGNAL_HD2_OPTION_COUNT 6 #define VIDEOMENU_VIDEOSIGNAL_HD2_OPTION_COUNT 6
const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD2_OPTIONS[VIDEOMENU_VIDEOSIGNAL_HD2_OPTION_COUNT] = const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD2_OPTIONS[VIDEOMENU_VIDEOSIGNAL_HD2_OPTION_COUNT] =
{ {
{ ANALOG_MODE(BOTH ,xD,AUTO ),LOCALE_VIDEOMENU_ANALOG_AUTO }, /* Encoder automatically adjusts based on content */ { ANALOG_MODE(BOTH, xD, AUTO), LOCALE_VIDEOMENU_ANALOG_AUTO }, // Encoder automatically adjusts based on content
{ ANALOG_MODE(BOTH ,xD,CVBS ),LOCALE_VIDEOMENU_ANALOG_CVBS }, /* CVBS on SCART (disables fastblank, un-used dacs) */ { ANALOG_MODE(BOTH, xD, CVBS), LOCALE_VIDEOMENU_ANALOG_CVBS }, // CVBS on SCART (disables fastblank, un-used dacs)
{ ANALOG_MODE(BOTH ,SD,RGB ), LOCALE_VIDEOMENU_ANALOG_SD_RGB }, /* SD RGB on Cinch and SCART */ { ANALOG_MODE(BOTH, SD, RGB), LOCALE_VIDEOMENU_ANALOG_SD_RGB }, // SD RGB on Cinch and SCART
{ ANALOG_MODE(BOTH ,SD,YPRPB), LOCALE_VIDEOMENU_ANALOG_SD_YPRPB }, /* SD YPrPb on Cinch and SCART */ { 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, 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 */ { 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
const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD1PLUS_SCART_OPTIONS[VIDEOMENU_VIDEOSIGNAL_HD1PLUS_SCART_OPTION_COUNT] = const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD1PLUS_SCART_OPTIONS[VIDEOMENU_VIDEOSIGNAL_HD1PLUS_SCART_OPTION_COUNT] =
{ {
{ ANALOG_MODE(SCART,SD,RGB ), LOCALE_VIDEOMENU_ANALOG_SD_RGB_SCART }, /* composite + RGB */ { ANALOG_MODE(SCART, SD, RGB), LOCALE_VIDEOMENU_ANALOG_SD_RGB_SCART }, // composite + RGB
{ ANALOG_MODE(SCART,SD,YPRPB), LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_SCART }, /* YPbPr SCART */ { ANALOG_MODE(SCART, SD, YPRPB), LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_SCART }, // YPbPr SCART
{ ANALOG_MODE(SCART, HD, RGB), LOCALE_VIDEOMENU_ANALOG_HD_RGB_SCART }, { ANALOG_MODE(SCART, HD, RGB), LOCALE_VIDEOMENU_ANALOG_HD_RGB_SCART },
{ ANALOG_MODE(SCART, HD, YPRPB), LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_SCART }, { ANALOG_MODE(SCART, HD, YPRPB), LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_SCART },
}; };
@@ -172,8 +172,8 @@ const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD1PLUS_SCART_OPTIONS[VID
#define VIDEOMENU_VIDEOSIGNAL_HD1PLUS_CINCH_OPTION_COUNT 4 #define VIDEOMENU_VIDEOSIGNAL_HD1PLUS_CINCH_OPTION_COUNT 4
const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD1PLUS_CINCH_OPTIONS[VIDEOMENU_VIDEOSIGNAL_HD1PLUS_CINCH_OPTION_COUNT] = const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD1PLUS_CINCH_OPTIONS[VIDEOMENU_VIDEOSIGNAL_HD1PLUS_CINCH_OPTION_COUNT] =
{ {
{ ANALOG_MODE(CINCH,SD,RGB ), LOCALE_VIDEOMENU_ANALOG_SD_RGB_CINCH }, /* composite + RGB (for both SCART and Cinch) */ { ANALOG_MODE(CINCH, SD, RGB), LOCALE_VIDEOMENU_ANALOG_SD_RGB_CINCH }, // composite + RGB (for both SCART and Cinch)
{ ANALOG_MODE(CINCH,SD,YPRPB), LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_CINCH }, /* YPbPr Cinch (with wrongly connected SCART) */ { ANALOG_MODE(CINCH, SD, YPRPB), LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_CINCH }, // YPbPr Cinch (with wrongly connected SCART)
{ ANALOG_MODE(CINCH, HD, RGB), LOCALE_VIDEOMENU_ANALOG_HD_RGB_CINCH }, { ANALOG_MODE(CINCH, HD, RGB), LOCALE_VIDEOMENU_ANALOG_HD_RGB_CINCH },
{ ANALOG_MODE(CINCH, HD, YPRPB), LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_CINCH } { ANALOG_MODE(CINCH, HD, YPRPB), LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_CINCH }
}; };
@@ -181,10 +181,10 @@ const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD1PLUS_CINCH_OPTIONS[VID
#define VIDEOMENU_VIDEOSIGNAL_HD1_OPTION_COUNT 8 #define VIDEOMENU_VIDEOSIGNAL_HD1_OPTION_COUNT 8
const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD1_OPTIONS[VIDEOMENU_VIDEOSIGNAL_HD1_OPTION_COUNT] = const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD1_OPTIONS[VIDEOMENU_VIDEOSIGNAL_HD1_OPTION_COUNT] =
{ {
{ ANALOG_SD_RGB_SCART, LOCALE_VIDEOMENU_ANALOG_SD_RGB_SCART }, /* composite + RGB (for both SCART and Cinch) */ { ANALOG_SD_RGB_SCART, LOCALE_VIDEOMENU_ANALOG_SD_RGB_SCART }, // composite + RGB (for both SCART and Cinch)
{ ANALOG_SD_RGB_CINCH, LOCALE_VIDEOMENU_ANALOG_SD_RGB_CINCH }, /* composite + RGB (for both SCART and Cinch) */ { ANALOG_SD_RGB_CINCH, LOCALE_VIDEOMENU_ANALOG_SD_RGB_CINCH }, // composite + RGB (for both SCART and Cinch)
{ ANALOG_SD_YPRPB_SCART, LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_SCART }, /* YPbPr SCART (with wrongly connected Cinch) */ { ANALOG_SD_YPRPB_SCART, LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_SCART }, // YPbPr SCART (with wrongly connected Cinch)
{ ANALOG_SD_YPRPB_CINCH, LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_CINCH }, /* YPbPr Cinch (with wrongly connected SCART) */ { ANALOG_SD_YPRPB_CINCH, LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_CINCH }, // YPbPr Cinch (with wrongly connected SCART)
{ ANALOG_HD_RGB_SCART, LOCALE_VIDEOMENU_ANALOG_HD_RGB_SCART }, { ANALOG_HD_RGB_SCART, LOCALE_VIDEOMENU_ANALOG_HD_RGB_SCART },
{ ANALOG_HD_RGB_CINCH, LOCALE_VIDEOMENU_ANALOG_HD_RGB_CINCH }, { ANALOG_HD_RGB_CINCH, LOCALE_VIDEOMENU_ANALOG_HD_RGB_CINCH },
{ ANALOG_HD_YPRPB_SCART, LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_SCART }, { ANALOG_HD_YPRPB_SCART, LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_SCART },
@@ -194,8 +194,8 @@ const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD1_OPTIONS[VIDEOMENU_VID
#define VIDEOMENU_VIDEOSIGNAL_HD1PLUS_SCART_OPTION_COUNT 4 #define VIDEOMENU_VIDEOSIGNAL_HD1PLUS_SCART_OPTION_COUNT 4
const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD1PLUS_SCART_OPTIONS[VIDEOMENU_VIDEOSIGNAL_HD1PLUS_SCART_OPTION_COUNT] = const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD1PLUS_SCART_OPTIONS[VIDEOMENU_VIDEOSIGNAL_HD1PLUS_SCART_OPTION_COUNT] =
{ {
{ ANALOG_SD_RGB_SCART, LOCALE_VIDEOMENU_ANALOG_SD_RGB_SCART }, /* composite + RGB */ { ANALOG_SD_RGB_SCART, LOCALE_VIDEOMENU_ANALOG_SD_RGB_SCART }, // composite + RGB
{ ANALOG_SD_YPRPB_SCART, LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_SCART }, /* YPbPr SCART */ { ANALOG_SD_YPRPB_SCART, LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_SCART }, // YPbPr SCART
{ ANALOG_HD_RGB_SCART, LOCALE_VIDEOMENU_ANALOG_HD_RGB_SCART }, { ANALOG_HD_RGB_SCART, LOCALE_VIDEOMENU_ANALOG_HD_RGB_SCART },
{ ANALOG_HD_YPRPB_SCART, LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_SCART }, { ANALOG_HD_YPRPB_SCART, LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_SCART },
}; };
@@ -203,8 +203,8 @@ const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD1PLUS_SCART_OPTIONS[VID
#define VIDEOMENU_VIDEOSIGNAL_HD1PLUS_CINCH_OPTION_COUNT 4 #define VIDEOMENU_VIDEOSIGNAL_HD1PLUS_CINCH_OPTION_COUNT 4
const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD1PLUS_CINCH_OPTIONS[VIDEOMENU_VIDEOSIGNAL_HD1PLUS_CINCH_OPTION_COUNT] = const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD1PLUS_CINCH_OPTIONS[VIDEOMENU_VIDEOSIGNAL_HD1PLUS_CINCH_OPTION_COUNT] =
{ {
{ ANALOG_SD_RGB_CINCH, LOCALE_VIDEOMENU_ANALOG_SD_RGB_CINCH }, /* composite + RGB (for both SCART and Cinch) */ { ANALOG_SD_RGB_CINCH, LOCALE_VIDEOMENU_ANALOG_SD_RGB_CINCH }, // composite + RGB (for both SCART and Cinch)
{ ANALOG_SD_YPRPB_CINCH, LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_CINCH }, /* YPbPr Cinch (with wrongly connected SCART) */ { ANALOG_SD_YPRPB_CINCH, LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_CINCH }, // YPbPr Cinch (with wrongly connected SCART)
{ ANALOG_HD_RGB_CINCH, LOCALE_VIDEOMENU_ANALOG_HD_RGB_CINCH }, { ANALOG_HD_RGB_CINCH, LOCALE_VIDEOMENU_ANALOG_HD_RGB_CINCH },
{ ANALOG_HD_YPRPB_CINCH, LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_CINCH } { ANALOG_HD_YPRPB_CINCH, LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_CINCH }
}; };
@@ -215,7 +215,7 @@ const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD1PLUS_CINCH_OPTIONS[VID
* TODO: instead of #ifdef select at run time * TODO: instead of #ifdef select at run time
*/ */
#if BOXMODEL_CST_HD1 #if BOXMODEL_CST_HD1
/* numbers corresponding to video.cpp from zapit */ // numbers corresponding to video.cpp from zapit
CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_OPTION_COUNT] = CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_OPTION_COUNT] =
{ {
{ VIDEO_STD_NTSC, NONEXISTANT_LOCALE, "NTSC" }, { VIDEO_STD_NTSC, NONEXISTANT_LOCALE, "NTSC" },
@@ -240,7 +240,7 @@ CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_O
{ VIDEO_STD_AUTO, NONEXISTANT_LOCALE, "Auto" } { VIDEO_STD_AUTO, NONEXISTANT_LOCALE, "Auto" }
}; };
#elif BOXMODEL_CST_HD2 #elif BOXMODEL_CST_HD2
/* numbers corresponding to video.cpp from zapit */ // numbers corresponding to video.cpp from zapit
CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_OPTION_COUNT] = CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_OPTION_COUNT] =
{ {
{ VIDEO_STD_NTSC, NONEXISTANT_LOCALE, "NTSC" }, { VIDEO_STD_NTSC, NONEXISTANT_LOCALE, "NTSC" },
@@ -339,7 +339,7 @@ CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_O
}; };
#endif #endif
#define VIDEOMENU_VIDEOFORMAT_OPTION_COUNT 3//2 #define VIDEOMENU_VIDEOFORMAT_OPTION_COUNT 3
const CMenuOptionChooser::keyval VIDEOMENU_VIDEOFORMAT_OPTIONS[VIDEOMENU_VIDEOFORMAT_OPTION_COUNT] = const CMenuOptionChooser::keyval VIDEOMENU_VIDEOFORMAT_OPTIONS[VIDEOMENU_VIDEOFORMAT_OPTION_COUNT] =
{ {
{ DISPLAY_AR_4_3, LOCALE_VIDEOMENU_VIDEOFORMAT_43 }, { DISPLAY_AR_4_3, LOCALE_VIDEOMENU_VIDEOFORMAT_43 },
@@ -406,7 +406,8 @@ int CVideoSettings::showVideoSetup()
vs_analg_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_ANALOG_MODE, &g_settings.analog_mode1, VIDEOMENU_VIDEOSIGNAL_HD2_OPTIONS, VIDEOMENU_VIDEOSIGNAL_HD2_OPTION_COUNT, true, this); vs_analg_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_ANALOG_MODE, &g_settings.analog_mode1, VIDEOMENU_VIDEOSIGNAL_HD2_OPTIONS, VIDEOMENU_VIDEOSIGNAL_HD2_OPTION_COUNT, true, this);
vs_analg_ch->setHint("", LOCALE_MENU_HINT_VIDEO_ANALOG_MODE); vs_analg_ch->setHint("", LOCALE_MENU_HINT_VIDEO_ANALOG_MODE);
#else #else
if(system_rev != 10) { if (system_rev != 10)
{
vs_scart_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_SCART, &g_settings.analog_mode1, VIDEOMENU_VIDEOSIGNAL_HD1PLUS_SCART_OPTIONS, VIDEOMENU_VIDEOSIGNAL_HD1PLUS_SCART_OPTION_COUNT, true, this); vs_scart_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_SCART, &g_settings.analog_mode1, VIDEOMENU_VIDEOSIGNAL_HD1PLUS_SCART_OPTIONS, VIDEOMENU_VIDEOSIGNAL_HD1PLUS_SCART_OPTION_COUNT, true, this);
vs_scart_ch->setHint("", LOCALE_MENU_HINT_VIDEO_SCART_MODE); vs_scart_ch->setHint("", LOCALE_MENU_HINT_VIDEO_SCART_MODE);
} }
@@ -441,15 +442,15 @@ int CVideoSettings::showVideoSetup()
#endif #endif
CAutoModeNotifier anotify; CAutoModeNotifier anotify;
CMenuForwarder *vs_videomodes_fw = NULL; CMenuForwarder *vs_videomodes_fw = NULL;
//dbdr options // dbdr options only on COOLSTREAM
if (system_rev != 0x01) /* dbdr options only on COOLSTREAM */ if (system_rev != 0x01)
{ {
vs_dbdropt_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_DBDR, &g_settings.video_dbdr, VIDEOMENU_DBDR_OPTIONS, VIDEOMENU_DBDR_OPTION_COUNT, true, this); vs_dbdropt_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_DBDR, &g_settings.video_dbdr, VIDEOMENU_DBDR_OPTIONS, VIDEOMENU_DBDR_OPTION_COUNT, true, this);
vs_dbdropt_ch->setHint("", LOCALE_MENU_HINT_VIDEO_DBDR); vs_dbdropt_ch->setHint("", LOCALE_MENU_HINT_VIDEO_DBDR);
} }
// video system modes submenue // video system modes submenue
if (g_info.hw_caps->has_HDMI) /* does this make sense on a box without HDMI? */ if (g_info.hw_caps->has_HDMI) // does this make sense on a box without HDMI?
{ {
videomodes.addIntroItems(LOCALE_VIDEOMENU_ENABLED_MODES); videomodes.addIntroItems(LOCALE_VIDEOMENU_ENABLED_MODES);
@@ -475,7 +476,7 @@ int CVideoSettings::showVideoSetup()
} }
neutrino_locale_t tmp_locale = NONEXISTANT_LOCALE; neutrino_locale_t tmp_locale = NONEXISTANT_LOCALE;
/* TODO: check the locale */ // TODO: check the locale
if (vs_analg_ch != NULL || vs_scart_ch != NULL || vs_chinch_ch != NULL) if (vs_analg_ch != NULL || vs_scart_ch != NULL || vs_chinch_ch != NULL)
tmp_locale = LOCALE_VIDEOMENU_TV_SCART; tmp_locale = LOCALE_VIDEOMENU_TV_SCART;
// --------------------------------------- // ---------------------------------------
@@ -503,7 +504,7 @@ int CVideoSettings::showVideoSetup()
#endif #endif
#ifdef BOXMODEL_CST_HD2 #ifdef BOXMODEL_CST_HD2
/* values are from -128 to 127, but brightness really no sense after +/- 40. changeNotify multiply contrast and saturation to 3 */ // values are from -128 to 127, but brightness really no sense after +/- 40. changeNotify multiply contrast and saturation to 3
CMenuOptionNumberChooser *bcont = new CMenuOptionNumberChooser(LOCALE_VIDEOMENU_BRIGHTNESS, &g_settings.brightness, true, -42, 42, this); CMenuOptionNumberChooser *bcont = new CMenuOptionNumberChooser(LOCALE_VIDEOMENU_BRIGHTNESS, &g_settings.brightness, true, -42, 42, this);
bcont->setHint("", LOCALE_MENU_HINT_VIDEO_BRIGHTNESS); bcont->setHint("", LOCALE_MENU_HINT_VIDEO_BRIGHTNESS);
CMenuOptionNumberChooser *ccont = new CMenuOptionNumberChooser(LOCALE_VIDEOMENU_CONTRAST, &g_settings.contrast, true, -42, 42, this); CMenuOptionNumberChooser *ccont = new CMenuOptionNumberChooser(LOCALE_VIDEOMENU_CONTRAST, &g_settings.contrast, true, -42, 42, this);
@@ -532,13 +533,15 @@ int CVideoSettings::showVideoSetup()
#endif #endif
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
if (file_exists("/proc/stb/video/zapmode")) { if (file_exists("/proc/stb/video/zapmode"))
{
CMenuOptionChooser *zm = new CMenuOptionChooser(LOCALE_VIDEOMENU_ZAPPINGMODE, &g_settings.zappingmode, VIDEOMENU_ZAPPINGMODE_OPTIONS, VIDEOMENU_ZAPPINGMODE_OPTION_COUNT, true, this); CMenuOptionChooser *zm = new CMenuOptionChooser(LOCALE_VIDEOMENU_ZAPPINGMODE, &g_settings.zappingmode, VIDEOMENU_ZAPPINGMODE_OPTIONS, VIDEOMENU_ZAPPINGMODE_OPTION_COUNT, true, this);
zm->setHint("", LOCALE_MENU_HINT_VIDEO_ZAPPINGMODE); zm->setHint("", LOCALE_MENU_HINT_VIDEO_ZAPPINGMODE);
videosetup->addItem(zm); videosetup->addItem(zm);
} }
if (file_exists("/proc/stb/video/hdmi_colorimetry")) { if (file_exists("/proc/stb/video/hdmi_colorimetry"))
{
CMenuOptionChooser *hm = new CMenuOptionChooser(LOCALE_VIDEOMENU_HDMI_MODE, &g_settings.hdmimode, VIDEOMENU_HDMI_MODE_OPTIONS, VIDEOMENU_HDMI_MODE_OPTION_COUNT, true, this); CMenuOptionChooser *hm = new CMenuOptionChooser(LOCALE_VIDEOMENU_HDMI_MODE, &g_settings.hdmimode, VIDEOMENU_HDMI_MODE_OPTIONS, VIDEOMENU_HDMI_MODE_OPTION_COUNT, true, this);
hm->setHint("", LOCALE_MENU_HINT_VIDEO_HDMI_MODE); hm->setHint("", LOCALE_MENU_HINT_VIDEO_HDMI_MODE);
videosetup->addItem(hm); videosetup->addItem(hm);
@@ -599,9 +602,12 @@ void CVideoSettings::initVideoSettings()
changeNotify(LOCALE_VIDEOMENU_ANALOG_MODE, NULL); changeNotify(LOCALE_VIDEOMENU_ANALOG_MODE, NULL);
#else #else
unsigned int system_rev = cs_get_revision(); unsigned int system_rev = cs_get_revision();
if (system_rev == 0x06) { if (system_rev == 0x06)
{
changeNotify(LOCALE_VIDEOMENU_ANALOG_MODE, NULL); changeNotify(LOCALE_VIDEOMENU_ANALOG_MODE, NULL);
} else { }
else
{
changeNotify(LOCALE_VIDEOMENU_SCART, NULL); changeNotify(LOCALE_VIDEOMENU_SCART, NULL);
changeNotify(LOCALE_VIDEOMENU_CINCH, NULL); changeNotify(LOCALE_VIDEOMENU_CINCH, NULL);
} }
@@ -682,10 +688,8 @@ bool CVideoSettings::changeNotify(const neutrino_locale_t OptionName, void * /*
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_VCRSIGNAL)) else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_VCRSIGNAL))
{ {
} }
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_VIDEOFORMAT) || else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_VIDEOFORMAT) || ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_43MODE))
ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_43MODE))
{ {
//if(g_settings.video_Format != 1 && g_settings.video_Format != 3)
if (g_settings.video_Format != 1 && g_settings.video_Format != 3 && g_settings.video_Format != 2) if (g_settings.video_Format != 1 && g_settings.video_Format != 3 && g_settings.video_Format != 2)
g_settings.video_Format = 3; g_settings.video_Format = 3;
@@ -734,7 +738,8 @@ bool CVideoSettings::changeNotify(const neutrino_locale_t OptionName, void * /*
} }
#endif #endif
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_ZAPPINGMODE)) { else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_ZAPPINGMODE))
{
videoDecoder->SetControl(VIDEO_CONTROL_ZAPPING_MODE, g_settings.zappingmode); videoDecoder->SetControl(VIDEO_CONTROL_ZAPPING_MODE, g_settings.zappingmode);
} }
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_HDMI_MODE)) else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_HDMI_MODE))
@@ -751,8 +756,10 @@ void CVideoSettings::next43Mode(void)
neutrino_locale_t text; neutrino_locale_t text;
unsigned int curmode = 0; unsigned int curmode = 0;
for (unsigned int i = 0; i < videomenu_43mode_options.size(); i++) { for (unsigned int i = 0; i < videomenu_43mode_options.size(); i++)
if (videomenu_43mode_options[i].key == g_settings.video_43mode) { {
if (videomenu_43mode_options[i].key == g_settings.video_43mode)
{
curmode = i; curmode = i;
break; break;
} }
@@ -777,8 +784,10 @@ void CVideoSettings::SwitchFormat()
neutrino_locale_t text; neutrino_locale_t text;
int curmode = 0; int curmode = 0;
for (int i = 0; i < VIDEOMENU_VIDEOFORMAT_OPTION_COUNT; i++) { for (int i = 0; i < VIDEOMENU_VIDEOFORMAT_OPTION_COUNT; i++)
if (VIDEOMENU_VIDEOFORMAT_OPTIONS[i].key == g_settings.video_Format) { {
if (VIDEOMENU_VIDEOFORMAT_OPTIONS[i].key == g_settings.video_Format)
{
curmode = i; curmode = i;
break; break;
} }
@@ -808,15 +817,18 @@ void CVideoSettings::nextMode(void)
bool disp_cur = 1; bool disp_cur = 1;
int res = messages_return::none; int res = messages_return::none;
for (i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++) { for (i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++)
if (VIDEOMENU_VIDEOMODE_OPTIONS[i].key == g_settings.video_Mode) { {
if (VIDEOMENU_VIDEOMODE_OPTIONS[i].key == g_settings.video_Mode)
{
curmode = i; curmode = i;
break; break;
} }
} }
text = VIDEOMENU_VIDEOMODE_OPTIONS[curmode].valname; text = VIDEOMENU_VIDEOMODE_OPTIONS[curmode].valname;
while(1) { while (1)
{
CVFD::getInstance()->ShowText(text); CVFD::getInstance()->ShowText(text);
if (res != messages_return::cancel_info) // avoid unnecessary display of messageboxes, when user is trying to press repeated format button if (res != messages_return::cancel_info) // avoid unnecessary display of messageboxes, when user is trying to press repeated format button
@@ -827,9 +839,11 @@ void CVideoSettings::nextMode(void)
disp_cur = 0; disp_cur = 0;
if(res == messages_return::handled) { if (res == messages_return::handled)
{
i = 0; i = 0;
while (true) { while (true)
{
curmode++; curmode++;
if (curmode >= VIDEOMENU_VIDEOMODE_OPTION_COUNT) if (curmode >= VIDEOMENU_VIDEOMODE_OPTION_COUNT)
curmode = 0; curmode = 0;
@@ -838,7 +852,8 @@ void CVideoSettings::nextMode(void)
if (g_settings.enabled_video_modes[curmode]) if (g_settings.enabled_video_modes[curmode])
break; break;
i++; i++;
if (i >= VIDEOMENU_VIDEOMODE_OPTION_COUNT) { if (i >= VIDEOMENU_VIDEOMODE_OPTION_COUNT)
{
CVFD::getInstance()->showServicename(g_RemoteControl->getCurrentChannelName(), g_RemoteControl->getCurrentChannelNumber()); CVFD::getInstance()->showServicename(g_RemoteControl->getCurrentChannelName(), g_RemoteControl->getCurrentChannelNumber());
return; return;
} }
@@ -846,7 +861,8 @@ void CVideoSettings::nextMode(void)
text = VIDEOMENU_VIDEOMODE_OPTIONS[curmode].valname; text = VIDEOMENU_VIDEOMODE_OPTIONS[curmode].valname;
} }
else if(res == messages_return::cancel_info) { else if (res == messages_return::cancel_info)
{
g_settings.video_Mode = VIDEOMENU_VIDEOMODE_OPTIONS[curmode].key; g_settings.video_Mode = VIDEOMENU_VIDEOMODE_OPTIONS[curmode].key;
//CVFD::getInstance()->ShowText(text); //CVFD::getInstance()->ShowText(text);
COsdHelpers::getInstance()->setVideoSystem(g_settings.video_Mode); COsdHelpers::getInstance()->setVideoSystem(g_settings.video_Mode);
@@ -866,8 +882,7 @@ void CVideoSettings::Init43ModeOptions()
videomenu_43mode_options.clear(); videomenu_43mode_options.clear();
for (unsigned int i = 0; i < VIDEOMENU_43MODE_OPTION_COUNT; i++) for (unsigned int i = 0; i < VIDEOMENU_43MODE_OPTION_COUNT; i++)
{ {
if (VIDEOMENU_43MODE_OPTIONS[i].key == DISPLAY_AR_MODE_PANSCAN2 && if (VIDEOMENU_43MODE_OPTIONS[i].key == DISPLAY_AR_MODE_PANSCAN2 && g_info.hw_caps->can_ps_14_9 == 0)
g_info.hw_caps->can_ps_14_9 == 0)
continue; continue;
CMenuOptionChooser::keyval_ext o; CMenuOptionChooser::keyval_ext o;
o = VIDEOMENU_43MODE_OPTIONS[i]; o = VIDEOMENU_43MODE_OPTIONS[i];