add possibility to read detailed epg from Digital+

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

diff --git a/lib/dvb/epgcache.h b/lib/dvb/epgcache.h
index 69eec7d750785ba633a2f161f35c75f0b3bbd486..73dd407c34e2ec748e688b01c88105c1c4ae8d01 100644 (file)
--- 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>
@@ -149,26 +152,50 @@ class eEPGCache: public eMainloop, private eThread, public Object
        DECLARE_REF(eEPGCache)
        struct channel_data: public Object
        {
+               pthread_mutex_t channel_active;
                channel_data(eEPGCache*);
                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
-#ifdef NEED_DEMUX_WORKAROUND
+               eTimer startPrivateTimer;
                int m_PrevVersion;
-#endif
                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(int pid, int version);
+               void startPrivateReader();
+#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, m_MHWConn2;
+               ePtr<iDVBSectionReader> m_MHWReader, m_MHWReader2;
+               eDVBSectionFilterMask m_MHWFilterMask, m_MHWFilterMask2;
+               eTimer m_MHWTimeoutTimer;
+               bool m_MHWTimeoutet;
+               void MHWTimeout() { m_MHWTimeoutet=true; }
+               void readMHWData(const __u8 *data);
+               void readMHWData2(const __u8 *data);
+               void startMHWReader(__u16 pid, __u8 tid);
+               void startMHWReader2(__u16 pid, __u8 tid, int ext=-1);
+               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();
@@ -177,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