X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ab92ba5e6b439cb9a0aabc8c9330ec7d4ad9b301..7698f560bce1d097c887cbee427e0389fa85eee6:/lib/dvb/epgcache.h

diff --git a/lib/dvb/epgcache.h b/lib/dvb/epgcache.h
index 01d738cb..487f409e 100644
--- a/lib/dvb/epgcache.h
+++ b/lib/dvb/epgcache.h
@@ -19,6 +19,7 @@
 #include <lib/base/thread.h>
 #include <lib/base/message.h>
 #include <lib/service/event.h>
+#include <lib/python/python.h>
 
 #define CLEAN_INTERVAL 60000    //  1 min
 #define UPDATE_INTERVAL 3600000  // 60 min
@@ -93,11 +94,8 @@ struct hash_uniqueEPGKey
 #define descriptorPair std::pair<int,__u8*>
 #define descriptorMap std::map<__u32, descriptorPair >
 
-#endif // SWIG
-
 class eventData
 {
-#ifndef SWIG
 	friend class eEPGCache;
 private:
 	__u8* EITdata;
@@ -108,17 +106,14 @@ private:
 	static int CacheSize;
 	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 get();
 	}
-#endif
 	int getEventID()
 	{
 		return (EITdata[0] << 8) | EITdata[1];
@@ -132,6 +127,7 @@ public:
 		return fromBCD(EITdata[7])*3600+fromBCD(EITdata[8])*60+fromBCD(EITdata[9]);
  }
 };
+#endif
 
 class eEPGCache: public eMainloop, private eThread, public Object
 {
@@ -142,6 +138,7 @@ class eEPGCache: public eMainloop, private eThread, public Object
 		channel_data(eEPGCache*);
 		eEPGCache *cache;
 		eTimer abortTimer, zapTimer;
+		int prevChannelState;
 		__u8 state, isRunning, haveData, can_delete;
 		ePtr<eDVBChannel> channel;
 		ePtr<eConnection> m_stateChangedConn, m_NowNextConn, m_ScheduleConn, m_ScheduleOtherConn;
@@ -221,11 +218,17 @@ private:
 	void DVBChannelRunning(iDVBChannel *);
 
 	timeMap::iterator m_timemap_cursor, m_timemap_end;
+	int currentQueryTsidOnid; // needed for getNextTimeEntry.. only valid until next startTimeQuery call
+#else
+	eEPGCache();
+	~eEPGCache();
 #endif // SWIG
 public:
 	static eEPGCache *getInstance() { return instance; }
+#ifndef SWIG
 	eEPGCache();
 	~eEPGCache();
+#endif
 
 	// called from main thread
 	inline void Lock();
@@ -234,31 +237,32 @@ public:
 	// at moment just for one service..
 	RESULT startTimeQuery(const eServiceReference &service, time_t begin=-1, int minutes=-1);
 
+#ifndef SWIG
 	// 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 *&);
+	SWIG_VOID(RESULT) lookupEventId(const eServiceReference &service, int event_id, const eventData *&SWIG_OUTPUT);
+	SWIG_VOID(RESULT) lookupEventTime(const eServiceReference &service, time_t, const eventData *&SWIG_OUTPUT);
+	SWIG_VOID(RESULT) getNextTimeEntry(const eventData *&SWIG_OUTPUT);
 
-#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 lookupEventId(const eServiceReference &service, int event_id, const eit_event_struct *&);
+	RESULT lookupEventTime(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 lookupEventId(const eServiceReference &service, int event_id, Event* &);
+	RESULT lookupEventTime(const eServiceReference &service, time_t, Event* &);
 	RESULT getNextTimeEntry(Event *&);
 #endif
+	PyObject *lookupEvent(PyObject *list, PyObject *convertFunc=NULL);
 
 	// 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<eServiceEvent> &);
-	RESULT lookupEvent(const eServiceReference &service, time_t, ePtr<eServiceEvent> &);
-	RESULT getNextTimeEntry(ePtr<eServiceEvent> &);
+	SWIG_VOID(RESULT) lookupEventId(const eServiceReference &service, int event_id, ePtr<eServiceEvent> &SWIG_OUTPUT);
+	SWIG_VOID(RESULT) lookupEventTime(const eServiceReference &service, time_t, ePtr<eServiceEvent> &SWIG_OUTPUT);
+	SWIG_VOID(RESULT) getNextTimeEntry(ePtr<eServiceEvent> &SWIG_OUTPUT);
 };
 
 #ifndef SWIG