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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 71b9627b6c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-05-08 23:46:54 +02:00
parent 49601b7909 4ded8abb12
commit ff37c99f40
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/neutrino.cpp
View File

@@ -499,14 +499,22 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.hdd_wakeup_msg = configfile.getInt32( "hdd_wakeup_msg", 1); //NI
g_settings.hdd_allow_set_recdir = configfile.getInt32( "hdd_allow_set_recdir", 1); //NI
/*
hw_caps uses CFEManager and CFEManager needs g_settings.
So g_settings cannot use hw_caps.
For this reason we need this workaround.
*/
bool can_shutdown = (cs_get_revision() > 7);
g_settings.shutdown_real = false;
if (g_info.hw_caps->can_shutdown)
if (can_shutdown) //(g_info.hw_caps->can_shutdown)
g_settings.shutdown_real = configfile.getBool("shutdown_real" , false );
g_settings.shutdown_real_rcdelay = configfile.getBool("shutdown_real_rcdelay", false );
g_settings.shutdown_count = configfile.getInt32("shutdown_count", 0);
g_settings.shutdown_min = 0;
if (g_info.hw_caps->can_shutdown)
if (can_shutdown) //(g_info.hw_caps->can_shutdown)
g_settings.shutdown_min = configfile.getInt32("shutdown_min", 000); //NI
g_settings.sleeptimer_min = configfile.getInt32("sleeptimer_min", 0);
@@ -2252,8 +2260,6 @@ TIMER_START();
cs_new_auto_videosystem();
#endif
g_info.hw_caps = get_hwcaps();
g_Locale = new CLocaleManager;
int loadSettingsErg = loadSetup(NEUTRINO_SETTINGS_FILE);
@@ -2354,6 +2360,9 @@ TIMER_START();
CheckFastScan();
// init hw_caps *after* zapit start!
g_info.hw_caps = get_hwcaps();
//timer start
timer_wakeup = false;//init
wake_up( timer_wakeup );