git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lcd: fix build without <dbox/*.h>
[enigma2.git]
/
main
/
enigma.cpp
diff --git
a/main/enigma.cpp
b/main/enigma.cpp
index 98175c49425f927a358a41f8d1471f04b96ab328..b3364679e98e3029da1e97d4797222b3bd0f5753 100644
(file)
--- a/
main/enigma.cpp
+++ b/
main/enigma.cpp
@@
-31,9
+31,7
@@
#include "bsod.h"
#include "bsod.h"
-#ifdef HAVE_GSTREAMER
#include <gst/gst.h>
#include <gst/gst.h>
-#endif
#ifdef OBJECT_DEBUG
int object_total_remaining;
#ifdef OBJECT_DEBUG
int object_total_remaining;
@@
-135,9
+133,7
@@
int main(int argc, char **argv)
atexit(object_dump);
#endif
atexit(object_dump);
#endif
-#ifdef HAVE_GSTREAMER
gst_init(&argc, &argv);
gst_init(&argc, &argv);
-#endif
// set pythonpath if unset
setenv("PYTHONPATH", LIBDIR "/enigma2/python", 0);
// set pythonpath if unset
setenv("PYTHONPATH", LIBDIR "/enigma2/python", 0);
@@
-172,11
+168,11
@@
int main(int argc, char **argv)
eTextPara::forceReplacementGlyph(i);
eWidgetDesktop dsk(eSize(720, 576));
eTextPara::forceReplacementGlyph(i);
eWidgetDesktop dsk(eSize(720, 576));
- eWidgetDesktop dsk_lcd(
eSize(132, 64
));
-
+ eWidgetDesktop dsk_lcd(
my_lcd_dc->size(
));
+
dsk.setStyleID(0);
dsk.setStyleID(0);
- dsk_lcd.setStyleID(1);
-
+ dsk_lcd.setStyleID(
my_lcd_dc->size().width() == 96 ? 2 :
1);
+
/* if (double_buffer)
{
eDebug(" - double buffering found, enable buffered graphics mode.");
/* if (double_buffer)
{
eDebug(" - double buffering found, enable buffered graphics mode.");
@@
-213,7
+209,7
@@
int main(int argc, char **argv)
ePtr<gPixmap> wait[MAX_SPINNER];
for (i=0; i<MAX_SPINNER; ++i)
{
ePtr<gPixmap> wait[MAX_SPINNER];
for (i=0; i<MAX_SPINNER; ++i)
{
- char filename[strlen(DATADIR) +
20
];
+ char filename[strlen(DATADIR) +
41
];
sprintf(filename, DATADIR "/enigma2/skin_default/spinner/wait%d.png", i + 1);
loadPNG(wait[i], filename);
sprintf(filename, DATADIR "/enigma2/skin_default/spinner/wait%d.png", i + 1);
loadPNG(wait[i], filename);
@@
-245,6
+241,9
@@
int main(int argc, char **argv)
// python.execute("mytest", "__main__");
python.execFile("/usr/lib/enigma2/python/mytest.py");
// python.execute("mytest", "__main__");
python.execFile("/usr/lib/enigma2/python/mytest.py");
+ extern void setFullsize(); // definend in lib/gui/evideo.cpp
+ setFullsize();
+
if (exit_code == 5) /* python crash */
{
eDebug("(exit code 5)");
if (exit_code == 5) /* python crash */
{
eDebug("(exit code 5)");
@@
-306,14
+305,21
@@
void quitMainloop(int exitCode)
const char *getEnigmaVersionString()
{
const char *getEnigmaVersionString()
{
- return
-#ifdef ENIGMA2_
CHECKOUT_TAG
- ENIGMA2_
CHECKOUT_TAG
+ std::string date =
+#ifdef ENIGMA2_
LAST_CHANGE_DATE
+ ENIGMA2_
LAST_CHANGE_DATE;
#else
#else
- "HEAD"
+ __DATE__;
#endif
#endif
- "-" __DATE__;
+ std::string branch =
+#ifdef ENIGMA2_BRANCH
+ ENIGMA2_BRANCH;
+#else
+ "HEAD";
+#endif
+ return std::string(date + '-' + branch).c_str();
}
}
+
#include <malloc.h>
void dump_malloc_stats(void)
#include <malloc.h>
void dump_malloc_stats(void)