From cf8bcbde37a00bcebdfd7e2144f611b7b1cf896e Mon Sep 17 00:00:00 2001 From: focus Date: Tue, 15 Jun 2010 15:51:49 +0000 Subject: [PATCH] new defaults for LCD preset and 4:3 mode git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@623 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/neutrino.cpp | 12 ++++++------ src/neutrino_menue.cpp | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index b46caee9b..9648cdc03 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -729,10 +729,10 @@ const lcd_setting_struct_t lcd_setting[LCD_SETTING_COUNT] = #define DEFAULT_X_END_SD 1220 #define DEFAULT_Y_END_SD 560 -#define DEFAULT_X_START_HD 5 -#define DEFAULT_Y_START_HD 5 -#define DEFAULT_X_END_HD 1275 -#define DEFAULT_Y_END_HD 715 +#define DEFAULT_X_START_HD 40 //5 +#define DEFAULT_Y_START_HD 25 //5 +#define DEFAULT_X_END_HD 1235 //1275 +#define DEFAULT_Y_END_HD 690 //715 std::string ttx_font_file = ""; @@ -761,8 +761,8 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.hdmi_cec_view_on = configfile.getInt32("hdmi_cec_view_on", 0); // default off g_settings.hdmi_cec_standby = configfile.getInt32("hdmi_cec_standby", 0); // default off - g_settings.video_Format = configfile.getInt32("video_Format", 3); - g_settings.video_43mode = configfile.getInt32("video_43mode", 0); + g_settings.video_Format = configfile.getInt32("video_Format", DISPLAY_AR_16_9); + g_settings.video_43mode = configfile.getInt32("video_43mode", DISPLAY_AR_MODE_LETTERBOX); g_settings.current_volume = configfile.getInt32("current_volume", 50); g_settings.channel_mode = configfile.getInt32("channel_mode", LIST_MODE_PROV); g_settings.channel_mode_radio = configfile.getInt32("channel_mode_radio", LIST_MODE_PROV); diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index e1f4cf301..f3b80476b 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -221,9 +221,9 @@ const CMenuOptionChooser::keyval VIDEOMENU_VCRSIGNAL_OPTIONS[VIDEOMENU_VCRSIGNAL #define VIDEOMENU_VIDEOFORMAT_OPTION_COUNT 3//2 const CMenuOptionChooser::keyval VIDEOMENU_VIDEOFORMAT_OPTIONS[VIDEOMENU_VIDEOFORMAT_OPTION_COUNT] = { - { 1, LOCALE_VIDEOMENU_VIDEOFORMAT_43 }, - { 3, LOCALE_VIDEOMENU_VIDEOFORMAT_169 }, - { 2, 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_43MODE_OPTION_COUNT 4