From 7178bcc48bc3377c4027e362ba217e9f3815cea5 Mon Sep 17 00:00:00 2001
From: mrwastl <mrwastl@users.sourceforge.net>
Date: Fri, 16 Sep 2011 17:59:04 +0200
Subject: move config/oldConfig + it's initialisation to base class cDriver;
 libglcddrivers.so no longer link-dependent on libglcdgraphics.so

---
 glcddrivers/framebuffer.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'glcddrivers/framebuffer.c')

diff --git a/glcddrivers/framebuffer.c b/glcddrivers/framebuffer.c
index 440af89..a77900d 100644
--- a/glcddrivers/framebuffer.c
+++ b/glcddrivers/framebuffer.c
@@ -29,16 +29,10 @@ namespace GLCD
 {
 
 cDriverFramebuffer::cDriverFramebuffer(cDriverConfig * config)
-:   config(config),
+:   cDriver(config),
     offbuff(0),
     fbfd(-1)
 {
-    oldConfig = new cDriverConfig(*config);
-}
-
-cDriverFramebuffer::~cDriverFramebuffer()
-{
-    delete oldConfig;
 }
 
 int cDriverFramebuffer::Init()
@@ -170,7 +164,7 @@ void cDriverFramebuffer::SetPixel(int x, int y, uint32_t data)
     location = (x*(1+zoom)+vinfo.xoffset) * (vinfo.bits_per_pixel/8) +
                (y*(1+zoom)+vinfo.yoffset) * finfo.line_length;
 
-    if (data == GLCD::cColor::White) {
+    if (data == GRAPHLCD_White) {
         if (vinfo.bits_per_pixel <= 8) {
             outcol = 15;
         } else {
@@ -243,7 +237,7 @@ void cDriverFramebuffer::Set8Pixels(int x, int y, unsigned char data)
     for (n = 0; n < 8; ++n)
     {
         if (data & (0x80 >> n))      // if bit is set
-            SetPixel(x + n, y, GLCD::cColor::White);
+            SetPixel(x + n, y, GRAPHLCD_White);
     }
 }
 #endif
-- 
cgit v1.2.3