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

Merge branch 'next' of coolstreamtech.de:cst-public-gui-neutrino into next

Browse Source 
Conflicts:
	lib/libconfigfile/configfile.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/femanager.cpp
This commit is contained in:
[CST] Focus
2013-03-07 17:10:57 +04:00
parent 65bd112d78 3d386649a9
commit aa60c85768
18 changed files with 407 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/eitd/sectionsd.cpp
View File

@@ -58,7 +58,7 @@
//#define DEBUG_TIME_THREAD
#define DEBUG_SECTION_THREADS
#define DEBUG_CN_THREAD
//#define DEBUG_CN_THREAD
/*static*/ bool reader_ready = true;
static unsigned int max_events;
@@ -255,12 +255,12 @@ static bool deleteEvent(const event_id_t uniqueKey)
}
if (cn) { // current-next => fill current or next event...
//xprintf("addEvent: current %016" PRIx64 " event %016" PRIx64 " messaging_got_CN %d\n", messaging_current_servicekey, evt.get_channel_id(), messaging_got_CN);
//xprintf("addEvent: current %012" PRIx64 " event %012" PRIx64 " messaging_got_CN %d\n", messaging_current_servicekey, evt.get_channel_id(), messaging_got_CN);
readLockMessaging();
// only if it is the current channel... and if we don't have them already.
if (evt.get_channel_id() == messaging_current_servicekey &&
(messaging_got_CN != 0x03)) {
xprintf("addEvent: current %016" PRIx64 " event %016" PRIx64 " running %d messaging_got_CN %d\n", messaging_current_servicekey, evt.get_channel_id(), evt.runningStatus(), messaging_got_CN);
xprintf("addEvent: ch %012" PRIx64 " running %d (%s) got_CN %d\n", evt.get_channel_id(), evt.runningStatus(), evt.runningStatus() > 2 ? "curr" : "next", messaging_got_CN);
unlockMessaging();
writeLockEvents();
@@ -318,7 +318,7 @@ xprintf("addEvent: current %016" PRIx64 " event %016" PRIx64 " running %d messag
{
/* if the new event has a lower (== more recent) table ID, replace the old one */
already_exists = false;
dprintf("replacing event %016" PRIx64 ":%02x with %04x:%02x '%.40s'\n", si->second->uniqueKey(),
dprintf("replacing event %012" PRIx64 ":%02x with %04x:%02x '%.40s'\n", si->second->uniqueKey(),
si->second->table_id, evt.eventID, evt.table_id, evt.getName().c_str());
}
else if (already_exists && ( (evt.table_id == 0x51 || evt.table_id == 0x50 || evt.table_id == 0x4e) && evt.table_id == si->second->table_id && evt.version != si->second->version ))
@@ -428,13 +428,13 @@ xprintf("addEvent: current %016" PRIx64 " event %016" PRIx64 " running %d messag
if ((*x)->table_id < e->table_id)
{
/* don't add the higher table_id */
dprintf("%s: don't replace 0x%016" PRIx64 ".%02x with 0x%016" PRIx64 ".%02x\n",
dprintf("%s: don't replace 0x%012" PRIx64 ".%02x with 0x%012" PRIx64 ".%02x\n",
__func__, x_key, (*x)->table_id, e_key, e->table_id);
unlockEvents();
return;
}
/* here we have an overlapping event */
dprintf("%s: delete 0x%016" PRIx64 ".%02x time = 0x%016" PRIx64 ".%02x\n", __func__,
dprintf("%s: delete 0x%012" PRIx64 ".%02x time = 0x%012" PRIx64 ".%02x\n", __func__,
x_key, (*x)->table_id, e_key, e->table_id);
to_delete.push_back(x_key);
}
@@ -1346,16 +1346,18 @@ void CTimeThread::setSystemTime(time_t tim)
#endif
if (timediff == 0) /* very unlikely... :-) */
return;
if (abs(timediff) < 120000000LL) {
if (abs(tim - tv.tv_sec) < 120) { /* abs() is int */
struct timeval oldd;
tv.tv_sec = timediff / 1000000LL;
tv.tv_usec = timediff % 1000000LL;
if (adjtime(&tv, &oldd))
perror("adjtime");
xprintf("difference is < 120s, using adjtime(%d, %d). oldd(%d, %d)\n",
(int)tv.tv_sec, (int)tv.tv_usec, (int)oldd.tv_sec, (int)oldd.tv_usec);
timediff = 0;
return;
xprintf("adjtime(%d, %d) failed: %m\n", (int)tv.tv_sec, (int)tv.tv_usec);
else {
xprintf("difference is < 120s, using adjtime(%d, %d). oldd(%d, %d)\n",
(int)tv.tv_sec, (int)tv.tv_usec, (int)oldd.tv_sec, (int)oldd.tv_usec);
timediff = 0;
return;
}
}
tv.tv_sec = tim;
@@ -1722,7 +1724,7 @@ void CCNThread::addFilters()
void CCNThread::beforeWait()
{
xprintf("%s: set eit update filter, service = 0x%016" PRIx64 ", current version 0x%x got events %d (%s)\n",
xprintf("%s: eit update filter, ch 0x%012" PRIx64 ", current ver 0x%02x got events %d (%s)\n",
name.c_str(), messaging_current_servicekey, eit_version, messaging_have_CN,
updating ? "active" : "not active");
@@ -1817,7 +1819,6 @@ bool CCNThread::checkUpdate()
if (ret > 0) {
LongSection section(buf);
printdate_ms(stdout);
xprintf("%s: eit update filter: ### new version 0x%02x ###, Activate thread\n",
name.c_str(), section.getVersionNumber());