From 878cbf5b31efa9d2d8fdb02511ecaab37be34a39 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 1 Apr 2012 13:39:47 +0200 Subject: [PATCH] spark: fix screen_preset selection Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/187a7c6851dffe1599fea098502bda433f3efbc2 Author: Stefan Seyfried Date: 2012-04-01 (Sun, 01 Apr 2012) --- src/neutrino.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 2330918f9..f8fa2f9b8 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -640,17 +640,13 @@ int CNeutrinoApp::loadSetup(const char * fname) 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", 1); #if HAVE_TRIPLEDRAGON - /* does not make sense to have two configurations for that... */ - g_settings.screen_preset = 0; -#else - int screen_preset_default = (g_settings.video_Mode > VIDEO_STD_576P); -#if HAVE_SPARK_HARDWARE - g_settings.screen_preset = screen_preset_default; -#else - g_settings.screen_preset = configfile.getInt32("screen_preset", screen_preset_default); + g_settings.screen_preset = 0; /* does not make sense to have two configurations for that... */ #endif +#if HAVE_SPARK_HARDWARE + g_settings.screen_preset = 1; /* spark is now always using 1280x720 framebuffer */ #endif 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;