X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f2c69b1c3a49b8b03866894fe3e3f3a4f330f517..269c1d980e92fa79d72c19b0a51db16240b2649d:/lib/python/enigma_python.i

diff --git a/lib/python/enigma_python.i b/lib/python/enigma_python.i
index 29294b12..2fec2ff1 100644
--- a/lib/python/enigma_python.i
+++ b/lib/python/enigma_python.i
@@ -39,14 +39,17 @@ is usually caused by not marking PSignals as immutable.
 #include <lib/base/ebase.h>
 #include <lib/base/smartptr.h>
 #include <lib/base/eerror.h>
-#include <lib/base/console.h>
+#include <lib/base/nconfig.h>
+#include <lib/base/message.h>
 #include <lib/driver/rc.h>
+#include <lib/service/event.h>
 #include <lib/service/iservice.h>
 #include <lib/service/service.h>
-#include <lib/service/event.h>
+#include <lib/service/servicedvb.h>
 #include <lib/gdi/fb.h>
 #include <lib/gdi/font.h>
 #include <lib/gdi/gpixmap.h>
+#include <lib/gdi/gfbdc.h>
 #include <lib/gui/ewidget.h>
 #include <lib/gui/elabel.h>
 #include <lib/gui/einput.h>
@@ -61,45 +64,44 @@ is usually caused by not marking PSignals as immutable.
 #include <lib/gui/ewidgetanimation.h>
 #include <lib/gui/eslider.h>
 #include <lib/gui/epositiongauge.h>
+#include <lib/gui/evideo.h>
+#include <lib/gui/ecanvas.h>
 #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/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/db.h>
-#include <lib/dvb/dvb.h>
+#include <lib/dvb/frontendparms.h>
 #include <lib/dvb/idvb.h>
+#include <lib/dvb/dvb.h>
 #include <lib/dvb/frontend.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/dvb/pmt.h>
+#include <lib/components/scan.h>
+#include <lib/components/file_eraser.h>
 #include <lib/driver/avswitch.h>
 #include <lib/driver/rfmod.h>
+#include <lib/driver/misc_options.h>
 #include <lib/driver/etimezone.h>
 #include <lib/gdi/lcd.h>
+#include <lib/mmi/mmi_ui.h>
+#include <lib/dvb_ci/dvbci.h>
 #include <lib/dvb_ci/dvbci_ui.h>
 #include <lib/python/python.h>
-
-extern void runMainloop();
-extern void quitMainloop(int exit_code);
-extern void setLCD(const char *c);
-extern void setLCDClock(const char *c);
-extern eApplication *getApplication();
-
-extern PSignal1<void,int> &keyPressedSignal();
+#include <lib/gdi/picload.h>
 %}
 
 %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)
@@ -120,55 +122,57 @@ extern PSignal1<void,int> &keyPressedSignal();
      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)));"
+   "$result = t_output_helper($result, ((*$1) ? SWIG_NewPointerObj((void*)($1), $1_descriptor, 1) : (delete $1, Py_INCREF(Py_None), Py_None)));"
 %enddef
 
 
 #define DEBUG
 typedef long time_t;
 %include "typemaps.i"
-%include "stl.i"
+%include "std_string.i"
 %include <lib/python/swig.h>
 %include <lib/base/object.h>
 %include <lib/base/eerror.h>
 
-%immutable eTimer::timeout;
 %immutable eSocketNotifier::activated;
 %include <lib/base/ebase.h>
 %include <lib/base/smartptr.h>
+%include <lib/service/event.h>
 %include <lib/service/iservice.h>
 %include <lib/service/service.h>
 
-%template(eServiceCenterPtr) ePtr<eServiceCenter>;
-%include <lib/service/event.h>
-
-
 // TODO: embed these...
-%immutable eConsoleAppContainer::appClosed;
-%immutable eConsoleAppContainer::dataAvail;
-%immutable eConsoleAppContainer::dataSent;
+%immutable ePicLoad::PictureData;
 %immutable eButton::selected;
 %immutable eInput::changed;
 %immutable eComponentScan::statusChanged;
 %immutable eComponentScan::newService;
 %immutable pNavigation::m_event;
+%immutable pNavigation::m_record_event;
 %immutable eListbox::selectionChanged;
-
-%include <lib/base/console.h>
+%immutable eDVBCI_UI::ciStateChanged;
+%immutable eSocket_UI::socketStateChanged;
+%immutable eDVBResourceManager::frontendUseMaskChanged;
+%immutable eAVSwitch::vcr_sb_notifier;
+%immutable ePythonMessagePump::recv_msg;
+%immutable eDVBLocalTimeHandler::m_timeUpdated;
+%include <lib/base/message.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/epoint.h>
 %include <lib/gdi/erect.h>
 %include <lib/gdi/esize.h>
-%include <lib/gdi/region.h>
 %include <lib/gui/ewidget.h>
 %include <lib/gui/elabel.h>
 %include <lib/gui/einput.h>
 %include <lib/gui/einputstring.h>
 %include <lib/gui/einputnumber.h>
 %include <lib/gui/epixmap.h>
+%include <lib/gui/ecanvas.h>
 %include <lib/gui/ebutton.h>
 %include <lib/gui/ewindow.h>
 %include <lib/gui/eslider.h>
@@ -179,9 +183,9 @@ typedef long time_t;
 %include <lib/gui/ewindowstyle.h>
 %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/components/scan.h>
-%include <lib/components/listboxepg.h>
 %include <lib/nav/pcore.h>
 %include <lib/actions/action.h>
 %include <lib/gdi/gfont.h>
@@ -191,20 +195,25 @@ typedef long time_t;
 %include <lib/dvb/epgcache.h>
 %include <lib/dvb/frontendparms.h>
 %include <lib/dvb/dvbtime.h>
-%include <lib/dvb/dvb.h>
 %include <lib/dvb/idvb.h>
+%include <lib/dvb/dvb.h>
 %include <lib/dvb/frontend.h>
+%include <lib/dvb/pmt.h>
+%include <lib/components/scan.h>
+%include <lib/components/file_eraser.h>
 %include <lib/driver/avswitch.h>
 %include <lib/driver/rfmod.h>
+%include <lib/driver/misc_options.h>
 %include <lib/driver/etimezone.h>
 %include <lib/gdi/lcd.h>
+%include <lib/mmi/mmi_ui.h>
+%include <lib/dvb_ci/dvbci.h>
 %include <lib/dvb_ci/dvbci_ui.h>
 %include <lib/dvb/db.h>
 %include <lib/python/python.h>
+%include <lib/gdi/picload.h>
 /**************  eptr  **************/
 
-%template(eActionMapPtr) ePtr<eActionMap>;
-
 /**************  signals  **************/
 
 template<class R> class PSignal0
@@ -242,15 +251,11 @@ public:
 	PyObject *get();
 };
 
-/**************  debug  **************/
+%template(PSignal2VoidIRecordableServiceInt) PSignal2<void,ePtr<iRecordableService>&,int>;
 
-void runMainloop();
-void quitMainloop(int exit_code);
-void setLCD(const char*);
-void setLCDClock(const char*);
-eApplication *getApplication();
-%immutable keyPressed;
-PSignal1<void,int> &keyPressedSignal();
+%typemap(out) PSignal2VoidIRecordableServiceInt {
+	$1 = $input->get();
+}
 
 %{
 RESULT SwigFromPython(ePtr<gPixmap> &result, PyObject *obj)
@@ -259,21 +264,70 @@ 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;
 	result = *res;
 	return 0;
 }
-PyObject *New_TestObj()
-{
-    TestObj *result = (TestObj *)new TestObj();
-    return SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_TestObj, 1);
-}
 PyObject *New_eServiceReference(const eServiceReference &ref)
 {
     eServiceReference *result = new eServiceReference(ref);
     return SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_eServiceReference, 1);
 }
+PyObject *New_iRecordableServicePtr(const ePtr<iRecordableService> &ptr)
+{
+    ePtr<iRecordableService> *result = new ePtr<iRecordableService>(ptr);
+#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, bool simulate=false);
+%{
+PyObject *getBestPlayableServiceReference(const eServiceReference &bouquet_ref, const eServiceReference &ignore, bool simulate=false)
+{
+	eStaticServiceDVBBouquetInformation info;
+	if (info.isPlayable(bouquet_ref, ignore, simulate))
+		return New_eServiceReference(info.getPlayableService());
+	Py_INCREF(Py_None);
+	return Py_None;
+}
+%}
+
+void setTunerTypePriorityOrder(int);
+%{
+void setTunerTypePriorityOrder(int order)
+{
+	eDVBFrontend::setTypePriorityOrder(order);
+}
 %}
+
+/************** temp *****************/
+
+	/* need a better place for this, i agree. */
+%{
+extern void runMainloop();
+extern void quitMainloop(int exit_code);
+extern eApplication *getApplication();
+extern int getPrevAsciiCode();
+extern void addFont(const char *filename, const char *alias, int scale_factor, int is_replacement);
+extern const char *getEnigmaVersionString();
+extern void dump_malloc_stats(void);
+%}
+
+extern void addFont(const char *filename, const char *alias, int scale_factor, int is_replacement);
+extern int getPrevAsciiCode();
+extern void runMainloop();
+extern void quitMainloop(int exit_code);
+extern eApplication *getApplication();
+extern const char *getEnigmaVersionString();
+extern void dump_malloc_stats(void);