framebuffer,loadSetup: fix TD build

Origin commit data
------------------
Commit: 26f85435a8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-03-11 (Sun, 11 Mar 2012)
This commit is contained in:
Stefan Seyfried
2012-03-11 10:55:48 +01:00
parent 116040e597
commit eaa6c66327
2 changed files with 6 additions and 4 deletions

View File

@@ -641,14 +641,16 @@ int CNeutrinoApp::loadSetup(const char * fname)
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);
int screen_preset_default = (g_settings.video_Mode > VIDEO_STD_576P);
#if HAVE_TRIPLEDRAGON
/* does not make sense to have two configurations for that... */
g_settings.screen_preset = 0;
#elif HAVE_SPARK_HARDWARE
#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);
#endif
#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;