diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2005-09-26 17:02:47 +0000 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2005-09-26 17:02:47 +0000 |
| commit | d1ba8203832c54b4a98978c6033296183a24b4d0 (patch) | |
| tree | bb15219b137658dec7b8665910973b361b31dce8 /lib/python | |
| parent | 71f4df6d025fa09d937dd5e259992cf04b4a04f8 (diff) | |
| download | enigma2-d1ba8203832c54b4a98978c6033296183a24b4d0.tar.gz enigma2-d1ba8203832c54b4a98978c6033296183a24b4d0.zip | |
- add SWIG_VOID, add tyemap_output_ptr
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/enigma_python.i | 12 | ||||
| -rw-r--r-- | lib/python/swig.h | 5 |
2 files changed, 16 insertions, 1 deletions
diff --git a/lib/python/enigma_python.i b/lib/python/enigma_python.i index 3eb22d55..79f9296e 100644 --- a/lib/python/enigma_python.i +++ b/lib/python/enigma_python.i @@ -83,6 +83,18 @@ extern PSignal1<void,int> &keyPressedSignal(); %feature("ref") iObject "$this->AddRef(); eDebug(\"AddRef (%s:%d)!\", __FILE__, __LINE__); " %feature("unref") iObject "$this->Release(); eDebug(\"Release! %s:%d\", __FILE__, __LINE__); " +/* this magic allows smartpointer to be used as OUTPUT arguments, i.e. call-by-reference-styled return value. */ + +%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 + "$result = t_output_helper($result, (SWIG_NewPointerObj((void*)($1), $1_descriptor, 1)));" +%enddef + %newobject eDebugClassPtr::operator->; #define DEBUG diff --git a/lib/python/swig.h b/lib/python/swig.h index b5cb77af..ae0bfd07 100644 --- a/lib/python/swig.h +++ b/lib/python/swig.h @@ -4,7 +4,8 @@ #ifdef SWIG #define TEMPLATE_TYPEDEF(x, y) \ %template(y) x; \ -typedef x y +typedef x y; \ +%typemap_output_ptr(x); #else #define TEMPLATE_TYPEDEF(x, y) typedef x y #endif @@ -12,9 +13,11 @@ typedef x y #ifdef SWIG #define SWIG_INPUT INPUT #define SWIG_OUTPUT OUTPUT +#define SWIG_VOID(x) void #else #define SWIG_INPUT #define SWIG_OUTPUT +#define SWIG_VOID(x) x #endif #endif |