X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fdvb%2Fepgcache.h;h=af02ead666d714f35cfa90d15ca7573331a582b3;hb=81366ee3db67e313faeac5073dc8b1f0e7e71921;hp=d88beca111d50ca2eeeae072bfee00baa5d871e8;hpb=025ad01a86542cba4eaceabdde5bed9bf72c4344;p=vuplus_dvbapp

diff --git a/lib/dvb/epgcache.h b/lib/dvb/epgcache.h
index d88beca..af02ead 100644
--- a/lib/dvb/epgcache.h
+++ b/lib/dvb/epgcache.h
@@ -1,6 +1,9 @@
 #ifndef __epgcache_h_
 #define __epgcache_h_
 
+#define ENABLE_PRIVATE_EPG 1
+//#define ENABLE_MHW_EPG 1
+
 #ifndef SWIG
 
 #include <vector>
@@ -12,6 +15,9 @@
 
 #include <lib/dvb/eit.h>
 #include <lib/dvb/lowlevel/eit.h>
+#ifdef ENABLE_MHW_EPG
+#include <lib/dvb/lowlevel/mhw.h>
+#endif
 #include <lib/dvb/idvb.h>
 #include <lib/dvb/demux.h>
 #include <lib/dvb/dvbtime.h>
@@ -29,6 +35,7 @@
 
 class eventData;
 class eServiceReferenceDVB;
+class eDVBServicePMTHandler;
 
 struct uniqueEPGKey
 {
@@ -87,8 +94,18 @@ 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>
+	#ifdef ENABLE_PRIVATE_EPG
+		#define contentTimeMap __gnu_cxx::hash_map<time_t, std::pair<time_t, __u16> >
+		#define contentMap __gnu_cxx::hash_map<int, contentTimeMap >
+		#define contentMaps __gnu_cxx::hash_map<uniqueEPGKey, contentMap, hash_uniqueEPGKey, uniqueEPGKey::equal >
+	#endif
 #else // for older gcc use following
 	#define eventCache std::hash_map<uniqueEPGKey, std::pair<eventMap, timeMap>, hash_uniqueEPGKey, uniqueEPGKey::equal >
+	#ifdef ENABLE_PRIVATE_EPG
+		#define contentTimeMap std::hash_map<time_t, std::pair<time_t, __u16> >
+		#define contentMap std::hash_map<int, contentTimeMap >
+		#define contentMaps std::hash_map<uniqueEPGKey, contentMap, hash_uniqueEPGKey, uniqueEPGKey::equal>
+	#endif
 #endif
 
 #define descriptorPair std::pair<int,__u8*>
@@ -125,7 +142,7 @@ public:
 	int getDuration()
 	{
 		return fromBCD(EITdata[7])*3600+fromBCD(EITdata[8])*60+fromBCD(EITdata[9]);
- }
+	}
 };
 #endif
 
@@ -139,11 +156,47 @@ class eEPGCache: public eMainloop, private eThread, public Object
 		eEPGCache *cache;
 		eTimer abortTimer, zapTimer;
 		int prevChannelState;
-		__u8 state, isRunning, haveData, can_delete;
+		__u8 state, isRunning, haveData;
 		ePtr<eDVBChannel> channel;
 		ePtr<eConnection> m_stateChangedConn, m_NowNextConn, m_ScheduleConn, m_ScheduleOtherConn;
 		ePtr<iDVBSectionReader> m_NowNextReader, m_ScheduleReader, m_ScheduleOtherReader;
 		tidMap seenSections[3], calcedSections[3];
+#ifdef ENABLE_PRIVATE_EPG
+		eTimer startPrivateTimer;
+		int m_PrevVersion;
+		int m_PrivatePid;
+		uniqueEPGKey m_PrivateService;
+		ePtr<eConnection> m_PrivateConn;
+		ePtr<iDVBSectionReader> m_PrivateReader;
+		std::set<__u8> seenPrivateSections;
+		void readPrivateData(const __u8 *data);
+		void startPrivateReader();
+		bool canDelete() { return !isRunning && !m_PrivateConn; }
+#else
+		bool canDelete() { return !isRunning; }
+#endif
+#ifdef ENABLE_MHW_EPG
+		std::vector<mhw_channel_name_t> m_channels;
+		std::map<__u8, mhw_theme_name_t> m_themes;
+		std::map<__u32, mhw_title_t> m_titles;
+		std::map<__u32, __u32> m_program_ids;
+		ePtr<eConnection> m_MHWConn;
+		ePtr<iDVBSectionReader> m_MHWReader;
+		eDVBSectionFilterMask m_MHWFilterMask;
+		eTimer m_MHWTimeoutTimer;
+		bool m_MHWTimeoutet;
+		void MHWTimeout() { m_MHWTimeoutet=true; }
+		void readMHWData(const __u8 *data);
+		void startMHWReader(__u16 pid, __u8 tid);
+		void startTimeout(int msek);
+		bool checkTimeout() { return m_MHWTimeoutet; }
+		void cleanup();
+		__u8 *delimitName( __u8 *in, __u8 *out, int len_in );
+		void timeMHW2DVB( u_char hours, u_char minutes, u_char *return_time);
+		void timeMHW2DVB( int minutes, u_char *return_time);
+		void timeMHW2DVB( u_char day, u_char hours, u_char minutes, u_char *return_time);
+		void storeTitle(std::map<__u32, mhw_title_t>::iterator itTitle, std::string sumText, const __u8 *data);
+#endif
 		void readData(const __u8 *data);
 		void startChannel();
 		void startEPG();
@@ -151,8 +204,13 @@ class eEPGCache: public eMainloop, private eThread, public Object
 		void abortEPG();
 		void abortNonAvail();
 	};
+	void FixOverlapping(std::pair<eventMap,timeMap> &servicemap, time_t TM, int duration, const timeMap::iterator &tm_it, const uniqueEPGKey &service);
 public:
-	enum {NOWNEXT=1, SCHEDULE=2, SCHEDULE_OTHER=4};
+	enum {PRIVATE=0, NOWNEXT=1, SCHEDULE=2, SCHEDULE_OTHER=4
+#ifdef ENABLE_MHW_EPG
+	,MHW=8
+#endif
+	};
 	struct Message
 	{
 		enum
@@ -165,6 +223,7 @@ public:
 			updated,
 			isavail,
 			quit,
+			got_private_pid,
 			timeChanged
 		};
 		int type;
@@ -174,6 +233,7 @@ public:
 			int err;
 			time_t time;
 			bool avail;
+			int pid;
 		};
 		Message()
 			:type(0), time(0) {}
@@ -201,11 +261,18 @@ private:
 	updateMap channelLastUpdated;
 	static pthread_mutex_t cache_lock, channel_map_lock;
 
+#ifdef ENABLE_PRIVATE_EPG
+	contentMaps content_time_tables;
+#endif
+
 	void thread();  // thread function
 
 // called from epgcache thread
 	void save();
 	void load();
+#ifdef ENABLE_PRIVATE_EPG
+	void privateSectionRead(const uniqueEPGKey &, const __u8 *);
+#endif
 	void sectionRead(const __u8 *data, int source, channel_data *channel);
 	void gotMessage(const Message &message);
 	void flushEPG(const uniqueEPGKey & s=uniqueEPGKey());
@@ -233,6 +300,11 @@ public:
 	// called from main thread
 	inline void Lock();
 	inline void Unlock();
+#ifdef ENABLE_PRIVATE_EPG
+	void PMTready(eDVBServicePMTHandler *pmthandler);
+#else
+	void PMTready(eDVBServicePMTHandler *pmthandler) {}
+#endif
 
 	// at moment just for one service..
 	RESULT startTimeQuery(const eServiceReference &service, time_t begin=-1, int minutes=-1);
@@ -256,7 +328,17 @@ public:
 	RESULT lookupEventTime(const eServiceReference &service, time_t, Event* &, int direction=0);
 	RESULT getNextTimeEntry(Event *&);
 #endif
+	enum {
+		SIMILAR_BROADCASTINGS_SEARCH,
+		EXAKT_TITLE_SEARCH,
+		PARTIAL_TITLE_SEARCH
+	};
+	enum {
+		CASE_CHECK,
+		NO_CASE_CHECK
+	};
 	PyObject *lookupEvent(PyObject *list, PyObject *convertFunc=NULL);
+	PyObject *search(PyObject *);
 
 	// 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 )