some small changes needed for build scroll support in eventview window

[enigma2.git] / lib / python / enigma_python.i

diff --git a/lib/python/enigma_python.i b/lib/python/enigma_python.i
index 1ec3975420ecdd09079a27eff16447e06a8f9236..7aa908128b3d0d5e8e4ddb73c0e84824775c4a79 100644 (file)
--- a/lib/python/enigma_python.i
+++ b/lib/python/enigma_python.i
@@ -43,9 +43,8 @@ is usually caused by not marking PSignals as immutable.
 #include <lib/service/iservice.h>
 #include <lib/service/service.h>
 #include <lib/service/event.h>
 #include <lib/service/iservice.h>
 #include <lib/service/service.h>
 #include <lib/service/event.h>

-
+#include <lib/gdi/font.h>

 #include <lib/gdi/gpixmap.h>
 #include <lib/gdi/gpixmap.h>

-

 #include <lib/gui/ewidget.h>
 #include <lib/gui/elabel.h>
 #include <lib/gui/einput.h>
 #include <lib/gui/ewidget.h>
 #include <lib/gui/elabel.h>
 #include <lib/gui/einput.h>


@@ -64,23 +63,54 @@ is usually caused by not marking PSignals as immutable.
 #include <lib/gui/elistboxcontent.h>
 #include <lib/service/listboxservice.h>
 #include <lib/components/scan.h>
 #include <lib/gui/elistboxcontent.h>
 #include <lib/service/listboxservice.h>
 #include <lib/components/scan.h>

+#include <lib/components/listboxepg.h>

 #include <lib/nav/pcore.h>
 #include <lib/actions/action.h>
 #include <lib/gdi/gfont.h>
 #include <lib/gdi/epng.h>
 #include <lib/dvb/volume.h>
 #include <lib/nav/pcore.h>
 #include <lib/actions/action.h>
 #include <lib/gdi/gfont.h>
 #include <lib/gdi/epng.h>
 #include <lib/dvb/volume.h>

+#include <lib/dvb/sec.h>
+#include <lib/dvb/epgcache.h>
+#include <lib/driver/avswitch.h>
+#include <lib/driver/rfmod.h>
+#include <lib/gdi/lcd.h>
+#include <lib/dvb_ci/dvbci_ui.h>

 
 extern void runMainloop();
 extern void quitMainloop();
 extern void setLCD(const char *c);
 
 extern void runMainloop();
 extern void quitMainloop();
 extern void setLCD(const char *c);

+extern void setLCDClock(const char *c);

 
 extern PSignal1<void,int> &keyPressedSignal();
 %}
 
 
 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__); "
+%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_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

 
 

-%newobject eDebugClassPtr::operator->;

 
 #define DEBUG
 %include "typemaps.i"
 
 #define DEBUG
 %include "typemaps.i"


@@ -103,6 +133,7 @@ extern PSignal1<void,int> &keyPressedSignal();
 %immutable eComponentScan::statusChanged;
 %immutable pNavigation::m_event;
 
 %immutable eComponentScan::statusChanged;
 %immutable pNavigation::m_event;
 

+%include <lib/gdi/font.h>

 %include <lib/gdi/epoint.h>
 %include <lib/gdi/erect.h>
 %include <lib/gdi/esize.h>
 %include <lib/gdi/epoint.h>
 %include <lib/gdi/erect.h>
 %include <lib/gdi/esize.h>


@@ -124,11 +155,18 @@ extern PSignal1<void,int> &keyPressedSignal();
 %include <lib/gui/ewidgetanimation.h>
 %include <lib/service/listboxservice.h>
 %include <lib/components/scan.h>
 %include <lib/gui/ewidgetanimation.h>
 %include <lib/service/listboxservice.h>
 %include <lib/components/scan.h>

+%include <lib/components/listboxepg.h>

 %include <lib/nav/pcore.h>
 %include <lib/actions/action.h>
 %include <lib/gdi/gfont.h>
 %include <lib/gdi/epng.h>
 %include <lib/dvb/volume.h>
 %include <lib/nav/pcore.h>
 %include <lib/actions/action.h>
 %include <lib/gdi/gfont.h>
 %include <lib/gdi/epng.h>
 %include <lib/dvb/volume.h>

+%include <lib/dvb/sec.h>
+%include <lib/dvb/epgcache.h>
+%include <lib/driver/avswitch.h>
+%include <lib/driver/rfmod.h>
+%include <lib/gdi/lcd.h>
+%include <lib/dvb_ci/dvbci_ui.h>

 
 %include <lib/gdi/gpixmap.h>
 /**************  eptr  **************/
 
 %include <lib/gdi/gpixmap.h>
 /**************  eptr  **************/


@@ -189,6 +227,7 @@ public:
 void runMainloop();
 void quitMainloop();
 void setLCD(const char*);
 void runMainloop();
 void quitMainloop();
 void setLCD(const char*);

+void setLCDClock(const char*);

 %immutable keyPressed;
 PSignal1<void,int> &keyPressedSignal();
 
 %immutable keyPressed;
 PSignal1<void,int> &keyPressedSignal();