X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f4f8f9a2775fa1794de6935756f30bf4d99f33e8..6d3b397a9316337447f2ebfcd66c01abec54b4e8:/main/enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 6c5169d2..b8554d58 100644
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -1,9 +1,8 @@
-#ifdef WITH_SDL
-#define SDLDC
-#endif
-
-#include <stdio.h>
 #include <unistd.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/ioctl.h>
 #include <libsig_comp.h>
 
 #include <lib/actions/action.h>
@@ -150,7 +149,7 @@ int main(int argc, char **argv)
 	eMain main;
 
 #if 1
-#ifdef SDLDC
+#ifdef WITH_SDL
 	ePtr<gSDLDC> my_dc;
 	gSDLDC::getInstance(my_dc);
 #else
@@ -173,11 +172,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.");
@@ -191,7 +190,7 @@ int main(int argc, char **argv)
 	dsk_lcd.setDC(my_lcd_dc);
 
 	ePtr<gPixmap> m_pm;
-	loadPNG(m_pm, DATADIR "/enigma2/pal.png");
+	loadPNG(m_pm, DATADIR "/enigma2/skin_default/pal.png");
 	if (!m_pm)
 	{
 		eFatal("pal.png not found!");
@@ -214,8 +213,8 @@ int main(int argc, char **argv)
 		ePtr<gPixmap> wait[MAX_SPINNER];
 		for (i=0; i<MAX_SPINNER; ++i)
 		{
-			char filename[strlen(DATADIR) + 20];
-			sprintf(filename, DATADIR "/enigma2/wait%d.png", i + 1);
+			char filename[strlen(DATADIR) + 41];
+			sprintf(filename, DATADIR "/enigma2/skin_default/spinner/wait%d.png", i + 1);
 			loadPNG(wait[i], filename);
 			
 			if (!wait[i])
@@ -243,12 +242,16 @@ int main(int argc, char **argv)
 
 	setIoPrio(IOPRIO_CLASS_BE, 3);
 
-	python.execute("mytest", "__main__");
-	
+//	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)");
-		bsodFatal();
+		bsodFatal(0);
 	}
 	
 	dsk.paint();
@@ -280,6 +283,24 @@ void runMainloop()
 
 void quitMainloop(int exitCode)
 {
+	FILE *f = fopen("/proc/stb/fp/was_timer_wakeup", "w");
+	if (f)
+	{
+		fprintf(f, "%d", 0);
+		fclose(f);
+	}
+	else
+	{
+		int fd = open("/dev/dbox/fp0", O_WRONLY);
+		if (fd >= 0)
+		{
+			if (ioctl(fd, 10 /*FP_CLEAR_WAKEUP_TIMER*/) < 0)
+				eDebug("FP_CLEAR_WAKEUP_TIMER failed (%m)");
+			close(fd);
+		}
+		else
+			eDebug("open /dev/dbox/fp0 for wakeup timer clear failed!(%m)");
+	}
 	exit_code = exitCode;
 	eApp->quit(0);
 }
@@ -288,11 +309,25 @@ 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)
+{
+	struct mallinfo mi = mallinfo();
+	eDebug("MALLOC: %d total", mi.uordblks);
 }