projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
[vuplus_dvbapp]
/
lib
/
gdi
/
grc.h
diff --git
a/lib/gdi/grc.h
b/lib/gdi/grc.h
index
555f2ff
..
7071425
100644
(file)
--- a/
lib/gdi/grc.h
+++ b/
lib/gdi/grc.h
@@
-145,8
+145,7
@@
struct gOpcode
/* gRC is the singleton which controls the fifo and dispatches commands */
class gRC: public iObject, public Object
{
/* gRC is the singleton which controls the fifo and dispatches commands */
class gRC: public iObject, public Object
{
-DECLARE_REF(gRC);
-private:
+ DECLARE_REF(gRC);
friend class gPainter;
static gRC *instance;
friend class gPainter;
static gRC *instance;
@@
-230,7
+229,8
@@
public:
enum
{
enum
{
- BT_ALPHATEST = 1
+ BT_ALPHATEST = 1,
+ BT_ALPHABLEND = 2
};
void blit(gPixmap *pixmap, ePoint pos, const eRect &what=eRect(), int flags=0);
};
void blit(gPixmap *pixmap, ePoint pos, const eRect &what=eRect(), int flags=0);
@@
-249,8
+249,6
@@
public:
void clip(const gRegion &clip);
void clippop();
void clip(const gRegion &clip);
void clippop();
- void flush();
-
void waitVSync();
void flip();
void notify();
void waitVSync();
void flip();
void notify();
@@
-258,7
+256,7
@@
public:
class gDC: public iObject
{
class gDC: public iObject
{
-DECLARE_REF(gDC);
+
DECLARE_REF(gDC);
protected:
ePtr<gPixmap> m_pixmap;
protected:
ePtr<gPixmap> m_pixmap;