projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'obi/master' into experimental
[vuplus_dvbapp]
/
lib
/
gdi
/
gfbdc.cpp
diff --git
a/lib/gdi/gfbdc.cpp
b/lib/gdi/gfbdc.cpp
index
80dd247
..
a4f65eb
100644
(file)
--- a/
lib/gdi/gfbdc.cpp
+++ b/
lib/gdi/gfbdc.cpp
@@
-7,18
+7,8
@@
#include <time.h>
#include <time.h>
-gFBDC *gFBDC::instance;
-
-ePtr<gFBDC> NewgFBDCPtr(void)
-{
- ePtr<gFBDC> ptr;
- gFBDC::getInstance(ptr);
- return ptr;
-}
-
gFBDC::gFBDC()
{
gFBDC::gFBDC()
{
- instance=this;
fb=new fbClass;
if (!fb->Available())
fb=new fbClass;
if (!fb->Available())
@@
-34,7
+24,6
@@
gFBDC::~gFBDC()
{
delete fb;
delete[] surface.clut.data;
{
delete fb;
delete[] surface.clut.data;
- instance=0;
}
void gFBDC::calcRamp()
}
void gFBDC::calcRamp()
@@
-91,7
+80,7
@@
void gFBDC::setPalette()
fb->PutCMAP();
}
fb->PutCMAP();
}
-void gFBDC::exec(gOpcode *o)
+void gFBDC::exec(
const
gOpcode *o)
{
switch (o->opcode)
{
{
switch (o->opcode)
{
@@
-242,7
+231,4
@@
void gFBDC::reloadSettings()
setPalette();
}
setPalette();
}
-// eAutoInitPtr<gFBDC> init_gFBDC(eAutoInitNumbers::graphic-1, "GFBDC");
-#ifndef WITH_SDL
eAutoInitPtr<gFBDC> init_gFBDC(eAutoInitNumbers::graphic-1, "GFBDC");
eAutoInitPtr<gFBDC> init_gFBDC(eAutoInitNumbers::graphic-1, "GFBDC");
-#endif