X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2Fenigma_python.i;h=7c9992772647645bf150fca9b1c7fcc52b56aab6;hp=e934885e01ae6c1710f15513256aba840fb4e77c;hb=ba5fcab217438b995c1f903e0294b71d1411668b;hpb=654bb0a0f8583b7cbc47b32f7e9b6921dffc4e03;ds=sidebyside

diff --git a/lib/python/enigma_python.i b/lib/python/enigma_python.i
index e934885..7c99927 100644
--- a/lib/python/enigma_python.i
+++ b/lib/python/enigma_python.i
@@ -38,8 +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/console.h>
+#include <lib/base/etpm.h>
 #include <lib/base/nconfig.h>
 #include <lib/base/message.h>
 #include <lib/driver/rc.h>
@@ -50,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>
@@ -70,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>
@@ -132,6 +134,7 @@ typedef long time_t;
 %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;
@@ -142,11 +145,7 @@ typedef long time_t;
 %include <lib/service/service.h>
 
 // TODO: embed these...
-%immutable eConsoleAppContainer::appClosed;
-%immutable eConsoleAppContainer::dataAvail;
-%immutable eConsoleAppContainer::stdoutAvail;
-%immutable eConsoleAppContainer::stderrAvail;
-%immutable eConsoleAppContainer::dataSent;
+%immutable ePicLoad::PictureData;
 %immutable eButton::selected;
 %immutable eInput::changed;
 %immutable eComponentScan::statusChanged;
@@ -161,13 +160,13 @@ typedef long time_t;
 %immutable ePythonMessagePump::recv_msg;
 %immutable eDVBLocalTimeHandler::m_timeUpdated;
 %include <lib/base/message.h>
-%include <lib/base/console.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>
@@ -189,6 +188,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>
@@ -268,7 +268,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;
@@ -283,18 +286,21 @@ 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);
 }
 %}
 
 /* needed for service groups */
 
-PyObject *getBestPlayableServiceReference(const eServiceReference &bouquet_ref, const eServiceReference &ignore);
+PyObject *getBestPlayableServiceReference(const eServiceReference &bouquet_ref, const eServiceReference &ignore, bool simulate=false);
 %{
-PyObject *getBestPlayableServiceReference(const eServiceReference &bouquet_ref, const eServiceReference &ignore)
+PyObject *getBestPlayableServiceReference(const eServiceReference &bouquet_ref, const eServiceReference &ignore, bool simulate=false)
 {
 	eStaticServiceDVBBouquetInformation info;
-	if (info.isPlayable(bouquet_ref, ignore))
+	if (info.isPlayable(bouquet_ref, ignore, simulate))
 		return New_eServiceReference(info.getPlayableService());
 	Py_INCREF(Py_None);
 	return Py_None;