From 0b7c80d7178a167661274c46b88de9a52bfbe80c Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Tue, 14 Mar 2017 00:03:30 +0100 Subject: [PATCH] src/gui/videosettings.cpp: Replace BOXMODEL_APOLLO by BOXMODEL_CS_HD2 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/bfcf4057d5c49999b0d8c57a5afa8d6ed04c5011 Author: Michael Liebmann Date: 2017-03-14 (Tue, 14 Mar 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/videosettings.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp index 06c27be48..093ec094e 100644 --- a/src/gui/videosettings.cpp +++ b/src/gui/videosettings.cpp @@ -58,7 +58,7 @@ #include #include -#ifdef BOXMODEL_APOLLO +#ifdef BOXMODEL_CS_HD2 #include #endif @@ -118,7 +118,7 @@ const CMenuOptionChooser::keyval VIDEOMENU_43MODE_OPTIONS[] = }; #define VIDEOMENU_43MODE_OPTION_COUNT (sizeof(VIDEOMENU_43MODE_OPTIONS)/sizeof(CMenuOptionChooser::keyval)) -#ifndef BOXMODEL_APOLLO +#ifndef BOXMODEL_CS_HD2 #define VIDEOMENU_VIDEOSIGNAL_TD_OPTION_COUNT 2 const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_TD_OPTIONS[VIDEOMENU_VIDEOSIGNAL_TD_OPTION_COUNT] = { @@ -346,7 +346,7 @@ int CVideoSettings::showVideoSetup() vs_chinch_ch->setHint("", LOCALE_MENU_HINT_VIDEO_CINCH_MODE); #endif } -#ifndef BOXMODEL_APOLLO +#ifndef BOXMODEL_CS_HD2 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);