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

diff --git a/lib/dvb/epgcache.h b/lib/dvb/epgcache.h
index d27c4b3..af02ead 100644
--- a/lib/dvb/epgcache.h
+++ b/lib/dvb/epgcache.h
@@ -2,7 +2,7 @@
 #define __epgcache_h_
 
 #define ENABLE_PRIVATE_EPG 1
-#define NEED_DEMUX_WORKAROUND 1
+//#define ENABLE_MHW_EPG 1
 
 #ifndef SWIG
 
@@ -15,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>
@@ -153,7 +156,7 @@ 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;
@@ -168,6 +171,31 @@ class eEPGCache: public eMainloop, private eThread, public Object
 		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();
@@ -176,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