X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/fff59f79bfb7220c58b1821c522d7f0bebbe5de5..d86dfb91c834be43d9bcddd69ddbc7e463825fbd:/lib/dvb/epgcache.h diff --git a/lib/dvb/epgcache.h b/lib/dvb/epgcache.h index 1282cc8b..01d738cb 100644 --- a/lib/dvb/epgcache.h +++ b/lib/dvb/epgcache.h @@ -1,6 +1,8 @@ #ifndef __epgcache_h_ #define __epgcache_h_ +#ifndef SWIG + #include #include #include @@ -16,6 +18,7 @@ #include #include #include +#include #define CLEAN_INTERVAL 60000 // 1 min #define UPDATE_INTERVAL 3600000 // 60 min @@ -29,10 +32,10 @@ class eServiceReferenceDVB; struct uniqueEPGKey { int sid, onid, tsid; - uniqueEPGKey( const eServiceReferenceDVB &ref ) - :sid( ref.type != eServiceReference::idInvalid ? ref.getServiceID().get() : -1 ) - ,onid( ref.type != eServiceReference::idInvalid ? ref.getOriginalNetworkID().get() : -1 ) - ,tsid( ref.type != eServiceReference::idInvalid ? ref.getTransportStreamID().get() : -1 ) + uniqueEPGKey( const eServiceReference &ref ) + :sid( ref.type != eServiceReference::idInvalid ? ((eServiceReferenceDVB&)ref).getServiceID().get() : -1 ) + ,onid( ref.type != eServiceReference::idInvalid ? ((eServiceReferenceDVB&)ref).getOriginalNetworkID().get() : -1 ) + ,tsid( ref.type != eServiceReference::idInvalid ? ((eServiceReferenceDVB&)ref).getTransportStreamID().get() : -1 ) { } uniqueEPGKey() @@ -72,22 +75,6 @@ struct uniqueEPGKey #define channelMapIterator std::map::iterator #define updateMap std::map -struct hash_32 -{ - inline size_t operator()( const __u32 &x) const - { - return (x >> 8)&0xFFFF; - } -}; - -struct equal_32 -{ - inline size_t operator()(const __u32 &x, const __u32 &y) const - { - return x == y; - } -}; - struct hash_uniqueEPGKey { inline size_t operator()( const uniqueEPGKey &x) const @@ -96,58 +83,59 @@ struct hash_uniqueEPGKey } }; +#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> - #define tidMap __gnu_cxx::hash_set<__u32, hash_32, equal_32> #else // for older gcc use following #define eventCache std::hash_map, hash_uniqueEPGKey, uniqueEPGKey::equal > - #define tidMap std::hash_map<__u32, hash_32, equal_32> #endif +#define descriptorPair std::pair +#define descriptorMap std::map<__u32, descriptorPair > + +#endif // SWIG + class eventData { - friend class eEPGCache; +#ifndef SWIG + friend class eEPGCache; private: __u8* EITdata; - int ByteSize; -public: - int type; + __u8 ByteSize; + __u8 type; + static descriptorMap descriptors; + static __u8 data[4108]; 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 *); +#endif // SWIG +public: + eventData(const eit_event_struct* e=NULL, int size=0, int type=0); + ~eventData(); +#ifndef SWIG + 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(); } +#endif 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]); + } }; class eEPGCache: public eMainloop, private eThread, public Object { +#ifndef SWIG DECLARE_REF(eEPGCache) struct channel_data: public Object { @@ -158,7 +146,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, calcedSections; + tidMap seenSections[3], calcedSections[3]; void readData(const __u8 *data); void startChannel(); void startEPG(); @@ -198,7 +186,7 @@ public: :type(type), avail(b) {} Message(int type, iDVBChannel *channel, int err=0) :type(type), channel(channel), err(err) {} - Message(int type, const eServiceReferenceDVB& service, int err=0) + Message(int type, const eServiceReference& service, int err=0) :type(type), service(service), err(err) {} Message(int type, time_t time) :type(type), time(time) {} @@ -231,40 +219,49 @@ private: void DVBChannelAdded(eDVBChannel*); void DVBChannelStateChanged(iDVBChannel*); void DVBChannelRunning(iDVBChannel *); + + timeMap::iterator m_timemap_cursor, m_timemap_end; +#endif // SWIG public: - static RESULT getInstance(ePtr &ptr); + static eEPGCache *getInstance() { return instance; } eEPGCache(); ~eEPGCache(); // 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); -}; -TEMPLATE_TYPEDEF(ePtr,eEPGCachePtr); + // at moment just for one service.. + RESULT startTimeQuery(const eServiceReference &service, time_t begin=-1, int minutes=-1); -inline const eventMap* eEPGCache::getEventMap(const eServiceReferenceDVB &service) -{ - eventCache::iterator It = eventDB.find( service ); - if ( It != eventDB.end() && It->second.first.size() ) - return &(It->second.first); - else - return 0; -} + // eventData's are plain entrys out of the cache.. it's not safe to use them after cache unlock + // but its faster in use... its not allowed to delete this pointers via delete or free.. + RESULT lookupEvent(const eServiceReference &service, int event_id, const eventData *&); + RESULT lookupEvent(const eServiceReference &service, time_t, const eventData *&); + RESULT getNextTimeEntry(const eventData *&); -inline const timeMap* eEPGCache::getTimeMap(const eServiceReferenceDVB &service) -{ - eventCache::iterator It = eventDB.find( service ); - if ( It != eventDB.end() && It->second.second.size() ) - return &(It->second.second); - else - return 0; -} +#ifndef SWIG + // eit_event_struct's are plain dvb eit_events .. it's not safe to use them after cache unlock + // its not allowed to delete this pointers via delete or free.. + RESULT lookupEvent(const eServiceReference &service, int event_id, const eit_event_struct *&); + RESULT lookupEvent(const eServiceReference &service, time_t , const eit_event_struct *&); + RESULT getNextTimeEntry(const eit_event_struct *&); + + // Event's are parsed epg events.. it's safe to use them after cache unlock + // after use this Events must be deleted (memleaks) + RESULT lookupEvent(const eServiceReference &service, int event_id, Event* &); + RESULT lookupEvent(const eServiceReference &service, time_t, Event* &); + RESULT getNextTimeEntry(Event *&); +#endif + + // eServiceEvent are parsed epg events.. it's safe to use them after cache unlock + // for use from python ( members: m_start_time, m_duration, m_short_description, m_extended_description ) + RESULT lookupEvent(const eServiceReference &service, int event_id, ePtr &); + RESULT lookupEvent(const eServiceReference &service, time_t, ePtr &); + RESULT getNextTimeEntry(ePtr &); +}; +#ifndef SWIG inline void eEPGCache::Lock() { pthread_mutex_lock(&cache_lock); @@ -274,5 +271,6 @@ inline void eEPGCache::Unlock() { pthread_mutex_unlock(&cache_lock); } +#endif #endif