mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-30 00:41:09 +02:00
src/gui/videosettings.cpp: Replace BOXMODEL_APOLLO by BOXMODEL_CS_HD2
Origin commit data
------------------
Branch: ni/coolstream
Commit: bfcf4057d5
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-14 (Tue, 14 Mar 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -58,7 +58,7 @@
|
||||
#include <cs_api.h>
|
||||
#include <video.h>
|
||||
|
||||
#ifdef BOXMODEL_APOLLO
|
||||
#ifdef BOXMODEL_CS_HD2
|
||||
#include <cnxtfb.h>
|
||||
#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);
|
||||
|
Reference in New Issue
Block a user