X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e9f93cc6f2e8f08020ecd987c607043166fd3f8b..fc233e3a96e68514165781859afc94a2bb33e9e9:/lib/python/enigma_python.i diff --git a/lib/python/enigma_python.i b/lib/python/enigma_python.i index 1ec39754..8b918bf0 100644 --- a/lib/python/enigma_python.i +++ b/lib/python/enigma_python.i @@ -69,10 +69,13 @@ is usually caused by not marking PSignals as immutable. #include #include #include +#include +#include extern void runMainloop(); extern void quitMainloop(); extern void setLCD(const char *c); +extern void setLCDClock(const char *c); extern PSignal1 &keyPressedSignal(); %} @@ -80,7 +83,30 @@ extern PSignal1 &keyPressedSignal(); %feature("ref") iObject "$this->AddRef(); eDebug(\"AddRef (%s:%d)!\", __FILE__, __LINE__); " %feature("unref") iObject "$this->Release(); eDebug(\"Release! %s:%d\", __FILE__, __LINE__); " -%newobject eDebugClassPtr::operator->; + +/* this magic allows smartpointer to be used as OUTPUT arguments, i.e. call-by-reference-styled return value. */ + +%define %typemap_output_simple(Type) + %typemap(in,numinputs=0) Type *OUTPUT ($*1_ltype temp), + Type &OUTPUT ($*1_ltype temp) + "$1 = new Type;"; + %fragment("t_out_helper"{Type},"header", + fragment="t_output_helper") {} + %typemap(argout,fragment="t_out_helper"{Type}) Type *OUTPUT, Type &OUTPUT + "$result = t_output_helper($result, (SWIG_NewPointerObj((void*)($1), $1_descriptor, 1)));" +%enddef + +%define %typemap_output_ptr(Type) + %typemap(in,numinputs=0) Type *OUTPUT ($*1_ltype temp), + Type &OUTPUT ($*1_ltype temp) + "$1 = new Type;"; + %fragment("t_out_helper"{Type},"header", + fragment="t_output_helper") {} + %typemap(argout,fragment="t_out_helper"{Type}) Type *OUTPUT, Type &OUTPUT + // generate None if smartpointer is NULL + "$result = t_output_helper($result, ((*$1) ? SWIG_NewPointerObj((void*)($1), $1_descriptor, 1) : (Py_INCREF(Py_None), Py_None)));" +%enddef + #define DEBUG %include "typemaps.i" @@ -129,6 +155,8 @@ extern PSignal1 &keyPressedSignal(); %include %include %include +%include +%include %include /************** eptr **************/ @@ -189,6 +217,7 @@ public: void runMainloop(); void quitMainloop(); void setLCD(const char*); +void setLCDClock(const char*); %immutable keyPressed; PSignal1 &keyPressedSignal();