X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1e830c12e59df00acb76af47a37e13fba4e1ae0b..d86dfb91c834be43d9bcddd69ddbc7e463825fbd:/lib/dvb/epgcache.h diff --git a/lib/dvb/epgcache.h b/lib/dvb/epgcache.h index 3f1aeaed..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() @@ -90,25 +93,32 @@ struct hash_uniqueEPGKey #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; + __u8 ByteSize; + __u8 type; static descriptorMap descriptors; -public: - int type; + static __u8 data[4108]; static int CacheSize; static void load(FILE *); static void save(FILE *); - eventData(const eit_event_struct* e, int size, int type); +#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 get(); } +#endif int getEventID() { return (EITdata[0] << 8) | EITdata[1]; @@ -120,11 +130,12 @@ public: 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 { @@ -175,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) {} @@ -208,8 +219,11 @@ 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(); @@ -217,65 +231,37 @@ public: inline void Lock(); inline void Unlock(); - // 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 *& ); + // at moment just for one service.. + RESULT startTimeQuery(const eServiceReference &service, time_t begin=-1, int minutes=-1); - // 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 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; -} + // 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 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; -} +#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 *&); -inline RESULT eEPGCache::getEventMap(const eServiceReferenceDVB &service, const eventMap *& result) -{ - eventCache::iterator It = eventDB.find( service ); - if ( It != eventDB.end() && It->second.first.size() ) - { - result=&(It->second.first); - return 0; - } - else - result=0; - return -1; -} + // 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 -inline RESULT eEPGCache::getTimeMap(const eServiceReferenceDVB &service, const timeMap *& result) -{ - eventCache::iterator It = eventDB.find( service ); - if ( It != eventDB.end() && It->second.second.size() ) - { - result=&(It->second.second); - return 0; - } - else - result=0; - return -1; -} + // 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); @@ -285,5 +271,6 @@ inline void eEPGCache::Unlock() { pthread_mutex_unlock(&cache_lock); } +#endif #endif