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

dont reset CI if recording running

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2001 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2011-12-25 11:39:58 +00:00
parent 6d8ead49bc
commit 4a967d86b5
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/neutrino.cpp
View File

@@ -188,8 +188,6 @@ CCAMMenuHandler * g_CamHandler;
bool parentallocked = false; bool parentallocked = false;
static char **global_argv; static char **global_argv;
CFontSizeNotifier fontsizenotifier;
extern const char * locale_real_names[]; /* #include <system/locals_intern.h> */ extern const char * locale_real_names[]; /* #include <system/locals_intern.h> */
// USERMENU // USERMENU
const char* usermenu_button_def[SNeutrinoSettings::BUTTON_MAX]={"red","green","yellow","blue"}; const char* usermenu_button_def[SNeutrinoSettings::BUTTON_MAX]={"red","green","yellow","blue"};
@@ -2570,7 +2568,7 @@ _repeat:
//FIXME better at announce ? //FIXME better at announce ?
if( mode == mode_standby ) { if( mode == mode_standby ) {
cpuFreq->SetCpuFreq(g_settings.cpufreq * 1000 * 1000); cpuFreq->SetCpuFreq(g_settings.cpufreq * 1000 * 1000);
if(g_settings.ci_standby_reset) { if(!recordingstatus && g_settings.ci_standby_reset) {
g_CamHandler->exec(NULL, "ca_ci_reset0"); g_CamHandler->exec(NULL, "ca_ci_reset0");
g_CamHandler->exec(NULL, "ca_ci_reset1"); g_CamHandler->exec(NULL, "ca_ci_reset1");
} }
@@ -3405,7 +3403,7 @@ void CNeutrinoApp::standbyMode( bool bOnOff )
powerManager->SetStandby(false, false); powerManager->SetStandby(false, false);
if(g_settings.ci_standby_reset) { if(!recordingstatus && g_settings.ci_standby_reset) {
g_CamHandler->exec(NULL, "ca_ci_reset0"); g_CamHandler->exec(NULL, "ca_ci_reset0");
g_CamHandler->exec(NULL, "ca_ci_reset1"); g_CamHandler->exec(NULL, "ca_ci_reset1");
} }