From eb9eba8914dd968f2f9bcb7436721d4b5821c10d Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Wed, 29 May 2013 15:30:06 +0200 Subject: [PATCH] neutrino: generic-pc is now also using 1280x70 FB per default --- src/neutrino.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index a5c2ccede..73d9c6079 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -296,12 +296,6 @@ const lcd_setting_struct_t lcd_setting[SNeutrinoSettings::LCD_SETTING_COUNT] = #define DEFAULT_X_END_HD 1235 //1275 #define DEFAULT_Y_END_HD 690 //715 -#if HAVE_GENERIC_HARDWARE -#define DEFAULT_SCREEN_PRESET 0 -#else -#define DEFAULT_SCREEN_PRESET 1 -#endif - std::string ttx_font_file = ""; int CNeutrinoApp::loadSetup(const char * fname) @@ -687,12 +681,12 @@ 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", DEFAULT_SCREEN_PRESET); + g_settings.screen_preset = configfile.getInt32( "screen_preset", 1); #if HAVE_TRIPLEDRAGON g_settings.screen_preset = 0; /* does not make sense to have two configurations for that... */ #endif -#if HAVE_SPARK_HARDWARE || HAVE_AZBOX_HARDWARE +#if ! HAVE_COOLSTREAM 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;