add possibility to get all component descriptors for a event from python

2 files changed, 18 insertions, 0 deletions

diff --git a/lib/service/event.cpp b/lib/service/event.cpp
index 07eafbc9..e78ddc4e 100644
--- a/lib/service/event.cpp
+++ b/lib/service/event.cpp
@@ -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 =
diff --git a/lib/service/event.h b/lib/service/event.h
index f315aca8..f1a307ec 100644
--- a/lib/service/event.h
+++ b/lib/service/event.h
@@ -59,6 +59,7 @@ public:
 	std::string getExtendedDescription() const { return m_extended_description; }
 	std::string getBeginTimeString() const;
 	SWIG_VOID(RESULT) getComponentData(ePtr<eComponentData> &SWIG_OUTPUT, int tagnum) const;
+	PyObject *getComponentData() const;
 	int getNumOfLinkageServices() const { return m_linkage_services.size(); }
 	SWIG_VOID(RESULT) getLinkageService(eServiceReference &SWIG_OUTPUT, eServiceReference &parent, int num) const;
 };