From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Tue, 21 Mar 2006 20:07:26 +0000 (+0000)
Subject: use timemap instead of eventmap.. so the returned list is sorted by service and time
X-Git-Tag: 2.6.0~3788
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/d407c606697ca1a74e5badaa37cbd4ca8bb79467

use timemap instead of eventmap.. so the returned list is sorted by service and time
---

diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp
index eb031be3..7c7dd6b2 100644
--- a/lib/dvb/epgcache.cpp
+++ b/lib/dvb/epgcache.cpp
@@ -1946,16 +1946,16 @@ PyObject *eEPGCache::search(PyObject *arg)
 			}
 			PyObject *service_name=0;
 			PyObject *service_reference=0;
-			eventMap &evmap = cit->second.first;
+			timeMap &evmap = cit->second.second;
 			// check all events
-			for (eventMap::iterator evit(evmap.begin()); evit != evmap.end() && maxcount; ++evit)
+			for (timeMap::iterator evit(evmap.begin()); evit != evmap.end() && maxcount; ++evit)
 			{
+				if (evit->second->getEventID() == eventid)
+					continue;
 				__u8 *data = evit->second->EITdata;
 				int tmp = evit->second->ByteSize-12;
 				__u32 *p = (__u32*)(data+12);
 				// check if any of our descriptor used by this event
-				if (evit->first == eventid )
-					continue;
 				int cnt=-1;
 				while(tmp>0)
 				{