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 eb031be3dda3d971ce23fcf63c29bd89a3f95e5a..7c7dd6b2c51ea595256068757b1e10c66ddc2dc7 100644 (file)
--- 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)
                                {