From 298ef5adc977b3d9f7432ac17edd7776fa458ccc Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 31 Jan 2015 12:14:11 +0100 Subject: [PATCH] videosettings: work around API differences in hd1/hd2 ...one more ugly #ifdef certainly does not spoil this code... Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/8a05656ef0ea5506130459f50386b0ddb58ce1e9 Author: Stefan Seyfried Date: 2015-01-31 (Sat, 31 Jan 2015) ------------------ This commit was generated by Migit --- src/gui/videosettings.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp index 771475fc9..ad941cb39 100644 --- a/src/gui/videosettings.cpp +++ b/src/gui/videosettings.cpp @@ -118,12 +118,14 @@ const CMenuOptionChooser::keyval VIDEOMENU_43MODE_OPTIONS[] = }; #define VIDEOMENU_43MODE_OPTION_COUNT (sizeof(VIDEOMENU_43MODE_OPTIONS)/sizeof(CMenuOptionChooser::keyval)) +#ifndef BOXMODEL_APOLLO #define VIDEOMENU_VIDEOSIGNAL_TD_OPTION_COUNT 2 const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_TD_OPTIONS[VIDEOMENU_VIDEOSIGNAL_TD_OPTION_COUNT] = { { ANALOG_SD_RGB_SCART, LOCALE_VIDEOMENU_ANALOG_SD_RGB_SCART }, { ANALOG_SD_YPRPB_SCART, LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_SCART } }; +#endif #ifdef ANALOG_MODE #define VIDEOMENU_VIDEOSIGNAL_HD1_OPTION_COUNT 8 @@ -353,10 +355,12 @@ int CVideoSettings::showVideoSetup() vs_chinch_ch->setHint("", LOCALE_MENU_HINT_VIDEO_CINCH_MODE); } } +#ifndef BOXMODEL_APOLLO 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); } +#endif //4:3 mode CMenuOptionChooser * vs_43mode_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_43MODE, &g_settings.video_43mode, VIDEOMENU_43MODE_OPTIONS, VIDEOMENU_43MODE_OPTION_COUNT, true, this);