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 be9d9a537326ac5a28605526b49bc753627664fb..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.");
@@
-309,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
+ __DATE__;
+#endif
+ std::string branch =
+#ifdef ENIGMA2_BRANCH
+ ENIGMA2_BRANCH;
#else
#else
- "HEAD"
+ "HEAD"
;
#endif
#endif
-
"-" __DATE__
;
+
return std::string(date + '-' + branch).c_str()
;
}
}
+
#include <malloc.h>
void dump_malloc_stats(void)
#include <malloc.h>
void dump_malloc_stats(void)