X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fservice%2Fevent.cpp;h=2a4cb0d1fbaed478a90d0129f95a25fb9fb50df5;hp=07eafbc9bceb0614073f2109bdca86497a73513d;hb=ba5ec76317a3bd96895506159b0d5bc1a1a6eecc;hpb=e628d5490dab543bfa2f109d28f504c49f89a2d7

diff --git a/lib/service/event.cpp b/lib/service/event.cpp
index 07eafbc..2a4cb0d 100644
--- a/lib/service/event.cpp
+++ b/lib/service/event.cpp
@@ -86,9 +86,9 @@ bool eServiceEvent::loadLanguage(Event *evt, std::string lang, int tsidonid)
 				int table=encodingHandler.getCountryCodeDefaultMapping(cc);
 				if (lang.empty())
 					lang = cc;  // use first found language
-				if (cc == lang)
+				if (!strncasecmp(lang.c_str(), cc.c_str(), 3))
 				{
-					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;
 				}
@@ -101,7 +101,7 @@ bool eServiceEvent::loadLanguage(Event *evt, std::string lang, int tsidonid)
 				int table=encodingHandler.getCountryCodeDefaultMapping(cc);
 				if (lang.empty())
 					lang = cc;  // use first found language
-				if (cc == lang)
+				if (!strncasecmp(lang.c_str(), cc.c_str(), 3))
 				{
 					m_extended_description += convertDVBUTF8(eed->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 =