git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sorry, i REALLY don't know, how to fix it other than using a try/except block
[enigma2.git]
/
lib
/
dvb
/
epgcache.cpp
diff --git
a/lib/dvb/epgcache.cpp
b/lib/dvb/epgcache.cpp
index 3b40efcb41bc57e5c55cce748c2c401e33ac71e6..6dea73bc354d88b1d5f06c06d801a7a694bbb1a2 100644
(file)
--- a/
lib/dvb/epgcache.cpp
+++ b/
lib/dvb/epgcache.cpp
@@
-15,7
+15,7
@@
__u8 eventData::data[4108];
extern const uint32_t crc32_table[256];
eventData::eventData(const eit_event_struct* e, int size, int type)
extern const uint32_t crc32_table[256];
eventData::eventData(const eit_event_struct* e, int size, int type)
- :ByteSize(size
), type(type
)
+ :ByteSize(size
&0xFF), type(type&0xFF
)
{
if (!e)
return;
{
if (!e)
return;
@@
-188,7
+188,7
@@
void eEPGCache::DVBChannelAdded(eDVBChannel *chan)
{
if ( chan )
{
{
if ( chan )
{
-
eDebug("[eEPGCache] add channel %p", chan);
+
//
eDebug("[eEPGCache] add channel %p", chan);
channel_data *data = new channel_data(this);
data->channel = chan;
singleLock s(channel_map_lock);
channel_data *data = new channel_data(this);
data->channel = chan;
singleLock s(channel_map_lock);
@@
-258,12
+258,6
@@
void eEPGCache::DVBChannelStateChanged(iDVBChannel *chan)
chan->getState(state);
switch (state)
{
chan->getState(state);
switch (state)
{
- case iDVBChannel::state_idle:
- break;
- case iDVBChannel::state_tuning:
- break;
- case iDVBChannel::state_unavailable:
- break;
case iDVBChannel::state_ok:
{
eDebug("[eEPGCache] channel %p running", chan);
case iDVBChannel::state_ok:
{
eDebug("[eEPGCache] channel %p running", chan);
@@
-753,14
+747,6
@@
void eEPGCache::save()
#endif
}
#endif
}
-RESULT eEPGCache::getInstance(ePtr<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)
@@
-1010,7
+996,7
@@
void eEPGCache::channel_data::readData( const __u8 *data)
}
}
}
}
-RESULT eEPGCache::lookupEvent
(const eServiceReferenceDVB
&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);
@@
-1051,41
+1037,42
@@
RESULT eEPGCache::lookupEvent(const eServiceReferenceDVB &service, time_t t, con
return -1;
}
return -1;
}
-RESULT eEPGCache::lookupEvent
(const eServiceReferenceDVB
&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 eServiceReferenceDVB
&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 eServiceReferenceDVB
&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 eServiceReferenceDVB
&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 );
@@
-1108,41
+1095,42
@@
RESULT eEPGCache::lookupEvent(const eServiceReferenceDVB &service, int event_id,
return -1;
}
return -1;
}
-RESULT eEPGCache::lookupEvent
(const eServiceReferenceDVB
&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 eServiceReferenceDVB
&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 eServiceReferenceDVB
&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;
}
-RESULT eEPGCache::startTimeQuery(const eServiceReference
DVB
&service, time_t begin, int minutes)
+RESULT eEPGCache::startTimeQuery(const eServiceReference &service, time_t begin, int minutes)
{
eventCache::iterator It = eventDB.find( service );
if ( It != eventDB.end() && It->second.second.size() )
{
eventCache::iterator It = eventDB.find( service );
if ( It != eventDB.end() && It->second.second.size() )
@@
-1159,6
+1147,10
@@
RESULT eEPGCache::startTimeQuery(const eServiceReferenceDVB &service, time_t beg
m_timemap_cursor = it;
}
}
m_timemap_cursor = it;
}
}
+ 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;
@@
-1200,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;
}