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

eitd/sectionsd.cpp: fix sendTimeEvent

Browse Source
This commit is contained in:
[CST] Focus
2012-02-26 10:24:38 +04:00
parent 68edbc0a2a
commit ec3e748ab3
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/eitd/sectionsd.cpp
View File

@@ -1375,13 +1375,14 @@ static void dump_sched_info(std::string label)
// updates system time according TOT every 30 minutes // updates system time according TOT every 30 minutes
//--------------------------------------------------------------------- //---------------------------------------------------------------------
static void sendTimeEvent(bool by_ntp, time_t tim = 0) static void sendTimeEvent(bool dvb, time_t tim = 0)
{ {
time_t actTime = time(NULL); time_t actTime = time(NULL);
if(!by_ntp) { if(dvb) {
struct tm *tmTime = localtime(&actTime); struct tm *tmTime = localtime(&actTime);
xprintf("[%sThread] - current: %02d.%02d.%04d %02d:%02d:%02d, dvb: %s", "time", xprintf("[%sThread] - current: %02d.%02d.%04d %02d:%02d:%02d, dvb: %s", "time",
tmTime->tm_mday, tmTime->tm_mon+1, tmTime->tm_year+1900, tmTime->tm_hour, tmTime->tm_min, tmTime->tm_sec, ctime(&tim)); tmTime->tm_mday, tmTime->tm_mon+1, tmTime->tm_year+1900, tmTime->tm_hour, tmTime->tm_min, tmTime->tm_sec, ctime(&tim));
actTime = tim;
} }
pthread_mutex_lock(&timeIsSetMutex); pthread_mutex_lock(&timeIsSetMutex);
timeset = true; timeset = true;
@@ -1415,7 +1416,7 @@ static void *timeThread(void *)
{ {
first_time = false; first_time = false;
time_ntp = true; time_ntp = true;
sendTimeEvent(true); sendTimeEvent(false);
} else { } else {
if (dvb_time_update) { if (dvb_time_update) {
xprintf("timeThread: getting UTC\n"); xprintf("timeThread: getting UTC\n");
@@ -1425,7 +1426,7 @@ xprintf("timeThread: getting UTC done : %d\n", success);
{ {
tim = changeUTCtoCtime((const unsigned char *) &UTC); tim = changeUTCtoCtime((const unsigned char *) &UTC);
time_ntp = false; time_ntp = false;
sendTimeEvent(false, tim); sendTimeEvent(true, tim);
if (tim) { if (tim) {
if ((!messaging_neutrino_sets_time) && (geteuid() == 0)) { if ((!messaging_neutrino_sets_time) && (geteuid() == 0)) {
@@ -1703,7 +1704,7 @@ void CEitThread::run()
- 4 then get the other TS's scheduled events, - 4 then get the other TS's scheduled events,
- 4ab (in two steps to reduce the POLLERRs on the DMX device) - 4ab (in two steps to reduce the POLLERRs on the DMX device)
*/ */
addfilter(0x00, 0x00); //0 dummy filter //addfilter(0x00, 0x00); //0 dummy filter
addfilter(0x50, 0xf0); //1 current TS, scheduled addfilter(0x50, 0xf0); //1 current TS, scheduled
addfilter(0x4f, 0xff); //2 other TS, current/next addfilter(0x4f, 0xff); //2 other TS, current/next
#if 1 #if 1