osd_setup: osd preset crt/lcd add locals use now for different Screen Setup when using different monitors

Origin commit data
------------------
Branch: ni/coolstream
Commit: 729710f40c
Author: Frankenstone <dampf_acc@online.de>
Date: 2021-03-31 (Wed, 31 Mar 2021)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Frankenstone
2021-03-31 17:38:22 +02:00
committed by vanhofen
parent 5ea7196d75
commit 6eaabdb084
7 changed files with 27 additions and 19 deletions

View File

@@ -119,12 +119,6 @@ int CScreenSetup::exec(CMenuTarget* parent, const std::string &)
case 1:
{
switch (g_settings.screen_preset) {
case COsdSetup::PRESET_CRT:
g_settings.screen_StartX_crt_1 = g_settings.screen_StartX;
g_settings.screen_StartY_crt_1 = g_settings.screen_StartY;
g_settings.screen_EndX_crt_1 = g_settings.screen_EndX;
g_settings.screen_EndY_crt_1 = g_settings.screen_EndY;
break;
case COsdSetup::PRESET_LCD:
default:
g_settings.screen_StartX_lcd_1 = g_settings.screen_StartX;
@@ -132,6 +126,12 @@ int CScreenSetup::exec(CMenuTarget* parent, const std::string &)
g_settings.screen_EndX_lcd_1 = g_settings.screen_EndX;
g_settings.screen_EndY_lcd_1 = g_settings.screen_EndY;
break;
case COsdSetup::PRESET_CRT:
g_settings.screen_StartX_crt_1 = g_settings.screen_StartX;
g_settings.screen_StartY_crt_1 = g_settings.screen_StartY;
g_settings.screen_EndX_crt_1 = g_settings.screen_EndX;
g_settings.screen_EndY_crt_1 = g_settings.screen_EndY;
break;
}
}
break;
@@ -140,12 +140,6 @@ int CScreenSetup::exec(CMenuTarget* parent, const std::string &)
default:
{
switch (g_settings.screen_preset) {
case COsdSetup::PRESET_CRT:
g_settings.screen_StartX_crt_0 = g_settings.screen_StartX;
g_settings.screen_StartY_crt_0 = g_settings.screen_StartY;
g_settings.screen_EndX_crt_0 = g_settings.screen_EndX;
g_settings.screen_EndY_crt_0 = g_settings.screen_EndY;
break;
case COsdSetup::PRESET_LCD:
default:
g_settings.screen_StartX_lcd_0 = g_settings.screen_StartX;
@@ -153,6 +147,12 @@ int CScreenSetup::exec(CMenuTarget* parent, const std::string &)
g_settings.screen_EndX_lcd_0 = g_settings.screen_EndX;
g_settings.screen_EndY_lcd_0 = g_settings.screen_EndY;
break;
case COsdSetup::PRESET_CRT:
g_settings.screen_StartX_crt_0 = g_settings.screen_StartX;
g_settings.screen_StartY_crt_0 = g_settings.screen_StartY;
g_settings.screen_EndX_crt_0 = g_settings.screen_EndX;
g_settings.screen_EndY_crt_0 = g_settings.screen_EndY;
break;
}
}
break;