bool eServiceEvent::loadLanguage(Event *evt, std::string lang, int tsidonid)
{
bool retval=0;
- for (DescriptorConstIterator desc = evt->getDescriptors()->begin(); desc != evt->getDescriptors()->end() && !retval; ++desc)
+ for (DescriptorConstIterator desc = evt->getDescriptors()->begin(); desc != evt->getDescriptors()->end(); ++desc)
{
switch ((*desc)->getTag())
{
const ShortEventDescriptor *sed = (ShortEventDescriptor*)*desc;
const std::string &cc = sed->getIso639LanguageCode();
int table=encodingHandler.getCountryCodeDefaultMapping(cc);
- if (lang.empty() || cc == lang)
+ if (lang.empty())
+ lang = cc; // use first found language
+ if (cc == lang)
{
m_event_name = convertDVBUTF8(sed->getEventName(), table, tsidonid);
m_short_description = convertDVBUTF8(sed->getText(), table, tsidonid);
const ExtendedEventDescriptor *eed = (ExtendedEventDescriptor*)*desc;
const std::string &cc = eed->getIso639LanguageCode();
int table=encodingHandler.getCountryCodeDefaultMapping(cc);
- if (lang.empty() || cc == lang)
+ if (lang.empty())
+ lang = cc; // use first found language
+ if (cc == lang)
{
m_extended_description += convertDVBUTF8(eed->getText(), table, tsidonid);
retval=1;
return -1;
}
+PyObject *eServiceEvent::getComponentData() const
+{
+ ePyObject ret = PyList_New(m_component_data.size());
+ int cnt=0;
+ for (std::list<eComponentData>::const_iterator it(m_component_data.begin()); it != m_component_data.end(); ++it)
+ {
+ ePyObject tuple = PyTuple_New(5);
+ PyTuple_SET_ITEM(tuple, 0, PyInt_FromLong(it->m_componentTag));
+ PyTuple_SET_ITEM(tuple, 1, PyInt_FromLong(it->m_componentType));
+ PyTuple_SET_ITEM(tuple, 2, PyInt_FromLong(it->m_streamContent));
+ PyTuple_SET_ITEM(tuple, 3, PyString_FromString(it->m_iso639LanguageCode.c_str()));
+ PyTuple_SET_ITEM(tuple, 4, PyString_FromString(it->m_text.c_str()));
+ PyList_SET_ITEM(ret, cnt++, tuple);
+ }
+ return ret;
+}
+
RESULT eServiceEvent::getLinkageService(eServiceReference &service, eServiceReference &parent, int num) const
{
std::list<eServiceReference>::const_iterator it =