X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/270f422d853462000ce8c934817c8b3da7571ce5..66f5402c111a563e2aa1089c86683ea24aea1957:/lib/dvb/epgcache.h

diff --git a/lib/dvb/epgcache.h b/lib/dvb/epgcache.h
index 1da612de..81d5abfb 100644
--- 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,53 +81,47 @@ 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*>
+#define descriptorMap std::map<__u32, descriptorPair >
+
 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;
-	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]);
 	}
 };
 
@@ -231,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();
@@ -239,31 +220,36 @@ 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);
-};
 
-TEMPLATE_TYPEDEF(ePtr<eEPGCache>,eEPGCachePtr);
+	// at moment just for one service..
+	inline RESULT startTimeQuery(const eServiceReferenceDVB &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 eServiceReferenceDVB &service, int event_id, const eventData *&);
+	RESULT lookupEvent(const eServiceReferenceDVB &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;
-}
+	// 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 void eEPGCache::Lock()
 {