git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow single tasks in jobs to stay resident and continue doing their thing while...
[enigma2.git]
/
main
/
enigma.cpp
diff --git
a/main/enigma.cpp
b/main/enigma.cpp
index 631a3fb25561c4d56ae2430546b0080bab2ba64e..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>
#include <stdio.h>
#include <unistd.h>
#include <libsig_comp.h>
@@
-20,7
+16,7
@@
#include <lib/gdi/sdl.h>
#endif
#include <lib/gdi/epng.h>
#include <lib/gdi/sdl.h>
#endif
#include <lib/gdi/epng.h>
-#include <lib/gdi/font.h>
+#include <lib/gdi/font.h>
#include <lib/gui/ebutton.h>
#include <lib/gui/elabel.h>
#include <lib/gui/elistboxcontent.h>
#include <lib/gui/ebutton.h>
#include <lib/gui/elabel.h>
#include <lib/gui/elistboxcontent.h>
@@
-30,7
+26,7
@@
#include <lib/python/connections.h>
#include <lib/python/python.h>
#include <lib/python/connections.h>
#include <lib/python/python.h>
-#include "bsod.h"
+#include "bsod.h"
#ifdef HAVE_GSTREAMER
#include <gst/gst.h>
#ifdef HAVE_GSTREAMER
#include <gst/gst.h>
@@
-150,7
+146,7
@@
int main(int argc, char **argv)
eMain main;
#if 1
eMain main;
#if 1
-#ifdef
SDLDC
+#ifdef
WITH_SDL
ePtr<gSDLDC> my_dc;
gSDLDC::getInstance(my_dc);
#else
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;
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!");
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];
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])
loadPNG(wait[i], filename);
if (!wait[i])
@@
-243,10
+239,14
@@
int main(int argc, char **argv)
setIoPrio(IOPRIO_CLASS_BE, 3);
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 */
if (exit_code == 5) /* python crash */
+ {
+ eDebug("(exit code 5)");
bsodFatal();
bsodFatal();
+ }
dsk.paint();
dsk_lcd.paint();
dsk.paint();
dsk_lcd.paint();
@@
-255,7
+255,6
@@
int main(int argc, char **argv)
gPainter p(my_lcd_dc);
p.resetClip(eRect(0, 0, 132, 64));
p.clear();
gPainter p(my_lcd_dc);
p.resetClip(eRect(0, 0, 132, 64));
p.clear();
- p.flush();
}
return exit_code;
}
return exit_code;
@@
-294,3
+293,10
@@
const char *getEnigmaVersionString()
#endif
"-" __DATE__;
}
#endif
"-" __DATE__;
}
+#include <malloc.h>
+
+void dump_malloc_stats(void)
+{
+ struct mallinfo mi = mallinfo();
+ eDebug("MALLOC: %d total", mi.uordblks);
+}