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

Revert "- neutrino: fix hw_caps init; it must be initialized after zapit start"

Browse Source 
This reverts commit 2d4130dab8 in
preparation for following changes.

Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: affcf191a9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-14 (Mon, 14 Aug 2017)
This commit is contained in:
vanhofen
2017-08-14 09:56:23 +02:00
parent 1f1a3a2375
commit c8aeed6eeb
1 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/neutrino.cpp
View File

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