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

sectionsd: delete events with vector list

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2081 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: e65cd22ebe
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-02-01 (Wed, 01 Feb 2012)



------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2012-02-01 13:07:42 +00:00
parent 17c12418ec
commit b610a6975e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/sectionsd/sectionsd.cpp
View File

@@ -1259,6 +1259,7 @@ xmlNodePtr FindTransponder(xmlNodePtr provider, const t_original_network_id onid
static void removeOldEvents(const long seconds) static void removeOldEvents(const long seconds)
{ {
bool goodtimefound; bool goodtimefound;
std::vector<event_id_t> to_delete;
// Alte events loeschen // Alte events loeschen
time_t zeit = time(NULL); time_t zeit = time(NULL);
@@ -1268,7 +1269,6 @@ static void removeOldEvents(const long seconds)
MySIeventsOrderFirstEndTimeServiceIDEventUniqueKey::iterator e = mySIeventsOrderFirstEndTimeServiceIDEventUniqueKey.begin(); MySIeventsOrderFirstEndTimeServiceIDEventUniqueKey::iterator e = mySIeventsOrderFirstEndTimeServiceIDEventUniqueKey.begin();
while ((e != mySIeventsOrderFirstEndTimeServiceIDEventUniqueKey.end()) && (!messaging_zap_detected)) { while ((e != mySIeventsOrderFirstEndTimeServiceIDEventUniqueKey.end()) && (!messaging_zap_detected)) {
unlockEvents();
goodtimefound = false; goodtimefound = false;
for (SItimes::iterator t = (*e)->times.begin(); t != (*e)->times.end(); t++) { for (SItimes::iterator t = (*e)->times.begin(); t != (*e)->times.end(); t++) {
if (t->startzeit + (long)t->dauer >= zeit - seconds) { if (t->startzeit + (long)t->dauer >= zeit - seconds) {
@@ -1279,13 +1279,14 @@ static void removeOldEvents(const long seconds)
} }
if (false == goodtimefound) if (false == goodtimefound)
deleteEvent((*(e++))->uniqueKey()); to_delete.push_back((*e)->uniqueKey());
else e++;
++e;
readLockEvents();
} }
unlockEvents(); unlockEvents();
for (std::vector<event_id_t>::iterator i = to_delete.begin(); i != to_delete.end(); i++)
deleteEvent(*i);
return; return;
} }
@@ -1341,7 +1342,6 @@ static void removeDupEvents(void)
/* clean up outside of the iterator loop */ /* clean up outside of the iterator loop */
for (std::vector<event_id_t>::iterator i = to_delete.begin(); i != to_delete.end(); i++) for (std::vector<event_id_t>::iterator i = to_delete.begin(); i != to_delete.end(); i++)
deleteEvent(*i); deleteEvent(*i);
to_delete.clear(); /* needed? can't hurt... */
return; return;
} }