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

neutrino: remove screen type selection for Tripledragon

Browse Source
This commit is contained in:
Stefan Seyfried
2010-08-07 22:50:12 +02:00
parent 084cf9d9f9
commit beb10241ad
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/osd_setup.cpp
View File

@@ -56,6 +56,7 @@
#include <driver/volume.h> #include <driver/volume.h>
#include <system/debug.h> #include <system/debug.h>
#include "cs_api.h"
static CTimingSettingsNotifier timingsettingsnotifier; static CTimingSettingsNotifier timingsettingsnotifier;
@@ -428,7 +429,8 @@ int COsdSetup::showOsdSetup()
//monitor //monitor
//CScreenPresetNotifier * presetNotify = new CScreenPresetNotifier(); //CScreenPresetNotifier * presetNotify = new CScreenPresetNotifier();
//osd_menu->addItem(new CMenuOptionChooser(LOCALE_COLORMENU_OSD_PRESET, &g_settings.screen_preset, OSD_PRESET_OPTIONS, OSD_PRESET_OPTIONS_COUNT, true, presetNotify)); //osd_menu->addItem(new CMenuOptionChooser(LOCALE_COLORMENU_OSD_PRESET, &g_settings.screen_preset, OSD_PRESET_OPTIONS, OSD_PRESET_OPTIONS_COUNT, true, presetNotify));
osd_menu->addItem(new CMenuOptionChooser(LOCALE_COLORMENU_OSD_PRESET, &g_settings.screen_preset, OSD_PRESET_OPTIONS, OSD_PRESET_OPTIONS_COUNT, true, this)); if (cs_get_revision() != 1) /* 1 == Tripledragon */
osd_menu->addItem(new CMenuOptionChooser(LOCALE_COLORMENU_OSD_PRESET, &g_settings.screen_preset, OSD_PRESET_OPTIONS, OSD_PRESET_OPTIONS_COUNT, true, this));
osd_menu->addItem(GenericMenuSeparatorLine); osd_menu->addItem(GenericMenuSeparatorLine);
//options //options

13
src/neutrino.cpp
View File

@@ -293,10 +293,17 @@ const lcd_setting_struct_t lcd_setting[SNeutrinoSettings::LCD_SETTING_COUNT] =
/************************************************************************************** /**************************************************************************************
* CNeutrinoApp - loadSetup, load the application-settings * * CNeutrinoApp - loadSetup, load the application-settings *
**************************************************************************************/ **************************************************************************************/
#if HAVE_TRIPLEDRAGON
#define DEFAULT_X_START_SD 32
#define DEFAULT_Y_START_SD 26
#define DEFAULT_X_END_SD 694
#define DEFAULT_Y_END_SD 570
#else
#define DEFAULT_X_START_SD 60 #define DEFAULT_X_START_SD 60
#define DEFAULT_Y_START_SD 20 #define DEFAULT_Y_START_SD 20
#define DEFAULT_X_END_SD 1220 #define DEFAULT_X_END_SD 1220
#define DEFAULT_Y_END_SD 560 #define DEFAULT_Y_END_SD 560
#endif
#define DEFAULT_X_START_HD 40 //5 #define DEFAULT_X_START_HD 40 //5
#define DEFAULT_Y_START_HD 25 //5 #define DEFAULT_Y_START_HD 25 //5
@@ -622,8 +629,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);
#if HAVE_TRIPLEDRAGON
/* does not make sense to have two configurations for that... */
g_settings.screen_preset = 0;
#else
g_settings.screen_preset = configfile.getInt32( "screen_preset", 1); g_settings.screen_preset = configfile.getInt32( "screen_preset", 1);
#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;
g_settings.screen_EndX = g_settings.screen_preset ? g_settings.screen_EndX_lcd : g_settings.screen_EndX_crt; g_settings.screen_EndX = g_settings.screen_preset ? g_settings.screen_EndX_lcd : g_settings.screen_EndX_crt;