gui/videosettings.cpp: split format key modes and auto-modes on apollo,

disable broken 14:9 pan&scan on apollo
This commit is contained in:
[CST] Focus
2014-12-04 19:21:14 +03:00
parent 4975b33dfd
commit 68e240b4e7
7 changed files with 44 additions and 7 deletions

View File

@@ -1374,6 +1374,7 @@ typedef enum
LOCALE_MENU_HINT_VIDEO_FORMAT,
LOCALE_MENU_HINT_VIDEO_MODE,
LOCALE_MENU_HINT_VIDEO_MODES,
LOCALE_MENU_HINT_VIDEO_MODES_AUTO,
LOCALE_MENU_HINT_VIDEO_PIP,
LOCALE_MENU_HINT_VIDEO_SATURATION,
LOCALE_MENU_HINT_VIDEO_SCART_MODE,
@@ -2279,6 +2280,7 @@ typedef enum
LOCALE_VIDEOMENU_DBDR_DEBLOCK,
LOCALE_VIDEOMENU_DBDR_NONE,
LOCALE_VIDEOMENU_ENABLED_MODES,
LOCALE_VIDEOMENU_ENABLED_MODES_AUTO,
LOCALE_VIDEOMENU_FULLSCREEN,
LOCALE_VIDEOMENU_HDMI_CEC,
LOCALE_VIDEOMENU_HDMI_CEC_MODE,

View File

@@ -1374,6 +1374,7 @@ const char * locale_real_names[] =
"menu.hint_video_format",
"menu.hint_video_mode",
"menu.hint_video_modes",
"menu.hint_video_modes_auto",
"menu.hint_video_pip",
"menu.hint_video_saturation",
"menu.hint_video_scart_mode",
@@ -2279,6 +2280,7 @@ const char * locale_real_names[] =
"videomenu.dbdr_deblock",
"videomenu.dbdr_none",
"videomenu.enabled_modes",
"videomenu.enabled_modes_auto",
"videomenu.fullscreen",
"videomenu.hdmi_cec",
"videomenu.hdmi_cec_mode",

View File

@@ -581,9 +581,12 @@ bool CAutoModeNotifier::changeNotify(const neutrino_locale_t /*OptionName*/, voi
memset(modes, 0, sizeof(int)*VIDEO_STD_MAX+1);
for(i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++) {
for(i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++)
#ifdef BOXMODEL_APOLLO
modes[VIDEOMENU_VIDEOMODE_OPTIONS[i].key] = g_settings.enabled_auto_modes[i];
#else
modes[VIDEOMENU_VIDEOMODE_OPTIONS[i].key] = g_settings.enabled_video_modes[i];
}
#endif
videoDecoder->SetAutoModes(modes);
return false;
}

View File

@@ -188,6 +188,7 @@ struct SNeutrinoSettings
int hdmi_cec_view_on;
int hdmi_cec_standby;
int enabled_video_modes[VIDEOMENU_VIDEOMODE_OPTION_COUNT];
int enabled_auto_modes[VIDEOMENU_VIDEOMODE_OPTION_COUNT];
int cpufreq;
int standby_cpufreq;
int make_hd_list;