autostart and autoend functions are now called on the start and the end of enigma2...

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

diff --git a/lib/python/enigma_python.i b/lib/python/enigma_python.i
index f3ca586720cbf8edec271e6bca90c43ab08ad199..5a6f126ecba41c3c0fe84c262639fbcbad85b647 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,33 +63,73 @@ 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/nav/pcore.h>
 #include <lib/actions/action.h>
 #include <lib/gdi/gfont.h>
 #include <lib/gdi/epng.h>

+#include <lib/dvb/db.h>

 #include <lib/dvb/volume.h>
 #include <lib/dvb/volume.h>

+#include <lib/dvb/sec.h>
+#include <lib/dvb/epgcache.h>
+#include <lib/dvb/frontendparms.h>
+#include <lib/dvb/dvbtime.h>

 #include <lib/driver/avswitch.h>
 #include <lib/driver/avswitch.h>

+#include <lib/driver/rfmod.h>
+#include <lib/driver/etimezone.h>
+#include <lib/gdi/lcd.h>
+#include <lib/dvb_ci/dvbci_ui.h>
+#include <lib/python/python.h>

 
 extern void runMainloop();
 
 extern void runMainloop();

-extern void quitMainloop();
+extern void quitMainloop(int exit_code);

 extern void setLCD(const char *c);
 extern void setLCDClock(const char *c);
 extern void setLCD(const char *c);
 extern void setLCDClock(const char *c);

+extern eApplication *getApplication();

 
 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
 
 #define DEBUG

+typedef long time_t;

 %include "typemaps.i"
 %include "stl.i"
 %include <lib/python/swig.h>
 %include <lib/base/object.h>
 %include <lib/base/eerror.h>
 %include <lib/base/econfig.h>
 %include "typemaps.i"
 %include "stl.i"
 %include <lib/python/swig.h>
 %include <lib/base/object.h>
 %include <lib/base/eerror.h>
 %include <lib/base/econfig.h>

+
+%immutable eTimer::timeout;
+%immutable eSocketNotifier::activated;
+%include <lib/base/ebase.h>

 %include <lib/base/smartptr.h>
 %include <lib/service/iservice.h>
 %include <lib/service/service.h>
 %include <lib/base/smartptr.h>
 %include <lib/service/iservice.h>
 %include <lib/service/service.h>


@@ -105,6 +144,8 @@ 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/gpixmap.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>


@@ -126,19 +167,26 @@ 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/dvb/frontendparms.h>
+%include <lib/dvb/dvbtime.h>

 %include <lib/driver/avswitch.h>
 %include <lib/driver/avswitch.h>

-
-%include <lib/gdi/gpixmap.h>
+%include <lib/driver/rfmod.h>
+%include <lib/driver/etimezone.h>
+%include <lib/gdi/lcd.h>
+%include <lib/dvb_ci/dvbci_ui.h>
+%include <lib/dvb/db.h>
+%include <lib/python/python.h>

 /**************  eptr  **************/
 
 %template(eActionMapPtr) ePtr<eActionMap>;
 /**************  eptr  **************/
 
 %template(eActionMapPtr) ePtr<eActionMap>;

-%apply eActionMapPtr OUTPUT { eActionMapPtr &ptr }
-%apply eActionMap* *OUTPUT { eActionMap **ptr }

 
 /**************  signals  **************/
 
 
 /**************  signals  **************/
 


@@ -172,27 +220,34 @@ public:
        $1 = $input->get();
 }
 
        $1 = $input->get();
 }
 

-/**************  base  **************/
-
-%immutable eTimer::timeout;
-
-class eTimer
-{
-public:
-       eTimer(eMainloop *context = eApp);
-       PSignal0<void> timeout;
-
-       void start(long msec, bool singleShot=false);
-       void stop();
-       void changeInterval(long msek);
-};

 
 /**************  debug  **************/
 
 void runMainloop();
 
 /**************  debug  **************/
 
 void runMainloop();

-void quitMainloop();
+void quitMainloop(int exit_code);

 void setLCD(const char*);
 void setLCDClock(const char*);
 void setLCD(const char*);
 void setLCDClock(const char*);

+eApplication *getApplication();

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

+%{
+RESULT SwigFromPython(ePtr<gPixmap> &result, PyObject *obj)
+{      
+       ePtr<gPixmap> *res;
+
+       res = 0;
+       result = 0;
+       if (SWIG_Python_ConvertPtr(obj, (void **)&res, SWIGTYPE_p_ePtrTgPixmap_t, SWIG_POINTER_EXCEPTION | 0))
+               return -1;
+       if (!res)
+               return -1;
+       result = *res;
+       return 0;
+}
+PyObject *New_TestObj()
+{
+    TestObj *result = (TestObj *)new TestObj();
+    return SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_TestObj, 1);
+}
+%}