mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-03 10:51:05 +02:00
Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo
Conflicts:
src/neutrino.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 89bf2f6846
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -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)
|
||||
|
Reference in New Issue
Block a user