mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 01:41:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

spark: fix screen_preset selection

Browse Source
This commit is contained in:
Stefan Seyfried
2012-04-01 13:39:47 +02:00
parent 269cbbe512
commit 187a7c6851
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/neutrino.cpp
View File

@@ -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_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_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_EndY_lcd = configfile.getInt32( "screen_EndY_lcd", DEFAULT_Y_END_HD);
g_settings.screen_preset = configfile.getInt32( "screen_preset", 1);
#if HAVE_TRIPLEDRAGON #if HAVE_TRIPLEDRAGON
/* does not make sense to have two configurations for that... */ g_settings.screen_preset = 0; /* 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);
#endif #endif
#if HAVE_SPARK_HARDWARE
g_settings.screen_preset = 1; /* spark is now always using 1280x720 framebuffer */
#endif #endif
g_settings.screen_StartX = g_settings.screen_preset ? g_settings.screen_StartX_lcd : g_settings.screen_StartX_crt; 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; g_settings.screen_StartY = g_settings.screen_preset ? g_settings.screen_StartY_lcd : g_settings.screen_StartY_crt;