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 92b24b631ef7013b835d3b4d129ed89b7656f415..307edd5a9fd35fb9f0fbe322b7574a1582e2c4ed 100644
(file)
--- a/
main/enigma.cpp
+++ b/
main/enigma.cpp
@@
-187,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!");
@@
-211,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])
@@
-239,8
+239,9
@@
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 */
{
eDebug("(exit code 5)");
if (exit_code == 5) /* python crash */
{
eDebug("(exit code 5)");
@@
-292,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);
+}