move AddFont to more related place

small cleanup

diff --git a/lib/gdi/font.cpp b/lib/gdi/font.cpp
index 329c4679c9db68e5e5a797681bda091853b0bf8b..3948ea98b244272b2def8551a911469fc79b68ae 100644 (file)
--- a/lib/gdi/font.cpp
+++ b/lib/gdi/font.cpp
@@ -235,6 +235,13 @@ int fontRenderClass::getFont(ePtr<Font> &font, const std::string &face, int size
        return 0;
 }
 
+void addFont(const char *filename, const char *alias, int scale_factor, int is_replacement)
+{
+       fontRenderClass::getInstance()->AddFont(filename, alias, scale_factor);
+       if (is_replacement)
+               eTextPara::setReplacementFont(alias);
+}
+
 DEFINE_REF(Font);
 
 Font::Font(fontRenderClass *render, FTC_FaceID faceid, int isize, int tw): tabwidth(tw)

diff --git a/lib/python/enigma_python.i b/lib/python/enigma_python.i
index 090585bd641e02a3e7b2198c614a0fc89ea37fd2..1debfeedb6913ff6940ba90f92a5c4c4b0a20a6e 100644 (file)
--- a/lib/python/enigma_python.i
+++ b/lib/python/enigma_python.i
@@ -92,28 +92,11 @@ is usually caused by not marking PSignals as immutable.
 #include <lib/dvb_ci/dvbci_ui.h>
 #include <lib/python/python.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)
@@ -265,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)
 {      
@@ -310,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();

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 4799a5cf0c4742242d9999a56d6e7dd8baa397e4..cc9781cc4b32c3e6d83ec7b2fc64bd3cf789bbe3 100644 (file)
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -236,10 +236,3 @@ void quitMainloop(int exitCode)
        exit_code = exitCode;
        eApp->quit(0);
 }
-
-void addFont(const char *filename, const char *alias, int scale_factor, int is_replacement)
-{
-       fontRenderClass::getInstance()->AddFont(filename, alias, scale_factor);
-       if (is_replacement)
-               eTextPara::setReplacementFont(alias);
-}