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

epgscan: allow to set rescan period to catch a bug in epgscan

Browse Source 
Scan isn't executed while a movie is played. When movie is stopped
the scan-timer is ignored too.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 36a1a146fc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-04 (Tue, 04 Jul 2017)

Origin message was:
------------------
- epgscan: allow to set rescan period to catch a bug in epgscan

Scan isn't executed while a movie is played. When movie is stopped
the scan-timer is ignored too.


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-07-04 11:07:30 +02:00
parent 7a7b17ea21
commit 012958caf2
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/rcinput.cpp
View File

@@ -469,7 +469,7 @@ int CRCInput::addTimer(uint64_t Interval, bool oneshot, bool correct_time )
_newtimer.correct_time = correct_time;
//printf("adding timer %d (0x%llx, 0x%llx)\n", _newtimer.id, _newtimer.times_out, Interval);
printf("adding timer %d (0x%llx, 0x%llx)\n", _newtimer.id, _newtimer.times_out, Interval);
std::vector<timer>::iterator e;
for ( e= timers.begin(); e!= timers.end(); ++e )
@@ -482,7 +482,7 @@ int CRCInput::addTimer(uint64_t Interval, bool oneshot, bool correct_time )
void CRCInput::killTimer(uint32_t &id)
{
//printf("killing timer %d\n", id);
printf("killing timer %d\n", id);
if(id == 0)
return;

5
src/driver/scanepg.cpp
View File

@@ -39,7 +39,7 @@
#include <driver/record.h>
#include <driver/streamts.h>
#define EPG_RESCAN_TIME (24*60*60)
//#define EPG_RESCAN_TIME (24*60*60)
extern CBouquetList * bouquetList;
extern CBouquetList * TVfavList;
@@ -322,8 +322,9 @@ int CEpgScan::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data)
void CEpgScan::AddTimer()
{
if (rescan_timer == 0)
rescan_timer = g_RCInput->addTimer(EPG_RESCAN_TIME*1000ULL*1000ULL, true);
rescan_timer = g_RCInput->addTimer((g_settings.epg_scan_rescan*60*60)*1000ULL*1000ULL, true);
INFO("rescan timer id %d", rescan_timer);
INFO("rescan time is %d*60*60", g_settings.epg_scan_rescan);
}
void CEpgScan::EnterStandby()

2
src/neutrino.cpp
View File

@@ -632,6 +632,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.epg_scan = CEpgScan::SCAN_CURRENT;
g_settings.epg_scan_mode = CEpgScan::MODE_OFF;
}
g_settings.epg_scan_rescan = configfile.getInt32("epg_scan_rescan", 24);
g_settings.epg_save_mode = configfile.getInt32("epg_save_mode", 0);
//widget settings
g_settings.widget_fade = false;
@@ -1369,6 +1370,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setInt32("epg_read_frequently", g_settings.epg_read_frequently);
configfile.setInt32("epg_scan", g_settings.epg_scan);
configfile.setInt32("epg_scan_mode", g_settings.epg_scan_mode);
configfile.setInt32("epg_scan_rescan", g_settings.epg_scan_rescan);
configfile.setInt32("epg_save_mode", g_settings.epg_save_mode);
configfile.setInt32("epg_cache_time" ,g_settings.epg_cache );
configfile.setInt32("epg_extendedcache_time" ,g_settings.epg_extendedcache);

1
src/system/settings.h
View File

@@ -305,6 +305,7 @@ struct SNeutrinoSettings
std::string epg_dir;
int epg_scan;
int epg_scan_mode;
int epg_scan_rescan;
int epg_save_mode;
int epg_search_history_size;