git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add TODO comment
[enigma2.git]
/
lib
/
dvb
/
epgcache.cpp
diff --git
a/lib/dvb/epgcache.cpp
b/lib/dvb/epgcache.cpp
index 7b94a1a7956b8f7679eaabebefb0aba3905e1052..6dea73bc354d88b1d5f06c06d801a7a694bbb1a2 100644
(file)
--- a/
lib/dvb/epgcache.cpp
+++ b/
lib/dvb/epgcache.cpp
@@
-747,14
+747,6
@@
void eEPGCache::save()
#endif
}
#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)
eEPGCache::channel_data::channel_data(eEPGCache *ml)
:cache(ml)
,abortTimer(ml), zapTimer(ml)
@@
-1004,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::lookupEvent
Time
(const eServiceReference &service, time_t t, const eventData *&result )
// if t == 0 we search the current event...
{
singleLock s(cache_lock);
// if t == 0 we search the current event...
{
singleLock s(cache_lock);
@@
-1045,41
+1037,42
@@
RESULT eEPGCache::lookupEvent(const eServiceReference &service, time_t t, const
return -1;
}
return -1;
}
-RESULT eEPGCache::lookupEvent(const eServiceReference &service, time_t t, const eit_event_struct *&result )
+RESULT eEPGCache::lookupEvent
Time
(const eServiceReference &service, time_t t, const eit_event_struct *&result )
{
singleLock s(cache_lock);
const eventData *data=0;
{
singleLock s(cache_lock);
const eventData *data=0;
- RESULT ret = lookupEvent(service, t, data);
+ RESULT ret = lookupEvent
Time
(service, t, data);
if ( !ret && data )
result = data->get();
return ret;
}
if ( !ret && data )
result = data->get();
return ret;
}
-RESULT eEPGCache::lookupEvent(const eServiceReference &service, time_t t, Event *& result )
+RESULT eEPGCache::lookupEvent
Time
(const eServiceReference &service, time_t t, Event *& result )
{
singleLock s(cache_lock);
const eventData *data=0;
{
singleLock s(cache_lock);
const eventData *data=0;
- RESULT ret = lookupEvent(service, t, data);
+ RESULT ret = lookupEvent
Time
(service, t, data);
if ( !ret && data )
result = new Event((uint8_t*)data->get());
return ret;
}
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::lookupEvent
Time
(const eServiceReference &service, time_t t, ePtr<eServiceEvent> &result )
{
singleLock s(cache_lock);
const eventData *data=0;
{
singleLock s(cache_lock);
const eventData *data=0;
- RESULT ret = lookupEvent(service, t, data);
+ RESULT ret = lookupEvent
Time
(service, t, data);
if ( !ret && data )
{
Event ev((uint8_t*)data->get());
result = new eServiceEvent();
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;
}
}
return ret;
}
-RESULT eEPGCache::lookupEvent(const eServiceReference &service, int event_id, const eventData *&result )
+RESULT eEPGCache::lookupEvent
Id
(const eServiceReference &service, int event_id, const eventData *&result )
{
singleLock s(cache_lock);
uniqueEPGKey key( service );
{
singleLock s(cache_lock);
uniqueEPGKey key( service );
@@
-1102,36
+1095,37
@@
RESULT eEPGCache::lookupEvent(const eServiceReference &service, int event_id, co
return -1;
}
return -1;
}
-RESULT eEPGCache::lookupEvent(const eServiceReference &service, int event_id, const eit_event_struct *&result)
+RESULT eEPGCache::lookupEvent
Id
(const eServiceReference &service, int event_id, const eit_event_struct *&result)
{
singleLock s(cache_lock);
const eventData *data=0;
{
singleLock s(cache_lock);
const eventData *data=0;
- RESULT ret = lookupEvent(service, event_id, data);
+ RESULT ret = lookupEvent
Id
(service, event_id, data);
if ( !ret && data )
result = data->get();
return ret;
}
if ( !ret && data )
result = data->get();
return ret;
}
-RESULT eEPGCache::lookupEvent(const eServiceReference &service, int event_id, Event *& result)
+RESULT eEPGCache::lookupEvent
Id
(const eServiceReference &service, int event_id, Event *& result)
{
singleLock s(cache_lock);
const eventData *data=0;
{
singleLock s(cache_lock);
const eventData *data=0;
- RESULT ret = lookupEvent(service, event_id, data);
+ RESULT ret = lookupEvent
Id
(service, event_id, data);
if ( !ret && data )
result = new Event((uint8_t*)data->get());
return ret;
}
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::lookupEvent
Id
(const eServiceReference &service, int event_id, ePtr<eServiceEvent> &result)
{
singleLock s(cache_lock);
const eventData *data=0;
{
singleLock s(cache_lock);
const eventData *data=0;
- RESULT ret = lookupEvent(service, event_id, data);
+ RESULT ret = lookupEvent
Id
(service, event_id, data);
if ( !ret && data )
{
Event ev((uint8_t*)data->get());
result = new eServiceEvent();
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;
}
}
return ret;
}
@@
-1155,6
+1149,8
@@
RESULT eEPGCache::startTimeQuery(const eServiceReference &service, time_t begin,
}
else
m_timemap_cursor = It->second.second.begin();
}
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;
return 0;
}
return -1;
@@
-1196,7
+1192,7
@@
RESULT eEPGCache::getNextTimeEntry(ePtr<eServiceEvent> &result)
{
Event ev((uint8_t*)m_timemap_cursor++->second->get());
result = new eServiceEvent();
{
Event ev((uint8_t*)m_timemap_cursor++->second->get());
result = new eServiceEvent();
- return result->parseFrom(&ev);
+ return result->parseFrom(&ev
, currentQueryTsidOnid
);
}
return -1;
}
}
return -1;
}