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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: ed38125791
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-19 01:07:17 +01:00
parent 42821934cd a833003150
commit 2aa18cd5e1
8 changed files with 45 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/neutrino.cpp
View File

@@ -2421,13 +2421,9 @@ TIMER_START();
cpuFreq = new cCpuFreqManager();
cpuFreq->SetCpuFreq(g_settings.cpufreq * 1000 * 1000);
#if HAVE_COOL_HARDWARE
/* only SAT-hd1 before rev 8 has fan */
g_info.has_fan = (cs_get_revision() < 8 && CFEManager::getInstance()->getFE(0)->hasSat());
#endif
dprintf(DEBUG_NORMAL, "g_info.has_fan: %d\n", g_info.has_fan);
//fan speed
if (g_info.has_fan)
if (g_info.hw_caps->has_fan)
CFanControlNotifier::setSpeed(g_settings.fan_speed);
dvbsub_init();
@@ -4093,7 +4089,7 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
g_RCInput = NULL;
//NI my_system("/etc/init.d/rcK");
//fan speed
if (g_info.has_fan) {
if (g_info.hw_caps->has_fan) {
CFanControlNotifier::setSpeed(0);
}
//CVFD::getInstance()->ShowText(g_Locale->getText(LOCALE_MAINMENU_REBOOT));
@@ -4335,7 +4331,7 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
cpuFreq->SetCpuFreq(g_settings.standby_cpufreq * 1000 * 1000);
//fan speed
if (g_info.has_fan)
if (g_info.hw_caps->has_fan)
CFanControlNotifier::setSpeed(1);
frameBuffer->setActive(false);
@@ -4368,7 +4364,7 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
}
frameBuffer->setActive(true);
//fan speed
if (g_info.has_fan)
if (g_info.hw_caps->has_fan)
CFanControlNotifier::setSpeed(g_settings.fan_speed);
puts("[neutrino.cpp] executing " NEUTRINO_LEAVE_STANDBY_SCRIPT ".");