lcd: fix build without <dbox/*.h>

[enigma2.git] / main / enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index b5523d31bda5abfda22e2d9cdfa8840da4eeaddf..b3364679e98e3029da1e97d4797222b3bd0f5753 100644 (file)
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -31,9 +31,7 @@
 
 #include "bsod.h"
 
-#ifdef HAVE_GSTREAMER
 #include <gst/gst.h>
-#endif
 
 #ifdef OBJECT_DEBUG
 int object_total_remaining;
@@ -135,9 +133,7 @@ int main(int argc, char **argv)
        atexit(object_dump);
 #endif
 
-#ifdef HAVE_GSTREAMER
        gst_init(&argc, &argv);
-#endif
 
        // 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));
-       eWidgetDesktop dsk_lcd(eSize(132, 64));
-       
+       eWidgetDesktop dsk_lcd(my_lcd_dc->size());
+
        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.");
@@ -319,7 +315,7 @@ const char *getEnigmaVersionString()
 #ifdef ENIGMA2_BRANCH
                ENIGMA2_BRANCH;
 #else
-               "HEAD"
+               "HEAD";
 #endif
        return std::string(date + '-' + branch).c_str();
 }