From 059c9a03c8cc02b0c595e3a5599be04dc157f725 Mon Sep 17 00:00:00 2001
From: Andreas Oberritter <obi@opendreambox.org>
Date: Fri, 29 Oct 2010 14:54:36 +0200
Subject: Add abstract class gMainDC as an interface for gFBDC and gSDLDC

---
 main/bsod.cpp       | 14 +++-----------
 main/enigma-gdi.cpp |  6 +++---
 main/enigma-gui.cpp |  6 +++---
 main/enigma.cpp     | 16 ++++------------
 4 files changed, 13 insertions(+), 29 deletions(-)

(limited to 'main')

diff --git a/main/bsod.cpp b/main/bsod.cpp
index c0362832..40252c0f 100755
--- a/main/bsod.cpp
+++ b/main/bsod.cpp
@@ -7,10 +7,7 @@
 #include <lib/base/smartptr.h>
 #include <lib/base/nconfig.h>
 #include <lib/gdi/grc.h>
-#include <lib/gdi/gfbdc.h>
-#ifdef WITH_SDL
-#include <lib/gdi/sdl.h>
-#endif
+#include <lib/gdi/gmaindc.h>
 
 #include "version.h"
 
@@ -341,13 +338,8 @@ void bsodFatal(const char *component)
 		
 	}
 	
-#ifdef WITH_SDL
-	ePtr<gSDLDC> my_dc;
-	gSDLDC::getInstance(my_dc);
-#else
-	ePtr<gFBDC> my_dc;
-	gFBDC::getInstance(my_dc);
-#endif
+	ePtr<gMainDC> my_dc;
+	gMainDC::getInstance(my_dc);
 	
 	{
 		gPainter p(my_dc);
diff --git a/main/enigma-gdi.cpp b/main/enigma-gdi.cpp
index 328fba44..f21c8701 100644
--- a/main/enigma-gdi.cpp
+++ b/main/enigma-gdi.cpp
@@ -9,7 +9,7 @@
 #include <unistd.h>
 
 #include <lib/gdi/grc.h>
-#include <lib/gdi/gfbdc.h>
+#include <lib/gdi/gmaindc.h>
 #include <lib/gdi/font.h> 
 
 #include <lib/gui/ewidget.h>
@@ -53,8 +53,8 @@ int main()
 	eInit init;
 
 	init.setRunlevel(eAutoInitNumbers::main);
-	ePtr<gFBDC> my_dc;
-	gFBDC::getInstance(my_dc);
+	ePtr<gMainDC> my_dc;
+	gMainDC::getInstance(my_dc);
 
 	gPainter p(my_dc);
 	
diff --git a/main/enigma-gui.cpp b/main/enigma-gui.cpp
index 2ba61067..f3d1b17d 100644
--- a/main/enigma-gui.cpp
+++ b/main/enigma-gui.cpp
@@ -8,7 +8,7 @@
 #include <unistd.h>
 
 #include <lib/gdi/grc.h>
-#include <lib/gdi/gfbdc.h>
+#include <lib/gdi/gmaindc.h>
 #include <lib/gdi/font.h> 
 
 #include <lib/gui/ewidget.h>
@@ -52,8 +52,8 @@ int main()
 	eInit init;
 
 	init.setRunlevel(eAutoInitNumbers::main);
-	ePtr<gFBDC> my_dc;
-	gFBDC::getInstance(my_dc);
+	ePtr<gMainDC> my_dc;
+	gMainDC::getInstance(my_dc);
 
 	gPainter p(my_dc);
 	
diff --git a/main/enigma.cpp b/main/enigma.cpp
index 882af996..3ea4afb7 100644
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -13,12 +13,9 @@
 #include <lib/base/eerror.h>
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
-#include <lib/gdi/gfbdc.h>
+#include <lib/gdi/gmaindc.h>
 #include <lib/gdi/glcddc.h>
 #include <lib/gdi/grc.h>
-#ifdef WITH_SDL
-#include <lib/gdi/sdl.h>
-#endif
 #include <lib/gdi/epng.h>
 #include <lib/gdi/font.h>
 #include <lib/gui/ebutton.h>
@@ -146,15 +143,10 @@ int main(int argc, char **argv)
 	eMain main;
 
 #if 1
-#ifdef WITH_SDL
-	ePtr<gSDLDC> my_dc;
-	gSDLDC::getInstance(my_dc);
-#else
-	ePtr<gFBDC> my_dc;
-	gFBDC::getInstance(my_dc);
+	ePtr<gMainDC> my_dc;
+	gMainDC::getInstance(my_dc);
 	
-	int double_buffer = my_dc->haveDoubleBuffering();
-#endif
+	//int double_buffer = my_dc->haveDoubleBuffering();
 
 	ePtr<gLCDDC> my_lcd_dc;
 	gLCDDC::getInstance(my_lcd_dc);
-- 
cgit v1.2.3