X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2Fenigma_python.i;h=79f9296e3251e1abac39ac38ae9fe929561a1af4;hp=59133cc57ca84f90c28fdd842d05d6356fcb8d98;hb=d1ba8203832c54b4a98978c6033296183a24b4d0;hpb=ab5aa90e1e05a89845c6e802ef1b2366d203aa45 diff --git a/lib/python/enigma_python.i b/lib/python/enigma_python.i index 59133cc..79f9296 100644 --- a/lib/python/enigma_python.i +++ b/lib/python/enigma_python.i @@ -44,12 +44,20 @@ is usually caused by not marking PSignals as immutable. #include #include +#include + #include #include +#include +#include +#include +#include #include #include #include #include +#include +#include #include #include #include @@ -59,9 +67,15 @@ is usually caused by not marking PSignals as immutable. #include #include #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(); %} @@ -69,11 +83,24 @@ 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__); " +/* 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 %include "typemaps.i" %include "stl.i" +%include %include %include %include @@ -87,6 +114,7 @@ extern PSignal1 &keyPressedSignal(); // TODO: embed these... %immutable eButton::selected; +%immutable eInput::changed; %immutable eComponentScan::statusChanged; %immutable pNavigation::m_event; @@ -96,6 +124,10 @@ extern PSignal1 &keyPressedSignal(); %include %include %include +%include +%include +%include +%include %include %include %include @@ -103,12 +135,19 @@ extern PSignal1 &keyPressedSignal(); %include %include %include +%include +%include %include %include %include %include %include +%include +%include +%include +%include +%include /************** eptr **************/ %template(eActionMapPtr) ePtr; @@ -147,7 +186,6 @@ public: $1 = $input->get(); } - /************** base **************/ %immutable eTimer::timeout; @@ -167,6 +205,8 @@ public: void runMainloop(); void quitMainloop(); +void setLCD(const char*); +void setLCDClock(const char*); %immutable keyPressed; PSignal1 &keyPressedSignal();