X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=main%2Fenigma.cpp;h=3f420b4bb6ee2e996e5a863dc42d457fc8073ae5;hp=36fcea4b6985bcbdd0b76bbd310ba18818b32429;hb=e74b05070b905c3ac0b00e588e38143c7a0db41d;hpb=361de59820cf1bde180548782a647a5137b2a21c

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 36fcea4..3f420b4 100644
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -1,5 +1,8 @@
-#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>
@@ -210,7 +213,7 @@ int main(int argc, char **argv)
 		ePtr<gPixmap> wait[MAX_SPINNER];
 		for (i=0; i<MAX_SPINNER; ++i)
 		{
-			char filename[strlen(DATADIR) + 20];
+			char filename[strlen(DATADIR) + 41];
 			sprintf(filename, DATADIR "/enigma2/skin_default/spinner/wait%d.png", i + 1);
 			loadPNG(wait[i], filename);
 			
@@ -239,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();
@@ -276,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);
 }
@@ -284,18 +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
+		__DATE__;
+#endif
+	std::string branch =
+#ifdef ENIGMA2_BRANCH
+		ENIGMA2_BRANCH;
 #else
-		"HEAD"
+		"HEAD";
 #endif
-			"-" __DATE__;
+	return std::string(date + '-' + branch).c_str();
 }
+
 #include <malloc.h>
 
 void dump_malloc_stats(void)
 {
 	struct mallinfo mi = mallinfo();
-	printf("MALLOC: %d total\n", mi.uordblks);
+	eDebug("MALLOC: %d total", mi.uordblks);
 }