X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6dcb75c26bbfec04b381bb99d75404f9fe50635d..1ac49f8f616a57d3b154d974f4cca310c05165a8:/lib/python/connections.h diff --git a/lib/python/connections.h b/lib/python/connections.h index d24bb42f..ad76198a 100644 --- a/lib/python/connections.h +++ b/lib/python/connections.h @@ -12,11 +12,15 @@ class PSignal { +protected: ePyObject m_list; public: PSignal(); ~PSignal(); void callPython(SWIG_PYOBJECT(ePyObject) tuple); +#ifndef SWIG + PyObject *getSteal(bool clear=false); +#endif PyObject *get(); }; @@ -36,9 +40,12 @@ class PSignal0: public PSignal, public Signal0 public: R operator()() { - PyObject *pArgs = PyTuple_New(0); - callPython(pArgs); - Org_Py_DECREF(pArgs); + if (m_list) + { + PyObject *pArgs = PyTuple_New(0); + callPython(pArgs); + Org_Py_DECREF(pArgs); + } return Signal0::operator()(); } }; @@ -49,10 +56,13 @@ class PSignal1: public PSignal, public Signal1 public: R operator()(V0 a0) { - PyObject *pArgs = PyTuple_New(1); - PyTuple_SET_ITEM(pArgs, 0, PyFrom(a0)); - callPython(pArgs); - Org_Py_DECREF(pArgs); + if (m_list) + { + PyObject *pArgs = PyTuple_New(1); + PyTuple_SET_ITEM(pArgs, 0, PyFrom(a0)); + callPython(pArgs); + Org_Py_DECREF(pArgs); + } return Signal1::operator()(a0); } }; @@ -63,11 +73,14 @@ class PSignal2: public PSignal, public Signal2 public: R operator()(V0 a0, V1 a1) { - PyObject *pArgs = PyTuple_New(2); - PyTuple_SET_ITEM(pArgs, 0, PyFrom(a0)); - PyTuple_SET_ITEM(pArgs, 1, PyFrom(a1)); - callPython(pArgs); - Org_Py_DECREF(pArgs); + if (m_list) + { + PyObject *pArgs = PyTuple_New(2); + PyTuple_SET_ITEM(pArgs, 0, PyFrom(a0)); + PyTuple_SET_ITEM(pArgs, 1, PyFrom(a1)); + callPython(pArgs); + Org_Py_DECREF(pArgs); + } return Signal2::operator()(a0, a1); } };