X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0cb7bd236d96662117bf8928cedd953b7b68579f..0ecfa70938499a3386c282577e28625d04d4626b:/lib/dvb/epgcache.h diff --git a/lib/dvb/epgcache.h b/lib/dvb/epgcache.h index 5dea4630..3f1aeaed 100644 --- a/lib/dvb/epgcache.h +++ b/lib/dvb/epgcache.h @@ -4,12 +4,8 @@ #include #include #include +#include -// check if gcc version >= 3.4 -#if defined(__GNUC__) && ((__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ == 4 ) -#else -#include -#endif #include #include @@ -74,26 +70,25 @@ struct uniqueEPGKey #define timeMap std::map #define channelMapIterator std::map::iterator - -#define tmpMap std::map > #define updateMap std::map -#if defined(__GNUC__) && ((__GNUC__ == 3 && __GNUC_MINOR__ >= 1) || __GNUC__ == 4 ) // check if gcc version >= 3.1 - #define eventCache __gnu_cxx::hash_map, __gnu_cxx::hash, uniqueEPGKey::equal> - namespace __gnu_cxx -#else // for older gcc use following - #define eventCache std::hash_map, std::hash, uniqueEPGKey::equal > - namespace std -#endif -{ -template<> struct hash +struct hash_uniqueEPGKey { inline size_t operator()( const uniqueEPGKey &x) const { - return (x.tsid << 16) | x.onid; + return (x.onid << 16) | x.tsid; } }; -} + +#define tidMap std::set<__u32> +#if defined(__GNUC__) && ((__GNUC__ == 3 && __GNUC_MINOR__ >= 1) || __GNUC__ == 4 ) // check if gcc version >= 3.1 + #define eventCache __gnu_cxx::hash_map, hash_uniqueEPGKey, uniqueEPGKey::equal> +#else // for older gcc use following + #define eventCache std::hash_map, hash_uniqueEPGKey, uniqueEPGKey::equal > +#endif + +#define descriptorPair std::pair +#define descriptorMap std::map<__u32, descriptorPair > class eventData { @@ -101,39 +96,30 @@ class eventData private: __u8* EITdata; int ByteSize; + static descriptorMap descriptors; public: int type; static int CacheSize; - eventData(const eit_event_struct* e, int size, int type) - :ByteSize(size), type(type) - { - CacheSize+=size; - EITdata = new __u8[size]; - if (e) - memcpy(EITdata, (__u8*) e, size); - } - ~eventData() - { - CacheSize-=ByteSize; - delete [] EITdata; - } + static void load(FILE *); + static void save(FILE *); + eventData(const eit_event_struct* e, int size, int type); + ~eventData(); + const eit_event_struct* get() const; operator const eit_event_struct*() const { - return (const eit_event_struct*) EITdata; - } - const eit_event_struct* get() const - { - return (const eit_event_struct*) EITdata; + return get(); } int getEventID() { - return HILO( ((const eit_event_struct*) EITdata)->event_id ); + return (EITdata[0] << 8) | EITdata[1]; } time_t getStartTime() { - return parseDVBtime( - EITdata[2], EITdata[3], - EITdata[4], EITdata[5], EITdata[6]); + return parseDVBtime(EITdata[2], EITdata[3], EITdata[4], EITdata[5], EITdata[6]); + } + int getDuration() + { + return fromBCD(EITdata[7])*3600+fromBCD(EITdata[8])*60+fromBCD(EITdata[9]); } }; @@ -149,6 +135,7 @@ class eEPGCache: public eMainloop, private eThread, public Object ePtr channel; ePtr m_stateChangedConn, m_NowNextConn, m_ScheduleConn, m_ScheduleOtherConn; ePtr m_NowNextReader, m_ScheduleReader, m_ScheduleOtherReader; + tidMap seenSections[3], calcedSections[3]; void readData(const __u8 *data); void startChannel(); void startEPG(); @@ -211,7 +198,7 @@ private: // called from epgcache thread void save(); void load(); - int sectionRead(const __u8 *data, int source, channel_data *channel); + void sectionRead(const __u8 *data, int source, channel_data *channel); void gotMessage(const Message &message); void flushEPG(const uniqueEPGKey & s=uniqueEPGKey()); void cleanLoop(); @@ -229,30 +216,64 @@ public: // called from main thread inline void Lock(); inline void Unlock(); - Event *lookupEvent(const eServiceReferenceDVB &service, int event_id, bool plain=false ); - Event *lookupEvent(const eServiceReferenceDVB &service, time_t=0, bool plain=false ); - const eventMap* getEventMap(const eServiceReferenceDVB &service); - const timeMap* getTimeMap(const eServiceReferenceDVB &service); + + // result Event * must be deleted by caller of lookupEvent + inline RESULT lookupEvent(const eServiceReferenceDVB &service, int event_id, Event *& ); + inline RESULT lookupEvent(const eServiceReferenceDVB &service, time_t , Event *& ); + + // methods for faster use.. but not thread save .. + // Lock and Unlock should be used !! + RESULT lookupEvent(const eServiceReferenceDVB &service, int event_id, const eventData *& ); + RESULT lookupEvent(const eServiceReferenceDVB &service, time_t , const eventData *& ); + + inline RESULT getEventMap(const eServiceReferenceDVB &service, const eventMap *& ); + inline RESULT getTimeMap(const eServiceReferenceDVB &service, const timeMap *& ); }; TEMPLATE_TYPEDEF(ePtr,eEPGCachePtr); -inline const eventMap* eEPGCache::getEventMap(const eServiceReferenceDVB &service) +inline RESULT eEPGCache::lookupEvent(const eServiceReferenceDVB &service, time_t t, Event *& result ) +{ + const eventData *data=0; + RESULT ret = lookupEvent(service, t, data); + if ( !ret && data ) + result = new Event((uint8_t*)data->get()); + return ret; +} + +inline RESULT eEPGCache::lookupEvent(const eServiceReferenceDVB &service, int event_id, Event *& result) +{ + const eventData *data=0; + RESULT ret = lookupEvent(service, event_id, data); + if ( !ret && data ) + result = new Event((uint8_t*)data->get()); + return ret; +} + +inline RESULT eEPGCache::getEventMap(const eServiceReferenceDVB &service, const eventMap *& result) { eventCache::iterator It = eventDB.find( service ); if ( It != eventDB.end() && It->second.first.size() ) - return &(It->second.first); - else + { + result=&(It->second.first); return 0; + } + else + result=0; + return -1; } -inline const timeMap* eEPGCache::getTimeMap(const eServiceReferenceDVB &service) +inline RESULT eEPGCache::getTimeMap(const eServiceReferenceDVB &service, const timeMap *& result) { eventCache::iterator It = eventDB.find( service ); if ( It != eventDB.end() && It->second.second.size() ) - return &(It->second.second); - else + { + result=&(It->second.second); return 0; + } + else + result=0; + return -1; } inline void eEPGCache::Lock()