X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/875b117b3aeca1af73942d4eeb691496f6c884f9..e15e18a6bb21498eb89e68473e8b1a3a5e2310aa:/main/enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 7f3ba44b..b3364679 100644
--- 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.");
@@ -245,6 +241,9 @@ int main(int argc, char **argv)
 //	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)");
@@ -306,14 +305,21 @@ void quitMainloop(int exitCode)
 
 const char *getEnigmaVersionString()
 {
-	return 
-#ifdef ENIGMA2_CHECKOUT_TAG
-		ENIGMA2_CHECKOUT_TAG
+	std::string date =
+#ifdef ENIGMA2_LAST_CHANGE_DATE
+		ENIGMA2_LAST_CHANGE_DATE;
 #else
-		"HEAD"
+		__DATE__;
 #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)