add support for markers in bouquets

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

diff --git a/lib/python/enigma_python.i b/lib/python/enigma_python.i
index 35290230b7dcc857a6eaf3347e126374c742388a..89aef414479881f947c81cec461a6989ac3fcfe6 100644 (file)
--- a/lib/python/enigma_python.i
+++ b/lib/python/enigma_python.i
@@ -39,10 +39,13 @@ 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/econfig.h>
+#include <lib/base/console.h>
+#include <lib/base/nconfig.h>
+#include <lib/driver/rc.h>
 #include <lib/service/iservice.h>
 #include <lib/service/service.h>
 #include <lib/service/event.h>
+#include <lib/gdi/fb.h>
 #include <lib/gdi/font.h>
 #include <lib/gdi/gpixmap.h>
 #include <lib/gui/ewidget.h>
@@ -58,17 +61,22 @@ is usually caused by not marking PSignals as immutable.
 #include <lib/gui/ewindowstyleskinned.h>
 #include <lib/gui/ewidgetanimation.h>
 #include <lib/gui/eslider.h>
+#include <lib/gui/epositiongauge.h>
+#include <lib/gui/evideo.h>
 #include <lib/python/connections.h>
 #include <lib/gui/elistbox.h>
 #include <lib/gui/elistboxcontent.h>
 #include <lib/service/listboxservice.h>
 #include <lib/components/scan.h>
-#include <lib/components/listboxepg.h>
+#include <lib/components/file_eraser.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/idvb.h>
+#include <lib/dvb/frontend.h>
 #include <lib/dvb/volume.h>
 #include <lib/dvb/sec.h>
 #include <lib/dvb/epgcache.h>
@@ -83,11 +91,11 @@ is usually caused by not marking PSignals as immutable.
 
 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();
+extern int getPrevAsciiCode();
+extern int isUTF8(const std::string &);
+extern std::string convertUTF8DVB(const std::string &, int);
+extern std::string convertDVBUTF8(const unsigned char *data, int len, int table, int tsidonid);
 %}
 
 %feature("ref")   iObject "$this->AddRef(); /* eDebug(\"AddRef (%s:%d)!\", __FILE__, __LINE__); */ "
@@ -125,7 +133,6 @@ typedef long time_t;
 %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;
@@ -137,15 +144,23 @@ typedef long time_t;
 %template(eServiceCenterPtr) ePtr<eServiceCenter>;
 %include <lib/service/event.h>
 
-
 // TODO: embed these...
+%immutable eConsoleAppContainer::appClosed;
+%immutable eConsoleAppContainer::dataAvail;
+%immutable eConsoleAppContainer::dataSent;
 %immutable eButton::selected;
 %immutable eInput::changed;
 %immutable eComponentScan::statusChanged;
 %immutable eComponentScan::newService;
 %immutable pNavigation::m_event;
 %immutable eListbox::selectionChanged;
+%immutable eDVBCI_UI::ciStateChanged;
+%immutable eDVBResourceManager::frontendUseMaskChanged;
 
+%include <lib/base/console.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/epoint.h>
@@ -161,15 +176,17 @@ typedef long time_t;
 %include <lib/gui/ebutton.h>
 %include <lib/gui/ewindow.h>
 %include <lib/gui/eslider.h>
+%include <lib/gui/epositiongauge.h>
 %include <lib/gui/ewidgetdesktop.h>
 %include <lib/gui/elistbox.h>
 %include <lib/gui/elistboxcontent.h>
 %include <lib/gui/ewindowstyle.h>
 %include <lib/gui/ewindowstyleskinned.h>
 %include <lib/gui/ewidgetanimation.h>
+%include <lib/gui/evideo.h>
 %include <lib/service/listboxservice.h>
 %include <lib/components/scan.h>
-%include <lib/components/listboxepg.h>
+%include <lib/components/file_eraser.h>
 %include <lib/nav/pcore.h>
 %include <lib/actions/action.h>
 %include <lib/gdi/gfont.h>
@@ -179,6 +196,9 @@ 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/frontend.h>
 %include <lib/driver/avswitch.h>
 %include <lib/driver/rfmod.h>
 %include <lib/driver/etimezone.h>
@@ -198,42 +218,60 @@ public:
        PyObject *get();
 };
 
-template<class R, class P0> class PSignal1
-{
-public:
-       PyObject *get();
-};
+%template(PSignal0V) PSignal0<void>;
 
-template<class R, class P0, class P1> class PSignal2
+%typemap(out) PSignal0V {
+       $1 = $input->get();
+}
+
+template<class R, class P0> class PSignal1
 {
 public:
        PyObject *get();
 };
 
 %template(PSignal1VI) PSignal1<void,int>;
+%template(PSignal1VS) PSignal1<void,const char *c>;
 
 %typemap(out) PSignal1VI {
        $1 = $input->get();
 }
 
-%template(PSignal0V) PSignal0<void>;
-
-%typemap(out) PSignal0V {
+%typemap(out) PSignal1VS {
        $1 = $input->get();
 }
 
+template<class R, class P0, class P1> class PSignal2
+{
+public:
+       PyObject *get();
+};
+
+/************** temp *****************/
+
+       /* need a better place for this, i agree. */
+%{
+void addFont(const char *filename, const char *alias, int scale_factor, int is_replacement); 
+%}
+void addFont(const char *filename, const char *alias, int scale_factor, int is_replacement);
 
 /**************  debug  **************/
 
+int getPrevAsciiCode();
 void runMainloop();
 void quitMainloop(int exit_code);
-void setLCD(const char*);
-void setLCDClock(const char*);
 eApplication *getApplication();
-%immutable keyPressed;
-PSignal1<void,int> &keyPressedSignal();
-
+int isUTF8(const std::string &);
+std::string convertUTF8DVB(const std::string &, int);
+std::string convertDVBUTF8(std::string text, int table);
 %{
+
+std::string convertDVBUTF8(std::string text, int table)
+{
+       int len = text.length();
+       return convertDVBUTF8(len?(unsigned char*)text.c_str():(unsigned char*)"", len, table, 0);
+}
+
 RESULT SwigFromPython(ePtr<gPixmap> &result, PyObject *obj)
 {      
        ePtr<gPixmap> *res;