X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/17cc37acecaabc88f4f257558480809142691fdc..1b2f75903244b6c03e1f123533d4385c0c271c78:/main/enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 156964ce..3a728b8d 100644
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -1,4 +1,8 @@
+#undef WITH_SDL
+#ifdef WITH_SDL
+#error
 #define SDLDC
+#endif
 #include <stdio.h>
 #include <libsig_comp.h>
 #include <lib/base/ebase.h>
@@ -10,7 +14,10 @@
 
 #include <lib/gdi/grc.h>
 #include <lib/gdi/gfbdc.h>
+#ifdef WITH_SDL
+#error
 #include <lib/gdi/sdl.h>
+#endif
 #include <lib/gdi/font.h> 
 
 #include <lib/gui/ewidget.h>
@@ -90,6 +97,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
 {
@@ -97,9 +106,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()
 	{
@@ -108,7 +118,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();
@@ -144,7 +155,7 @@ int main(int argc, char **argv)
 	gFBDC::getInstance(my_dc);
 #endif
 
-	fontRenderClass::getInstance()->AddFont("/home/tmbinc/enigma2/fonts/arial.ttf", "Arial", 100);
+	fontRenderClass::getInstance()->AddFont(FONTDIR "/arial.ttf", "Arial", 100);
 
 	eWidgetDesktop dsk(eSize(720, 576));
 	
@@ -161,7 +172,7 @@ int main(int argc, char **argv)
 	} else
 		dsk.setPalette(*m_pm);
 
-	dsk.setBackgroundColor(gRGB(0,0,0,0));
+	dsk.setBackgroundColor(gRGB(0,0,0,0xFF));
 #endif
 
 		/* redrawing is done in an idle-timer, so we have to set the context */