mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 23:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove screen_width/height from neutrino.conf; ...

Browse Source 
it's just for internal usage


Origin commit data
------------------
Branch: ni/coolstream
Commit: abb76c2efb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-12 (Thu, 12 Jan 2017)

Origin message was:
------------------
- remove screen_width/height from neutrino.conf; ...

it's just for internal usage


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-01-12 23:08:02 +01:00
committed by Michael Liebmann
parent 050a0c720c
commit d17ca08f73
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/neutrino.cpp
View File

@@ -736,8 +736,8 @@ int CNeutrinoApp::loadSetup(const char * fname)
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;
g_settings.screen_EndY = g_settings.screen_preset ? g_settings.screen_EndY_lcd : g_settings.screen_EndY_crt; g_settings.screen_EndY = g_settings.screen_preset ? g_settings.screen_EndY_lcd : g_settings.screen_EndY_crt;
g_settings.screen_width = configfile.getInt32("screen_width", 0); g_settings.screen_width = frameBuffer->getScreenWidth(true);
g_settings.screen_height = configfile.getInt32("screen_height", 0); g_settings.screen_height = frameBuffer->getScreenHeight(true);
g_settings.bigFonts = configfile.getInt32("bigFonts", 0); g_settings.bigFonts = configfile.getInt32("bigFonts", 0);
g_settings.window_size = configfile.getInt32("window_size", 100); g_settings.window_size = configfile.getInt32("window_size", 100);
@@ -906,17 +906,6 @@ int CNeutrinoApp::loadSetup(const char * fname)
erg = 2; erg = 2;
} }
/* in case FB resolution changed */
if((g_settings.screen_width && g_settings.screen_width != (int) frameBuffer->getScreenWidth(true))
|| (g_settings.screen_height && g_settings.screen_height != (int) frameBuffer->getScreenHeight(true))) {
g_settings.screen_StartX = g_settings.screen_preset ? DEFAULT_X_START_HD : DEFAULT_X_START_SD;
g_settings.screen_StartY = g_settings.screen_preset ? DEFAULT_Y_START_HD : DEFAULT_Y_START_SD;
g_settings.screen_EndX = g_settings.screen_preset ? DEFAULT_X_END_HD : DEFAULT_X_END_SD;
g_settings.screen_EndY = g_settings.screen_preset ? DEFAULT_Y_END_HD : DEFAULT_Y_END_SD;
g_settings.screen_width = frameBuffer->getScreenWidth(true);
g_settings.screen_height = frameBuffer->getScreenHeight(true);
}
#ifdef BOXMODEL_APOLLO #ifdef BOXMODEL_APOLLO
g_settings.brightness = configfile.getInt32("brightness", 0); g_settings.brightness = configfile.getInt32("brightness", 0);
g_settings.contrast = configfile.getInt32("contrast", 0); g_settings.contrast = configfile.getInt32("contrast", 0);
@@ -998,6 +987,13 @@ void CNeutrinoApp::upgradeSetup(const char * fname)
configfile.deleteKey("screen_xres"); configfile.deleteKey("screen_xres");
configfile.deleteKey("screen_yres"); configfile.deleteKey("screen_yres");
} }
if (g_settings.version_pseudo < "20170209181002")
{
//remove screen_width/height keys
configfile.deleteKey("screen_width");
configfile.deleteKey("screen_height");
}
g_settings.version_pseudo = NEUTRINO_VERSION_PSEUDO; g_settings.version_pseudo = NEUTRINO_VERSION_PSEUDO;
configfile.setString("version_pseudo", g_settings.version_pseudo); configfile.setString("version_pseudo", g_settings.version_pseudo);
@@ -1317,8 +1313,6 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setInt32( "screen_EndX_crt", g_settings.screen_EndX_crt ); configfile.setInt32( "screen_EndX_crt", g_settings.screen_EndX_crt );
configfile.setInt32( "screen_EndY_crt", g_settings.screen_EndY_crt ); configfile.setInt32( "screen_EndY_crt", g_settings.screen_EndY_crt );
configfile.setInt32( "screen_preset", g_settings.screen_preset ); configfile.setInt32( "screen_preset", g_settings.screen_preset );
configfile.setInt32( "screen_width", g_settings.screen_width);
configfile.setInt32( "screen_height", g_settings.screen_height);
//Software-update //Software-update
configfile.setInt32 ("softupdate_mode" , g_settings.softupdate_mode ); configfile.setInt32 ("softupdate_mode" , g_settings.softupdate_mode );

2
version_pseudo.h
View File

@@ -1 +1 @@
#define NEUTRINO_VERSION_PSEUDO "20170209181001" #define NEUTRINO_VERSION_PSEUDO "20170209181002"