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

- unify new presets; part 1

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2021-03-31 22:15:28 +02:00
committed by Thilo Graf
parent 0189205fd1
commit 96ff1b6b3a
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/osd_setup.cpp
View File

@@ -421,8 +421,8 @@ int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey)
#define OSD_PRESET_OPTIONS_COUNT 2 #define OSD_PRESET_OPTIONS_COUNT 2
const CMenuOptionChooser::keyval_ext OSD_PRESET_OPTIONS[] = const CMenuOptionChooser::keyval_ext OSD_PRESET_OPTIONS[] =
{ {
{ COsdSetup::PRESET_LCD_A, LOCALE_OSD_PRESET_SCREEN_A }, { COsdSetup::PRESET_SCREEN_A, LOCALE_OSD_PRESET_SCREEN_A },
{ COsdSetup::PRESET_LCD_B, LOCALE_OSD_PRESET_SCREEN_B } { COsdSetup::PRESET_SCREEN_B, LOCALE_OSD_PRESET_SCREEN_B }
}; };
#define INFOBAR_CASYSTEM_MODE_OPTION_COUNT 4 #define INFOBAR_CASYSTEM_MODE_OPTION_COUNT 4

4
src/gui/osd_setup.h
View File

@@ -101,8 +101,8 @@ class COsdSetup : public CMenuTarget, public CChangeObserver
enum enum
{ {
PRESET_LCD_A, PRESET_SCREEN_A,
PRESET_LCD_B PRESET_SCREEN_B
}; };
COsdSetup(int wizard_mode = SNeutrinoSettings::WIZARD_OFF); COsdSetup(int wizard_mode = SNeutrinoSettings::WIZARD_OFF);

8
src/gui/screensetup.cpp
View File

@@ -119,13 +119,13 @@ int CScreenSetup::exec(CMenuTarget* parent, const std::string &)
case 1: case 1:
{ {
switch (g_settings.screen_preset) { switch (g_settings.screen_preset) {
case COsdSetup::PRESET_LCD_B: case COsdSetup::PRESET_SCREEN_B:
g_settings.screen_StartX_lcd_b_1 = g_settings.screen_StartX; g_settings.screen_StartX_lcd_b_1 = g_settings.screen_StartX;
g_settings.screen_StartY_lcd_b_1 = g_settings.screen_StartY; g_settings.screen_StartY_lcd_b_1 = g_settings.screen_StartY;
g_settings.screen_EndX_lcd_b_1 = g_settings.screen_EndX; g_settings.screen_EndX_lcd_b_1 = g_settings.screen_EndX;
g_settings.screen_EndY_lcd_b_1 = g_settings.screen_EndY; g_settings.screen_EndY_lcd_b_1 = g_settings.screen_EndY;
break; break;
case COsdSetup::PRESET_LCD_A: case COsdSetup::PRESET_SCREEN_A:
default: default:
g_settings.screen_StartX_lcd_a_1 = g_settings.screen_StartX; g_settings.screen_StartX_lcd_a_1 = g_settings.screen_StartX;
g_settings.screen_StartY_lcd_a_1 = g_settings.screen_StartY; g_settings.screen_StartY_lcd_a_1 = g_settings.screen_StartY;
@@ -140,13 +140,13 @@ int CScreenSetup::exec(CMenuTarget* parent, const std::string &)
default: default:
{ {
switch (g_settings.screen_preset) { switch (g_settings.screen_preset) {
case COsdSetup::PRESET_LCD_B: case COsdSetup::PRESET_SCREEN_B:
g_settings.screen_StartX_lcd_b_0 = g_settings.screen_StartX; g_settings.screen_StartX_lcd_b_0 = g_settings.screen_StartX;
g_settings.screen_StartY_lcd_b_0 = g_settings.screen_StartY; g_settings.screen_StartY_lcd_b_0 = g_settings.screen_StartY;
g_settings.screen_EndX_lcd_b_0 = g_settings.screen_EndX; g_settings.screen_EndX_lcd_b_0 = g_settings.screen_EndX;
g_settings.screen_EndY_lcd_b_0 = g_settings.screen_EndY; g_settings.screen_EndY_lcd_b_0 = g_settings.screen_EndY;
break; break;
case COsdSetup::PRESET_LCD_A: case COsdSetup::PRESET_SCREEN_A:
default: default:
g_settings.screen_StartX_lcd_a_0 = g_settings.screen_StartX; g_settings.screen_StartX_lcd_a_0 = g_settings.screen_StartX;
g_settings.screen_StartY_lcd_a_0 = g_settings.screen_StartY; g_settings.screen_StartY_lcd_a_0 = g_settings.screen_StartY;

10
src/neutrino.cpp
View File

@@ -956,7 +956,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.screen_EndX_lcd_b_1 = configfile.getInt32("screen_EndX_lcd_b_1" , 1888 - g_settings.screen_StartX_lcd_b_1 - 1); g_settings.screen_EndX_lcd_b_1 = configfile.getInt32("screen_EndX_lcd_b_1" , 1888 - g_settings.screen_StartX_lcd_b_1 - 1);
g_settings.screen_EndY_lcd_b_1 = configfile.getInt32("screen_EndY_lcd_b_1" , 1062 - g_settings.screen_StartY_lcd_b_1 - 1); g_settings.screen_EndY_lcd_b_1 = configfile.getInt32("screen_EndY_lcd_b_1" , 1062 - g_settings.screen_StartY_lcd_b_1 - 1);
g_settings.screen_preset = configfile.getInt32("screen_preset", COsdSetup::PRESET_LCD_A); g_settings.screen_preset = configfile.getInt32("screen_preset", COsdSetup::PRESET_SCREEN_A);
setScreenSettings(); setScreenSettings();
// avoid configuration mismatch // avoid configuration mismatch
@@ -1240,13 +1240,13 @@ void CNeutrinoApp::setScreenSettings()
case 1: case 1:
{ {
switch (g_settings.screen_preset) { switch (g_settings.screen_preset) {
case COsdSetup::PRESET_LCD_B: case COsdSetup::PRESET_SCREEN_B:
g_settings.screen_StartX = g_settings.screen_StartX_lcd_b_1; g_settings.screen_StartX = g_settings.screen_StartX_lcd_b_1;
g_settings.screen_StartY = g_settings.screen_StartY_lcd_b_1; g_settings.screen_StartY = g_settings.screen_StartY_lcd_b_1;
g_settings.screen_EndX = g_settings.screen_EndX_lcd_b_1; g_settings.screen_EndX = g_settings.screen_EndX_lcd_b_1;
g_settings.screen_EndY = g_settings.screen_EndY_lcd_b_1; g_settings.screen_EndY = g_settings.screen_EndY_lcd_b_1;
break; break;
case COsdSetup::PRESET_LCD_A: case COsdSetup::PRESET_SCREEN_A:
default: default:
g_settings.screen_StartX = g_settings.screen_StartX_lcd_a_1; g_settings.screen_StartX = g_settings.screen_StartX_lcd_a_1;
g_settings.screen_StartY = g_settings.screen_StartY_lcd_a_1; g_settings.screen_StartY = g_settings.screen_StartY_lcd_a_1;
@@ -1261,13 +1261,13 @@ void CNeutrinoApp::setScreenSettings()
default: default:
{ {
switch (g_settings.screen_preset) { switch (g_settings.screen_preset) {
case COsdSetup::PRESET_LCD_B: case COsdSetup::PRESET_SCREEN_B:
g_settings.screen_StartX = g_settings.screen_StartX_lcd_b_0; g_settings.screen_StartX = g_settings.screen_StartX_lcd_b_0;
g_settings.screen_StartY = g_settings.screen_StartY_lcd_b_0; g_settings.screen_StartY = g_settings.screen_StartY_lcd_b_0;
g_settings.screen_EndX = g_settings.screen_EndX_lcd_b_0; g_settings.screen_EndX = g_settings.screen_EndX_lcd_b_0;
g_settings.screen_EndY = g_settings.screen_EndY_lcd_b_0; g_settings.screen_EndY = g_settings.screen_EndY_lcd_b_0;
break; break;
case COsdSetup::PRESET_LCD_A: case COsdSetup::PRESET_SCREEN_A:
default: default:
g_settings.screen_StartX = g_settings.screen_StartX_lcd_a_0; g_settings.screen_StartX = g_settings.screen_StartX_lcd_a_0;
g_settings.screen_StartY = g_settings.screen_StartY_lcd_a_0; g_settings.screen_StartY = g_settings.screen_StartY_lcd_a_0;