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

test remove

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1388 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2011-04-11 14:01:36 +00:00
parent 7c49669d32
commit 5f8ed77fc1
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/sectionsd/sectionsd.cpp
View File

@@ -1215,7 +1215,6 @@ static void removeDupEvents(void)
readLockEvents(); readLockEvents();
e1 = mySIeventsOrderServiceUniqueKeyFirstStartTimeEventUniqueKey.begin(); e1 = mySIeventsOrderServiceUniqueKeyFirstStartTimeEventUniqueKey.begin();
while ((e1 != mySIeventsOrderServiceUniqueKeyFirstStartTimeEventUniqueKey.end()) && !messaging_zap_detected) while ((e1 != mySIeventsOrderServiceUniqueKeyFirstStartTimeEventUniqueKey.end()) && !messaging_zap_detected)
{ {
e2 = e1; e2 = e1;
@@ -1227,28 +1226,27 @@ static void removeDupEvents(void)
if ((*e1)->get_channel_id() != (*e2)->get_channel_id()) if ((*e1)->get_channel_id() != (*e2)->get_channel_id())
continue; continue;
/* check for same time */ /* check for same time */
if (((*e1)->times.begin()->startzeit != (*e2)->times.begin()->startzeit) || if ((*e1)->times.begin()->startzeit != (*e2)->times.begin()->startzeit)
((*e1)->times.begin()->dauer != (*e2)->times.begin()->dauer))
continue; continue;
if ((*e1)->table_id == (*e2)->table_id)
{
xprintf("%s: not removing events %llx %llx, t:%02x '%s'\n", __func__,
(*e1)->uniqueKey(), (*e2)->uniqueKey(), (*e1)->table_id, (*e1)->getName().c_str());
continue;
}
del = mySIeventsOrderServiceUniqueKeyFirstStartTimeEventUniqueKey.end(); del = mySIeventsOrderServiceUniqueKeyFirstStartTimeEventUniqueKey.end();
if ((*e1)->table_id > (*e2)->table_id) if ((*e1)->table_id > (*e2)->table_id){
del = e1; del = e1;
if ((*e1)->table_id < (*e2)->table_id) }
else if ((*e1)->table_id < (*e2)->table_id){
del = e2; del = e2;
}
else // ((*e1)->table_id == (*e2)->table_id)
{
del = e1;
}
/* can not happen. This check is pure paranoia :) */ /* can not happen. This check is pure paranoia :) */
if (del == mySIeventsOrderServiceUniqueKeyFirstStartTimeEventUniqueKey.end()) if (del == mySIeventsOrderServiceUniqueKeyFirstStartTimeEventUniqueKey.end())
continue; continue;
xprintf("%s: removing event %llx.%02x '%s'\n", __func__, xprintf("%s: -------- %llx.%02x '%s'\n", __func__,
(*del)->uniqueKey(), (*del)->table_id, (*del)->getName().c_str()); (*del)->uniqueKey(), (*del)->table_id, (*del)->getName().c_str());
unlockEvents(); unlockEvents();
deleteEvent((*del)->uniqueKey()); deleteEvent((*del)->uniqueKey());
@@ -8293,14 +8291,12 @@ printf("[sectionsd] Removed %d old events.\n", anzEventsAlt - mySIeventsOrderUni
unlockEvents(); unlockEvents();
// usleep(100); // usleep(100);
// lockEvents(); // lockEvents();
#ifdef USE_BROKEN_REMOVE_DUP_EVENTS
/* this is currently broken */ /* this is currently broken */
removeDupEvents(); removeDupEvents();
readLockEvents(); readLockEvents();
printf("[sectionsd] Removed %d dup events.\n", anzEventsAlt - mySIeventsOrderUniqueKey.size()); printf("[sectionsd] Removed %d dup events.\n", anzEventsAlt - mySIeventsOrderUniqueKey.size());
anzEventsAlt = mySIeventsOrderUniqueKey.size(); anzEventsAlt = mySIeventsOrderUniqueKey.size();
unlockEvents(); unlockEvents();
#endif
dprintf("before removewasteepg\n"); dprintf("before removewasteepg\n");
#ifdef UPDATE_NETWORKS #ifdef UPDATE_NETWORKS
removeWasteEvents(); // Events for channels not in services.xml removeWasteEvents(); // Events for channels not in services.xml