X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2Fenigma_python.i;h=33fc0a1444206cacdeda34d8c3c2e8da2d1b3ab6;hb=1cdf6cb021fcaa6548b90ba7b6765cf1e8b8b37b;hp=8e55b74fc8d419585d9fec77d54c6572a9d17f4c;hpb=4bc08995411e21f3564f09e136809be68ddf96a8;p=vuplus_dvbapp

diff --git a/lib/python/enigma_python.i b/lib/python/enigma_python.i
index 8e55b74..33fc0a1 100644
--- a/lib/python/enigma_python.i
+++ b/lib/python/enigma_python.i
@@ -29,8 +29,7 @@
 
 
 Oh, things like "operator= is private in this context" etc.
-is usually caused by not marking PSignals as immutable.
-
+is usually caused by not marking PSignals as immutable. 
 */
 
 %define RefCount(...)
@@ -48,6 +47,7 @@ is usually caused by not marking PSignals as immutable.
 #include <lib/base/econfig.h>
 #include <lib/service/iservice.h>
 #include <lib/service/service.h>
+#include <lib/service/event.h>
 
 #include <lib/gui/ewidget.h>
 #include <lib/gui/elabel.h>
@@ -59,15 +59,22 @@ is usually caused by not marking PSignals as immutable.
 #include <lib/gui/elistbox.h>
 #include <lib/gui/elistboxcontent.h>
 #include <lib/service/listboxservice.h>
+#include <lib/components/scan.h>
+#include <lib/nav/pcore.h>
+#include <lib/actions/action.h>
 
 extern void runMainloop();
+extern void quitMainloop();
 
 extern PSignal1<void,int> &keyPressedSignal();
 %}
 
 RefCount(eListboxPythonStringContent)
+RefCount(eListboxServiceContent)
+RefCount(eComponentScan)
 
 #define DEBUG
+%include "typemaps.i"
 %include "stl.i"
 %include <lib/base/object.h>
 %include <lib/base/eerror.h>
@@ -76,8 +83,13 @@ RefCount(eListboxPythonStringContent)
 %include <lib/service/iservice.h>
 %include <lib/service/service.h>
 %template(eServiceCenterPtr) ePtr<eServiceCenter>;
+%include <lib/service/event.h>
+
 
+// TODO: embed these...
 %immutable eButton::selected;
+%immutable eComponentScan::statusChanged;
+%immutable pNavigation::m_event;
 
 %include <lib/gdi/epoint.h>
 %include <lib/gdi/erect.h>
@@ -92,6 +104,18 @@ RefCount(eListboxPythonStringContent)
 %include <lib/gui/elistbox.h>
 %include <lib/gui/elistboxcontent.h>
 %include <lib/service/listboxservice.h>
+%include <lib/components/scan.h>
+%include <lib/nav/pcore.h>
+%include <lib/actions/action.h>
+
+/**************  eptr  **************/
+
+%template(eActionMapPtr) ePtr<eActionMap>;
+RefCount(eActionMap)
+%apply eActionMapPtr OUTPUT { eActionMapPtr &ptr }
+%apply eActionMap* *OUTPUT { eActionMap **ptr }
+
+/**************  signals  **************/
 
 template<class R> class PSignal0
 {
@@ -142,5 +166,6 @@ public:
 /**************  debug  **************/
 
 void runMainloop();
+void quitMainloop();
 %immutable keyPressed;
 PSignal1<void,int> &keyPressedSignal();