X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a1664e81dd83e11828909d10b629ed04ea7d3467..3f35474ab204e99bf710724d949ac29b7d2029d7:/lib/python/connections.h

diff --git a/lib/python/connections.h b/lib/python/connections.h
index ac5865e5..d24bb42f 100644
--- a/lib/python/connections.h
+++ b/lib/python/connections.h
@@ -7,39 +7,29 @@
 #include <features.h>
 #undef _POSIX_C_SOURCE
 #define _POSIX_C_SOURCE 200112L
-#include <Python.h>
+
 #include <lib/python/python.h>
 
 class PSignal
 {
+	ePyObject m_list;
 public:
-	PyObject *m_list;
-public:
-	PSignal()
-	{
-		m_list = PyList_New(0);
-		Py_INCREF(m_list);
-	}
-	~PSignal()
-	{
-		Py_DECREF(m_list);
-	}
-	
-	void callPython(PyObject *tuple)
-	{
-		int size = PyList_Size(m_list);
-		int i;
-		for (i=0; i<size; ++i)
-		{
-			PyObject *b = PyList_GET_ITEM(m_list, i);
-			ePython::call(b, tuple);
-		}
-	}
-	
-	
-	PyObject *get() { Py_INCREF(m_list); return m_list; }
+	PSignal();
+	~PSignal();
+	void callPython(SWIG_PYOBJECT(ePyObject) tuple);
+	PyObject *get();
 };
 
+inline PyObject *PyFrom(int v)
+{
+	return PyInt_FromLong(v);
+}
+
+inline PyObject *PyFrom(const char *c)
+{
+	return PyString_FromString(c);
+}
+
 template <class R>
 class PSignal0: public PSignal, public Signal0<R>
 {
@@ -48,7 +38,7 @@ public:
 	{
 		PyObject *pArgs = PyTuple_New(0);
 		callPython(pArgs);
-		Py_DECREF(pArgs);
+		Org_Py_DECREF(pArgs);
 		return Signal0<R>::operator()();
 	}
 };
@@ -60,23 +50,9 @@ public:
 	R operator()(V0 a0)
 	{
 		PyObject *pArgs = PyTuple_New(1);
-		PyTuple_SET_ITEM(pArgs, 0, PyInt_FromLong(a0));
-		callPython(pArgs);
-		Py_DECREF(pArgs);
-		return Signal1<R,V0>::operator()(a0);
-	}
-};
-
-template <class R, class V0>
-class PSignal1Str: public PSignal, public Signal1<R,V0>
-{
-public:
-	R operator()(V0 a0)
-	{
-		PyObject *pArgs = PyTuple_New(1);
-		PyTuple_SET_ITEM(pArgs, 0, PyString_FromString(a0));
+		PyTuple_SET_ITEM(pArgs, 0, PyFrom(a0));
 		callPython(pArgs);
-		Py_DECREF(pArgs);
+		Org_Py_DECREF(pArgs);
 		return Signal1<R,V0>::operator()(a0);
 	}
 };
@@ -88,10 +64,10 @@ public:
 	R operator()(V0 a0, V1 a1)
 	{
 		PyObject *pArgs = PyTuple_New(2);
-		PyTuple_SET_ITEM(pArgs, 0, PyInt_FromLong(a0));
-		PyTuple_SET_ITEM(pArgs, 1, PyInt_FromLong(a1));
+		PyTuple_SET_ITEM(pArgs, 0, PyFrom(a0));
+		PyTuple_SET_ITEM(pArgs, 1, PyFrom(a1));
 		callPython(pArgs);
-		Py_DECREF(pArgs);
+		Org_Py_DECREF(pArgs);
 		return Signal2<R,V0,V1>::operator()(a0, a1);
 	}
 };