From d0c0c67fa9ad177ea46552d435e525a598fadcca Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Thu, 24 Nov 2005 19:25:21 +0000 Subject: better names for epg lookups --- lib/dvb/epgcache.cpp | 28 ++++++++++++++-------------- lib/dvb/epgcache.h | 20 ++++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp index c1f294a6..587d680c 100644 --- a/lib/dvb/epgcache.cpp +++ b/lib/dvb/epgcache.cpp @@ -996,7 +996,7 @@ void eEPGCache::channel_data::readData( const __u8 *data) } } -RESULT eEPGCache::lookupEvent(const eServiceReference &service, time_t t, const eventData *&result ) +RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, const eventData *&result ) // if t == 0 we search the current event... { singleLock s(cache_lock); @@ -1037,31 +1037,31 @@ RESULT eEPGCache::lookupEvent(const eServiceReference &service, time_t t, const return -1; } -RESULT eEPGCache::lookupEvent(const eServiceReference &service, time_t t, const eit_event_struct *&result ) +RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, const eit_event_struct *&result ) { singleLock s(cache_lock); const eventData *data=0; - RESULT ret = lookupEvent(service, t, data); + RESULT ret = lookupEventTime(service, t, data); if ( !ret && data ) result = data->get(); return ret; } -RESULT eEPGCache::lookupEvent(const eServiceReference &service, time_t t, Event *& result ) +RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, Event *& result ) { singleLock s(cache_lock); const eventData *data=0; - RESULT ret = lookupEvent(service, t, data); + RESULT ret = lookupEventTime(service, t, data); if ( !ret && data ) result = new Event((uint8_t*)data->get()); return ret; } -RESULT eEPGCache::lookupEvent(const eServiceReference &service, time_t t, ePtr &result ) +RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, ePtr &result ) { singleLock s(cache_lock); const eventData *data=0; - RESULT ret = lookupEvent(service, t, data); + RESULT ret = lookupEventTime(service, t, data); if ( !ret && data ) { Event ev((uint8_t*)data->get()); @@ -1071,7 +1071,7 @@ RESULT eEPGCache::lookupEvent(const eServiceReference &service, time_t t, ePtrget(); return ret; } -RESULT eEPGCache::lookupEvent(const eServiceReference &service, int event_id, Event *& result) +RESULT eEPGCache::lookupEventId(const eServiceReference &service, int event_id, Event *& result) { singleLock s(cache_lock); const eventData *data=0; - RESULT ret = lookupEvent(service, event_id, data); + RESULT ret = lookupEventId(service, event_id, data); if ( !ret && data ) result = new Event((uint8_t*)data->get()); return ret; } -RESULT eEPGCache::lookupEvent(const eServiceReference &service, int event_id, ePtr &result) +RESULT eEPGCache::lookupEventId(const eServiceReference &service, int event_id, ePtr &result) { singleLock s(cache_lock); const eventData *data=0; - RESULT ret = lookupEvent(service, event_id, data); + RESULT ret = lookupEventId(service, event_id, data); if ( !ret && data ) { Event ev((uint8_t*)data->get()); diff --git a/lib/dvb/epgcache.h b/lib/dvb/epgcache.h index 01d738cb..c0a4d93f 100644 --- a/lib/dvb/epgcache.h +++ b/lib/dvb/epgcache.h @@ -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 &); - RESULT lookupEvent(const eServiceReference &service, time_t, ePtr &); - RESULT getNextTimeEntry(ePtr &); + SWIG_VOID(RESULT) lookupEventId(const eServiceReference &service, int event_id, ePtr &); + SWIG_VOID(RESULT) lookupEventTime(const eServiceReference &service, time_t, ePtr &); + SWIG_VOID(RESULT) getNextTimeEntry(ePtr &SWIG_OUTPUT); }; #ifndef SWIG -- cgit v1.2.3