implement interface for query epg

[enigma2.git] / lib / dvb / epgcache.h

diff --git a/lib/dvb/epgcache.h b/lib/dvb/epgcache.h
index 8a62325d25e3cd5c6006164cccc13ac53fb3c200..81d5abfbd09adf4c4596a6502bb8c13d64e35a12 100644 (file)
--- a/lib/dvb/epgcache.h
+++ b/lib/dvb/epgcache.h
@@ -16,6 +16,7 @@
 #include <lib/base/ebase.h>
 #include <lib/base/thread.h>
 #include <lib/base/message.h>
+#include <lib/service/event.h>
 
 #define CLEAN_INTERVAL 60000    //  1 min
 #define UPDATE_INTERVAL 3600000  // 60 min
@@ -72,22 +73,6 @@ struct uniqueEPGKey
 #define channelMapIterator std::map<iDVBChannel*, channel_data*>::iterator
 #define updateMap std::map<eDVBChannelID, time_t>
 
-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,12 +81,11 @@ 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<uniqueEPGKey, std::pair<eventMap, timeMap>, 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<uniqueEPGKey, std::pair<eventMap, timeMap>, hash_uniqueEPGKey, uniqueEPGKey::equal >
-       #define tidMap std::hash_map<__u32, hash_32, equal_32>
 #endif
 
 #define descriptorPair std::pair<int,__u8*>
@@ -112,10 +96,11 @@ class eventData
        friend class eEPGCache;
 private:
        __u8* EITdata;
-       int ByteSize;
+       __u8 ByteSize;
        static descriptorMap descriptors;
+       static __u8 data[4108];
 public:
-       int type;
+       __u8 type;
        static int CacheSize;
        static void load(FILE *);
        static void save(FILE *);
@@ -225,6 +210,8 @@ private:
        void DVBChannelAdded(eDVBChannel*);
        void DVBChannelStateChanged(iDVBChannel*);
        void DVBChannelRunning(iDVBChannel *);
+
+       timeMap::iterator m_timemap_cursor, m_timemap_end;
 public:
        static RESULT getInstance(ePtr<eEPGCache> &ptr);
        eEPGCache();
@@ -234,65 +221,36 @@ 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 *& );
-
-       // 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 *& );
+       // at moment just for one service..
+       inline RESULT startTimeQuery(const eServiceReferenceDVB &service, time_t begin=-1, int minutes=-1);
+
+       // 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 eServiceReferenceDVB &service, int event_id, const eventData *&);
+       RESULT lookupEvent(const eServiceReferenceDVB &service, time_t , const eventData *&);
+       RESULT getNextTimeEntry(const eventData *&);
+
+       // 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 eServiceReferenceDVB &service, int event_id, const eit_event_struct *&);
+       RESULT lookupEvent(const eServiceReferenceDVB &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 eServiceReferenceDVB &service, int event_id, Event* &);
+       RESULT lookupEvent(const eServiceReferenceDVB &service, time_t, Event* &);
+       RESULT getNextTimeEntry(Event *&);
+
+       // 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 eServiceReferenceDVB &service, int event_id, ePtr<eServiceEvent> &);
+       RESULT lookupEvent(const eServiceReferenceDVB &service, time_t , ePtr<eServiceEvent> &);
+       RESULT getNextTimeEntry(ePtr<eServiceEvent> &);
 };
 
 TEMPLATE_TYPEDEF(ePtr<eEPGCache>,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;
-}
-
-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() )
-       {
-               result=&(It->second.first);
-               return 0;
-       }
-       else
-               result=0;
-       return -1;
-}
-
-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;
-}
-
 inline void eEPGCache::Lock()
 {
        pthread_mutex_lock(&cache_lock);