mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino: generic-pc is now also using 1280x70 FB per default

Browse Source
This commit is contained in:
Stefan Seyfried
2013-05-29 15:30:06 +02:00
parent 463fa3027e
commit eb9eba8914
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/neutrino.cpp
View File

@@ -296,12 +296,6 @@ const lcd_setting_struct_t lcd_setting[SNeutrinoSettings::LCD_SETTING_COUNT] =
#define DEFAULT_X_END_HD 1235 //1275 #define DEFAULT_X_END_HD 1235 //1275
#define DEFAULT_Y_END_HD 690 //715 #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 = ""; std::string ttx_font_file = "";
int CNeutrinoApp::loadSetup(const char * fname) 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_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", DEFAULT_SCREEN_PRESET); g_settings.screen_preset = configfile.getInt32( "screen_preset", 1);
#if HAVE_TRIPLEDRAGON #if HAVE_TRIPLEDRAGON
g_settings.screen_preset = 0; /* 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... */
#endif #endif
#if HAVE_SPARK_HARDWARE || HAVE_AZBOX_HARDWARE #if ! HAVE_COOLSTREAM
g_settings.screen_preset = 1; /* spark is now always using 1280x720 framebuffer */ 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;