mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 09:21:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino.cpp: blocking standby for multical

Browse Source
This commit is contained in:
satbaby
2012-10-23 12:37:56 +02:00
parent cf1dfdad7c
commit f4c976beb5
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/neutrino.cpp
View File

@@ -228,6 +228,7 @@ CNeutrinoApp::CNeutrinoApp()
RADIOchannelList = NULL; RADIOchannelList = NULL;
skipShutdownTimer = false; skipShutdownTimer = false;
skipSleepnTimer = false; skipSleepnTimer = false;
lockStandbyCall = false;
current_muted = 0; current_muted = 0;
recordingstatus = 0; recordingstatus = 0;
g_channel_list_changed = 0; g_channel_list_changed = 0;
@@ -3180,6 +3181,10 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
//static bool wasshift = false; //static bool wasshift = false;
INFO("%s", bOnOff ? "ON" : "OFF" ); INFO("%s", bOnOff ? "ON" : "OFF" );
if(lockStandbyCall)
return;
lockStandbyCall = true;
if( bOnOff ) { if( bOnOff ) {
if( mode == mode_scart ) { if( mode == mode_scart ) {
//g_Controld->setScartMode( 0 ); //g_Controld->setScartMode( 0 );
@@ -3197,8 +3202,6 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
if(mode == mode_radio && g_Radiotext) if(mode == mode_radio && g_Radiotext)
g_Radiotext->radiotext_stop(); g_Radiotext->radiotext_stop();
lastMode = mode;
mode = mode_standby;
if(!fromDeepStandby && !CRecordManager::getInstance()->RecordingStatus()) { if(!fromDeepStandby && !CRecordManager::getInstance()->RecordingStatus()) {
g_Zapit->setStandby(true); g_Zapit->setStandby(true);
@@ -3235,6 +3238,9 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
if(!CRecordManager::getInstance()->RecordingStatus()) if(!CRecordManager::getInstance()->RecordingStatus())
cpuFreq->SetCpuFreq(g_settings.standby_cpufreq * 1000 * 1000); cpuFreq->SetCpuFreq(g_settings.standby_cpufreq * 1000 * 1000);
lastMode = mode;
mode = mode_standby;
//fan speed //fan speed
if (g_info.has_fan) { if (g_info.has_fan) {
int fspeed = 1; int fspeed = 1;
@@ -3319,6 +3325,7 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
#endif #endif
StartSubtitles(); StartSubtitles();
} }
lockStandbyCall = false;
} }
void CNeutrinoApp::radioMode( bool rezap) void CNeutrinoApp::radioMode( bool rezap)

2
src/neutrino.h
View File

@@ -120,7 +120,7 @@ private:
bool skipShutdownTimer; bool skipShutdownTimer;
bool skipSleepnTimer; bool skipSleepnTimer;
bool pbBlinkChange; bool pbBlinkChange;
bool lockStandbyCall;
int tvsort[LIST_MODE_LAST]; int tvsort[LIST_MODE_LAST];
int radiosort[LIST_MODE_LAST]; int radiosort[LIST_MODE_LAST];