diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 3bed511d4..b46caee9b 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -753,7 +753,7 @@ int CNeutrinoApp::loadSetup(const char * fname) checkParentallocked.close(); } //video - g_settings.video_Mode = configfile.getInt32("video_Mode", 7); // default 720p/50HZ + g_settings.video_Mode = configfile.getInt32("video_Mode", VIDEO_STD_1080I50); // VIDEO_STD_720P50 prev_video_mode = g_settings.video_Mode; g_settings.analog_mode1 = configfile.getInt32("analog_mode1", 0); // default RGB g_settings.analog_mode2 = configfile.getInt32("analog_mode2", 0); // default RGB @@ -763,7 +763,7 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.video_Format = configfile.getInt32("video_Format", 3); g_settings.video_43mode = configfile.getInt32("video_43mode", 0); - g_settings.current_volume = configfile.getInt32("current_volume", 100); + 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); g_settings.video_csync = configfile.getInt32( "video_csync", 0 ); @@ -784,8 +784,11 @@ int CNeutrinoApp::loadSetup(const char * fname) for(int i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++) { sprintf(cfg_key, "enabled_video_mode_%d", i); - g_settings.enabled_video_modes[i] = configfile.getInt32(cfg_key, 1); + g_settings.enabled_video_modes[i] = configfile.getInt32(cfg_key, 0); } + g_settings.enabled_video_modes[3] = 1; // 720p 50Hz + g_settings.enabled_video_modes[4] = 1; // 1080i 50Hz + g_settings.cpufreq = configfile.getInt32("cpufreq", 0); g_settings.standby_cpufreq = configfile.getInt32("standby_cpufreq", 100); g_settings.rounded_corners = configfile.getInt32("rounded_corners", 1); @@ -834,7 +837,7 @@ int CNeutrinoApp::loadSetup(const char * fname) sprintf(cfg_key, "pref_subs_%d", i); strncpy(g_settings.pref_subs[i], configfile.getString(cfg_key, "").c_str(), 30); } - g_settings.zap_cycle = configfile.getInt32( "zap_cycle", 1 ); + g_settings.zap_cycle = configfile.getInt32( "zap_cycle", 0 ); g_settings.sms_channel = configfile.getInt32( "sms_channel", 0 ); strcpy( g_settings.audio_PCMOffset, configfile.getString( "audio_PCMOffset", "0" ).c_str() ); @@ -1065,7 +1068,7 @@ printf("***************************** rec dir %s timeshift dir %s\n", g_settings g_settings.screen_StartY_lcd = configfile.getInt32( "screen_StartY_lcd", DEFAULT_Y_START_HD ); g_settings.screen_EndX_lcd = configfile.getInt32( "screen_EndX_lcd", DEFAULT_X_END_HD); g_settings.screen_EndY_lcd = configfile.getInt32( "screen_EndY_lcd", DEFAULT_Y_END_HD); - g_settings.screen_preset = configfile.getInt32( "screen_preset", 0); + g_settings.screen_preset = configfile.getInt32( "screen_preset", 1); g_settings.screen_StartX = g_settings.screen_preset ? g_settings.screen_StartX_lcd : g_settings.screen_StartX_crt; g_settings.screen_StartY = g_settings.screen_preset ? g_settings.screen_StartY_lcd : g_settings.screen_StartY_crt; diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index 5186f9d3b..e1f4cf301 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -248,19 +248,19 @@ const CMenuOptionChooser::keyval VIDEOMENU_HDMI_CEC_MODE_OPTIONS[VIDEOMENU_HDMI_ //#define VIDEOMENU_VIDEOMODE_OPTION_COUNT 11 const CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_OPTION_COUNT] = { - { 1, NONEXISTANT_LOCALE, "SECAM" }, - { 2, NONEXISTANT_LOCALE, "PAL" }, - { 4, NONEXISTANT_LOCALE, "576p" }, - { 7, NONEXISTANT_LOCALE, "720p 50Hz" }, - { 8, NONEXISTANT_LOCALE, "1080i 50Hz" }, - { 10, NONEXISTANT_LOCALE, "1080p 24Hz" }, - { 11, NONEXISTANT_LOCALE, "1080p 25Hz" }, + { VIDEO_STD_SECAM, NONEXISTANT_LOCALE, "SECAM" }, + { VIDEO_STD_PAL, NONEXISTANT_LOCALE, "PAL" }, + { VIDEO_STD_576P, NONEXISTANT_LOCALE, "576p" }, + { VIDEO_STD_720P50, NONEXISTANT_LOCALE, "720p 50Hz" }, + { VIDEO_STD_1080I50, NONEXISTANT_LOCALE, "1080i 50Hz" }, + { VIDEO_STD_1080P24, NONEXISTANT_LOCALE, "1080p 24Hz" }, + { VIDEO_STD_1080P25, NONEXISTANT_LOCALE, "1080p 25Hz" }, - { 0, NONEXISTANT_LOCALE, "NTSC" }, - { 3, NONEXISTANT_LOCALE, "480p" }, - { 5, NONEXISTANT_LOCALE, "720p 60Hz" }, - { 6, NONEXISTANT_LOCALE, "1080i 60Hz" }, - { VIDEO_STD_AUTO, NONEXISTANT_LOCALE, "Auto" } + { VIDEO_STD_NTSC, NONEXISTANT_LOCALE, "NTSC" }, + { VIDEO_STD_480P, NONEXISTANT_LOCALE, "480p" }, + { VIDEO_STD_720P60, NONEXISTANT_LOCALE, "720p 60Hz" }, + { VIDEO_STD_1080I60, NONEXISTANT_LOCALE, "1080i 60Hz" }, + { VIDEO_STD_AUTO, NONEXISTANT_LOCALE, "Auto" } }; #define VIDEOMENU_DBDR_OPTION_COUNT 3 @@ -2482,7 +2482,7 @@ void CNeutrinoApp::InitColorSettings(CMenuWidget &colorSettings, CMenuWidget &fo colorSettings.addItem(new CMenuForwarder(LOCALE_COLORMENU_TIMING, true, NULL, colorSettings_timing, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW)); colorSettings.addItem(new CMenuForwarder(LOCALE_VIDEOMENU_SCREENSETUP, true, NULL, ScreenSetup, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE)); - CScreePresetNotifier * presetNotify = new CScreePresetNotifier(); + CScreenPresetNotifier * presetNotify = new CScreenPresetNotifier(); colorSettings.addItem(new CMenuOptionChooser(LOCALE_COLORMENU_OSD_PRESET, &g_settings.screen_preset, OSD_PRESET_OPTIONS, OSD_PRESET_OPTIONS_COUNT, true, presetNotify, CRCInput::RC_1)); //infobar diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index 39a2cca3e..8828a7a47 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -992,10 +992,10 @@ bool CCpuFreqNotifier::changeNotify(const neutrino_locale_t, void * data) return true; } -bool CScreePresetNotifier::changeNotify(const neutrino_locale_t /*OptionName*/, void * data) +bool CScreenPresetNotifier::changeNotify(const neutrino_locale_t /*OptionName*/, void * data) { int preset = * (int *) data; -printf("CScreePresetNotifier::changeNotify preset %d (setting %d)\n", preset, g_settings.screen_preset); +printf("CScreenPresetNotifier::changeNotify preset %d (setting %d)\n", preset, g_settings.screen_preset); g_settings.screen_StartX = g_settings.screen_preset ? g_settings.screen_StartX_lcd : g_settings.screen_StartX_crt; g_settings.screen_StartY = g_settings.screen_preset ? g_settings.screen_StartY_lcd : g_settings.screen_StartY_crt; diff --git a/src/system/setting_helpers.h b/src/system/setting_helpers.h index 0b12f2977..8f4b6fc87 100644 --- a/src/system/setting_helpers.h +++ b/src/system/setting_helpers.h @@ -306,7 +306,7 @@ public: bool changeNotify(const neutrino_locale_t, void * data); }; -class CScreePresetNotifier : public CChangeObserver +class CScreenPresetNotifier : public CChangeObserver { public: bool changeNotify(const neutrino_locale_t, void * data);