Merge branch 'cst-next' into nmp-cst-next

Origin commit data
------------------
Branch: ni/coolstream
Commit: db8a9e6388
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-25 (Mon, 25 Jan 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2016-01-25 13:20:10 +01:00
13 changed files with 38 additions and 19 deletions

View File

@@ -459,6 +459,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.backlight_standby = configfile.getInt32( "backlight_standby", 0);
g_settings.backlight_deepstandby = configfile.getInt32( "backlight_deepstandby", 0);
g_settings.lcd_scroll = configfile.getInt32( "lcd_scroll", 1);
g_settings.lcd_notify_rclock = configfile.getInt32("lcd_notify_rclock", 1);
g_settings.hdd_fs = configfile.getInt32( "hdd_fs", 0);
g_settings.hdd_sleep = configfile.getInt32( "hdd_sleep", 120);
@@ -1016,6 +1017,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setInt32( "backlight_standby", g_settings.backlight_standby);
configfile.setInt32( "backlight_deepstandby", g_settings.backlight_deepstandby);
configfile.setInt32( "lcd_scroll", g_settings.lcd_scroll);
configfile.setInt32( "lcd_notify_rclock", g_settings.lcd_notify_rclock);
//misc
configfile.setInt32( "power_standby", g_settings.power_standby);