__u8 eventData::data[4108];
extern const uint32_t crc32_table[256];
+const eServiceReference &handleGroup(const eServiceReference &ref)
+{
+ if (ref.flags & eServiceReference::isGroup)
+ {
+ ePtr<eDVBResourceManager> res;
+ if (!eDVBResourceManager::getInstance(res))
+ {
+ ePtr<iDVBChannelList> db;
+ if (!res->getChannelList(db))
+ {
+ eBouquet *bouquet=0;
+ if (!db->getBouquet(ref, bouquet))
+ {
+ std::list<eServiceReference>::iterator it(bouquet->m_services.begin());
+ if (it != bouquet->m_services.end())
+ return *it;
+ }
+ }
+ }
+ }
+ return ref;
+}
+
+
eventData::eventData(const eit_event_struct* e, int size, int type)
:ByteSize(size&0xFF), type(type&0xFF)
{
// if t == -1 we search the current event...
{
singleLock s(cache_lock);
- uniqueEPGKey key(service);
+ uniqueEPGKey key(handleGroup(service));
// check if EPG for this service is ready...
eventCache::iterator It = eventDB.find( key );
RESULT eEPGCache::lookupEventId(const eServiceReference &service, int event_id, const eventData *&result )
{
singleLock s(cache_lock);
- uniqueEPGKey key( service );
+ uniqueEPGKey key(handleGroup(service));
eventCache::iterator It = eventDB.find( key );
if ( It != eventDB.end() && !It->second.first.empty() ) // entrys cached?
RESULT eEPGCache::startTimeQuery(const eServiceReference &service, time_t begin, int minutes)
{
- eventCache::iterator It = eventDB.find( service );
+ eventCache::iterator It = eventDB.find(handleGroup(service));
if ( It != eventDB.end() && It->second.second.size() )
{
m_timemap_end = minutes != -1 ? It->second.second.upper_bound(begin+minutes*60) : It->second.second.end();
}
else
m_timemap_cursor = It->second.second.begin();
- const eServiceReferenceDVB &ref = (const eServiceReferenceDVB&)service;
+ const eServiceReferenceDVB &ref = (const eServiceReferenceDVB&)handleGroup(service);
currentQueryTsidOnid = (ref.getTransportStreamID().get()<<16) | ref.getOriginalNetworkID().get();
return 0;
}
tmp = PyLong_FromLong(0);
break;
case 'I': // Event Id
- tmp = ptr ? PyLong_FromLong(ptr->getEventId()) : NULL;
+ tmp = ptr ? PyLong_FromLong(ptr->getEventId()) : ePyObject();
break;
case 'B': // Event Begin Time
- tmp = ptr ? PyLong_FromLong(ptr->getBeginTime()) : NULL;
+ tmp = ptr ? PyLong_FromLong(ptr->getBeginTime()) : ePyObject();
break;
case 'D': // Event Duration
- tmp = ptr ? PyLong_FromLong(ptr->getDuration()) : NULL;
+ tmp = ptr ? PyLong_FromLong(ptr->getDuration()) : ePyObject();
break;
case 'T': // Event Title
- tmp = ptr ? PyString_FromString(ptr->getEventName().c_str()) : NULL;
+ tmp = ptr ? PyString_FromString(ptr->getEventName().c_str()) : ePyObject();
break;
case 'S': // Event Short Description
- tmp = ptr ? PyString_FromString(ptr->getShortDescription().c_str()) : NULL;
+ tmp = ptr ? PyString_FromString(ptr->getShortDescription().c_str()) : ePyObject();
break;
case 'E': // Event Extended Description
- tmp = ptr ? PyString_FromString(ptr->getExtendedDescription().c_str()) : NULL;
+ tmp = ptr ? PyString_FromString(ptr->getExtendedDescription().c_str()) : ePyObject();
break;
case 'C': // Current Time
tmp = nowTime;
{
fillTuple(convertFuncArgs, argstring, argcount, service, ptr, nowTime, service_name);
ePyObject result = PyObject_CallObject(convertFunc, convertFuncArgs);
- if (result == NULL)
+ if (result)
{
if (service_name)
Py_DECREF(service_name);
ePyObject nowTime = strchr(argstring, 'C') ?
PyLong_FromLong(eDVBLocalTimeHandler::getInstance()->nowTime()) :
- NULL;
+ ePyObject();
bool must_get_service_name = strchr(argstring, 'N') ? true : false;
break;
}
}
- eServiceReference ref(PyString_AS_STRING(service));
+ eServiceReference ref(handleGroup(eServiceReference(PyString_AS_STRING(service))));
if (ref.type != eServiceReference::idDVB)
{
eDebug("service reference for epg query is not valid");
break;
case 'B': // Event Begin Time
if (ptr)
- tmp = ptr ? PyLong_FromLong(ptr->getBeginTime()) : NULL;
+ tmp = ptr ? PyLong_FromLong(ptr->getBeginTime()) : ePyObject();
else
tmp = PyLong_FromLong(evData->getStartTime());
break;
case 'D': // Event Duration
if (ptr)
- tmp = ptr ? PyLong_FromLong(ptr->getDuration()) : NULL;
+ tmp = ptr ? PyLong_FromLong(ptr->getDuration()) : ePyObject();
else
tmp = PyLong_FromLong(evData->getDuration());
break;
case 'T': // Event Title
- tmp = ptr ? PyString_FromString(ptr->getEventName().c_str()) : NULL;
+ tmp = ptr ? PyString_FromString(ptr->getEventName().c_str()) : ePyObject();
break;
case 'S': // Event Short Description
- tmp = ptr ? PyString_FromString(ptr->getShortDescription().c_str()) : NULL;
+ tmp = ptr ? PyString_FromString(ptr->getShortDescription().c_str()) : ePyObject();
break;
case 'E': // Event Extended Description
- tmp = ptr ? PyString_FromString(ptr->getExtendedDescription().c_str()) : NULL;
+ tmp = ptr ? PyString_FromString(ptr->getExtendedDescription().c_str()) : ePyObject();
break;
case 'R': // service reference string
tmp = service_reference;
if (descridx > -1)
{
int maxcount=maxmatches;
- eServiceReferenceDVB ref(refstr?refstr:"");
+ eServiceReferenceDVB ref(refstr?(const eServiceReferenceDVB&)handleGroup(eServiceReference(refstr)):eServiceReferenceDVB(""));
// ref is only valid in SIMILAR_BROADCASTING_SEARCH
// in this case we start searching with the base service
bool first = ref.valid() ? true : false;
}
if (!ret)
- {
- Py_INCREF(Py_None);
- ret=Py_None;
- }
+ Py_RETURN_NONE;
return ret;
}