add VideoWindow Component

[enigma2.git] / lib / python / connections.h

diff --git a/lib/python/connections.h b/lib/python/connections.h
index ac5865e51f73f8a395a7e1d8dd1ce102bf73fb94..8a06f7faaa3d44ebd2c84b3ffdc05b5b1b0c9491 100644 (file)
--- a/lib/python/connections.h
+++ b/lib/python/connections.h
@@ -40,6 +40,16 @@ public:
        PyObject *get() { Py_INCREF(m_list); return m_list; }
 };
 
+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>
 {
@@ -60,21 +70,7 @@ 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);
                return Signal1<R,V0>::operator()(a0);
@@ -88,8 +84,8 @@ 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);
                return Signal2<R,V0,V1>::operator()(a0, a1);