Merge branch 'bug_538_ignore_global_actions_in_standby'

[enigma2.git] / lib / service / event.cpp

diff --git a/lib/service/event.cpp b/lib/service/event.cpp
index 07eafbc9bceb0614073f2109bdca86497a73513d..949e150a7a4e1a562262bf43d9c5d074165ade44 100644 (file)
--- a/lib/service/event.cpp
+++ b/lib/service/event.cpp
@@ -88,7 +88,7 @@ bool eServiceEvent::loadLanguage(Event *evt, std::string lang, int tsidonid)
                                        lang = cc;  // use first found language
                                if (cc == lang)
                                {
-                                       m_event_name = convertDVBUTF8(sed->getEventName(), table, tsidonid);
+                                       m_event_name = convertDVBUTF8(replace_all(replace_all(sed->getEventName(), "\n", " "), "\t", " "), table, tsidonid);
                                        m_short_description = convertDVBUTF8(sed->getText(), table, tsidonid);
                                        retval=1;
                                }
@@ -154,7 +154,7 @@ bool eServiceEvent::loadLanguage(Event *evt, std::string lang, int tsidonid)
                                                dvb_ref.setOriginalNetworkID(ld->getOriginalNetworkId());
                                                dvb_ref.setServiceID(ld->getServiceId());
                                                const PrivateDataByteVector *privateData = ld->getPrivateDataBytes();
-                                               dvb_ref.name = convertDVBUTF8((const unsigned char*)&((*privateData)[0]), privateData->size(), 0, tsidonid);
+                                               dvb_ref.name = convertDVBUTF8((const unsigned char*)&((*privateData)[0]), privateData->size(), 1, tsidonid);
                                                m_linkage_services.push_back(ref);
                                        }
                                        break;
@@ -240,6 +240,23 @@ RESULT eServiceEvent::getComponentData(ePtr<eComponentData> &dest, int tagnum) c
        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 =