git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add pcr handling
[enigma2.git]
/
lib
/
gdi
/
fb.cpp
diff --git
a/lib/gdi/fb.cpp
b/lib/gdi/fb.cpp
index 52d950a69a0d12b5d30da9b1d89239334ffe7939..fb0cc03b053a13bde8d7b10a52481b5eb5e769cc 100644
(file)
--- a/
lib/gdi/fb.cpp
+++ b/
lib/gdi/fb.cpp
@@
-29,9
+29,6
@@
fbClass::fbClass(const char *fb)
cmap.blue=blue;
cmap.transp=trans;
cmap.blue=blue;
cmap.transp=trans;
- int state=0;
- eConfig::getInstance()->getKey("/ezap/osd/showConsoleOnFB", state);
-
fd=open(fb, O_RDWR);
if (fd<0)
{
fd=open(fb, O_RDWR);
if (fd<0)
{
@@
-62,7
+59,7
@@
fbClass::fbClass(const char *fb)
goto nolfb;
}
goto nolfb;
}
-
showConsole(state
);
+
// showConsole(0
);
return;
nolfb:
lfb=0;
return;
nolfb:
lfb=0;
@@
-86,8
+83,8
@@
int fbClass::showConsole(int state)
int fbClass::SetMode(unsigned int nxRes, unsigned int nyRes, unsigned int nbpp)
{
int fbClass::SetMode(unsigned int nxRes, unsigned int nyRes, unsigned int nbpp)
{
-
screeninfo.xres_virtual=screeninfo.xres=nxRes;
- screeninfo.yres_virtual=screeninfo.yres=nyRes;
+
/*
screeninfo.xres_virtual=screeninfo.xres=nxRes;
+ screeninfo.yres_virtual=screeninfo.yres=nyRes;
*/
screeninfo.height=0;
screeninfo.width=0;
screeninfo.xoffset=screeninfo.yoffset=0;
screeninfo.height=0;
screeninfo.width=0;
screeninfo.xoffset=screeninfo.yoffset=0;
@@
-124,6
+121,7
@@
fbClass::~fbClass()
ioctl(fd, FBIOPUT_VSCREENINFO, &oldscreen);
if (lfb)
munmap(lfb, available);
ioctl(fd, FBIOPUT_VSCREENINFO, &oldscreen);
if (lfb)
munmap(lfb, available);
+ showConsole(1);
}
int fbClass::PutCMAP()
}
int fbClass::PutCMAP()