mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-29 16:31:11 +02:00
- videosettings: formatting code using astyle; some manual code nicenings
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
@@ -76,7 +76,7 @@ extern cVideo *pipVideoDecoder[3];
|
||||
#include <gui/quadpip_setup.h>
|
||||
#endif
|
||||
extern int prev_video_mode;
|
||||
extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
|
||||
extern CRemoteControl *g_RemoteControl; /* neutrino.cpp */
|
||||
|
||||
CVideoSettings::CVideoSettings(int wizard_mode)
|
||||
{
|
||||
@@ -101,10 +101,10 @@ CVideoSettings::~CVideoSettings()
|
||||
videomenu_43mode_options.clear();
|
||||
}
|
||||
|
||||
int CVideoSettings::exec(CMenuTarget* parent, const std::string &/*actionKey*/)
|
||||
int CVideoSettings::exec(CMenuTarget *parent, const std::string &/*actionKey*/)
|
||||
{
|
||||
dprintf(DEBUG_NORMAL, "[CVideoSettings] [%s - %d], init video setup (Mode: %d)...\n", __func__, __LINE__, is_wizard);
|
||||
int res = menu_return::RETURN_REPAINT;
|
||||
dprintf(DEBUG_NORMAL, "[CVideoSettings] [%s - %d], init video setup (Mode: %d)...\n", __func__, __LINE__, is_wizard);
|
||||
int res = menu_return::RETURN_REPAINT;
|
||||
|
||||
if (parent)
|
||||
{
|
||||
@@ -139,63 +139,63 @@ const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_TD_OPTIONS[VIDEOMENU_VIDE
|
||||
#define VIDEOMENU_VIDEOSIGNAL_HD1_OPTION_COUNT 8
|
||||
const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD1_OPTIONS[VIDEOMENU_VIDEOSIGNAL_HD1_OPTION_COUNT] =
|
||||
{
|
||||
{ ANALOG_MODE(SCART,SD,RGB ), LOCALE_VIDEOMENU_ANALOG_SD_RGB_SCART }, /* composite + RGB (for both SCART and Cinch) */
|
||||
{ ANALOG_MODE(CINCH,SD,RGB ), LOCALE_VIDEOMENU_ANALOG_SD_RGB_CINCH }, /* composite + RGB (for both SCART and Cinch) */
|
||||
{ ANALOG_MODE(SCART,SD,YPRPB), LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_SCART }, /* YPbPr SCART (with wrongly connected Cinch) */
|
||||
{ ANALOG_MODE(CINCH,SD,YPRPB), LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_CINCH }, /* YPbPr Cinch (with wrongly connected SCART) */
|
||||
{ ANALOG_MODE(SCART,HD,RGB ), LOCALE_VIDEOMENU_ANALOG_HD_RGB_SCART },
|
||||
{ ANALOG_MODE(CINCH,HD,RGB ), LOCALE_VIDEOMENU_ANALOG_HD_RGB_CINCH },
|
||||
{ ANALOG_MODE(SCART,HD,YPRPB), LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_SCART },
|
||||
{ ANALOG_MODE(CINCH,HD,YPRPB), LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_CINCH }
|
||||
{ ANALOG_MODE(SCART, SD, RGB), LOCALE_VIDEOMENU_ANALOG_SD_RGB_SCART }, // composite + RGB (for both SCART and Cinch)
|
||||
{ ANALOG_MODE(CINCH, SD, RGB), LOCALE_VIDEOMENU_ANALOG_SD_RGB_CINCH }, // composite + RGB (for both SCART and Cinch)
|
||||
{ ANALOG_MODE(SCART, SD, YPRPB), LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_SCART }, // YPbPr SCART (with wrongly connected Cinch)
|
||||
{ ANALOG_MODE(CINCH, SD, YPRPB), LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_CINCH }, // YPbPr Cinch (with wrongly connected SCART)
|
||||
{ ANALOG_MODE(SCART, HD, RGB), LOCALE_VIDEOMENU_ANALOG_HD_RGB_SCART },
|
||||
{ ANALOG_MODE(CINCH, HD, RGB), LOCALE_VIDEOMENU_ANALOG_HD_RGB_CINCH },
|
||||
{ ANALOG_MODE(SCART, HD, YPRPB), LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_SCART },
|
||||
{ ANALOG_MODE(CINCH, HD, YPRPB), LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_CINCH }
|
||||
};
|
||||
|
||||
#define VIDEOMENU_VIDEOSIGNAL_HD2_OPTION_COUNT 6
|
||||
const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD2_OPTIONS[VIDEOMENU_VIDEOSIGNAL_HD2_OPTION_COUNT] =
|
||||
{
|
||||
{ ANALOG_MODE(BOTH ,xD,AUTO ),LOCALE_VIDEOMENU_ANALOG_AUTO }, /* Encoder automatically adjusts based on content */
|
||||
{ ANALOG_MODE(BOTH ,xD,CVBS ),LOCALE_VIDEOMENU_ANALOG_CVBS }, /* CVBS on SCART (disables fastblank, un-used dacs) */
|
||||
{ ANALOG_MODE(BOTH ,SD,RGB ), LOCALE_VIDEOMENU_ANALOG_SD_RGB }, /* SD RGB on Cinch and SCART */
|
||||
{ ANALOG_MODE(BOTH ,SD,YPRPB), LOCALE_VIDEOMENU_ANALOG_SD_YPRPB }, /* SD YPrPb on Cinch and SCART */
|
||||
{ ANALOG_MODE(BOTH ,HD,RGB ), LOCALE_VIDEOMENU_ANALOG_HD_RGB }, /* HD RGB on Cinch and SCART */
|
||||
{ ANALOG_MODE(BOTH ,HD,YPRPB), LOCALE_VIDEOMENU_ANALOG_HD_YPRPB }, /* HD YPrPb on Cinch and SCART */
|
||||
{ ANALOG_MODE(BOTH, xD, AUTO), LOCALE_VIDEOMENU_ANALOG_AUTO }, // Encoder automatically adjusts based on content
|
||||
{ ANALOG_MODE(BOTH, xD, CVBS), LOCALE_VIDEOMENU_ANALOG_CVBS }, // CVBS on SCART (disables fastblank, un-used dacs)
|
||||
{ ANALOG_MODE(BOTH, SD, RGB), LOCALE_VIDEOMENU_ANALOG_SD_RGB }, // SD RGB on Cinch and SCART
|
||||
{ ANALOG_MODE(BOTH, SD, YPRPB), LOCALE_VIDEOMENU_ANALOG_SD_YPRPB }, // SD YPrPb on Cinch and SCART
|
||||
{ ANALOG_MODE(BOTH, HD, RGB), LOCALE_VIDEOMENU_ANALOG_HD_RGB }, // HD RGB on Cinch and SCART
|
||||
{ ANALOG_MODE(BOTH, HD, YPRPB), LOCALE_VIDEOMENU_ANALOG_HD_YPRPB }, // HD YPrPb on Cinch and SCART
|
||||
};
|
||||
|
||||
#define VIDEOMENU_VIDEOSIGNAL_HD1PLUS_SCART_OPTION_COUNT 4
|
||||
const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD1PLUS_SCART_OPTIONS[VIDEOMENU_VIDEOSIGNAL_HD1PLUS_SCART_OPTION_COUNT] =
|
||||
{
|
||||
{ ANALOG_MODE(SCART,SD,RGB ), LOCALE_VIDEOMENU_ANALOG_SD_RGB_SCART }, /* composite + RGB */
|
||||
{ ANALOG_MODE(SCART,SD,YPRPB), LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_SCART }, /* YPbPr SCART */
|
||||
{ ANALOG_MODE(SCART,HD,RGB ), LOCALE_VIDEOMENU_ANALOG_HD_RGB_SCART },
|
||||
{ ANALOG_MODE(SCART,HD,YPRPB), LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_SCART },
|
||||
{ ANALOG_MODE(SCART, SD, RGB), LOCALE_VIDEOMENU_ANALOG_SD_RGB_SCART }, // composite + RGB
|
||||
{ ANALOG_MODE(SCART, SD, YPRPB), LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_SCART }, // YPbPr SCART
|
||||
{ ANALOG_MODE(SCART, HD, RGB), LOCALE_VIDEOMENU_ANALOG_HD_RGB_SCART },
|
||||
{ ANALOG_MODE(SCART, HD, YPRPB), LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_SCART },
|
||||
};
|
||||
|
||||
#define VIDEOMENU_VIDEOSIGNAL_HD1PLUS_CINCH_OPTION_COUNT 4
|
||||
const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD1PLUS_CINCH_OPTIONS[VIDEOMENU_VIDEOSIGNAL_HD1PLUS_CINCH_OPTION_COUNT] =
|
||||
{
|
||||
{ ANALOG_MODE(CINCH,SD,RGB ), LOCALE_VIDEOMENU_ANALOG_SD_RGB_CINCH }, /* composite + RGB (for both SCART and Cinch) */
|
||||
{ ANALOG_MODE(CINCH,SD,YPRPB), LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_CINCH }, /* YPbPr Cinch (with wrongly connected SCART) */
|
||||
{ ANALOG_MODE(CINCH,HD,RGB ), LOCALE_VIDEOMENU_ANALOG_HD_RGB_CINCH },
|
||||
{ ANALOG_MODE(CINCH,HD,YPRPB), LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_CINCH }
|
||||
{ ANALOG_MODE(CINCH, SD, RGB), LOCALE_VIDEOMENU_ANALOG_SD_RGB_CINCH }, // composite + RGB (for both SCART and Cinch)
|
||||
{ ANALOG_MODE(CINCH, SD, YPRPB), LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_CINCH }, // YPbPr Cinch (with wrongly connected SCART)
|
||||
{ ANALOG_MODE(CINCH, HD, RGB), LOCALE_VIDEOMENU_ANALOG_HD_RGB_CINCH },
|
||||
{ ANALOG_MODE(CINCH, HD, YPRPB), LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_CINCH }
|
||||
};
|
||||
#else
|
||||
#define VIDEOMENU_VIDEOSIGNAL_HD1_OPTION_COUNT 8
|
||||
const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD1_OPTIONS[VIDEOMENU_VIDEOSIGNAL_HD1_OPTION_COUNT] =
|
||||
{
|
||||
{ ANALOG_SD_RGB_SCART, LOCALE_VIDEOMENU_ANALOG_SD_RGB_SCART }, /* composite + RGB (for both SCART and Cinch) */
|
||||
{ ANALOG_SD_RGB_CINCH, LOCALE_VIDEOMENU_ANALOG_SD_RGB_CINCH }, /* composite + RGB (for both SCART and Cinch) */
|
||||
{ ANALOG_SD_YPRPB_SCART, LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_SCART }, /* YPbPr SCART (with wrongly connected Cinch) */
|
||||
{ ANALOG_SD_YPRPB_CINCH, LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_CINCH }, /* YPbPr Cinch (with wrongly connected SCART) */
|
||||
{ ANALOG_HD_RGB_SCART, LOCALE_VIDEOMENU_ANALOG_HD_RGB_SCART },
|
||||
{ ANALOG_HD_RGB_CINCH, LOCALE_VIDEOMENU_ANALOG_HD_RGB_CINCH },
|
||||
{ ANALOG_HD_YPRPB_SCART, LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_SCART },
|
||||
{ ANALOG_HD_YPRPB_CINCH, LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_CINCH }
|
||||
{ ANALOG_SD_RGB_SCART, LOCALE_VIDEOMENU_ANALOG_SD_RGB_SCART }, // composite + RGB (for both SCART and Cinch)
|
||||
{ ANALOG_SD_RGB_CINCH, LOCALE_VIDEOMENU_ANALOG_SD_RGB_CINCH }, // composite + RGB (for both SCART and Cinch)
|
||||
{ ANALOG_SD_YPRPB_SCART, LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_SCART }, // YPbPr SCART (with wrongly connected Cinch)
|
||||
{ ANALOG_SD_YPRPB_CINCH, LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_CINCH }, // YPbPr Cinch (with wrongly connected SCART)
|
||||
{ ANALOG_HD_RGB_SCART, LOCALE_VIDEOMENU_ANALOG_HD_RGB_SCART },
|
||||
{ ANALOG_HD_RGB_CINCH, LOCALE_VIDEOMENU_ANALOG_HD_RGB_CINCH },
|
||||
{ ANALOG_HD_YPRPB_SCART, LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_SCART },
|
||||
{ ANALOG_HD_YPRPB_CINCH, LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_CINCH }
|
||||
};
|
||||
|
||||
#define VIDEOMENU_VIDEOSIGNAL_HD1PLUS_SCART_OPTION_COUNT 4
|
||||
const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD1PLUS_SCART_OPTIONS[VIDEOMENU_VIDEOSIGNAL_HD1PLUS_SCART_OPTION_COUNT] =
|
||||
{
|
||||
{ ANALOG_SD_RGB_SCART, LOCALE_VIDEOMENU_ANALOG_SD_RGB_SCART }, /* composite + RGB */
|
||||
{ ANALOG_SD_YPRPB_SCART, LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_SCART }, /* YPbPr SCART */
|
||||
{ ANALOG_SD_RGB_SCART, LOCALE_VIDEOMENU_ANALOG_SD_RGB_SCART }, // composite + RGB
|
||||
{ ANALOG_SD_YPRPB_SCART, LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_SCART }, // YPbPr SCART
|
||||
{ ANALOG_HD_RGB_SCART, LOCALE_VIDEOMENU_ANALOG_HD_RGB_SCART },
|
||||
{ ANALOG_HD_YPRPB_SCART, LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_SCART },
|
||||
};
|
||||
@@ -203,10 +203,10 @@ const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD1PLUS_SCART_OPTIONS[VID
|
||||
#define VIDEOMENU_VIDEOSIGNAL_HD1PLUS_CINCH_OPTION_COUNT 4
|
||||
const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD1PLUS_CINCH_OPTIONS[VIDEOMENU_VIDEOSIGNAL_HD1PLUS_CINCH_OPTION_COUNT] =
|
||||
{
|
||||
{ ANALOG_SD_RGB_CINCH, LOCALE_VIDEOMENU_ANALOG_SD_RGB_CINCH }, /* composite + RGB (for both SCART and Cinch) */
|
||||
{ ANALOG_SD_YPRPB_CINCH, LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_CINCH }, /* YPbPr Cinch (with wrongly connected SCART) */
|
||||
{ ANALOG_HD_RGB_CINCH, LOCALE_VIDEOMENU_ANALOG_HD_RGB_CINCH },
|
||||
{ ANALOG_HD_YPRPB_CINCH, LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_CINCH }
|
||||
{ ANALOG_SD_RGB_CINCH, LOCALE_VIDEOMENU_ANALOG_SD_RGB_CINCH }, // composite + RGB (for both SCART and Cinch)
|
||||
{ ANALOG_SD_YPRPB_CINCH, LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_CINCH }, // YPbPr Cinch (with wrongly connected SCART)
|
||||
{ ANALOG_HD_RGB_CINCH, LOCALE_VIDEOMENU_ANALOG_HD_RGB_CINCH },
|
||||
{ ANALOG_HD_YPRPB_CINCH, LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_CINCH }
|
||||
};
|
||||
#endif
|
||||
|
||||
@@ -215,136 +215,136 @@ const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD1PLUS_CINCH_OPTIONS[VID
|
||||
* TODO: instead of #ifdef select at run time
|
||||
*/
|
||||
#if BOXMODEL_CST_HD1
|
||||
/* numbers corresponding to video.cpp from zapit */
|
||||
// numbers corresponding to video.cpp from zapit
|
||||
CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_OPTION_COUNT] =
|
||||
{
|
||||
{ VIDEO_STD_NTSC, NONEXISTANT_LOCALE, "NTSC" },
|
||||
{ VIDEO_STD_PAL, NONEXISTANT_LOCALE, "PAL" },
|
||||
{ VIDEO_STD_SECAM, NONEXISTANT_LOCALE, "SECAM" },
|
||||
{ VIDEO_STD_480P, NONEXISTANT_LOCALE, "480p" },
|
||||
{ VIDEO_STD_576P, NONEXISTANT_LOCALE, "576p" },
|
||||
{ VIDEO_STD_720P50, NONEXISTANT_LOCALE, "720p 50Hz" },
|
||||
{ VIDEO_STD_720P60, NONEXISTANT_LOCALE, "720p 60Hz" },
|
||||
{ VIDEO_STD_1080I50, NONEXISTANT_LOCALE, "1080i 50Hz" },
|
||||
{ VIDEO_STD_1080I60, NONEXISTANT_LOCALE, "1080i 60Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "1080p 23.97Hz"},
|
||||
{ VIDEO_STD_1080P24, NONEXISTANT_LOCALE, "1080p 24Hz" },
|
||||
{ VIDEO_STD_1080P25, NONEXISTANT_LOCALE, "1080p 25Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "1080p 29.97Hz"},
|
||||
{ -1, NONEXISTANT_LOCALE, "1080p 50Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "1080p 60Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "2160p 24Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "2160p 25Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "2160p 30Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "2160p 50Hz" },
|
||||
{ VIDEO_STD_AUTO, NONEXISTANT_LOCALE, "Auto" }
|
||||
{ VIDEO_STD_NTSC, NONEXISTANT_LOCALE, "NTSC" },
|
||||
{ VIDEO_STD_PAL, NONEXISTANT_LOCALE, "PAL" },
|
||||
{ VIDEO_STD_SECAM, NONEXISTANT_LOCALE, "SECAM" },
|
||||
{ VIDEO_STD_480P, NONEXISTANT_LOCALE, "480p" },
|
||||
{ VIDEO_STD_576P, NONEXISTANT_LOCALE, "576p" },
|
||||
{ VIDEO_STD_720P50, NONEXISTANT_LOCALE, "720p 50Hz" },
|
||||
{ VIDEO_STD_720P60, NONEXISTANT_LOCALE, "720p 60Hz" },
|
||||
{ VIDEO_STD_1080I50, NONEXISTANT_LOCALE, "1080i 50Hz" },
|
||||
{ VIDEO_STD_1080I60, NONEXISTANT_LOCALE, "1080i 60Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "1080p 23.97Hz" },
|
||||
{ VIDEO_STD_1080P24, NONEXISTANT_LOCALE, "1080p 24Hz" },
|
||||
{ VIDEO_STD_1080P25, NONEXISTANT_LOCALE, "1080p 25Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "1080p 29.97Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "1080p 50Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "1080p 60Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "2160p 24Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "2160p 25Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "2160p 30Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "2160p 50Hz" },
|
||||
{ VIDEO_STD_AUTO, NONEXISTANT_LOCALE, "Auto" }
|
||||
};
|
||||
#elif BOXMODEL_CST_HD2
|
||||
/* numbers corresponding to video.cpp from zapit */
|
||||
// numbers corresponding to video.cpp from zapit
|
||||
CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_OPTION_COUNT] =
|
||||
{
|
||||
{ VIDEO_STD_NTSC, NONEXISTANT_LOCALE, "NTSC" },
|
||||
{ VIDEO_STD_PAL, NONEXISTANT_LOCALE, "PAL" },
|
||||
{ VIDEO_STD_SECAM, NONEXISTANT_LOCALE, "SECAM" },
|
||||
{ VIDEO_STD_480P, NONEXISTANT_LOCALE, "480p" },
|
||||
{ VIDEO_STD_576P, NONEXISTANT_LOCALE, "576p" },
|
||||
{ VIDEO_STD_720P50, NONEXISTANT_LOCALE, "720p 50Hz" },
|
||||
{ VIDEO_STD_720P60, NONEXISTANT_LOCALE, "720p 60Hz" },
|
||||
{ VIDEO_STD_1080I50, NONEXISTANT_LOCALE, "1080i 50Hz" },
|
||||
{ VIDEO_STD_1080I60, NONEXISTANT_LOCALE, "1080i 60Hz" },
|
||||
{ VIDEO_STD_1080P2397, NONEXISTANT_LOCALE, "1080p 23.97Hz"},
|
||||
{ VIDEO_STD_1080P24, NONEXISTANT_LOCALE, "1080p 24Hz" },
|
||||
{ VIDEO_STD_1080P25, NONEXISTANT_LOCALE, "1080p 25Hz" },
|
||||
{ VIDEO_STD_1080P2997, NONEXISTANT_LOCALE, "1080p 29.97Hz"},
|
||||
{ VIDEO_STD_1080P50, NONEXISTANT_LOCALE, "1080p 50Hz" },
|
||||
{ VIDEO_STD_1080P60, NONEXISTANT_LOCALE, "1080p 60Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "2160p 24Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "2160p 25Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "2160p 30Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "2160p 50Hz" },
|
||||
{ VIDEO_STD_AUTO, NONEXISTANT_LOCALE, "Auto" }
|
||||
{ VIDEO_STD_NTSC, NONEXISTANT_LOCALE, "NTSC" },
|
||||
{ VIDEO_STD_PAL, NONEXISTANT_LOCALE, "PAL" },
|
||||
{ VIDEO_STD_SECAM, NONEXISTANT_LOCALE, "SECAM" },
|
||||
{ VIDEO_STD_480P, NONEXISTANT_LOCALE, "480p" },
|
||||
{ VIDEO_STD_576P, NONEXISTANT_LOCALE, "576p" },
|
||||
{ VIDEO_STD_720P50, NONEXISTANT_LOCALE, "720p 50Hz" },
|
||||
{ VIDEO_STD_720P60, NONEXISTANT_LOCALE, "720p 60Hz" },
|
||||
{ VIDEO_STD_1080I50, NONEXISTANT_LOCALE, "1080i 50Hz" },
|
||||
{ VIDEO_STD_1080I60, NONEXISTANT_LOCALE, "1080i 60Hz" },
|
||||
{ VIDEO_STD_1080P2397, NONEXISTANT_LOCALE, "1080p 23.97Hz" },
|
||||
{ VIDEO_STD_1080P24, NONEXISTANT_LOCALE, "1080p 24Hz" },
|
||||
{ VIDEO_STD_1080P25, NONEXISTANT_LOCALE, "1080p 25Hz" },
|
||||
{ VIDEO_STD_1080P2997, NONEXISTANT_LOCALE, "1080p 29.97Hz" },
|
||||
{ VIDEO_STD_1080P50, NONEXISTANT_LOCALE, "1080p 50Hz" },
|
||||
{ VIDEO_STD_1080P60, NONEXISTANT_LOCALE, "1080p 60Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "2160p 24Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "2160p 25Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "2160p 30Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "2160p 50Hz" },
|
||||
{ VIDEO_STD_AUTO, NONEXISTANT_LOCALE, "Auto" }
|
||||
};
|
||||
#elif BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOXSE || BOXMODEL_VUPLUS_ALL
|
||||
CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_OPTION_COUNT] =
|
||||
{
|
||||
{ -1, NONEXISTANT_LOCALE, "NTSC" },
|
||||
{ VIDEO_STD_PAL, NONEXISTANT_LOCALE, "PAL" },
|
||||
{ -1, NONEXISTANT_LOCALE, "SECAM" },
|
||||
{ -1, NONEXISTANT_LOCALE, "480p" },
|
||||
{ VIDEO_STD_576P, NONEXISTANT_LOCALE, "576p" },
|
||||
{ VIDEO_STD_720P50, NONEXISTANT_LOCALE, "720p 50Hz" },
|
||||
{ VIDEO_STD_720P60, NONEXISTANT_LOCALE, "720p 60Hz" },
|
||||
{ VIDEO_STD_1080I50, NONEXISTANT_LOCALE, "1080i 50Hz" },
|
||||
{ VIDEO_STD_1080I60, NONEXISTANT_LOCALE, "1080i 60Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "1080p 23.97Hz"},
|
||||
{ VIDEO_STD_1080P24, NONEXISTANT_LOCALE, "1080p 24Hz" },
|
||||
{ VIDEO_STD_1080P25, NONEXISTANT_LOCALE, "1080p 25Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "1080p 29.97Hz"},
|
||||
{ VIDEO_STD_1080P50, NONEXISTANT_LOCALE, "1080p 50Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "1080p 60Hz" },
|
||||
{ VIDEO_STD_2160P24, NONEXISTANT_LOCALE, "2160p 24Hz" },
|
||||
{ VIDEO_STD_2160P25, NONEXISTANT_LOCALE, "2160p 25Hz" },
|
||||
{ VIDEO_STD_2160P30, NONEXISTANT_LOCALE, "2160p 30Hz" },
|
||||
{ VIDEO_STD_2160P50, NONEXISTANT_LOCALE, "2160p 50Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "Auto" }
|
||||
{ -1, NONEXISTANT_LOCALE, "NTSC" },
|
||||
{ VIDEO_STD_PAL, NONEXISTANT_LOCALE, "PAL" },
|
||||
{ -1, NONEXISTANT_LOCALE, "SECAM" },
|
||||
{ -1, NONEXISTANT_LOCALE, "480p" },
|
||||
{ VIDEO_STD_576P, NONEXISTANT_LOCALE, "576p" },
|
||||
{ VIDEO_STD_720P50, NONEXISTANT_LOCALE, "720p 50Hz" },
|
||||
{ VIDEO_STD_720P60, NONEXISTANT_LOCALE, "720p 60Hz" },
|
||||
{ VIDEO_STD_1080I50, NONEXISTANT_LOCALE, "1080i 50Hz" },
|
||||
{ VIDEO_STD_1080I60, NONEXISTANT_LOCALE, "1080i 60Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "1080p 23.97Hz" },
|
||||
{ VIDEO_STD_1080P24, NONEXISTANT_LOCALE, "1080p 24Hz" },
|
||||
{ VIDEO_STD_1080P25, NONEXISTANT_LOCALE, "1080p 25Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "1080p 29.97Hz" },
|
||||
{ VIDEO_STD_1080P50, NONEXISTANT_LOCALE, "1080p 50Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "1080p 60Hz" },
|
||||
{ VIDEO_STD_2160P24, NONEXISTANT_LOCALE, "2160p 24Hz" },
|
||||
{ VIDEO_STD_2160P25, NONEXISTANT_LOCALE, "2160p 25Hz" },
|
||||
{ VIDEO_STD_2160P30, NONEXISTANT_LOCALE, "2160p 30Hz" },
|
||||
{ VIDEO_STD_2160P50, NONEXISTANT_LOCALE, "2160p 50Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "Auto" }
|
||||
};
|
||||
#elif BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS
|
||||
CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_OPTION_COUNT] =
|
||||
{
|
||||
{ -1, NONEXISTANT_LOCALE, "NTSC" },
|
||||
{ VIDEO_STD_PAL, NONEXISTANT_LOCALE, "PAL" },
|
||||
{ -1, NONEXISTANT_LOCALE, "SECAM" },
|
||||
{ -1, NONEXISTANT_LOCALE, "480p" },
|
||||
{ VIDEO_STD_576P, NONEXISTANT_LOCALE, "576p" },
|
||||
{ VIDEO_STD_720P50, NONEXISTANT_LOCALE, "720p 50Hz" },
|
||||
{ VIDEO_STD_720P60, NONEXISTANT_LOCALE, "720p 60Hz" },
|
||||
{ VIDEO_STD_1080I50, NONEXISTANT_LOCALE, "1080i 50Hz" },
|
||||
{ VIDEO_STD_1080I60, NONEXISTANT_LOCALE, "1080i 60Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "1080p 23.97Hz"},
|
||||
{ VIDEO_STD_1080P24, NONEXISTANT_LOCALE, "1080p 24Hz" },
|
||||
{ VIDEO_STD_1080P25, NONEXISTANT_LOCALE, "1080p 25Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "1080p 29.97Hz"},
|
||||
{ VIDEO_STD_1080P50, NONEXISTANT_LOCALE, "1080p 50Hz" },
|
||||
{ VIDEO_STD_1080P60, NONEXISTANT_LOCALE, "1080p 60Hz" },
|
||||
{ VIDEO_STD_2160P24, NONEXISTANT_LOCALE, "2160p 24Hz" },
|
||||
{ VIDEO_STD_2160P25, NONEXISTANT_LOCALE, "2160p 25Hz" },
|
||||
{ VIDEO_STD_2160P30, NONEXISTANT_LOCALE, "2160p 30Hz" },
|
||||
{ VIDEO_STD_2160P50, NONEXISTANT_LOCALE, "2160p 50Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "Auto" }
|
||||
{ -1, NONEXISTANT_LOCALE, "NTSC" },
|
||||
{ VIDEO_STD_PAL, NONEXISTANT_LOCALE, "PAL" },
|
||||
{ -1, NONEXISTANT_LOCALE, "SECAM" },
|
||||
{ -1, NONEXISTANT_LOCALE, "480p" },
|
||||
{ VIDEO_STD_576P, NONEXISTANT_LOCALE, "576p" },
|
||||
{ VIDEO_STD_720P50, NONEXISTANT_LOCALE, "720p 50Hz" },
|
||||
{ VIDEO_STD_720P60, NONEXISTANT_LOCALE, "720p 60Hz" },
|
||||
{ VIDEO_STD_1080I50, NONEXISTANT_LOCALE, "1080i 50Hz" },
|
||||
{ VIDEO_STD_1080I60, NONEXISTANT_LOCALE, "1080i 60Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "1080p 23.97Hz" },
|
||||
{ VIDEO_STD_1080P24, NONEXISTANT_LOCALE, "1080p 24Hz" },
|
||||
{ VIDEO_STD_1080P25, NONEXISTANT_LOCALE, "1080p 25Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "1080p 29.97Hz" },
|
||||
{ VIDEO_STD_1080P50, NONEXISTANT_LOCALE, "1080p 50Hz" },
|
||||
{ VIDEO_STD_1080P60, NONEXISTANT_LOCALE, "1080p 60Hz" },
|
||||
{ VIDEO_STD_2160P24, NONEXISTANT_LOCALE, "2160p 24Hz" },
|
||||
{ VIDEO_STD_2160P25, NONEXISTANT_LOCALE, "2160p 25Hz" },
|
||||
{ VIDEO_STD_2160P30, NONEXISTANT_LOCALE, "2160p 30Hz" },
|
||||
{ VIDEO_STD_2160P50, NONEXISTANT_LOCALE, "2160p 50Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "Auto" }
|
||||
};
|
||||
#else
|
||||
/* generic PC -> 5 different resolutions, 480, 576, 720 and 1080 lines */
|
||||
CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_OPTION_COUNT] =
|
||||
{
|
||||
{ VIDEO_STD_NTSC, NONEXISTANT_LOCALE, "NTSC" },
|
||||
{ VIDEO_STD_PAL, NONEXISTANT_LOCALE, "PAL" },
|
||||
{ -1, NONEXISTANT_LOCALE, "SECAM" },
|
||||
{ -1, NONEXISTANT_LOCALE, "480p" },
|
||||
{ -1, NONEXISTANT_LOCALE, "576p" },
|
||||
{ VIDEO_STD_720P50, NONEXISTANT_LOCALE, "720p 50Hz" },
|
||||
{ VIDEO_STD_720P60, NONEXISTANT_LOCALE, "720p 60Hz" },
|
||||
{ VIDEO_STD_1080I50, NONEXISTANT_LOCALE, "1080i 50Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "1080i 60Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "1080p 23.97Hz"},
|
||||
{ -1, NONEXISTANT_LOCALE, "1080p 24Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "1080p 25Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "1080p 29.97Hz"},
|
||||
{ -1, NONEXISTANT_LOCALE, "1080p 50Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "1080p 60Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "2160p 24Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "2160p 25Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "2160p 30Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "2160p 50Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "Auto" }
|
||||
{ VIDEO_STD_NTSC, NONEXISTANT_LOCALE, "NTSC" },
|
||||
{ VIDEO_STD_PAL, NONEXISTANT_LOCALE, "PAL" },
|
||||
{ -1, NONEXISTANT_LOCALE, "SECAM" },
|
||||
{ -1, NONEXISTANT_LOCALE, "480p" },
|
||||
{ -1, NONEXISTANT_LOCALE, "576p" },
|
||||
{ VIDEO_STD_720P50, NONEXISTANT_LOCALE, "720p 50Hz" },
|
||||
{ VIDEO_STD_720P60, NONEXISTANT_LOCALE, "720p 60Hz" },
|
||||
{ VIDEO_STD_1080I50, NONEXISTANT_LOCALE, "1080i 50Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "1080i 60Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "1080p 23.97Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "1080p 24Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "1080p 25Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "1080p 29.97Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "1080p 50Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "1080p 60Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "2160p 24Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "2160p 25Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "2160p 30Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "2160p 50Hz" },
|
||||
{ -1, NONEXISTANT_LOCALE, "Auto" }
|
||||
};
|
||||
#endif
|
||||
|
||||
#define VIDEOMENU_VIDEOFORMAT_OPTION_COUNT 3//2
|
||||
#define VIDEOMENU_VIDEOFORMAT_OPTION_COUNT 3
|
||||
const CMenuOptionChooser::keyval VIDEOMENU_VIDEOFORMAT_OPTIONS[VIDEOMENU_VIDEOFORMAT_OPTION_COUNT] =
|
||||
{
|
||||
{ DISPLAY_AR_4_3, LOCALE_VIDEOMENU_VIDEOFORMAT_43 },
|
||||
{ DISPLAY_AR_16_9, LOCALE_VIDEOMENU_VIDEOFORMAT_169 },
|
||||
{ DISPLAY_AR_14_9, LOCALE_VIDEOMENU_VIDEOFORMAT_149 }
|
||||
{ DISPLAY_AR_4_3, LOCALE_VIDEOMENU_VIDEOFORMAT_43 },
|
||||
{ DISPLAY_AR_16_9, LOCALE_VIDEOMENU_VIDEOFORMAT_169 },
|
||||
{ DISPLAY_AR_14_9, LOCALE_VIDEOMENU_VIDEOFORMAT_149 }
|
||||
};
|
||||
|
||||
#define VIDEOMENU_DBDR_OPTION_COUNT 3
|
||||
@@ -375,8 +375,8 @@ const CMenuOptionChooser::keyval VIDEOMENU_HDMI_MODE_OPTIONS[VIDEOMENU_HDMI_MODE
|
||||
|
||||
int CVideoSettings::showVideoSetup()
|
||||
{
|
||||
//init
|
||||
CMenuWidget * videosetup = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width);
|
||||
// init
|
||||
CMenuWidget *videosetup = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width);
|
||||
videosetup->setSelected(selected);
|
||||
videosetup->setWizardMode(is_wizard);
|
||||
|
||||
@@ -390,11 +390,11 @@ int CVideoSettings::showVideoSetup()
|
||||
vmode_option_count++;
|
||||
}
|
||||
|
||||
//analog options
|
||||
// analog options
|
||||
unsigned int system_rev = cs_get_revision();
|
||||
CMenuOptionChooser * vs_analg_ch = NULL;
|
||||
CMenuOptionChooser * vs_scart_ch = NULL;
|
||||
CMenuOptionChooser * vs_chinch_ch = NULL;
|
||||
CMenuOptionChooser *vs_analg_ch = NULL;
|
||||
CMenuOptionChooser *vs_scart_ch = NULL;
|
||||
CMenuOptionChooser *vs_chinch_ch = NULL;
|
||||
if (system_rev == 0x06)
|
||||
{
|
||||
vs_analg_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_ANALOG_MODE, &g_settings.analog_mode1, VIDEOMENU_VIDEOSIGNAL_HD1_OPTIONS, VIDEOMENU_VIDEOSIGNAL_HD1_OPTION_COUNT, true, this);
|
||||
@@ -406,7 +406,8 @@ int CVideoSettings::showVideoSetup()
|
||||
vs_analg_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_ANALOG_MODE, &g_settings.analog_mode1, VIDEOMENU_VIDEOSIGNAL_HD2_OPTIONS, VIDEOMENU_VIDEOSIGNAL_HD2_OPTION_COUNT, true, this);
|
||||
vs_analg_ch->setHint("", LOCALE_MENU_HINT_VIDEO_ANALOG_MODE);
|
||||
#else
|
||||
if(system_rev != 10) {
|
||||
if (system_rev != 10)
|
||||
{
|
||||
vs_scart_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_SCART, &g_settings.analog_mode1, VIDEOMENU_VIDEOSIGNAL_HD1PLUS_SCART_OPTIONS, VIDEOMENU_VIDEOSIGNAL_HD1PLUS_SCART_OPTION_COUNT, true, this);
|
||||
vs_scart_ch->setHint("", LOCALE_MENU_HINT_VIDEO_SCART_MODE);
|
||||
}
|
||||
@@ -421,35 +422,35 @@ int CVideoSettings::showVideoSetup()
|
||||
}
|
||||
#endif
|
||||
|
||||
//4:3 mode
|
||||
CMenuOptionChooser * vs_43mode_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_43MODE, &g_settings.video_43mode, videomenu_43mode_options, true, this);
|
||||
// 4:3 mode
|
||||
CMenuOptionChooser *vs_43mode_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_43MODE, &g_settings.video_43mode, videomenu_43mode_options, true, this);
|
||||
vs_43mode_ch->setHint("", LOCALE_MENU_HINT_VIDEO_43MODE);
|
||||
|
||||
//display format
|
||||
CMenuOptionChooser * vs_dispformat_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_VIDEOFORMAT, &g_settings.video_Format, VIDEOMENU_VIDEOFORMAT_OPTIONS, g_info.hw_caps->can_ar_14_9 ? VIDEOMENU_VIDEOFORMAT_OPTION_COUNT : VIDEOMENU_VIDEOFORMAT_OPTION_COUNT -1, true, this); /* works only if 14:9 is last! */
|
||||
// display format
|
||||
CMenuOptionChooser *vs_dispformat_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_VIDEOFORMAT, &g_settings.video_Format, VIDEOMENU_VIDEOFORMAT_OPTIONS, g_info.hw_caps->can_ar_14_9 ? VIDEOMENU_VIDEOFORMAT_OPTION_COUNT : VIDEOMENU_VIDEOFORMAT_OPTION_COUNT - 1, true, this); /* works only if 14:9 is last! */
|
||||
vs_dispformat_ch->setHint("", LOCALE_MENU_HINT_VIDEO_FORMAT);
|
||||
|
||||
//video system
|
||||
CMenuOptionChooser * vs_videomodes_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_VIDEOMODE, &g_settings.video_Mode, vmode_options, vmode_option_count, true, this, CRCInput::RC_nokey, "", true);
|
||||
// video system
|
||||
CMenuOptionChooser *vs_videomodes_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_VIDEOMODE, &g_settings.video_Mode, vmode_options, vmode_option_count, true, this, CRCInput::RC_nokey, "", true);
|
||||
vs_videomodes_ch->setHint("", LOCALE_MENU_HINT_VIDEO_MODE);
|
||||
|
||||
CMenuOptionChooser *vs_dbdropt_ch = NULL;
|
||||
CMenuWidget videomodes(LOCALE_MAINSETTINGS_VIDEO, NEUTRINO_ICON_SETTINGS);
|
||||
#ifdef BOXMODEL_CST_HD2
|
||||
CMenuForwarder * vs_automodes_fw = NULL;
|
||||
CMenuForwarder *vs_automodes_fw = NULL;
|
||||
CMenuWidget automodes(LOCALE_MAINSETTINGS_VIDEO, NEUTRINO_ICON_SETTINGS);
|
||||
#endif
|
||||
CAutoModeNotifier anotify;
|
||||
CMenuForwarder *vs_videomodes_fw = NULL;
|
||||
//dbdr options
|
||||
if (system_rev != 0x01) /* dbdr options only on COOLSTREAM */
|
||||
// dbdr options only on COOLSTREAM
|
||||
if (system_rev != 0x01)
|
||||
{
|
||||
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? */
|
||||
// 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);
|
||||
|
||||
@@ -475,52 +476,52 @@ int CVideoSettings::showVideoSetup()
|
||||
}
|
||||
|
||||
neutrino_locale_t tmp_locale = NONEXISTANT_LOCALE;
|
||||
/* TODO: check the locale */
|
||||
// TODO: check the locale
|
||||
if (vs_analg_ch != NULL || vs_scart_ch != NULL || vs_chinch_ch != NULL)
|
||||
tmp_locale = LOCALE_VIDEOMENU_TV_SCART;
|
||||
//---------------------------------------
|
||||
// ---------------------------------------
|
||||
videosetup->addIntroItems(LOCALE_MAINSETTINGS_VIDEO, tmp_locale);
|
||||
//---------------------------------------
|
||||
//videosetup->addItem(vs_scart_sep); //separator scart
|
||||
// ---------------------------------------
|
||||
//videosetup->addItem(vs_scart_sep); // separator scart
|
||||
if (vs_analg_ch != NULL)
|
||||
videosetup->addItem(vs_analg_ch); //analog option
|
||||
videosetup->addItem(vs_analg_ch); // analog option
|
||||
if (vs_scart_ch != NULL)
|
||||
videosetup->addItem(vs_scart_ch); //scart
|
||||
videosetup->addItem(vs_scart_ch); // scart
|
||||
if (vs_chinch_ch != NULL)
|
||||
videosetup->addItem(vs_chinch_ch);//chinch
|
||||
videosetup->addItem(vs_chinch_ch); // chinch
|
||||
//if (tmp_locale != NONEXISTANT_LOCALE)
|
||||
// videosetup->addItem(GenericMenuSeparatorLine);
|
||||
//---------------------------------------
|
||||
videosetup->addItem(vs_43mode_ch); //4:3 mode
|
||||
videosetup->addItem(vs_dispformat_ch); //display format
|
||||
videosetup->addItem(vs_videomodes_ch); //video system
|
||||
// ---------------------------------------
|
||||
videosetup->addItem(vs_43mode_ch); // 4:3 mode
|
||||
videosetup->addItem(vs_dispformat_ch); // display format
|
||||
videosetup->addItem(vs_videomodes_ch); // video system
|
||||
if (vs_dbdropt_ch != NULL)
|
||||
videosetup->addItem(vs_dbdropt_ch); //dbdr options
|
||||
videosetup->addItem(vs_dbdropt_ch); // dbdr options
|
||||
if (vs_videomodes_fw != NULL)
|
||||
videosetup->addItem(vs_videomodes_fw); //video modes submenue
|
||||
videosetup->addItem(vs_videomodes_fw); // video modes submenue
|
||||
#ifdef BOXMODEL_CST_HD2
|
||||
videosetup->addItem(vs_automodes_fw); //video auto modes submenue
|
||||
videosetup->addItem(vs_automodes_fw); // video auto modes submenue
|
||||
#endif
|
||||
|
||||
#ifdef BOXMODEL_CST_HD2
|
||||
/* 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);
|
||||
// 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);
|
||||
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);
|
||||
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);
|
||||
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
|
||||
#if ENABLE_PIP
|
||||
CPipSetup pip;
|
||||
CMenuForwarder * pipsetup = new CMenuForwarder(LOCALE_VIDEOMENU_PIP, g_info.hw_caps->can_pip, NULL, &pip);
|
||||
CMenuForwarder *pipsetup = new CMenuForwarder(LOCALE_VIDEOMENU_PIP, g_info.hw_caps->can_pip, NULL, &pip);
|
||||
pipsetup->setHint("", LOCALE_MENU_HINT_VIDEO_PIP);
|
||||
videosetup->addItem(pipsetup);
|
||||
#endif
|
||||
@@ -532,13 +533,15 @@ int CVideoSettings::showVideoSetup()
|
||||
#endif
|
||||
|
||||
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
|
||||
if (file_exists("/proc/stb/video/zapmode")) {
|
||||
CMenuOptionChooser * zm = new CMenuOptionChooser(LOCALE_VIDEOMENU_ZAPPINGMODE, &g_settings.zappingmode, VIDEOMENU_ZAPPINGMODE_OPTIONS, VIDEOMENU_ZAPPINGMODE_OPTION_COUNT, true, this);
|
||||
if (file_exists("/proc/stb/video/zapmode"))
|
||||
{
|
||||
CMenuOptionChooser *zm = new CMenuOptionChooser(LOCALE_VIDEOMENU_ZAPPINGMODE, &g_settings.zappingmode, VIDEOMENU_ZAPPINGMODE_OPTIONS, VIDEOMENU_ZAPPINGMODE_OPTION_COUNT, true, this);
|
||||
zm->setHint("", LOCALE_MENU_HINT_VIDEO_ZAPPINGMODE);
|
||||
videosetup->addItem(zm);
|
||||
}
|
||||
|
||||
if (file_exists("/proc/stb/video/hdmi_colorimetry")) {
|
||||
if (file_exists("/proc/stb/video/hdmi_colorimetry"))
|
||||
{
|
||||
CMenuOptionChooser *hm = new CMenuOptionChooser(LOCALE_VIDEOMENU_HDMI_MODE, &g_settings.hdmimode, VIDEOMENU_HDMI_MODE_OPTIONS, VIDEOMENU_HDMI_MODE_OPTION_COUNT, true, this);
|
||||
hm->setHint("", LOCALE_MENU_HINT_VIDEO_HDMI_MODE);
|
||||
videosetup->addItem(hm);
|
||||
@@ -591,7 +594,7 @@ void CVideoSettings::initVideoSettings()
|
||||
{
|
||||
dprintf(DEBUG_NORMAL, "[CVideoSettings] [%s - %d], init video settings...\n", __func__, __LINE__);
|
||||
#if 0
|
||||
//FIXME focus: ?? this is different for different boxes
|
||||
// FIXME focus: ?? this is different for different boxes
|
||||
videoDecoder->SetVideoMode((analog_mode_t) g_settings.analog_mode1);
|
||||
videoDecoder->SetVideoMode((analog_mode_t) g_settings.analog_mode2);
|
||||
#endif
|
||||
@@ -599,14 +602,17 @@ void CVideoSettings::initVideoSettings()
|
||||
changeNotify(LOCALE_VIDEOMENU_ANALOG_MODE, NULL);
|
||||
#else
|
||||
unsigned int system_rev = cs_get_revision();
|
||||
if (system_rev == 0x06) {
|
||||
if (system_rev == 0x06)
|
||||
{
|
||||
changeNotify(LOCALE_VIDEOMENU_ANALOG_MODE, NULL);
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
changeNotify(LOCALE_VIDEOMENU_SCART, NULL);
|
||||
changeNotify(LOCALE_VIDEOMENU_CINCH, NULL);
|
||||
}
|
||||
#endif
|
||||
//setupVideoSystem(false/*don't ask*/);// focus: CVideoSettings constructor do this already ?
|
||||
//setupVideoSystem(false/*don't ask*/); // focus: CVideoSettings constructor do this already ?
|
||||
|
||||
#if 0
|
||||
videoDecoder->setAspectRatio(-1, g_settings.video_43mode);
|
||||
@@ -636,7 +642,7 @@ void CVideoSettings::initVideoSettings()
|
||||
void CVideoSettings::setupVideoSystem(bool do_ask)
|
||||
{
|
||||
dprintf(DEBUG_NORMAL, "[CVideoSettings] [%s - %d], setup video system...\n", __func__, __LINE__);
|
||||
COsdHelpers::getInstance()->setVideoSystem(g_settings.video_Mode); //FIXME
|
||||
COsdHelpers::getInstance()->setVideoSystem(g_settings.video_Mode); // FIXME
|
||||
COsdHelpers::getInstance()->changeOsdResolution(0, true, false);
|
||||
|
||||
if (do_ask)
|
||||
@@ -660,7 +666,7 @@ bool CVideoSettings::changeNotify(const neutrino_locale_t OptionName, void * /*
|
||||
{
|
||||
#if 0
|
||||
int val = 0;
|
||||
if(data)
|
||||
if (data)
|
||||
val = * (int *) data;
|
||||
#endif
|
||||
if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_ANALOG_MODE))
|
||||
@@ -682,10 +688,8 @@ bool CVideoSettings::changeNotify(const neutrino_locale_t OptionName, void * /*
|
||||
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_VCRSIGNAL))
|
||||
{
|
||||
}
|
||||
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_VIDEOFORMAT) ||
|
||||
ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_43MODE))
|
||||
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_VIDEOFORMAT) || ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_43MODE))
|
||||
{
|
||||
//if(g_settings.video_Format != 1 && g_settings.video_Format != 3)
|
||||
if (g_settings.video_Format != 1 && g_settings.video_Format != 3 && g_settings.video_Format != 2)
|
||||
g_settings.video_Format = 3;
|
||||
|
||||
@@ -698,43 +702,44 @@ bool CVideoSettings::changeNotify(const neutrino_locale_t OptionName, void * /*
|
||||
}
|
||||
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_VIDEOMODE))
|
||||
{
|
||||
setupVideoSystem(true/*ask*/);
|
||||
setupVideoSystem(true /*ask*/);
|
||||
return true;
|
||||
}
|
||||
#ifdef BOXMODEL_CST_HD2
|
||||
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_BRIGHTNESS))
|
||||
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_BRIGHTNESS))
|
||||
{
|
||||
videoDecoder->SetControl(VIDEO_CONTROL_BRIGHTNESS, g_settings.brightness);
|
||||
}
|
||||
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_CONTRAST))
|
||||
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_CONTRAST))
|
||||
{
|
||||
videoDecoder->SetControl(VIDEO_CONTROL_CONTRAST, g_settings.contrast*3);
|
||||
videoDecoder->SetControl(VIDEO_CONTROL_CONTRAST, g_settings.contrast * 3);
|
||||
}
|
||||
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_SATURATION))
|
||||
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_SATURATION))
|
||||
{
|
||||
videoDecoder->SetControl(VIDEO_CONTROL_SATURATION, g_settings.saturation*3);
|
||||
videoDecoder->SetControl(VIDEO_CONTROL_SATURATION, g_settings.saturation * 3);
|
||||
}
|
||||
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_SDOSD))
|
||||
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_SDOSD))
|
||||
{
|
||||
int val = g_settings.enable_sd_osd;
|
||||
dprintf(DEBUG_NORMAL, "[CVideoSettings] [%s - %d], SD OSD enable: %d\n", __func__, __LINE__, val);
|
||||
dprintf(DEBUG_NORMAL, "[CVideoSettings] [%s - %d], SD OSD enable: %d\n", __func__, __LINE__, val);
|
||||
int fd = CFrameBuffer::getInstance()->getFileHandle();
|
||||
if (ioctl(fd, FBIO_SCALE_SD_OSD, &val))
|
||||
perror("FBIO_SCALE_SD_OSD");
|
||||
}
|
||||
#endif
|
||||
#if 0
|
||||
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_SHARPNESS))
|
||||
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_SHARPNESS))
|
||||
{
|
||||
videoDecoder->SetControl(VIDEO_CONTROL_SHARPNESS, val);
|
||||
}
|
||||
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_HUE))
|
||||
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_HUE))
|
||||
{
|
||||
videoDecoder->SetControl(VIDEO_CONTROL_HUE, val);
|
||||
}
|
||||
#endif
|
||||
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
|
||||
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_ZAPPINGMODE)) {
|
||||
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_ZAPPINGMODE))
|
||||
{
|
||||
videoDecoder->SetControl(VIDEO_CONTROL_ZAPPING_MODE, g_settings.zappingmode);
|
||||
}
|
||||
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_HDMI_MODE))
|
||||
@@ -751,8 +756,10 @@ void CVideoSettings::next43Mode(void)
|
||||
neutrino_locale_t text;
|
||||
unsigned int curmode = 0;
|
||||
|
||||
for (unsigned int i = 0; i < videomenu_43mode_options.size(); i++) {
|
||||
if (videomenu_43mode_options[i].key == g_settings.video_43mode) {
|
||||
for (unsigned int i = 0; i < videomenu_43mode_options.size(); i++)
|
||||
{
|
||||
if (videomenu_43mode_options[i].key == g_settings.video_43mode)
|
||||
{
|
||||
curmode = i;
|
||||
break;
|
||||
}
|
||||
@@ -777,8 +784,10 @@ void CVideoSettings::SwitchFormat()
|
||||
neutrino_locale_t text;
|
||||
int curmode = 0;
|
||||
|
||||
for (int i = 0; i < VIDEOMENU_VIDEOFORMAT_OPTION_COUNT; i++) {
|
||||
if (VIDEOMENU_VIDEOFORMAT_OPTIONS[i].key == g_settings.video_Format) {
|
||||
for (int i = 0; i < VIDEOMENU_VIDEOFORMAT_OPTION_COUNT; i++)
|
||||
{
|
||||
if (VIDEOMENU_VIDEOFORMAT_OPTIONS[i].key == g_settings.video_Format)
|
||||
{
|
||||
curmode = i;
|
||||
break;
|
||||
}
|
||||
@@ -788,7 +797,7 @@ void CVideoSettings::SwitchFormat()
|
||||
curmode = 0;
|
||||
if (VIDEOMENU_VIDEOFORMAT_OPTIONS[curmode].key == DISPLAY_AR_14_9 && g_info.hw_caps->can_ar_14_9 == 0)
|
||||
curmode = 0;
|
||||
text = VIDEOMENU_VIDEOFORMAT_OPTIONS[curmode].value;
|
||||
text = VIDEOMENU_VIDEOFORMAT_OPTIONS[curmode].value;
|
||||
g_settings.video_Format = VIDEOMENU_VIDEOFORMAT_OPTIONS[curmode].key;
|
||||
|
||||
videoDecoder->setAspectRatio(g_settings.video_Format, -1);
|
||||
@@ -802,34 +811,39 @@ void CVideoSettings::SwitchFormat()
|
||||
void CVideoSettings::nextMode(void)
|
||||
{
|
||||
dprintf(DEBUG_NORMAL, "[CVideoSettings] [%s - %d], setting video mode...\n", __func__, __LINE__);
|
||||
const char * text;
|
||||
const char *text;
|
||||
int curmode = 0;
|
||||
int i;
|
||||
bool disp_cur = 1;
|
||||
int res = messages_return::none;
|
||||
|
||||
for (i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++) {
|
||||
if (VIDEOMENU_VIDEOMODE_OPTIONS[i].key == g_settings.video_Mode) {
|
||||
for (i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++)
|
||||
{
|
||||
if (VIDEOMENU_VIDEOMODE_OPTIONS[i].key == g_settings.video_Mode)
|
||||
{
|
||||
curmode = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
text = VIDEOMENU_VIDEOMODE_OPTIONS[curmode].valname;
|
||||
text = VIDEOMENU_VIDEOMODE_OPTIONS[curmode].valname;
|
||||
|
||||
while(1) {
|
||||
while (1)
|
||||
{
|
||||
CVFD::getInstance()->ShowText(text);
|
||||
|
||||
if (res != messages_return::cancel_info) // avoid unnecessary display of messageboxes, when user is trying to press repeated format button
|
||||
res = ShowHint(LOCALE_VIDEOMENU_VIDEOMODE, text, 450, 2);
|
||||
|
||||
if(disp_cur && res != messages_return::handled)
|
||||
if (disp_cur && res != messages_return::handled)
|
||||
break;
|
||||
|
||||
disp_cur = 0;
|
||||
|
||||
if(res == messages_return::handled) {
|
||||
if (res == messages_return::handled)
|
||||
{
|
||||
i = 0;
|
||||
while (true) {
|
||||
while (true)
|
||||
{
|
||||
curmode++;
|
||||
if (curmode >= VIDEOMENU_VIDEOMODE_OPTION_COUNT)
|
||||
curmode = 0;
|
||||
@@ -838,15 +852,17 @@ void CVideoSettings::nextMode(void)
|
||||
if (g_settings.enabled_video_modes[curmode])
|
||||
break;
|
||||
i++;
|
||||
if (i >= VIDEOMENU_VIDEOMODE_OPTION_COUNT) {
|
||||
if (i >= VIDEOMENU_VIDEOMODE_OPTION_COUNT)
|
||||
{
|
||||
CVFD::getInstance()->showServicename(g_RemoteControl->getCurrentChannelName(), g_RemoteControl->getCurrentChannelNumber());
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
text = VIDEOMENU_VIDEOMODE_OPTIONS[curmode].valname;
|
||||
text = VIDEOMENU_VIDEOMODE_OPTIONS[curmode].valname;
|
||||
}
|
||||
else if(res == messages_return::cancel_info) {
|
||||
else if (res == messages_return::cancel_info)
|
||||
{
|
||||
g_settings.video_Mode = VIDEOMENU_VIDEOMODE_OPTIONS[curmode].key;
|
||||
//CVFD::getInstance()->ShowText(text);
|
||||
COsdHelpers::getInstance()->setVideoSystem(g_settings.video_Mode);
|
||||
@@ -866,8 +882,7 @@ void CVideoSettings::Init43ModeOptions()
|
||||
videomenu_43mode_options.clear();
|
||||
for (unsigned int i = 0; i < VIDEOMENU_43MODE_OPTION_COUNT; i++)
|
||||
{
|
||||
if (VIDEOMENU_43MODE_OPTIONS[i].key == DISPLAY_AR_MODE_PANSCAN2 &&
|
||||
g_info.hw_caps->can_ps_14_9 == 0)
|
||||
if (VIDEOMENU_43MODE_OPTIONS[i].key == DISPLAY_AR_MODE_PANSCAN2 && g_info.hw_caps->can_ps_14_9 == 0)
|
||||
continue;
|
||||
CMenuOptionChooser::keyval_ext o;
|
||||
o = VIDEOMENU_43MODE_OPTIONS[i];
|
||||
|
||||
@@ -37,11 +37,11 @@ class CFrameBuffer;
|
||||
class CVideoSettings : public CMenuWidget, CChangeObserver
|
||||
{
|
||||
private:
|
||||
CFrameBuffer *frameBuffer;
|
||||
CMenuForwarder *SyncControlerForwarder;
|
||||
CMenuOptionChooser *VcrVideoOutSignalOptionChooser;
|
||||
CFrameBuffer *frameBuffer;
|
||||
CMenuForwarder *SyncControlerForwarder;
|
||||
CMenuOptionChooser *VcrVideoOutSignalOptionChooser;
|
||||
|
||||
int prev_video_mode;
|
||||
int prev_video_mode;
|
||||
|
||||
int is_wizard;
|
||||
|
||||
@@ -50,7 +50,7 @@ class CVideoSettings : public CMenuWidget, CChangeObserver
|
||||
std::vector<CMenuOptionChooser::keyval_ext> videomenu_43mode_options;
|
||||
void Init43ModeOptions();
|
||||
|
||||
public:
|
||||
public:
|
||||
CVideoSettings(int wizard_mode = SNeutrinoSettings::WIZARD_OFF);
|
||||
~CVideoSettings();
|
||||
|
||||
@@ -65,7 +65,7 @@ public:
|
||||
|
||||
void setWizardMode(int mode) {is_wizard = mode;};
|
||||
|
||||
int exec(CMenuTarget* parent, const std::string & actionKey);
|
||||
int exec(CMenuTarget *parent, const std::string &actionKey);
|
||||
};
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user