X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/44433f650cd3e5f9f66253b74d194fcb01578595..20f69c200ec5703e958a6b95abfcfd5a108e5939:/main/enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 222bdebc..9647dea9 100644
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -29,6 +29,8 @@
 
 #include <lib/actions/action.h>
 
+#include <lib/gdi/epng.h>
+
 #ifdef OBJECT_DEBUG
 int object_total_remaining;
 
@@ -88,6 +90,8 @@ void keyEvent(const eRCKey &key)
 #include <lib/dvb/idvb.h>
 #include <lib/dvb/dvb.h>
 #include <lib/dvb/db.h>
+#include <lib/dvb/dvbtime.h>
+#include <lib/dvb/epgcache.h>
 
 class eMain: public eApplication, public Object
 {
@@ -95,9 +99,10 @@ class eMain: public eApplication, public Object
 	
 	ePtr<eDVBResourceManager> m_mgr;
 	ePtr<eDVBDB> m_dvbdb;
-
+	ePtr<eDVBLocalTimeHandler> m_locale_time_handler;
 	ePtr<eComponentScan> m_scan;
-	
+	ePtr<eEPGCache> m_epgcache;
+
 public:
 	eMain()
 	{
@@ -106,7 +111,8 @@ public:
 				/* TODO: put into init */
 		m_dvbdb = new eDVBDB();
 		m_mgr = new eDVBResourceManager();
-		
+		m_locale_time_handler = new eDVBLocalTimeHandler();
+		m_epgcache = new eEPGCache();
 		m_mgr->setChannelList(m_dvbdb);
 		
 //		m_scan = new eComponentScan();
@@ -142,35 +148,24 @@ int main(int argc, char **argv)
 	gFBDC::getInstance(my_dc);
 #endif
 
-	gPainter p(my_dc);
-	
-	gRGB pal[256];
-	pal[0] = 0;
-	pal[1] = 0xff00ff;
-	pal[2] = 0xffFFff;
-	pal[3] = 0x00ff00;
-	
-	for (int a=0; a<0x10; ++a)
-		pal[a | 0x10] = 0x111111 * a;
-	for (int a=0; a<0x10; ++a)
-		pal[a | 0x20] = (0x111100 * a) | 0xFF;
-	for (int a=0; a<0x10; ++a)
-		pal[a | 0x30] = (0x110011 * a) | 0xFF00;
-	for (int a=0; a<0x10; ++a)
-		pal[a | 0x40] = (0x001111 * a) | 0xFF0000;
-	
-	pal[0x50] = 0x586D88;
-	pal[0x51] = 0x4075a7;
-	
-	p.setPalette(pal, 0, 256);
-
 	fontRenderClass::getInstance()->AddFont("/home/tmbinc/enigma2/fonts/arial.ttf", "Arial", 100);
 
 	eWidgetDesktop dsk(eSize(720, 576));
 	
 	wdsk = &dsk;
-	dsk.setBackgroundColor(gColor(0));
+
+
 	dsk.setDC(my_dc);
+
+	ePtr<gPixmap> m_pm;
+	loadPNG(m_pm, "data/pal.png");
+	if (!m_pm)
+	{
+		eFatal("hi ghost, please copy pal.png into your ./data, thanks!");
+	} else
+		dsk.setPalette(*m_pm);
+
+	dsk.setBackgroundColor(gRGB(0,0,0,0xFF));
 #endif
 
 		/* redrawing is done in an idle-timer, so we have to set the context */
@@ -182,7 +177,6 @@ int main(int argc, char **argv)
 
 	python.execute("mytest", "__main__");
 
-
 //	eApp->exec();
 
 	return 0;