move AddFont to more related place

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

diff --git a/lib/python/enigma_python.i b/lib/python/enigma_python.i
index 3ee1416e1491dacc027d3c597b42a6c7dab02b29..1debfeedb6913ff6940ba90f92a5c4c4b0a20a6e 100644 (file)
--- a/lib/python/enigma_python.i
+++ b/lib/python/enigma_python.i
@@ -91,30 +91,12 @@ is usually caused by not marking PSignals as immutable.
 #include <lib/gdi/lcd.h>
 #include <lib/dvb_ci/dvbci_ui.h>
 #include <lib/python/python.h>
-#include <lib/gdi/picexif.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__); */ "
 
-
 /* this magic allows smartpointer to be used as OUTPUT arguments, i.e. call-by-reference-styled return value. */
 
 %define %typemap_output_simple(Type)
@@ -142,7 +124,7 @@ PyObject *getBestPlayableServiceReference(const eServiceReference &bouquet_ref,
 #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>
@@ -153,8 +135,6 @@ typedef long time_t;
 %include <lib/base/smartptr.h>
 %include <lib/service/iservice.h>
 %include <lib/service/service.h>
-
-%template(eServiceCenterPtr) ePtr<eServiceCenter>;
 %include <lib/service/event.h>
 
 // TODO: embed these...
@@ -222,12 +202,9 @@ typedef long time_t;
 %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  **************/
 
-%template(eActionMapPtr) ePtr<eActionMap>;
-
 /**************  signals  **************/
 
 template<class R> class PSignal0
@@ -271,21 +248,6 @@ public:
        $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)
 {      
@@ -316,3 +278,34 @@ PyObject *New_iRecordableServicePtr(const ePtr<iRecordableService> &ptr)
     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();