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

Fix unndedn recording status reset; save epg in standby only if no record running

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1610 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2011-08-01 15:28:11 +00:00
parent 49f20f3915
commit 3a2bacceed
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/neutrino.cpp
View File

@@ -174,7 +174,6 @@ extern int zapit_ready;
static pthread_t zapit_thread ; static pthread_t zapit_thread ;
void * zapit_main_thread(void *data); void * zapit_main_thread(void *data);
extern t_channel_id live_channel_id; //zapit extern t_channel_id live_channel_id; //zapit
extern t_channel_id rec_channel_id; //zapit
extern CZapitChannel *g_current_channel; extern CZapitChannel *g_current_channel;
void * nhttpd_main_thread(void *data); void * nhttpd_main_thread(void *data);
@@ -3481,7 +3480,7 @@ void CNeutrinoApp::tvMode( bool rezap )
if(stopauto /*&& autoshift*/) { if(stopauto /*&& autoshift*/) {
//printf("standby on: autoshift ! stopping ...\n"); //printf("standby on: autoshift ! stopping ...\n");
CRecordManager::getInstance()->StopAutoRecord(); CRecordManager::getInstance()->StopAutoRecord();
recordingstatus = 0; //recordingstatus = 0;
} }
frameBuffer->useBackground(false); frameBuffer->useBackground(false);
@@ -3550,6 +3549,9 @@ void CNeutrinoApp::standbyMode( bool bOnOff )
wasshift = CRecordManager::getInstance()->StopAutoRecord(); wasshift = CRecordManager::getInstance()->StopAutoRecord();
if(!CRecordManager::getInstance()->RecordingStatus()) { if(!CRecordManager::getInstance()->RecordingStatus()) {
if(g_settings.epg_save)
saveEpg();
g_Zapit->setStandby(true); g_Zapit->setStandby(true);
cpuFreq->SetCpuFreq(g_settings.standby_cpufreq * 1000 * 1000); cpuFreq->SetCpuFreq(g_settings.standby_cpufreq * 1000 * 1000);
} else } else
@@ -3559,9 +3561,11 @@ void CNeutrinoApp::standbyMode( bool bOnOff )
g_Sectionsd->setServiceChanged(0, false); g_Sectionsd->setServiceChanged(0, false);
g_Sectionsd->setPauseScanning(true); g_Sectionsd->setPauseScanning(true);
#if 0
if(g_settings.epg_save) { if(g_settings.epg_save) {
saveEpg(); saveEpg();
} }
#endif
if(g_settings.mode_clock) if(g_settings.mode_clock)
InfoClock->StopClock(); InfoClock->StopClock();