diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-03-21 20:07:26 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-03-21 20:07:26 +0000 |
| commit | d407c606697ca1a74e5badaa37cbd4ca8bb79467 (patch) | |
| tree | 362f055a262fa516381b1f4ee326e8cb1fcb9d64 /lib/dvb/epgcache.cpp | |
| parent | 4d4d24f46602d76b5cfa5459ec129b93d8fe37b0 (diff) | |
| download | enigma2-d407c606697ca1a74e5badaa37cbd4ca8bb79467.tar.gz enigma2-d407c606697ca1a74e5badaa37cbd4ca8bb79467.zip | |
use timemap instead of eventmap.. so the returned list is sorted by service and time
Diffstat (limited to 'lib/dvb/epgcache.cpp')
| -rw-r--r-- | lib/dvb/epgcache.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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) { |