some dvb subtitles fixes

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

diff --git a/lib/dvb/epgcache.h b/lib/dvb/epgcache.h
index fe768aee714c701bb00096c2fcd971d660e62220..6febc5ebc6f027758ea390276b55f5b747a9c6aa 100644 (file)
--- a/lib/dvb/epgcache.h
+++ b/lib/dvb/epgcache.h
@@ -177,7 +177,7 @@ class eEPGCache: public eMainloop, private eThread, public Object
                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;
+               std::multimap<__u32, __u32> m_program_ids;
                ePtr<eConnection> m_MHWConn, m_MHWConn2;
                ePtr<iDVBSectionReader> m_MHWReader, m_MHWReader2;
                eDVBSectionFilterMask m_MHWFilterMask, m_MHWFilterMask2;
@@ -218,10 +218,6 @@ public:
                        flush,
                        startChannel,
                        leaveChannel,
-                       pause,
-                       restart,
-                       updated,
-                       isavail,
                        quit,
                        got_private_pid,
                        timeChanged
@@ -313,9 +309,9 @@ public:
 #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..
@@ -338,8 +334,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 )