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

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-09-13 13:40:40 +02:00
parent 2d4f52ae62 932a535b6a
commit 2c5bf73006
44 changed files with 349 additions and 687 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
src/gui/videosettings.cpp
View File

@@ -374,36 +374,34 @@ int CVideoSettings::showVideoSetup()
#endif
CAutoModeNotifier anotify;
CMenuForwarder *vs_videomodes_fw = NULL;
if (!g_settings.easymenu) {
//dbdr options
if (system_rev != 0x01) /* dbdr options only on COOLSTREAM */
{
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);
}
//dbdr options
if (system_rev != 0x01) /* dbdr options only on COOLSTREAM */
{
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);
}
//video system modes submenue
if (g_info.hw_caps->has_HDMI) /* does this make sense on a box without HDMI? */
{
videomodes.addIntroItems(LOCALE_VIDEOMENU_ENABLED_MODES);
//video system modes submenue
if (g_info.hw_caps->has_HDMI) /* does this make sense on a box without HDMI? */
{
videomodes.addIntroItems(LOCALE_VIDEOMENU_ENABLED_MODES);
for (int i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++)
if (VIDEOMENU_VIDEOMODE_OPTIONS[i].key != -1)
videomodes.addItem(new CMenuOptionChooser(VIDEOMENU_VIDEOMODE_OPTIONS[i].valname, &g_settings.enabled_video_modes[i], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, &anotify));
for (int i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++)
if (VIDEOMENU_VIDEOMODE_OPTIONS[i].key != -1)
videomodes.addItem(new CMenuOptionChooser(VIDEOMENU_VIDEOMODE_OPTIONS[i].valname, &g_settings.enabled_video_modes[i], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, &anotify));
vs_videomodes_fw = new CMenuForwarder(LOCALE_VIDEOMENU_ENABLED_MODES, true, NULL, &videomodes, NULL, CRCInput::RC_red);
vs_videomodes_fw->setHint("", LOCALE_MENU_HINT_VIDEO_MODES);
vs_videomodes_fw = new CMenuForwarder(LOCALE_VIDEOMENU_ENABLED_MODES, true, NULL, &videomodes, NULL, CRCInput::RC_red);
vs_videomodes_fw->setHint("", LOCALE_MENU_HINT_VIDEO_MODES);
#ifdef BOXMODEL_CS_HD2
automodes.addIntroItems(LOCALE_VIDEOMENU_ENABLED_MODES_AUTO);
automodes.addIntroItems(LOCALE_VIDEOMENU_ENABLED_MODES_AUTO);
for (int i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT - 1; i++)
automodes.addItem(new CMenuOptionChooser(VIDEOMENU_VIDEOMODE_OPTIONS[i].valname, &g_settings.enabled_auto_modes[i], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, &anotify));
for (int i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT - 1; i++)
automodes.addItem(new CMenuOptionChooser(VIDEOMENU_VIDEOMODE_OPTIONS[i].valname, &g_settings.enabled_auto_modes[i], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, &anotify));
vs_automodes_fw = new CMenuForwarder(LOCALE_VIDEOMENU_ENABLED_MODES_AUTO, true, NULL, &automodes, NULL, CRCInput::RC_green);
vs_automodes_fw->setHint("", LOCALE_MENU_HINT_VIDEO_MODES_AUTO);
vs_automodes_fw = new CMenuForwarder(LOCALE_VIDEOMENU_ENABLED_MODES_AUTO, true, NULL, &automodes, NULL, CRCInput::RC_green);
vs_automodes_fw->setHint("", LOCALE_MENU_HINT_VIDEO_MODES_AUTO);
#endif
}
}
neutrino_locale_t tmp_locale = NONEXISTANT_LOCALE;
@@ -426,33 +424,29 @@ int CVideoSettings::showVideoSetup()
videosetup->addItem(vs_43mode_ch); //4:3 mode
videosetup->addItem(vs_dispformat_ch); //display format
videosetup->addItem(vs_videomodes_ch); //video system
if (!g_settings.easymenu) {
if (vs_dbdropt_ch != NULL)
videosetup->addItem(vs_dbdropt_ch); //dbdr options
if (vs_videomodes_fw != NULL)
videosetup->addItem(vs_videomodes_fw); //video modes submenue
if (vs_dbdropt_ch != NULL)
videosetup->addItem(vs_dbdropt_ch); //dbdr options
if (vs_videomodes_fw != NULL)
videosetup->addItem(vs_videomodes_fw); //video modes submenue
#ifdef BOXMODEL_CS_HD2
videosetup->addItem(vs_automodes_fw); //video auto modes submenue
#endif
}
#ifdef BOXMODEL_CS_HD2
if (!g_settings.easymenu) {
/* 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);
bcont->setHint("", LOCALE_MENU_HINT_VIDEO_BRIGHTNESS);
CMenuOptionNumberChooser * ccont = new CMenuOptionNumberChooser(LOCALE_VIDEOMENU_CONTRAST, &g_settings.contrast, true, -42, 42, this);
ccont->setHint("", LOCALE_MENU_HINT_VIDEO_CONTRAST);
CMenuOptionNumberChooser * scont = new CMenuOptionNumberChooser(LOCALE_VIDEOMENU_SATURATION, &g_settings.saturation, true, -42, 42, this);
scont->setHint("", LOCALE_MENU_HINT_VIDEO_SATURATION);
videosetup->addItem(bcont);
videosetup->addItem(ccont);
videosetup->addItem(scont);
/* 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);
bcont->setHint("", LOCALE_MENU_HINT_VIDEO_BRIGHTNESS);
CMenuOptionNumberChooser * ccont = new CMenuOptionNumberChooser(LOCALE_VIDEOMENU_CONTRAST, &g_settings.contrast, true, -42, 42, this);
ccont->setHint("", LOCALE_MENU_HINT_VIDEO_CONTRAST);
CMenuOptionNumberChooser * scont = new CMenuOptionNumberChooser(LOCALE_VIDEOMENU_SATURATION, &g_settings.saturation, true, -42, 42, this);
scont->setHint("", LOCALE_MENU_HINT_VIDEO_SATURATION);
videosetup->addItem(bcont);
videosetup->addItem(ccont);
videosetup->addItem(scont);
CMenuOptionChooser * sd = new CMenuOptionChooser(LOCALE_VIDEOMENU_SDOSD, &g_settings.enable_sd_osd, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this);
sd->setHint("", LOCALE_MENU_HINT_VIDEO_SDOSD);
videosetup->addItem(sd);
}
CMenuOptionChooser * sd = new CMenuOptionChooser(LOCALE_VIDEOMENU_SDOSD, &g_settings.enable_sd_osd, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this);
sd->setHint("", LOCALE_MENU_HINT_VIDEO_SDOSD);
videosetup->addItem(sd);
#endif
#ifdef ENABLE_PIP
CPipSetup pip;
@@ -460,11 +454,6 @@ int CVideoSettings::showVideoSetup()
pipsetup->setHint("", LOCALE_MENU_HINT_VIDEO_PIP);
videosetup->addItem(pipsetup);
#endif
if (g_settings.easymenu) {
CMenuForwarder * mf = new CMenuDForwarder(LOCALE_FONTMENU_SCALING, true, NULL, new COsdSetup(), "font_scaling");
mf->setHint("", LOCALE_MENU_HINT_FONT_SCALING);
videosetup->addItem(mf);
}
int res = videosetup->exec(NULL, "");
selected = videosetup->getSelected();
delete videosetup;