X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=main%2Fenigma.cpp;h=1cdd867ba9e2b9a20250e36b762168300862f0f0;hp=882af996eed3b4112cb71f40bd4edbf33a6da4cb;hb=c72fb90523ab709569016548763d872ae53327e3;hpb=879d60c88e24c2c3f2aab9dff73192c901f63f31

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 882af99..1cdd867 100644
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -13,12 +13,9 @@
 #include <lib/base/eerror.h>
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
-#include <lib/gdi/gfbdc.h>
+#include <lib/gdi/gmaindc.h>
 #include <lib/gdi/glcddc.h>
 #include <lib/gdi/grc.h>
-#ifdef WITH_SDL
-#include <lib/gdi/sdl.h>
-#endif
 #include <lib/gdi/epng.h>
 #include <lib/gdi/font.h>
 #include <lib/gui/ebutton.h>
@@ -31,6 +28,7 @@
 #include <lib/python/python.h>
 
 #include "bsod.h"
+#include "version_info.h"
 
 #include <gst/gst.h>
 
@@ -146,15 +144,10 @@ int main(int argc, char **argv)
 	eMain main;
 
 #if 1
-#ifdef WITH_SDL
-	ePtr<gSDLDC> my_dc;
-	gSDLDC::getInstance(my_dc);
-#else
-	ePtr<gFBDC> my_dc;
-	gFBDC::getInstance(my_dc);
+	ePtr<gMainDC> my_dc;
+	gMainDC::getInstance(my_dc);
 	
-	int double_buffer = my_dc->haveDoubleBuffering();
-#endif
+	//int double_buffer = my_dc->haveDoubleBuffering();
 
 	ePtr<gLCDDC> my_lcd_dc;
 	gLCDDC::getInstance(my_lcd_dc);
@@ -275,11 +268,6 @@ eApplication *getApplication()
 	return eApp;
 }
 
-void runMainloop()
-{
-	eApp->runLoop();
-}
-
 void quitMainloop(int exitCode)
 {
 	FILE *f = fopen("/proc/stb/fp/was_timer_wakeup", "w");
@@ -304,22 +292,30 @@ void quitMainloop(int exitCode)
 	eApp->quit(0);
 }
 
-#include "version.h"
+static void sigterm_handler(int num)
+{
+	quitMainloop(128 + num);
+}
+
+void runMainloop()
+{
+	struct sigaction act;
+
+	act.sa_handler = sigterm_handler;
+	act.sa_flags = SA_RESTART;
+
+	if (sigemptyset(&act.sa_mask) == -1)
+		perror("sigemptyset");
+	if (sigaction(SIGTERM, &act, 0) == -1)
+		perror("SIGTERM");
+
+	eApp->runLoop();
+}
 
 const char *getEnigmaVersionString()
 {
-	std::string date =
-#ifdef ENIGMA2_LAST_CHANGE_DATE
-		ENIGMA2_LAST_CHANGE_DATE;
-#else
-		__DATE__;
-#endif
-	std::string branch =
-#ifdef ENIGMA2_BRANCH
-		ENIGMA2_BRANCH;
-#else
-		"HEAD";
-#endif
+	std::string date = enigma2_date;
+	std::string branch = enigma2_branch;
 	return std::string(date + '-' + branch).c_str();
 }