From 26f85435a8ff3fa366dd0c1f98668b1dcba54716 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 11 Mar 2012 10:55:48 +0100 Subject: [PATCH] framebuffer,loadSetup: fix TD build --- src/driver/framebuffer.h | 4 ++-- src/neutrino.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/driver/framebuffer.h b/src/driver/framebuffer.h index f7fac39d6..8f90b26de 100644 --- a/src/driver/framebuffer.h +++ b/src/driver/framebuffer.h @@ -237,8 +237,8 @@ class CFrameBuffer void resize(int format); void update(void); #else - int scaleX(const int x, bool) { return x; }; - int scaleY(const int y, bool) { return y; }; + int scaleX(const int x, bool __attribute__((unused)) clamp = true) { return x; }; + int scaleY(const int y, bool __attribute__((unused)) clamp = true) { return y; }; void resize(int) {}; void update(void) {}; #endif diff --git a/src/neutrino.cpp b/src/neutrino.cpp index c568857ff..cbd20d07e 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -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;