X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/94e20b4fa99280fc8fb0d7c4753286cefc32b114..8cdc19061d56d649b298462f7e64283551d0bbf9:/main/enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index e669b19b..a3770b86 100644
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -128,15 +128,11 @@ public:
 		m_locale_time_handler = new eDVBLocalTimeHandler();
 		m_epgcache = new eEPGCache();
 		m_mgr->setChannelList(m_dvbdb);
-		
-//		m_scan = new eComponentScan();
-//		m_scan->start();
-
 	}
 	
 	~eMain()
 	{
-		m_dvbdb->save();
+		m_dvbdb->saveServicelist();
 		m_scan = 0;
 	}
 };
@@ -145,12 +141,18 @@ public:
 
 eLabel *lcd_label, *lcd_clock;
 
+int exit_code;
+
 int main(int argc, char **argv)
 {
 #ifdef OBJECT_DEBUG
 	atexit(object_dump);
 #endif
 
+	// set pythonpath if unset
+	setenv("PYTHONPATH", LIBDIR "/enigma2/python", 0);
+	printf("PYTHONPATH: %s\n", getenv("PYTHONPATH"));
+
 
 	ePython python;
 	eMain main;
@@ -171,16 +173,16 @@ int main(int argc, char **argv)
 	ePtr<gLCDDC> my_lcd_dc;
 	gLCDDC::getInstance(my_lcd_dc);
 
-	fontRenderClass::getInstance()->AddFont(FONTDIR "/arial.ttf", "Arial", 100);
+	fontRenderClass::getInstance()->AddFont(FONTDIR "/md_khmurabi_10.ttf", "Regular", 100);
 
 	eWidgetDesktop dsk(eSize(720, 576));
 	eWidgetDesktop dsk_lcd(eSize(132, 64));
 	
-	if (double_buffer)
+/*	if (double_buffer)
 	{
 		eDebug(" - double buffering found, enable buffered graphics mode.");
 		dsk.setCompositionMode(eWidgetDesktop::cmBuffered);
-	}
+	} */
 	
 	wdsk = &dsk;
 	lcddsk = &dsk_lcd;
@@ -189,10 +191,10 @@ int main(int argc, char **argv)
 	dsk_lcd.setDC(my_lcd_dc);
 
 	ePtr<gPixmap> m_pm;
-	loadPNG(m_pm, "data/pal.png");
+	loadPNG(m_pm, DATADIR "/enigma2/pal.png");
 	if (!m_pm)
 	{
-		eFatal("hi ghost, please copy pal.png into your ./data, thanks!");
+		eFatal("pal.png not found!");
 	} else
 		dsk.setPalette(*m_pm);
 
@@ -211,16 +213,17 @@ int main(int argc, char **argv)
 	lcd_win->resize(eSize(132, 64));
 	
 	lcd_label = new eLabel(lcd_win);
-	lcd_label->move(ePoint(0, 10));
-	lcd_label->resize(eSize(132, 36));
-	ePtr<gFont> font = new gFont("Arial", 16);
+	lcd_label->move(ePoint(0, 4));
+	lcd_label->resize(eSize(132, 42));
+	ePtr<gFont> font = new gFont("Regular", 19);
+	//ePtr<gFont> font = new gFont("Regular", 16);
 	lcd_label->setFont(font);
 
 	lcd_clock = new eLabel(lcd_win);
 	lcd_clock->move(ePoint(50, 46));
-	lcd_clock->resize(eSize(132, 20));
-	//ePtr<gFont> clkfont = new gFont("Arial", 18);
-	lcd_clock->setFont(font);
+	lcd_clock->resize(eSize(132, 18));
+	ePtr<gFont> clkfont = new gFont("Regular", 16);
+	lcd_clock->setFont(clkfont);
 
 	//lcd_label->setText("bla bla bla, this lcd\nSUCKS!");
 	//lcd_clock->setText("88:88:88");
@@ -233,9 +236,7 @@ int main(int argc, char **argv)
 
 	python.execute("mytest", "__main__");
 
-//	eApp->exec();
-
-	return 0;
+	return exit_code;
 }
 
 eWidgetDesktop *getDesktop()
@@ -243,14 +244,19 @@ eWidgetDesktop *getDesktop()
 	return wdsk;
 }
 
+eApplication *getApplication()
+{
+	return eApp;
+}
+
 void runMainloop()
 {
-	eApp->exec();
+	exit_code = eApp->runLoop();
 }
 
-void quitMainloop()
+void quitMainloop(int exitCode)
 {
-	eApp->quit(0);
+	eApp->quit(exitCode);
 }
 
 void setLCD(const char *string)