X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d63d2c3c6cbbd574dda4f8b00ebe6c661735edd5..8eb03b9a607269d101bf67c7734cf3fb5346ccf5:/lib/gdi/glcddc.cpp diff --git a/lib/gdi/glcddc.cpp b/lib/gdi/glcddc.cpp index 3895df9a..1a5e03fa 100644 --- a/lib/gdi/glcddc.cpp +++ b/lib/gdi/glcddc.cpp @@ -1,7 +1,6 @@ #ifndef DISABLE_LCD #include -#include gLCDDC *gLCDDC::instance; @@ -11,21 +10,20 @@ gLCDDC::gLCDDC(eLCD *lcd): lcd(lcd) update=1; - pixmap=new gPixmap(); - pixmap->x=lcd->size().width(); - pixmap->y=lcd->size().height(); - pixmap->bpp=8; - pixmap->bypp=1; - pixmap->stride=lcd->stride(); - pixmap->data=lcd->buffer(); - - pixmap->clut.colors=256; - pixmap->clut.data=0; + surface.x=lcd->size().width(); + surface.y=lcd->size().height(); + surface.bpp=8; + surface.bypp=1; + surface.stride=lcd->stride(); + surface.data=lcd->buffer(); + + surface.clut.colors=256; + surface.clut.data=0; + m_pixmap = new gPixmap(&surface); } gLCDDC::~gLCDDC() { - delete pixmap; instance=0; } @@ -33,12 +31,12 @@ void gLCDDC::exec(gOpcode *o) { switch (o->opcode) { - case gOpcode::flush: +// case gOpcode::flush: case gOpcode::end: if (update) lcd->update(); default: - gPixmapDC::exec(o); + gDC::exec(o); break; } }