git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
commented out not used values
[enigma2.git]
/
lib
/
python
/
connections.h
diff --git
a/lib/python/connections.h
b/lib/python/connections.h
index 9b4abdd20c4ba66291564ef4b10284cba2d68289..8a06f7faaa3d44ebd2c84b3ffdc05b5b1b0c9491 100644
(file)
--- a/
lib/python/connections.h
+++ b/
lib/python/connections.h
@@
-31,7
+31,7
@@
public:
int i;
for (i=0; i<size; ++i)
{
int i;
for (i=0; i<size; ++i)
{
- PyObject *b = PyList_G
etItem
(m_list, i);
+ PyObject *b = PyList_G
ET_ITEM
(m_list, i);
ePython::call(b, tuple);
}
}
ePython::call(b, tuple);
}
}
@@
-45,6
+45,11
@@
inline PyObject *PyFrom(int v)
return PyInt_FromLong(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>
{
template <class R>
class PSignal0: public PSignal, public Signal0<R>
{
@@
-65,7
+70,7
@@
public:
R operator()(V0 a0)
{
PyObject *pArgs = PyTuple_New(1);
R operator()(V0 a0)
{
PyObject *pArgs = PyTuple_New(1);
- PyTuple_S
etItem
(pArgs, 0, PyFrom(a0));
+ PyTuple_S
ET_ITEM
(pArgs, 0, PyFrom(a0));
callPython(pArgs);
Py_DECREF(pArgs);
return Signal1<R,V0>::operator()(a0);
callPython(pArgs);
Py_DECREF(pArgs);
return Signal1<R,V0>::operator()(a0);
@@
-79,8
+84,8
@@
public:
R operator()(V0 a0, V1 a1)
{
PyObject *pArgs = PyTuple_New(2);
R operator()(V0 a0, V1 a1)
{
PyObject *pArgs = PyTuple_New(2);
- PyTuple_S
etItem
(pArgs, 0, PyFrom(a0));
- PyTuple_S
etItem
(pArgs, 1, PyFrom(a1));
+ PyTuple_S
ET_ITEM
(pArgs, 0, PyFrom(a0));
+ PyTuple_S
ET_ITEM
(pArgs, 1, PyFrom(a1));
callPython(pArgs);
Py_DECREF(pArgs);
return Signal2<R,V0,V1>::operator()(a0, a1);
callPython(pArgs);
Py_DECREF(pArgs);
return Signal2<R,V0,V1>::operator()(a0, a1);