use another function to initial import mytest.py (this fixes python

[enigma2.git] / main / enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 6c5169d2e23dab04b66a559ca13aafce56e35cdc..307edd5a9fd35fb9f0fbe322b7574a1582e2c4ed 100644 (file)
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -1,7 +1,3 @@
-#ifdef WITH_SDL
-#define SDLDC
-#endif
-
 #include <stdio.h>
 #include <unistd.h>
 #include <libsig_comp.h>
@@ -150,7 +146,7 @@ int main(int argc, char **argv)
        eMain main;
 
 #if 1
-#ifdef SDLDC
+#ifdef WITH_SDL
        ePtr<gSDLDC> my_dc;
        gSDLDC::getInstance(my_dc);
 #else
@@ -191,7 +187,7 @@ int main(int argc, char **argv)
        dsk_lcd.setDC(my_lcd_dc);
 
        ePtr<gPixmap> m_pm;
-       loadPNG(m_pm, DATADIR "/enigma2/pal.png");
+       loadPNG(m_pm, DATADIR "/enigma2/skin_default/pal.png");
        if (!m_pm)
        {
                eFatal("pal.png not found!");
@@ -215,7 +211,7 @@ int main(int argc, char **argv)
                for (i=0; i<MAX_SPINNER; ++i)
                {
                        char filename[strlen(DATADIR) + 20];
-                       sprintf(filename, DATADIR "/enigma2/wait%d.png", i + 1);
+                       sprintf(filename, DATADIR "/enigma2/skin_default/spinner/wait%d.png", i + 1);
                        loadPNG(wait[i], filename);
                        
                        if (!wait[i])
@@ -243,8 +239,9 @@ int main(int argc, char **argv)
 
        setIoPrio(IOPRIO_CLASS_BE, 3);
 
-       python.execute("mytest", "__main__");
-       
+//     python.execute("mytest", "__main__");
+       python.execFile("/usr/lib/enigma2/python/mytest.py");
+
        if (exit_code == 5) /* python crash */
        {
                eDebug("(exit code 5)");
@@ -296,3 +293,10 @@ const char *getEnigmaVersionString()
 #endif
                        "-" __DATE__;
 }
+#include <malloc.h>
+
+void dump_malloc_stats(void)
+{
+       struct mallinfo mi = mallinfo();
+       eDebug("MALLOC: %d total", mi.uordblks);
+}