From 823d79467a06a8339e713cc3cf09fe73f4f49bb9 Mon Sep 17 00:00:00 2001 From: leslie Date: Tue, 9 Mar 2010 17:15:27 +0800 Subject: [PATCH] fix missing define / sasc compile --- cam.c | 7 ++++--- contrib/sasc-ng/sc/sasccam.cpp | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cam.c b/cam.c index 3826203..e08ec99 100644 --- a/cam.c +++ b/cam.c @@ -3017,6 +3017,7 @@ uchar *cDeCsaTSBuffer::Get(void) // --- cScDeviceProbe ---------------------------------------------------------- +#define DEV_DVB_ADAPTER "/dev/dvb/adapter" #define DEV_DVB_FRONTEND "frontend" #define DEV_DVB_DVR "dvr" #define DEV_DVB_DEMUX "demux" @@ -3163,8 +3164,8 @@ bool cScDevices::ForceBudget(int n) #else //SASC -void cScDevice::OnPluginLoad(void) {} -void cScDevice::OnPluginUnload(void) {} +void cScDevices::OnPluginLoad(void) {} +void cScDevices::OnPluginUnload(void) {} bool cScDevices::Initialize(void) { return true; } void cScDevices::Startup(void) {} void cScDevices::Shutdown(void) {} @@ -3543,7 +3544,7 @@ void cScDevice::DumpAV7110(void) #else //SASC -cScDevice::cScDevice(int n, int cafd) +cScDevice::cScDevice(int n, int zero, int cafd) :cDvbDevice(n) { softcsa=false; diff --git a/contrib/sasc-ng/sc/sasccam.cpp b/contrib/sasc-ng/sc/sasccam.cpp index df7a94a..ab78da1 100644 --- a/contrib/sasc-ng/sc/sasccam.cpp +++ b/contrib/sasc-ng/sc/sasccam.cpp @@ -29,11 +29,11 @@ #include "scsetup.h" // -- cSascDvbDevice ------------------------------------------------------------- -class cSascDvbDevice : public cScDvbDevice { +class cSascDvbDevice : public cScDevice { private: int cardidx; public: - cSascDvbDevice(int n, int cafd) :cScDvbDevice(n, cafd) {cardidx = n;} + cSascDvbDevice(int n, int cafd) :cScDevice(n, 0, cafd) {cardidx = n;} ~cSascDvbDevice() {}; bool SetCaDescr(ca_descr_t *ca_descr, bool initial); bool SetCaPid(ca_pid_t *ca_pid); -- 2.39.5