git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
servicedvd.cpp: fix merge error (caused by the vob subtitle bug merge)
[enigma2.git]
/
lib
/
gdi
/
gfbdc.h
diff --git
a/lib/gdi/gfbdc.h
b/lib/gdi/gfbdc.h
index 23051c4f7207fc351142214c937a86147d06f410..7f76d0c96bbce3a256c1513f3383ae71d62ec13d 100644
(file)
--- a/
lib/gdi/gfbdc.h
+++ b/
lib/gdi/gfbdc.h
@@
-3,17
+3,12
@@
#include "fb.h"
#include "gpixmap.h"
#include "fb.h"
#include "gpixmap.h"
-#include "g
r
c.h"
+#include "g
maind
c.h"
-class gFBDC;
-
-SWIG_IGNORE(gFBDC);
-class gFBDC: public gDC
+class gFBDC: public gMainDC
{
{
-#ifndef SWIG
fbClass *fb;
fbClass *fb;
- static gFBDC *instance;
- void exec(gOpcode *opcode);
+ void exec(const gOpcode *opcode);
unsigned char ramp[256], rampalpha[256]; // RGB ramp 0..255
int brightness, gamma, alpha;
void calcRamp();
unsigned char ramp[256], rampalpha[256]; // RGB ramp 0..255
int brightness, gamma, alpha;
void calcRamp();
@@
-21,13
+16,8
@@
class gFBDC: public gDC
gSurface surface, surface_back;
int m_enable_double_buffering;
int m_xres, m_yres;
gSurface surface, surface_back;
int m_enable_double_buffering;
int m_xres, m_yres;
-#else
- gFBDC();
- virtual ~gFBDC();
-#endif
public:
void setResolution(int xres, int yres);
public:
void setResolution(int xres, int yres);
-#ifndef SWIG
void reloadSettings();
void setAlpha(int alpha);
void setBrightness(int brightness);
void reloadSettings();
void setAlpha(int alpha);
void setBrightness(int brightness);
@@
-43,17
+33,7
@@
public:
gFBDC();
virtual ~gFBDC();
gFBDC();
virtual ~gFBDC();
- static int getInstance(ePtr<gFBDC> &ptr) { if (!instance) return -1; ptr = instance; return 0; }
int islocked() { return fb->islocked(); }
int islocked() { return fb->islocked(); }
-#endif
};
};
-SWIG_TEMPLATE_TYPEDEF(ePtr<gFBDC>, gFBDC);
-SWIG_EXTEND(ePtr<gFBDC>,
- static ePtr<gFBDC> getInstance()
- {
- extern ePtr<gFBDC> NewgFBDCPtr(void);
- return NewgFBDCPtr();
- }
-);
#endif
#endif