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

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

Browse Source 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	data/locale/slovak.locale
	data/locale/unmaintained/czech.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/start_wizard.cpp
	src/gui/widget/msgbox.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-11-21 12:46:49 +01:00
parent ccd9e67d78 f57041a98b
commit 6b0e887585
125 changed files with 3517 additions and 3169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/eitd/sectionsd.cpp
View File

@@ -73,7 +73,7 @@ static bool notify_complete = false;
/* period to clean cached sections and force restart sections read */
#define META_HOUSEKEEPING_COUNT (24 * 60 * 60) / HOUSEKEEPING_SLEEP // meta housekeeping after XX housekeepings - every 24h -
#define STANDBY_HOUSEKEEPING_COUNT (60 * 60) / HOUSEKEEPING_SLEEP
#define EPG_SAVE_FREQUENTLY_COUNT (60 * 60) / HOUSEKEEPING_SLEEP
#define EPG_SERVICE_FREQUENTLY_COUNT (60 * 60) / HOUSEKEEPING_SLEEP
// Timeout bei tcp/ip connections in ms
#define READ_TIMEOUT_IN_SECONDS 2
@@ -86,6 +86,7 @@ static bool notify_complete = false;
#define TIMEOUTS_EIT_VERSION_WAIT (2 * CHECK_RESTART_DMX_AFTER_TIMEOUTS)
static unsigned int epg_save_frequently;
static unsigned int epg_read_frequently;
static long secondsToCache;
long int secondsExtendedTextCache = 0;
static long oldEventsAre;
@@ -1127,6 +1128,8 @@ static void commandSetConfig(int connfd, char *data, const unsigned /*dataLength
secondsExtendedTextCache = (long)(pmsg->epg_extendedcache)*60L*60L;
max_events = pmsg->epg_max_events;
epg_save_frequently = pmsg->epg_save_frequently;
epg_read_frequently = pmsg->epg_read_frequently;
unlockEvents();
bool time_wakeup = false;
@@ -2142,7 +2145,7 @@ static void *houseKeepingThread(void *)
removeOldEvents(oldEventsAre); // alte Events
ecount++;
if (ecount == EPG_SAVE_FREQUENTLY_COUNT)
if (ecount == EPG_SERVICE_FREQUENTLY_COUNT)
{
if (epg_save_frequently > 0)
{
@@ -2155,6 +2158,22 @@ static void *houseKeepingThread(void *)
}
writeEventsToFile(d.c_str());
}
if (epg_read_frequently > 0)
{
pthread_t thrInsert;
pthread_attr_t attr;
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
std::string d = epg_dir + "/";
printf("[%s]: %s\n",__func__,d.c_str());
if (pthread_create (&thrInsert, &attr, insertEventsfromFile, (void *)d.c_str() ))
{
perror("sectionsd: pthread_create()");
}
pthread_attr_destroy(&attr);
}
ecount = 0;
}
@@ -2212,6 +2231,7 @@ bool CEitManager::Start()
oldEventsAre = config.epg_old_events*60L*60L; //hours
max_events = config.epg_max_events;
epg_save_frequently = config.epg_save_frequently;
epg_read_frequently = config.epg_read_frequently;
if (find_executable("ntpdate").empty()){
ntp_system_cmd_prefix = find_executable("ntpd");