projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug_587_new_internally_connectable_and_unsupported_tuner_management...
[vuplus_dvbapp]
/
lib
/
gdi
/
lcd.cpp
diff --git
a/lib/gdi/lcd.cpp
b/lib/gdi/lcd.cpp
index
f6f29a7
..
a7dc22d
100644
(file)
--- a/
lib/gdi/lcd.cpp
+++ b/
lib/gdi/lcd.cpp
@@
-56,7
+56,9
@@
eDBoxLCD::eDBoxLCD()
lcdfd = open("/dev/dbox/oled0", O_RDWR);
if (lcdfd < 0)
{
lcdfd = open("/dev/dbox/oled0", O_RDWR);
if (lcdfd < 0)
{
- FILE *f=fopen("/proc/stb/fp/oled_brightness", "w");
+ FILE *f=fopen("/proc/stb/lcd/oled_brightness", "w");
+ if (!f)
+ f = fopen("/proc/stb/fp/oled_brightness", "w");
if (f)
{
is_oled = 2;
if (f)
{
is_oled = 2;
@@
-133,11
+135,13
@@
int eDBoxLCD::setLCDContrast(int contrast)
int eDBoxLCD::setLCDBrightness(int brightness)
{
eDebug("setLCDBrightness %d", brightness);
int eDBoxLCD::setLCDBrightness(int brightness)
{
eDebug("setLCDBrightness %d", brightness);
- FILE *f=fopen("/proc/stb/fp/oled_brightness", "w");
+ FILE *f=fopen("/proc/stb/lcd/oled_brightness", "w");
+ if (!f)
+ f = fopen("/proc/stb/fp/oled_brightness", "w");
if (f)
{
if (fprintf(f, "%d", brightness) == 0)
if (f)
{
if (fprintf(f, "%d", brightness) == 0)
- eDebug("write /proc/stb/
fp
/oled_brightness failed!! (%m)");
+ eDebug("write /proc/stb/
lcd
/oled_brightness failed!! (%m)");
fclose(f);
}
else
fclose(f);
}
else
@@
-192,14
+196,8
@@
void eDBoxLCD::update()
}
write(lcdfd, raw, 132*8);
}
}
write(lcdfd, raw, 132*8);
}
- else if (is_oled == 3) {
- FILE *f = fopen("/tmp/bla", "w+");
- if (f) {
- fwrite(_buffer, _stride * res.height(), 1, f);
- fclose(f);
- }
+ else if (is_oled == 3)
write(lcdfd, _buffer, _stride * res.height());
write(lcdfd, _buffer, _stride * res.height());
- }
else
{
unsigned char raw[64*64];
else
{
unsigned char raw[64*64];