better names for epg lookups

diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp
index c1f294a6cba3b643a681eaf7d78dc1ec0f35142e..587d680c49bdc8b58664b7201ebac03a5fc65e8f 100644 (file)
--- 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<eServiceEvent> &result )
+RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, ePtr<eServiceEvent> &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, ePtr<e
        return ret;
 }
 
-RESULT eEPGCache::lookupEvent(const eServiceReference &service, int event_id, const eventData *&result )
+RESULT eEPGCache::lookupEventId(const eServiceReference &service, int event_id, const eventData *&result )
 {
        singleLock s(cache_lock);
        uniqueEPGKey key( service );
@@ -1094,31 +1094,31 @@ RESULT eEPGCache::lookupEvent(const eServiceReference &service, int event_id, co
        return -1;
 }
 
-RESULT eEPGCache::lookupEvent(const eServiceReference &service, int event_id, const eit_event_struct *&result)
+RESULT eEPGCache::lookupEventId(const eServiceReference &service, int event_id, const eit_event_struct *&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 = data->get();
        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<eServiceEvent> &result)
+RESULT eEPGCache::lookupEventId(const eServiceReference &service, int event_id, ePtr<eServiceEvent> &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 01d738cb3aa1f1795d7ecfcd6dd95dbbfadb15eb..c0a4d93f14a208e3ce68db540b0f3883ed61a2f4 100644 (file)
--- 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<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_VOID(RESULT) lookupEventTime(const eServiceReference &service, time_t, ePtr<eServiceEvent> &);
+       SWIG_VOID(RESULT) getNextTimeEntry(ePtr<eServiceEvent> &SWIG_OUTPUT);
 };
 
 #ifndef SWIG