X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/855949a917ed8cf65397adc49872c99bdb2123c2..1398385cff4a4fc4d770afa1e9d1f6d560431b23:/lib/service/event.cpp

diff --git a/lib/service/event.cpp b/lib/service/event.cpp
index aa8482a0..949e150a 100644
--- a/lib/service/event.cpp
+++ b/lib/service/event.cpp
@@ -72,7 +72,7 @@ std::string ISOtbl[MAX_LANG][2] =
 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())
 		{
@@ -84,9 +84,11 @@ bool eServiceEvent::loadLanguage(Event *evt, std::string lang, int tsidonid)
 				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_event_name = convertDVBUTF8(replace_all(replace_all(sed->getEventName(), "\n", " "), "\t", " "), table, tsidonid);
 					m_short_description = convertDVBUTF8(sed->getText(), table, tsidonid);
 					retval=1;
 				}
@@ -97,7 +99,9 @@ bool eServiceEvent::loadLanguage(Event *evt, std::string lang, int 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;
@@ -150,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;
@@ -236,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 =