X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4c1d83d373b4a0737da668945d1ddb3278b6c3b7..4ebd765cac9f8a7ae4934147ed876a9e228eeb8d:/main/enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 4f3287f5..16bbcbce 100644
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -1,3 +1,8 @@
+#undef WITH_SDL
+#ifdef WITH_SDL
+#error
+#define SDLDC
+#endif
 #include <stdio.h>
 #include <libsig_comp.h>
 #include <lib/base/ebase.h>
@@ -9,7 +14,8 @@
 
 #include <lib/gdi/grc.h>
 #include <lib/gdi/gfbdc.h>
-#ifdef SDLDC
+#ifdef WITH_SDL
+#error
 #include <lib/gdi/sdl.h>
 #endif
 #include <lib/gdi/font.h> 
@@ -46,6 +52,7 @@ void dumpRegion(const gRegion &region)
 	fprintf(stderr, "extends: %d %d -> %d %d (%d rects)\n", 
 		region.extends.left(), region.extends.top(),
 		region.extends.right(), region.extends.bottom(), region.rects.size());
+#if 0
 	for (int y=0; y<region.extends.bottom(); ++y)
 	{
 		for (int x=0; x<region.extends.right(); ++x)
@@ -58,6 +65,8 @@ void dumpRegion(const gRegion &region)
 		}
 		fprintf(stderr, "\n");
 	}
+#endif
+
 }
 
 eWidgetDesktop *wdsk;
@@ -91,6 +100,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
 {
@@ -98,9 +109,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()
 	{
@@ -109,7 +121,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();
@@ -145,13 +158,14 @@ int main(int argc, char **argv)
 	gFBDC::getInstance(my_dc);
 #endif
 
-	fontRenderClass::getInstance()->AddFont("/usr/share/fonts/arial.ttf", "Arial", 100);
+	fontRenderClass::getInstance()->AddFont(FONTDIR "/arial.ttf", "Arial", 100);
 
 	eWidgetDesktop dsk(eSize(720, 576));
 	
+	dsk.setCompositionMode(eWidgetDesktop::cmBuffered);
+	
 	wdsk = &dsk;
 
-
 	dsk.setDC(my_dc);
 
 	ePtr<gPixmap> m_pm;
@@ -162,7 +176,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 */