pcore: add python wrapper for getRecordings

And move it to a SWIG interface file
openatv · May 4, 2013 · 0b0267d · 0b0267d
1 parent 23ba503
commit 0b0267d
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 11 deletions.
diff --git a/lib/nav/core.cpp b/lib/nav/core.cpp
@@ -122,17 +122,14 @@ RESULT eNavigation::stopRecordService(ePtr<iRecordableService> &service)
 	return -1;
 }
 
-PyObject *eNavigation::getRecordings(bool simulate)
+void eNavigation::getRecordings(std::vector<ePtr<iRecordableService> > &recordings, bool simulate)
 {
-	ePyObject result = PyList_New(simulate ? m_simulate_recordings.size() : m_recordings.size());
-	int pos=0;
 	if (simulate)
 		for (std::set<ePtr<iRecordableService> >::iterator it(m_simulate_recordings.begin()); it != m_simulate_recordings.end(); ++it)
-			PyList_SET_ITEM(result, pos++, NEW_iRecordableServicePtr(*it));
+			recordings.push_back(*it);
 	else
 		for (std::map<ePtr<iRecordableService>, ePtr<eConnection> >::iterator it(m_recordings.begin()); it != m_recordings.end(); ++it)
-			PyList_SET_ITEM(result, pos++, NEW_iRecordableServicePtr(it->first)); 
-	return result;
+			recordings.push_back(it->first);
 }
 
 RESULT eNavigation::pause(int dop)

diff --git a/lib/nav/core.h b/lib/nav/core.h
@@ -33,7 +33,7 @@ class eNavigation: public iObject, public Object
 
 	RESULT recordService(const eServiceReference &ref, ePtr<iRecordableService> &service, bool simulate=false);
 	RESULT stopRecordService(ePtr<iRecordableService> &service);
-	PyObject *getRecordings(bool simulate=false);
+	void getRecordings(std::vector<ePtr<iRecordableService> > &recordings, bool simulate=false);
 
 	RESULT pause(int p);
 	eNavigation(iServiceHandler *serviceHandler);

diff --git a/lib/nav/pcore.cpp b/lib/nav/pcore.cpp
@@ -47,9 +47,9 @@ RESULT pNavigation::stopRecordService(ePtr<iRecordableService> &service)
 	return m_core->stopRecordService(service);
 }
 
-PyObject *pNavigation::getRecordings(bool simulate)
+void pNavigation::getRecordings(std::vector<ePtr<iRecordableService> > &recordings, bool simulate)
 {
-	return m_core->getRecordings(simulate);
+	m_core->getRecordings(recordings, simulate);
 }
 
 void pNavigation::navEvent(int event)

diff --git a/lib/nav/pcore.h b/lib/nav/pcore.h
@@ -22,7 +22,7 @@ class pNavigation: public iObject, public Object
 
 	SWIG_VOID(RESULT) recordService(const eServiceReference &ref, ePtr<iRecordableService> &SWIG_OUTPUT, bool simulate);
 	RESULT stopRecordService(ePtr<iRecordableService> &service);
-	PyObject *getRecordings(bool simulate=false);
+	void getRecordings(std::vector<ePtr<iRecordableService> > &recordings, bool simulate=false);
 
 private:
 	ePtr<eNavigation> m_core;

diff --git a/lib/python/Makefile.inc b/lib/python/Makefile.inc
@@ -26,7 +26,8 @@ EXTRA_DIST += \
 	python/python_dvb.i \
 	python/python_base.i \
 	python/python_console.i \
-	python/python_pmt.i
+	python/python_pmt.i \
+	python/python/pcore.i
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/python/enigma_python.Pcpp@am__quote@
 

diff --git a/lib/python/enigma_python.i b/lib/python/enigma_python.i
@@ -149,6 +149,7 @@ typedef long time_t;
 %include <lib/python/python_dvb.i>
 %include <lib/python/python_service.i>
 %include <lib/python/python_pmt.i>
+%include <lib/python/python_pcore.i>
 
 %immutable eSocketNotifier::activated;
 %include <lib/base/ebase.h>

diff --git a/lib/python/python_pcore.i b/lib/python/python_pcore.i
@@ -0,0 +1,13 @@
+%extend pNavigation {
+PyObject *getRecordings(bool simulate)
+{
+	std::vector<ePtr<iRecordableService> > recordings;
+	self->getRecordings(recordings, simulate);
+	ePyObject result = PyList_New(recordings.size());
+	for (unsigned int i = 0; i < recordings.size(); i++)
+		PyList_SET_ITEM(result, i, NEW_iRecordableServicePtr(recordings[i])); 
+	return result;
+}
+};
+
+%ignore pNavigation::getRecordings;