git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
switch appsink to async again (fixes embedded mkv text subtitles)
[enigma2.git]
/
lib
/
gdi
/
glcddc.cpp
diff --git
a/lib/gdi/glcddc.cpp
b/lib/gdi/glcddc.cpp
index 1a5e03fa0671d95e1fd0cf9b9327eadb70153bf2..a593cfa3e7938cb6e4cde89accbbb407e7fb23cb 100644
(file)
--- a/
lib/gdi/glcddc.cpp
+++ b/
lib/gdi/glcddc.cpp
@@
-1,29
+1,32
@@
-#ifndef DISABLE_LCD
-
#include <lib/gdi/glcddc.h>
#include <lib/gdi/glcddc.h>
+#include <lib/gdi/lcd.h>
+#include <lib/base/init.h>
+#include <lib/base/init_num.h>
gLCDDC *gLCDDC::instance;
gLCDDC *gLCDDC::instance;
-gLCDDC::gLCDDC(
eLCD *lcd): lcd(lcd
)
+gLCDDC::gLCDDC()
{
{
+ lcd = new eDBoxLCD();
instance=this;
update=1;
surface.x=lcd->size().width();
surface.y=lcd->size().height();
instance=this;
update=1;
surface.x=lcd->size().width();
surface.y=lcd->size().height();
- surface.bpp=8;
- surface.bypp=1;
surface.stride=lcd->stride();
surface.stride=lcd->stride();
+ surface.bypp=surface.stride / surface.x;
+ surface.bpp=surface.bypp*8;
surface.data=lcd->buffer();
surface.data=lcd->buffer();
-
- surface.clut.colors=256;
+ surface.clut.colors=0;
surface.clut.data=0;
surface.clut.data=0;
+
m_pixmap = new gPixmap(&surface);
}
gLCDDC::~gLCDDC()
{
m_pixmap = new gPixmap(&surface);
}
gLCDDC::~gLCDDC()
{
+ delete lcd;
instance=0;
}
instance=0;
}
@@
-31,9
+34,8
@@
void gLCDDC::exec(gOpcode *o)
{
switch (o->opcode)
{
{
switch (o->opcode)
{
-// case gOpcode::flush:
- case gOpcode::end:
- if (update)
+ case gOpcode::flush:
+// if (update)
lcd->update();
default:
gDC::exec(o);
lcd->update();
default:
gDC::exec(o);
@@
-41,14
+43,9
@@
void gLCDDC::exec(gOpcode *o)
}
}
}
}
-gLCDDC *gLCDDC::getInstance()
-{
- return instance;
-}
-
void gLCDDC::setUpdate(int u)
{
update=u;
}
void gLCDDC::setUpdate(int u)
{
update=u;
}
-#endif //DISABLE_LCD
+eAutoInitPtr<gLCDDC> init_gLCDDC(eAutoInitNumbers::graphic-1, "gLCDDC");