From eb2dce221ac347bcda0e0b04aa6fd7077822ad3c Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 3 Nov 2012 22:23:32 +0100 Subject: [PATCH] videosettings: select more options based on hw_caps Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/badf556cf68e3154090021c54f986631fd12d485 Author: Stefan Seyfried Date: 2012-11-03 (Sat, 03 Nov 2012) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/videosettings.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp index c422a4ef0..38ee12137 100644 --- a/src/gui/videosettings.cpp +++ b/src/gui/videosettings.cpp @@ -250,7 +250,7 @@ int CVideoSettings::showVideoSetup() vs_chinch_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_CINCH, &g_settings.analog_mode2, VIDEOMENU_VIDEOSIGNAL_HD1PLUS_CINCH_OPTIONS, VIDEOMENU_VIDEOSIGNAL_HD1PLUS_CINCH_OPTION_COUNT, true, this); vs_chinch_ch->setHint("", LOCALE_MENU_HINT_VIDEO_CINCH_MODE); } - else if (system_rev == 0x01) /* TRIPLEDRAGON hack... :-) */ + else if (g_info.hw_caps->has_SCART) /* TRIPLEDRAGON hack... :-) TODO: SPARK? */ { vs_scart_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_SCART, &g_settings.analog_mode1, VIDEOMENU_VIDEOSIGNAL_TD_OPTIONS, VIDEOMENU_VIDEOSIGNAL_TD_OPTION_COUNT, true, this); } @@ -268,14 +268,18 @@ int CVideoSettings::showVideoSetup() vs_videomodes_ch->setHint("", LOCALE_MENU_HINT_VIDEO_MODE); //dbdr options - CMenuOptionChooser * 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); + CMenuOptionChooser *vs_dbdropt_ch = NULL; + 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 CMenuWidget videomodes(LOCALE_MAINSETTINGS_VIDEO, NEUTRINO_ICON_SETTINGS); CAutoModeNotifier anotify; CMenuForwarder *vs_videomodes_fw = NULL; - if (system_rev != 0x01) /* Tripledragon */ + if (g_info.hw_caps->has_HDMI) /* does this make sense on a box without HDMI? */ { videomodes.addIntroItems(LOCALE_VIDEOMENU_ENABLED_MODES); @@ -302,11 +306,10 @@ 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 (system_rev != 0x01) /* TRIPLEDRAGON hack... :-) */ - { + 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 - } int res = videosetup->exec(NULL, ""); selected = videosetup->getSelected();