align enabled_videomodes preset

Origin commit data
------------------
Branch: ni/coolstream
Commit: 7737d48599
Author: Markus Volk <f_l_k@t-online.de>
Date: 2020-03-24 (Tue, 24 Mar 2020)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Markus Volk
2020-03-24 22:25:05 +01:00
committed by vanhofen
parent d943cb9d82
commit c54fd23c7b
2 changed files with 5 additions and 5 deletions

View File

@@ -355,7 +355,7 @@ CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_O
{ -1, NONEXISTANT_LOCALE, "Auto" }
};
#else
/* generic PC -> 4 different resolutions, 480, 576, 720 and 1080 lines */
/* 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" },
@@ -364,7 +364,7 @@ CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_O
{ -1, NONEXISTANT_LOCALE, "480p" },
{ -1, NONEXISTANT_LOCALE, "576p" },
{ VIDEO_STD_720P50, NONEXISTANT_LOCALE, "720p 50Hz" },
{ -1, NONEXISTANT_LOCALE, "720p 60Hz" },
{ 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"},

View File

@@ -453,9 +453,9 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.enabled_video_modes[i] = configfile.getInt32(cfg_key, 0);
}
#if VIDEOMENU_VIDEOMODE_OPTION_COUNT > 3
g_settings.enabled_video_modes[3] = 1; // 720p 50Hz
g_settings.enabled_video_modes[4] = 1; // 1080i 50Hz
g_settings.enabled_video_modes[9] = 1; // 720p 60Hz //NI
g_settings.enabled_video_modes[5] = 1; // 720p 50Hz
g_settings.enabled_video_modes[6] = 1; // 720p 60Hz
g_settings.enabled_video_modes[7] = 1; // 1080i 50Hz
#endif
for (int i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++) {