add missing SWIG_OUTPUT

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

diff --git a/lib/dvb/epgcache.h b/lib/dvb/epgcache.h
index 5643fa43eae0094f8b10bfd06773638809ba33d7..3c2b612b058f84cde9a725933ceb270cd22ad1a9 100644 (file)
--- a/lib/dvb/epgcache.h
+++ b/lib/dvb/epgcache.h
@@ -223,7 +223,7 @@ private:
        timeMap::iterator m_timemap_cursor, m_timemap_end;
 #endif // SWIG
 public:
-       static RESULT getInstance(eEPGCache *&ptr);
+       static eEPGCache *getInstance() { return instance; }
        eEPGCache();
        ~eEPGCache();
 
@@ -236,29 +236,29 @@ public:
 
        // 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..
-       RESULT lookupEvent(const eServiceReference &service, int event_id, const eventData *&);
-       RESULT lookupEvent(const eServiceReference &service, time_t , const eventData *&);
-       RESULT getNextTimeEntry(const eventData *&);
+       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);
+       SWIG_VOID(RESULT) getNextTimeEntry(const eventData *&SWIG_OUTPUT);
 
 #ifndef SWIG
        // 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..
-       RESULT lookupEvent(const eServiceReference &service, int event_id, const eit_event_struct *&);
-       RESULT lookupEvent(const eServiceReference &service, time_t , const eit_event_struct *&);
+       RESULT lookupEventId(const eServiceReference &service, int event_id, const eit_event_struct *&);
+       RESULT lookupEventTime(const eServiceReference &service, time_t , const eit_event_struct *&);
        RESULT getNextTimeEntry(const eit_event_struct *&);
 
        // Event's are parsed epg events.. it's safe to use them after cache unlock
        // after use this Events must be deleted (memleaks)
-       RESULT lookupEvent(const eServiceReference &service, int event_id, Event* &);
-       RESULT lookupEvent(const eServiceReference &service, time_t, Event* &);
+       RESULT lookupEventId(const eServiceReference &service, int event_id, Event* &);
+       RESULT lookupEventTime(const eServiceReference &service, time_t, Event* &);
        RESULT getNextTimeEntry(Event *&);
 #endif
 
        // 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 )
-       RESULT lookupEvent(const eServiceReference &service, int event_id, ePtr<eServiceEvent> &);
-       RESULT lookupEvent(const eServiceReference &service, time_t , ePtr<eServiceEvent> &);
-       RESULT getNextTimeEntry(ePtr<eServiceEvent> &);
+       SWIG_VOID(RESULT) lookupEventId(const eServiceReference &service, int event_id, ePtr<eServiceEvent> &SWIG_OUTPUT);
+       SWIG_VOID(RESULT) lookupEventTime(const eServiceReference &service, time_t, ePtr<eServiceEvent> &SWIG_OUTPUT);
+       SWIG_VOID(RESULT) getNextTimeEntry(ePtr<eServiceEvent> &SWIG_OUTPUT);
 };
 
 #ifndef SWIG