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 remote branch 'origin/bug_429_remove_hardcoded_paths' into bug_429_remove_hardc...
[enigma2.git]
/
lib
/
gdi
/
lcd.h
diff --git
a/lib/gdi/lcd.h
b/lib/gdi/lcd.h
index f2e707f035b6801852f316a40da91b279f5e6e1f..e7b4c2c47149be77d2d29de680c1ffc7379ba832 100644
(file)
--- a/
lib/gdi/lcd.h
+++ b/
lib/gdi/lcd.h
@@
-12,38
+12,52
@@
class eLCD
{
class eLCD
{
+#ifdef SWIG
+ eLCD();
+ ~eLCD();
+#else
protected:
protected:
+ void setSize(int xres, int yres, int bpp);
eSize res;
unsigned char *_buffer;
int lcdfd;
int _stride;
int locked;
eSize res;
unsigned char *_buffer;
int lcdfd;
int _stride;
int locked;
+#endif
public:
int lock();
void unlock();
int islocked() { return locked; }
public:
int lock();
void unlock();
int islocked() { return locked; }
-
- eLCD(eSize size);
+ bool detected() { return lcdfd >= 0; }
+#ifndef SWIG
+ eLCD();
virtual ~eLCD();
virtual ~eLCD();
-
__u8 *buffer() { return (__u8*)_buffer; }
int stride() { return _stride; }
eSize size() { return res; }
__u8 *buffer() { return (__u8*)_buffer; }
int stride() { return _stride; }
eSize size() { return res; }
-
virtual void update()=0;
virtual void update()=0;
+#endif
};
class eDBoxLCD: public eLCD
{
static eDBoxLCD *instance;
unsigned char inverted;
};
class eDBoxLCD: public eLCD
{
static eDBoxLCD *instance;
unsigned char inverted;
+ int is_oled;
+#ifdef SWIG
+ eDBoxLCD();
+ ~eDBoxLCD();
+#endif
public:
public:
- static eDBoxLCD *getInstance();
- int eDBoxLCD::setLCDContrast(int contrast);
- int eDBoxLCD::setLCDBrightness(int brightness);
- void setInverted( unsigned char );
+#ifndef SWIG
eDBoxLCD();
~eDBoxLCD();
eDBoxLCD();
~eDBoxLCD();
+#endif
+ static eDBoxLCD *getInstance();
+ int setLCDContrast(int contrast);
+ int setLCDBrightness(int brightness);
+ void setInverted( unsigned char );
+ bool isOled() const { return !!is_oled; }
void update();
};
void update();
};