#endif
}
-RESULT eEPGCache::getInstance(eEPGCache *&ptr)
-{
- ptr = instance;
- if (!ptr)
- return -1;
- return 0;
-}
-
eEPGCache::channel_data::channel_data(eEPGCache *ml)
:cache(ml)
,abortTimer(ml), zapTimer(ml)
}
}
-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);
{
if (!t)
t = time(0)+eDVBLocalTimeHandler::getInstance()->difference();
-
-// TODO: optimize this.. why we here search first in timemap.. and then in eventmap??
- timeMap::iterator i = It->second.second.lower_bound(t);
+ timeMap::iterator i = It->second.second.lower_bound(t); // find > or equal
if ( i != It->second.second.end() )
{
- if ( i != It->second.second.end() )
+ if ( i->second->getStartTime() != t )
{
- if ( t <= i->first+i->second->getDuration() )
+ timeMap::iterator x = i;
+ --x;
+ if ( x != It->second.second.end() )
{
- result = i->second;
- return 0;
+ time_t start_time = x->second->getStartTime();
+ if (t < start_time)
+ return -1;
+ if (t > (start_time+x->second->getDuration()))
+ return -1;
+ i = x;
}
+ else
+ return -1;
}
- }
-
- for ( eventMap::iterator i( It->second.first.begin() ); i != It->second.first.end(); i++)
- {
- int duration = i->second->getDuration();
- time_t begTime = i->second->getStartTime();
- if ( t >= begTime && t <= begTime+duration) // then we have found
- {
- result = i->second;
- return 0;
- }
+ result = i->second;
+ return 0;
}
}
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());
result = new eServiceEvent();
- ret = result->parseFrom(&ev);
+ const eServiceReferenceDVB &ref = (const eServiceReferenceDVB&)service;
+ ret = result->parseFrom(&ev, (ref.getTransportStreamID().get()<<16)|ref.getOriginalNetworkID().get());
}
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 );
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());
result = new eServiceEvent();
- ret = result->parseFrom(&ev);
+ const eServiceReferenceDVB &ref = (const eServiceReferenceDVB&)service;
+ ret = result->parseFrom(&ev, (ref.getTransportStreamID().get()<<16)|ref.getOriginalNetworkID().get());
}
return ret;
}
if ( begin != -1 )
{
m_timemap_cursor = It->second.second.lower_bound(begin);
- if ( m_timemap_cursor != It->second.second.end() && m_timemap_cursor != It->second.second.begin() )
+ if ( m_timemap_cursor != It->second.second.end() )
{
- timeMap::iterator it = m_timemap_cursor;
- --it;
- if ( (it->second->getStartTime() + it->second->getDuration()) > begin )
- m_timemap_cursor = it;
+ if ( m_timemap_cursor->second->getStartTime() != begin )
+ {
+ timeMap::iterator x = m_timemap_cursor;
+ --x;
+ if ( x != It->second.second.end() )
+ {
+ time_t start_time = x->second->getStartTime();
+ if ( begin > start_time && begin < (start_time+x->second->getDuration()))
+ m_timemap_cursor = x;
+ }
+ }
}
}
else
m_timemap_cursor = It->second.second.begin();
+ const eServiceReferenceDVB &ref = (const eServiceReferenceDVB&)service;
+ currentQueryTsidOnid = (ref.getTransportStreamID().get()<<16) | ref.getOriginalNetworkID().get();
return 0;
}
return -1;
{
Event ev((uint8_t*)m_timemap_cursor++->second->get());
result = new eServiceEvent();
- return result->parseFrom(&ev);
+ return result->parseFrom(&ev, currentQueryTsidOnid);
}
return -1;
}