projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'vuplus_experimental' of code.vuplus.com:/opt/repository/dvbapp into...
[vuplus_dvbapp]
/
lib
/
gdi
/
lcd.h
diff --git
a/lib/gdi/lcd.h
b/lib/gdi/lcd.h
old mode 100644
(file)
new mode 100755
(executable)
index
11749c6
..
e7b4c2c
--- a/
lib/gdi/lcd.h
+++ b/
lib/gdi/lcd.h
@@
-13,10
+13,11
@@
class eLCD
{
#ifdef SWIG
class eLCD
{
#ifdef SWIG
- eLCD(
eSize size
);
+ eLCD();
~eLCD();
#else
protected:
~eLCD();
#else
protected:
+ void setSize(int xres, int yres, int bpp);
eSize res;
unsigned char *_buffer;
int lcdfd;
eSize res;
unsigned char *_buffer;
int lcdfd;
@@
-27,13
+28,13
@@
public:
int lock();
void unlock();
int islocked() { return locked; }
int lock();
void unlock();
int islocked() { return locked; }
+ bool detected() { return lcdfd >= 0; }
#ifndef SWIG
#ifndef SWIG
- eLCD(
eSize size
);
+ eLCD();
virtual ~eLCD();
__u8 *buffer() { return (__u8*)_buffer; }
int stride() { return _stride; }
eSize size() { return res; }
virtual ~eLCD();
__u8 *buffer() { return (__u8*)_buffer; }
int stride() { return _stride; }
eSize size() { return res; }
-
virtual void update()=0;
#endif
};
virtual void update()=0;
#endif
};
@@
-42,6
+43,7
@@
class eDBoxLCD: public eLCD
{
static eDBoxLCD *instance;
unsigned char inverted;
{
static eDBoxLCD *instance;
unsigned char inverted;
+ int is_oled;
#ifdef SWIG
eDBoxLCD();
~eDBoxLCD();
#ifdef SWIG
eDBoxLCD();
~eDBoxLCD();
@@
-52,9
+54,10
@@
public:
~eDBoxLCD();
#endif
static eDBoxLCD *getInstance();
~eDBoxLCD();
#endif
static eDBoxLCD *getInstance();
- int
eDBoxLCD::
setLCDContrast(int contrast);
- int
eDBoxLCD::
setLCDBrightness(int brightness);
+ int setLCDContrast(int contrast);
+ int setLCDBrightness(int brightness);
void setInverted( unsigned char );
void setInverted( unsigned char );
+ bool isOled() const { return !!is_oled; }
void update();
};
void update();
};