Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo

Conflicts:
	src/neutrino.cpp
This commit is contained in:
[CST] Bas
2012-11-13 12:51:18 +08:00
151 changed files with 3208 additions and 1867 deletions

View File

@@ -73,8 +73,10 @@ CVFD::CVFD()
CVFD::~CVFD()
{
if(fd > 0)
if(fd > 0){
close(fd);
fd = -1;
}
}
CVFD* CVFD::getInstance()
@@ -678,7 +680,7 @@ void CVFD::Clear()
void CVFD::ShowIcon(fp_icon icon, bool show)
{
if(!has_lcd) return;
if(!has_lcd || fd < 0) return;
//printf("CVFD::ShowIcon %s %x\n", show ? "show" : "hide", (int) icon);
int ret = ioctl(fd, show ? IOC_FP_SET_ICON : IOC_FP_CLEAR_ICON, icon);
if(ret < 0)