mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-14 17:03:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

unify new presets; part 2

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 780127c904
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-03-31 (Wed, 31 Mar 2021)

Origin message was:
------------------
- unify new presets; part 2

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2021-03-31 17:38:22 +02:00
parent a1c53ea239
commit 316c4a9c7f
3 changed files with 88 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/gui/screensetup.cpp
View File

@@ -120,17 +120,17 @@ int CScreenSetup::exec(CMenuTarget* parent, const std::string &)
{
switch (g_settings.screen_preset) {
case COsdSetup::PRESET_SCREEN_B:
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_EndX_lcd_b_1 = g_settings.screen_EndX;
g_settings.screen_EndY_lcd_b_1 = g_settings.screen_EndY;
g_settings.screen_StartX_b_1 = g_settings.screen_StartX;
g_settings.screen_StartY_b_1 = g_settings.screen_StartY;
g_settings.screen_EndX_b_1 = g_settings.screen_EndX;
g_settings.screen_EndY_b_1 = g_settings.screen_EndY;
break;
case COsdSetup::PRESET_SCREEN_A:
default:
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_EndX_lcd_a_1 = g_settings.screen_EndX;
g_settings.screen_EndY_lcd_a_1 = g_settings.screen_EndY;
g_settings.screen_StartX_a_1 = g_settings.screen_StartX;
g_settings.screen_StartY_a_1 = g_settings.screen_StartY;
g_settings.screen_EndX_a_1 = g_settings.screen_EndX;
g_settings.screen_EndY_a_1 = g_settings.screen_EndY;
break;
}
}
@@ -141,17 +141,17 @@ int CScreenSetup::exec(CMenuTarget* parent, const std::string &)
{
switch (g_settings.screen_preset) {
case COsdSetup::PRESET_SCREEN_B:
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_EndX_lcd_b_0 = g_settings.screen_EndX;
g_settings.screen_EndY_lcd_b_0 = g_settings.screen_EndY;
g_settings.screen_StartX_b_0 = g_settings.screen_StartX;
g_settings.screen_StartY_b_0 = g_settings.screen_StartY;
g_settings.screen_EndX_b_0 = g_settings.screen_EndX;
g_settings.screen_EndY_b_0 = g_settings.screen_EndY;
break;
case COsdSetup::PRESET_SCREEN_A:
default:
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_EndX_lcd_a_0 = g_settings.screen_EndX;
g_settings.screen_EndY_lcd_a_0 = g_settings.screen_EndY;
g_settings.screen_StartX_a_0 = g_settings.screen_StartX;
g_settings.screen_StartY_a_0 = g_settings.screen_StartY;
g_settings.screen_EndX_a_0 = g_settings.screen_EndX;
g_settings.screen_EndY_a_0 = g_settings.screen_EndY;
break;
}
}

112
src/neutrino.cpp
View File

@@ -955,24 +955,24 @@ int CNeutrinoApp::loadSetup(const char * fname)
COsdHelpers::getInstance()->g_settings_osd_resolution_save = g_settings.osd_resolution;
// default for fullpixel
g_settings.screen_StartX_lcd_a_0 = configfile.getInt32("screen_StartX_lcd_a_0", 0);
g_settings.screen_StartY_lcd_a_0 = configfile.getInt32("screen_StartY_lcd_a_0", 0);
g_settings.screen_EndX_lcd_a_0 = configfile.getInt32("screen_EndX_lcd_a_0" , 1280 - g_settings.screen_StartX_lcd_a_0 - 1);
g_settings.screen_EndY_lcd_a_0 = configfile.getInt32("screen_EndY_lcd_a_0" , 720 - g_settings.screen_StartY_lcd_a_0 - 1);
g_settings.screen_StartX_lcd_a_1 = configfile.getInt32("screen_StartX_lcd_a_1", 0);
g_settings.screen_StartY_lcd_a_1 = configfile.getInt32("screen_StartY_lcd_a_1", 0);
g_settings.screen_EndX_lcd_a_1 = configfile.getInt32("screen_EndX_lcd_a_1" , 1920 - g_settings.screen_StartX_lcd_a_1 - 1);
g_settings.screen_EndY_lcd_a_1 = configfile.getInt32("screen_EndY_lcd_a_1" , 1080 - g_settings.screen_StartY_lcd_a_1 - 1);
g_settings.screen_StartX_a_0 = configfile.getInt32("screen_StartX_a_0", 0);
g_settings.screen_StartY_a_0 = configfile.getInt32("screen_StartY_a_0", 0);
g_settings.screen_EndX_a_0 = configfile.getInt32("screen_EndX_a_0" , 1280 - g_settings.screen_StartX_a_0 - 1);
g_settings.screen_EndY_a_0 = configfile.getInt32("screen_EndY_a_0" , 720 - g_settings.screen_StartY_a_0 - 1);
g_settings.screen_StartX_a_1 = configfile.getInt32("screen_StartX_a_1", 0);
g_settings.screen_StartY_a_1 = configfile.getInt32("screen_StartY_a_1", 0);
g_settings.screen_EndX_a_1 = configfile.getInt32("screen_EndX_a_1" , 1920 - g_settings.screen_StartX_a_1 - 1);
g_settings.screen_EndY_a_1 = configfile.getInt32("screen_EndY_a_1" , 1080 - g_settings.screen_StartY_a_1 - 1);
// default for non fullpixel
g_settings.screen_StartX_lcd_b_0 = configfile.getInt32("screen_StartX_lcd_b_0", 22);
g_settings.screen_StartY_lcd_b_0 = configfile.getInt32("screen_StartY_lcd_b_0", 12);
g_settings.screen_EndX_lcd_b_0 = configfile.getInt32("screen_EndX_lcd_b_0" , 1259 - g_settings.screen_StartX_lcd_b_0 - 1);
g_settings.screen_EndY_lcd_b_0 = configfile.getInt32("screen_EndY_lcd_b_0" , 708 - g_settings.screen_StartY_lcd_b_0 - 1);
g_settings.screen_StartX_lcd_b_1 = configfile.getInt32("screen_StartX_lcd_b_1", 33);
g_settings.screen_StartY_lcd_b_1 = configfile.getInt32("screen_StartY_lcd_b_1", 18);
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_StartX_b_0 = configfile.getInt32("screen_StartX_b_0", 22);
g_settings.screen_StartY_b_0 = configfile.getInt32("screen_StartY_b_0", 12);
g_settings.screen_EndX_b_0 = configfile.getInt32("screen_EndX_b_0" , 1259 - g_settings.screen_StartX_b_0 - 1);
g_settings.screen_EndY_b_0 = configfile.getInt32("screen_EndY_b_0" , 708 - g_settings.screen_StartY_b_0 - 1);
g_settings.screen_StartX_b_1 = configfile.getInt32("screen_StartX_b_1", 33);
g_settings.screen_StartY_b_1 = configfile.getInt32("screen_StartY_b_1", 18);
g_settings.screen_EndX_b_1 = configfile.getInt32("screen_EndX_b_1" , 1888 - g_settings.screen_StartX_b_1 - 1);
g_settings.screen_EndY_b_1 = configfile.getInt32("screen_EndY_b_1" , 1062 - g_settings.screen_StartY_b_1 - 1);
g_settings.screen_preset = configfile.getInt32("screen_preset", COsdSetup::PRESET_SCREEN_A);
setScreenSettings();
@@ -1259,17 +1259,17 @@ void CNeutrinoApp::setScreenSettings()
{
switch (g_settings.screen_preset) {
case COsdSetup::PRESET_SCREEN_B:
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_EndX = g_settings.screen_EndX_lcd_b_1;
g_settings.screen_EndY = g_settings.screen_EndY_lcd_b_1;
g_settings.screen_StartX = g_settings.screen_StartX_b_1;
g_settings.screen_StartY = g_settings.screen_StartY_b_1;
g_settings.screen_EndX = g_settings.screen_EndX_b_1;
g_settings.screen_EndY = g_settings.screen_EndY_b_1;
break;
case COsdSetup::PRESET_SCREEN_A:
default:
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_EndX = g_settings.screen_EndX_lcd_a_1;
g_settings.screen_EndY = g_settings.screen_EndY_lcd_a_1;
g_settings.screen_StartX = g_settings.screen_StartX_a_1;
g_settings.screen_StartY = g_settings.screen_StartY_a_1;
g_settings.screen_EndX = g_settings.screen_EndX_a_1;
g_settings.screen_EndY = g_settings.screen_EndY_a_1;
break;
}
}
@@ -1280,17 +1280,17 @@ void CNeutrinoApp::setScreenSettings()
{
switch (g_settings.screen_preset) {
case COsdSetup::PRESET_SCREEN_B:
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_EndX = g_settings.screen_EndX_lcd_b_0;
g_settings.screen_EndY = g_settings.screen_EndY_lcd_b_0;
g_settings.screen_StartX = g_settings.screen_StartX_b_0;
g_settings.screen_StartY = g_settings.screen_StartY_b_0;
g_settings.screen_EndX = g_settings.screen_EndX_b_0;
g_settings.screen_EndY = g_settings.screen_EndY_b_0;
break;
case COsdSetup::PRESET_SCREEN_A:
default:
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_EndX = g_settings.screen_EndX_lcd_a_0;
g_settings.screen_EndY = g_settings.screen_EndY_lcd_a_0;
g_settings.screen_StartX = g_settings.screen_StartX_a_0;
g_settings.screen_StartY = g_settings.screen_StartY_a_0;
g_settings.screen_EndX = g_settings.screen_EndX_a_0;
g_settings.screen_EndY = g_settings.screen_EndY_a_0;
break;
}
}
@@ -1890,22 +1890,22 @@ void CNeutrinoApp::saveSetup(const char * fname)
//screen configuration
configfile.setInt32("osd_resolution" , COsdHelpers::getInstance()->g_settings_osd_resolution_save);
configfile.setInt32("screen_StartX_lcd_a_0", g_settings.screen_StartX_lcd_a_0);
configfile.setInt32("screen_StartY_lcd_a_0", g_settings.screen_StartY_lcd_a_0);
configfile.setInt32("screen_EndX_lcd_a_0" , g_settings.screen_EndX_lcd_a_0);
configfile.setInt32("screen_EndY_lcd_a_0" , g_settings.screen_EndY_lcd_a_0);
configfile.setInt32("screen_StartX_lcd_a_1", g_settings.screen_StartX_lcd_a_1);
configfile.setInt32("screen_StartY_lcd_a_1", g_settings.screen_StartY_lcd_a_1);
configfile.setInt32("screen_EndX_lcd_a_1" , g_settings.screen_EndX_lcd_a_1);
configfile.setInt32("screen_EndY_lcd_a_1" , g_settings.screen_EndY_lcd_a_1);
configfile.setInt32("screen_StartX_lcd_b_0", g_settings.screen_StartX_lcd_b_0);
configfile.setInt32("screen_StartY_lcd_b_0", g_settings.screen_StartY_lcd_b_0);
configfile.setInt32("screen_EndX_lcd_b_0" , g_settings.screen_EndX_lcd_b_0);
configfile.setInt32("screen_EndY_lcd_b_0" , g_settings.screen_EndY_lcd_b_0);
configfile.setInt32("screen_StartX_lcd_b_1", g_settings.screen_StartX_lcd_b_1);
configfile.setInt32("screen_StartY_lcd_b_1", g_settings.screen_StartY_lcd_b_1);
configfile.setInt32("screen_EndX_lcd_b_1" , g_settings.screen_EndX_lcd_b_1);
configfile.setInt32("screen_EndY_lcd_b_1" , g_settings.screen_EndY_lcd_b_1);
configfile.setInt32("screen_StartX_a_0", g_settings.screen_StartX_a_0);
configfile.setInt32("screen_StartY_a_0", g_settings.screen_StartY_a_0);
configfile.setInt32("screen_EndX_a_0" , g_settings.screen_EndX_a_0);
configfile.setInt32("screen_EndY_a_0" , g_settings.screen_EndY_a_0);
configfile.setInt32("screen_StartX_a_1", g_settings.screen_StartX_a_1);
configfile.setInt32("screen_StartY_a_1", g_settings.screen_StartY_a_1);
configfile.setInt32("screen_EndX_a_1" , g_settings.screen_EndX_a_1);
configfile.setInt32("screen_EndY_a_1" , g_settings.screen_EndY_a_1);
configfile.setInt32("screen_StartX_b_0", g_settings.screen_StartX_b_0);
configfile.setInt32("screen_StartY_b_0", g_settings.screen_StartY_b_0);
configfile.setInt32("screen_EndX_b_0" , g_settings.screen_EndX_b_0);
configfile.setInt32("screen_EndY_b_0" , g_settings.screen_EndY_b_0);
configfile.setInt32("screen_StartX_b_1", g_settings.screen_StartX_b_1);
configfile.setInt32("screen_StartY_b_1", g_settings.screen_StartY_b_1);
configfile.setInt32("screen_EndX_b_1" , g_settings.screen_EndX_b_1);
configfile.setInt32("screen_EndY_b_1" , g_settings.screen_EndY_b_1);
configfile.setInt32("screen_preset" , g_settings.screen_preset);
//Software-update
@@ -6074,14 +6074,14 @@ static struct __key_rename key_rename[] = {
{ "casystem_display", "infobar_casystem_display" },
{ "casystem_dotmatrix", "infobar_casystem_dotmatrix"},
{ "casystem_frame", "infobar_casystem_frame" },
{ "screen_StartX_lcd", "screen_StartX_lcd_a_0" },
{ "screen_StartY_lcd", "screen_StartY_lcd_a_0" },
{ "screen_EndX_lcd", "screen_EndX_lcd_a_0" },
{ "screen_EndY_lcd", "screen_EndY_lcd_a_0" },
{ "screen_StartX_crt", "screen_StartX_lcd_b_0" },
{ "screen_StartY_crt", "screen_StartY_lcd_b_0" },
{ "screen_EndX_crt", "screen_EndX_lcd_b_0" },
{ "screen_EndY_crt", "screen_EndY_lcd_b_0" },
{ "screen_StartX_lcd", "screen_StartX_a_0" },
{ "screen_StartY_lcd", "screen_StartY_a_0" },
{ "screen_EndX_lcd", "screen_EndX_a_0" },
{ "screen_EndY_lcd", "screen_EndY_a_0" },
{ "screen_StartX_crt", "screen_StartX_b_0" },
{ "screen_StartY_crt", "screen_StartY_b_0" },
{ "screen_EndX_crt", "screen_EndX_b_0" },
{ "screen_EndY_crt", "screen_EndY_b_0" },
{ "timing.infobar_movieplayer", "timing.infobar_media_video" },
{ "ci_clock", "ci_clock_0" },
{ "ci_save_pincode", "ci_save_pincode_0" },

32
src/system/settings.h
View File

@@ -805,22 +805,22 @@ struct SNeutrinoSettings
int screen_StartY;
int screen_EndX;
int screen_EndY;
int screen_StartX_lcd_a_0;
int screen_StartY_lcd_a_0;
int screen_EndX_lcd_a_0;
int screen_EndY_lcd_a_0;
int screen_StartX_lcd_a_1;
int screen_StartY_lcd_a_1;
int screen_EndX_lcd_a_1;
int screen_EndY_lcd_a_1;
int screen_StartX_lcd_b_0;
int screen_StartY_lcd_b_0;
int screen_EndX_lcd_b_0;
int screen_EndY_lcd_b_0;
int screen_StartX_lcd_b_1;
int screen_StartY_lcd_b_1;
int screen_EndX_lcd_b_1;
int screen_EndY_lcd_b_1;
int screen_StartX_a_0;
int screen_StartY_a_0;
int screen_EndX_a_0;
int screen_EndY_a_0;
int screen_StartX_a_1;
int screen_StartY_a_1;
int screen_EndX_a_1;
int screen_EndY_a_1;
int screen_StartX_b_0;
int screen_StartY_b_0;
int screen_EndX_b_0;
int screen_EndY_b_0;
int screen_StartX_b_1;
int screen_StartY_b_1;
int screen_EndX_b_1;
int screen_EndY_b_1;
int osd_resolution;
int screen_preset;
int screen_width;