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;
+ std::multimap<__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();
void abortEPG();
void abortNonAvail();
};
- void FixOverlapping(std::pair<eventMap,timeMap> &servicemap, time_t TM, int duration, const timeMap::iterator &tm_it, const uniqueEPGKey &service);
+ bool FixOverlapping(std::pair<eventMap,timeMap> &servicemap, time_t TM, int duration, const timeMap::iterator &tm_it, const uniqueEPGKey &service);
public:
enum {PRIVATE=0, NOWNEXT=1, SCHEDULE=2, SCHEDULE_OTHER=4
#ifdef ENABLE_MHW_EPG
flush,
startChannel,
leaveChannel,
- pause,
- restart,
- updated,
- isavail,
quit,
got_private_pid,
timeChanged
#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);
#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..
- 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, int direction=0);
- SWIG_VOID(RESULT) getNextTimeEntry(const eventData *&SWIG_OUTPUT);
+ RESULT lookupEventId(const eServiceReference &service, int event_id, const eventData *&);
+ RESULT lookupEventTime(const eServiceReference &service, time_t, const eventData *&, int direction=0);
+ RESULT getNextTimeEntry(const eventData *&);
// 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..
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 )