X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2Fenigma_python.i;h=7a42f76a4ece3bba1139c5fb1234ccd068ce1c70;hb=a97a44187ed9b5da8473ceab5708d6f190b02372;hp=bdf1b1441e68a566ec5c8f9513ffbbcdf7fd9d9d;hpb=bbfcb7ea1f040d030277e2b6f2efa9ea0967bf2b;p=vuplus_dvbapp

diff --git a/lib/python/enigma_python.i b/lib/python/enigma_python.i
old mode 100644
new mode 100755
index bdf1b14..7a42f76
--- a/lib/python/enigma_python.i
+++ b/lib/python/enigma_python.i
@@ -38,7 +38,9 @@ is usually caused by not marking PSignals as immutable.
 #define SWIG_COMPILE
 #include <lib/base/ebase.h>
 #include <lib/base/smartptr.h>
+#include <lib/base/eenv.h>
 #include <lib/base/eerror.h>
+#include <lib/base/etpm.h>
 #include <lib/base/nconfig.h>
 #include <lib/base/message.h>
 #include <lib/driver/rc.h>
@@ -49,7 +51,7 @@ is usually caused by not marking PSignals as immutable.
 #include <lib/gdi/fb.h>
 #include <lib/gdi/font.h>
 #include <lib/gdi/gpixmap.h>
-#include <lib/gdi/gfbdc.h>
+#include <lib/gdi/gmaindc.h>
 #include <lib/gui/ewidget.h>
 #include <lib/gui/elabel.h>
 #include <lib/gui/einput.h>
@@ -69,6 +71,7 @@ is usually caused by not marking PSignals as immutable.
 #include <lib/python/connections.h>
 #include <lib/gui/elistbox.h>
 #include <lib/gui/elistboxcontent.h>
+#include <lib/gui/esubtitle.h>
 #include <lib/service/listboxservice.h>
 #include <lib/nav/pcore.h>
 #include <lib/actions/action.h>
@@ -87,6 +90,7 @@ is usually caused by not marking PSignals as immutable.
 #include <lib/components/scan.h>
 #include <lib/components/file_eraser.h>
 #include <lib/driver/avswitch.h>
+#include <lib/driver/hdmi_cec.h>
 #include <lib/driver/rfmod.h>
 #include <lib/driver/misc_options.h>
 #include <lib/driver/etimezone.h>
@@ -126,11 +130,13 @@ is usually caused by not marking PSignals as immutable.
 
 
 #define DEBUG
+#define BUILD_VUPLUS
 typedef long time_t;
 %include "typemaps.i"
 %include "std_string.i"
 %include <lib/python/swig.h>
 %include <lib/base/object.h>
+%include <lib/base/eenv.h>
 %include <lib/base/eerror.h>
 
 %immutable eSocketNotifier::activated;
@@ -153,15 +159,18 @@ typedef long time_t;
 %immutable eSocket_UI::socketStateChanged;
 %immutable eDVBResourceManager::frontendUseMaskChanged;
 %immutable eAVSwitch::vcr_sb_notifier;
+%immutable eHdmiCEC::messageReceived;
+%immutable eHdmiCEC::messageReceivedKey;
 %immutable ePythonMessagePump::recv_msg;
 %immutable eDVBLocalTimeHandler::m_timeUpdated;
 %include <lib/base/message.h>
+%include <lib/base/etpm.h>
 %include <lib/base/nconfig.h>
 %include <lib/driver/rc.h>
 %include <lib/gdi/fb.h>
 %include <lib/gdi/font.h>
 %include <lib/gdi/gpixmap.h>
-%include <lib/gdi/gfbdc.h>
+%include <lib/gdi/gmaindc.h>
 %include <lib/gdi/epoint.h>
 %include <lib/gdi/erect.h>
 %include <lib/gdi/esize.h>
@@ -183,6 +192,7 @@ typedef long time_t;
 %include <lib/gui/ewindowstyleskinned.h>
 %include <lib/gui/ewidgetanimation.h>
 %include <lib/gui/evideo.h>
+%include <lib/gui/esubtitle.h>
 %include <lib/service/listboxservice.h>
 %include <lib/nav/pcore.h>
 %include <lib/actions/action.h>
@@ -200,6 +210,7 @@ typedef long time_t;
 %include <lib/components/scan.h>
 %include <lib/components/file_eraser.h>
 %include <lib/driver/avswitch.h>
+%include <lib/driver/hdmi_cec.h>
 %include <lib/driver/rfmod.h>
 %include <lib/driver/misc_options.h>
 %include <lib/driver/etimezone.h>
@@ -255,6 +266,12 @@ public:
 	$1 = $input->get();
 }
 
+%template(PSignal2VII) PSignal2<void,int,int>;
+
+%typemap(out) PSignal2VII {
+       $1 = $input->get();
+}
+
 %{
 RESULT SwigFromPython(ePtr<gPixmap> &result, PyObject *obj)
 {	
@@ -262,7 +279,10 @@ RESULT SwigFromPython(ePtr<gPixmap> &result, PyObject *obj)
 
 	res = 0;
 	result = 0;
-	if (SWIG_Python_ConvertPtr(obj, (void **)&res, SWIGTYPE_p_ePtrTgPixmap_t, SWIG_POINTER_EXCEPTION | 0))
+#ifndef SWIGTYPE_p_ePtrT_gPixmap_t
+#define SWIGTYPE_p_ePtrT_gPixmap_t SWIGTYPE_p_ePtrTgPixmap_t
+#endif
+	if (SWIG_Python_ConvertPtr(obj, (void **)&res, SWIGTYPE_p_ePtrT_gPixmap_t, SWIG_POINTER_EXCEPTION | 0))
 		return -1;
 	if (!res)
 		return -1;
@@ -277,7 +297,10 @@ PyObject *New_eServiceReference(const eServiceReference &ref)
 PyObject *New_iRecordableServicePtr(const ePtr<iRecordableService> &ptr)
 {
     ePtr<iRecordableService> *result = new ePtr<iRecordableService>(ptr);
-    return SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_ePtrTiRecordableService_t, 1);
+#ifndef SWIGTYPE_p_ePtrT_iRecordableService_t
+#define SWIGTYPE_p_ePtrT_iRecordableService_t SWIGTYPE_p_ePtrTiRecordableService_t
+#endif
+    return SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_ePtrT_iRecordableService_t, 1);
 }
 %}