git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update da,lt language
[enigma2.git]
/
main
/
enigma.cpp
diff --git
a/main/enigma.cpp
b/main/enigma.cpp
index 72087c92144655f63cf6f2b981c92859cdece004..156929619239c0e6f96015ac757d1d9697d0eacc 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>
@@
-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])
@@
-258,7
+254,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;
@@
-297,3
+292,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);
+}