From: leslie <unknown> Date: Mon, 11 Jan 2010 18:09:31 +0000 (+0100) Subject: fix pre-1.7.11 compile X-Git-Tag: upstream/620~111 X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=910ea01a9993dae109f94cd1ef895234a89eaaf1;p=sasc-ng.git fix pre-1.7.11 compile --- diff --git a/cam.c b/cam.c index 570529b..e8d0e2a 100644 --- a/cam.c +++ b/cam.c @@ -2996,6 +2996,7 @@ uchar *cDeCsaTSBuffer::Get(void) // --- cScDvbDeviceProbe ------------------------------------------------------- +#define DEV_DVB_FRONTEND "frontend" #define DEV_DVB_DVR "dvr" #define DEV_DVB_DEMUX "demux" #define DEV_DVB_CA "ca" @@ -3199,31 +3200,6 @@ bool cScDvbDevice::Initialize(void) #endif } -int cScDvbDevice::FilterHandle(void) -{ -#if APIVERSNUM >= 10711 - return DvbOpen(DEV_DVB_DEMUX,adapter,frontend,O_RDWR|O_NONBLOCK); -#else - return DvbOpen(DEV_DVB_DEMUX,CardIndex(),O_RDWR|O_NONBLOCK); -#endif -} - -#if APIVERSNUM < 10711 -void cScDvbDevice::DvbName(const char *Name, int n, char *buffer, int len) -{ - snprintf(buffer,len,"/dev/dvb/adapter%d/%s%d",n,Name,0); -} - -int cScDvbDevice::DvbOpen(const char *Name, int n, int Mode, bool ReportError) -{ - char FileName[128]; - DvbName(Name,n,FileName,sizeof(FileName)); - int fd=open(FileName,Mode); - if(fd<0 && ReportError) LOG_ERROR_STR(FileName); - return fd; -} -#endif - #if APIVERSNUM >= 10501 bool cScDvbDevice::HasCi(void) { @@ -3551,3 +3527,28 @@ void cScDvbDevice::DumpAV7110(void) {} #endif //SASC + +int cScDvbDevice::FilterHandle(void) +{ +#if APIVERSNUM >= 10711 + return DvbOpen(DEV_DVB_DEMUX,adapter,frontend,O_RDWR|O_NONBLOCK); +#else + return DvbOpen(DEV_DVB_DEMUX,CardIndex(),O_RDWR|O_NONBLOCK); +#endif +} + +#if APIVERSNUM < 10711 +void cScDvbDevice::DvbName(const char *Name, int n, char *buffer, int len) +{ + snprintf(buffer,len,"/dev/dvb/adapter%d/%s%d",n,Name,0); +} + +int cScDvbDevice::DvbOpen(const char *Name, int n, int Mode, bool ReportError) +{ + char FileName[128]; + DvbName(Name,n,FileName,sizeof(FileName)); + int fd=open(FileName,Mode); + if(fd<0 && ReportError) LOG_ERROR_STR(FileName); + return fd; +} +#endif