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

framebuffer,loadSetup: fix TD build

Browse Source
This commit is contained in:
Stefan Seyfried
2012-03-11 10:55:48 +01:00
parent 4856816f5a
commit 26f85435a8
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/framebuffer.h
View File

@@ -237,8 +237,8 @@ class CFrameBuffer
void resize(int format); void resize(int format);
void update(void); void update(void);
#else #else
int scaleX(const int x, bool) { return x; }; int scaleX(const int x, bool __attribute__((unused)) clamp = true) { return x; };
int scaleY(const int y, bool) { return y; }; int scaleY(const int y, bool __attribute__((unused)) clamp = true) { return y; };
void resize(int) {}; void resize(int) {};
void update(void) {}; void update(void) {};
#endif #endif

6
src/neutrino.cpp
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_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);
int screen_preset_default = (g_settings.video_Mode > VIDEO_STD_576P);
#if HAVE_TRIPLEDRAGON #if HAVE_TRIPLEDRAGON
/* does not make sense to have two configurations for that... */ /* does not make sense to have two configurations for that... */
g_settings.screen_preset = 0; 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; g_settings.screen_preset = screen_preset_default;
#else #else
g_settings.screen_preset = configfile.getInt32("screen_preset", screen_preset_default); g_settings.screen_preset = configfile.getInt32("screen_preset", screen_preset_default);
#endif
#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;