git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix corrupted epg.dat by using a faked version string and not writing the correct...
[enigma2.git]
/
lib
/
gdi
/
grc.h
diff --git
a/lib/gdi/grc.h
b/lib/gdi/grc.h
index adc1d3be82af0aacf7a5fbdb69c86d7f5e5bc704..7071425ef6ce7e968b96e239c35b4db5cc365e1f 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;
@@
-270,9
+268,10
@@
protected:
std::stack<gRegion> m_clip_stack;
gRegion m_current_clip;
std::stack<gRegion> m_clip_stack;
gRegion m_current_clip;
- ePtr<gPixmap> m_spinner_saved;
+ ePtr<gPixmap> m_spinner_saved, m_spinner_temp;
+ ePtr<gPixmap> *m_spinner_pic;
eRect m_spinner_pos;
eRect m_spinner_pos;
-
+ int m_spinner_num, m_spinner_i;
public:
virtual void exec(gOpcode *opcode);
gDC(gPixmap *pixmap);
public:
virtual void exec(gOpcode *opcode);
gDC(gPixmap *pixmap);
@@
-287,7
+286,7
@@
public:
void enableSpinner();
void disableSpinner();
void incrementSpinner();
void enableSpinner();
void disableSpinner();
void incrementSpinner();
- void setSpinner(eRect pos);
+ void setSpinner(eRect pos
, ePtr<gPixmap> *pic, int len
);
};
#endif
};
#endif