add EntryForegroundColor, EntryBorderColor, EntryBackgroundColor and

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

diff --git a/lib/python/enigma_python.i b/lib/python/enigma_python.i
index 92484735f34968b30848b92515a795e51a94c3ca..e19f4561455fa4c14f60e7993f0c5ed13988053a 100644 (file)
--- a/lib/python/enigma_python.i
+++ b/lib/python/enigma_python.i
@@ -41,10 +41,11 @@ is usually caused by not marking PSignals as immutable.
 #include <lib/base/eerror.h>
 #include <lib/base/console.h>
 #include <lib/base/nconfig.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/driver/rc.h>

+#include <lib/service/event.h>

 #include <lib/service/iservice.h>
 #include <lib/service/service.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/service/servicedvb.h>
 #include <lib/gdi/fb.h>
 #include <lib/gdi/font.h>


@@ -64,57 +65,41 @@ is usually caused by not marking PSignals as immutable.
 #include <lib/gui/eslider.h>
 #include <lib/gui/epositiongauge.h>
 #include <lib/gui/evideo.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/service/listboxservice.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/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/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/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/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/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/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/dvb_ci/dvbci.h>

 #include <lib/dvb_ci/dvbci_ui.h>
 #include <lib/python/python.h>
 #include <lib/dvb_ci/dvbci_ui.h>
 #include <lib/python/python.h>

-#include <lib/gdi/picexif.h>

 #include <lib/gdi/picload.h>
 #include <lib/gdi/picload.h>

-
-extern void runMainloop();
-extern void quitMainloop(int exit_code);
-extern eApplication *getApplication();
-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);
-PyObject *getBestPlayableServiceReference(const eServiceReference &bouquet_ref, const eServiceReference &ignore)
-{
-       eStaticServiceDVBBouquetInformation info;
-       if (info.isPlayable(bouquet_ref, ignore))
-               return New_eServiceReference(info.getPlayableService());
-       Py_INCREF(Py_None);
-       return Py_None;
-}

 %}
 
 %feature("ref")   iObject "$this->AddRef(); /* eDebug(\"AddRef (%s:%d)!\", __FILE__, __LINE__); */ "
 %feature("unref") iObject "$this->Release(); /* eDebug(\"Release! %s:%d\", __FILE__, __LINE__); */ "
 
 %}
 
 %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)
 /* this magic allows smartpointer to be used as OUTPUT arguments, i.e. call-by-reference-styled return value. */
 
 %define %typemap_output_simple(Type)


@@ -151,12 +136,10 @@ typedef long time_t;
 %immutable eSocketNotifier::activated;
 %include <lib/base/ebase.h>
 %include <lib/base/smartptr.h>
 %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>
 
 %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;
 // TODO: embed these...
 %immutable eConsoleAppContainer::appClosed;
 %immutable eConsoleAppContainer::dataAvail;


@@ -171,7 +154,9 @@ typedef long time_t;
 %immutable eDVBCI_UI::ciStateChanged;
 %immutable eDVBResourceManager::frontendUseMaskChanged;
 %immutable eAVSwitch::vcr_sb_notifier;
 %immutable eDVBCI_UI::ciStateChanged;
 %immutable eDVBResourceManager::frontendUseMaskChanged;
 %immutable eAVSwitch::vcr_sb_notifier;

-
+%immutable ePythonMessagePump::recv_msg;
+%immutable eDVBLocalTimeHandler::m_timeUpdated;
+%include <lib/base/message.h>

 %include <lib/base/console.h>
 %include <lib/base/nconfig.h>
 %include <lib/driver/rc.h>
 %include <lib/base/console.h>
 %include <lib/base/nconfig.h>
 %include <lib/driver/rc.h>


@@ -187,6 +172,7 @@ typedef long time_t;
 %include <lib/gui/einputstring.h>
 %include <lib/gui/einputnumber.h>
 %include <lib/gui/epixmap.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>
 %include <lib/gui/ebutton.h>
 %include <lib/gui/ewindow.h>
 %include <lib/gui/eslider.h>


@@ -199,8 +185,6 @@ typedef long time_t;
 %include <lib/gui/ewidgetanimation.h>
 %include <lib/gui/evideo.h>
 %include <lib/service/listboxservice.h>
 %include <lib/gui/ewidgetanimation.h>
 %include <lib/gui/evideo.h>
 %include <lib/service/listboxservice.h>

-%include <lib/components/scan.h>
-%include <lib/components/file_eraser.h>

 %include <lib/nav/pcore.h>
 %include <lib/actions/action.h>
 %include <lib/gdi/gfont.h>
 %include <lib/nav/pcore.h>
 %include <lib/actions/action.h>
 %include <lib/gdi/gfont.h>


@@ -210,24 +194,24 @@ typedef long time_t;
 %include <lib/dvb/epgcache.h>
 %include <lib/dvb/frontendparms.h>
 %include <lib/dvb/dvbtime.h>
 %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/idvb.h>

+%include <lib/dvb/dvb.h>

 %include <lib/dvb/frontend.h>
 %include <lib/dvb/pmt.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/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/dvb_ci/dvbci.h>

 %include <lib/dvb_ci/dvbci_ui.h>
 %include <lib/dvb/db.h>
 %include <lib/python/python.h>
 %include <lib/dvb_ci/dvbci_ui.h>
 %include <lib/dvb/db.h>
 %include <lib/python/python.h>

-%include <lib/gdi/picexif.h>

 %include <lib/gdi/picload.h>
 /**************  eptr  **************/
 
 %include <lib/gdi/picload.h>
 /**************  eptr  **************/
 

-%template(eActionMapPtr) ePtr<eActionMap>;
-

 /**************  signals  **************/
 
 template<class R> class PSignal0
 /**************  signals  **************/
 
 template<class R> class PSignal0


@@ -271,21 +255,6 @@ public:
        $1 = $input->get();
 }
 
        $1 = $input->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);
-eApplication *getApplication();
-PyObject *getBestPlayableServiceReference(const eServiceReference &bouquet_ref, const eServiceReference &ignore);

 %{
 RESULT SwigFromPython(ePtr<gPixmap> &result, PyObject *obj)
 {      
 %{
 RESULT SwigFromPython(ePtr<gPixmap> &result, PyObject *obj)
 {      


@@ -300,11 +269,6 @@ RESULT SwigFromPython(ePtr<gPixmap> &result, PyObject *obj)
        result = *res;
        return 0;
 }
        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);
 PyObject *New_eServiceReference(const eServiceReference &ref)
 {
     eServiceReference *result = new eServiceReference(ref);


@@ -316,3 +280,34 @@ PyObject *New_iRecordableServicePtr(const ePtr<iRecordableService> &ptr)
     return SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_ePtrTiRecordableService_t, 1);
 }
 %}
     return SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_ePtrTiRecordableService_t, 1);
 }
 %}

+
+/* needed for service groups */
+
+PyObject *getBestPlayableServiceReference(const eServiceReference &bouquet_ref, const eServiceReference &ignore);
+%{
+PyObject *getBestPlayableServiceReference(const eServiceReference &bouquet_ref, const eServiceReference &ignore)
+{
+       eStaticServiceDVBBouquetInformation info;
+       if (info.isPlayable(bouquet_ref, ignore))
+               return New_eServiceReference(info.getPlayableService());
+       Py_INCREF(Py_None);
+       return Py_None;
+}
+%}
+
+/************** 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 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();