add some assertions

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

diff --git a/lib/dvb/epgcache.h b/lib/dvb/epgcache.h
index c692bc22aa4d5a3db1f2637dd9dfb97734a8591a..162749657a16804e7e34a0075a50505fca4f8e5a 100644 (file)
--- a/lib/dvb/epgcache.h
+++ b/lib/dvb/epgcache.h
@@ -178,14 +178,16 @@ class eEPGCache: public eMainloop, private eThread, public Object
                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;
+               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();
@@ -293,17 +295,18 @@ public:
 #ifndef SWIG
        eEPGCache();
        ~eEPGCache();
-#endif
 
-       // called from main thread
-       inline void Lock();
-       inline void Unlock();
 #ifdef ENABLE_PRIVATE_EPG
        void PMTready(eDVBServicePMTHandler *pmthandler);
 #else
        void PMTready(eDVBServicePMTHandler *pmthandler) {}
 #endif
 
+#endif
+       // called from main thread
+       inline void Lock();
+       inline void Unlock();
+
        // at moment just for one service..
        RESULT startTimeQuery(const eServiceReference &service, time_t begin=-1, int minutes=-1);
 
@@ -335,8 +338,8 @@ public:
                CASE_CHECK,
                NO_CASE_CHECK
        };
-       PyObject *lookupEvent(PyObject *list, PyObject *convertFunc=NULL);
-       PyObject *search(PyObject *);
+       PyObject *lookupEvent(SWIG_PYOBJECT(ePyObject) list, SWIG_PYOBJECT(ePyObject) convertFunc=(PyObject*)0);
+       PyObject *search(SWIG_PYOBJECT(ePyObject));
 
        // 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 )