Merge branch 'master' into pu/fb-modules

Origin commit data
------------------
Commit: 0cb26e6e98
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)
This commit is contained in:
Michael Liebmann
2017-02-12 09:24:08 +01:00
32 changed files with 112 additions and 99 deletions

View File

@@ -912,7 +912,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
erg = 2;
}
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
g_settings.brightness = configfile.getInt32("brightness", 0);
g_settings.contrast = configfile.getInt32("contrast", 0);
g_settings.saturation = configfile.getInt32("saturation", 0);
@@ -1436,7 +1436,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setInt32("window_size", g_settings.window_size);
configfile.setInt32("window_width", g_settings.window_width);
configfile.setInt32("window_height", g_settings.window_height);
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
configfile.setInt32("brightness", g_settings.brightness );
configfile.setInt32("contrast", g_settings.contrast );
configfile.setInt32("enable_sd_osd", g_settings.enable_sd_osd );