git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs
[enigma2.git]
/
lib
/
gdi
/
lcd.h
diff --git
a/lib/gdi/lcd.h
b/lib/gdi/lcd.h
index 11749c64a2ec99ce35770120c650e086c1f73aa5..99f921b525e16434bf6cb4dcf8c952b6a508f8d4 100644
(file)
--- a/
lib/gdi/lcd.h
+++ b/
lib/gdi/lcd.h
@@
-27,6
+27,7
@@
public:
int lock();
void unlock();
int islocked() { return locked; }
int lock();
void unlock();
int islocked() { return locked; }
+ bool detected() { return lcdfd >= 0; }
#ifndef SWIG
eLCD(eSize size);
virtual ~eLCD();
#ifndef SWIG
eLCD(eSize size);
virtual ~eLCD();
@@
-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();
};