From 38dafc9ae0f0747f91a490ed5dbf47558a5ed48c Mon Sep 17 00:00:00 2001 From: leslie <unknown> Date: Fri, 9 Sep 2011 07:58:42 +0800 Subject: [PATCH] sasc: fix calling SetCaDescr --- cam.c | 6 ++---- contrib/sasc-ng/sc/sasccam.cpp | 3 --- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/cam.c b/cam.c index 6fc59f4..8f4f6d3 100644 --- a/cam.c +++ b/cam.c @@ -2561,9 +2561,9 @@ void cCam::WriteCW(int index, unsigned char *cw, bool force) bool cCam::SetCaDescr(ca_descr_t *ca_descr, bool initial) { -#ifndef SASC if(!softcsa || (fullts && ca_descr->index==0)) return devplugin->SetCaDescr(device,ca_descr,initial); +#ifndef SASC else if(decsa) return decsa->SetDescr(ca_descr,initial); #endif //!SASC @@ -2572,9 +2572,9 @@ bool cCam::SetCaDescr(ca_descr_t *ca_descr, bool initial) bool cCam::SetCaPid(ca_pid_t *ca_pid) { -#ifndef SASC if(!softcsa || (fullts && ca_pid->index==0)) return devplugin->SetCaPid(device,ca_pid); +#ifndef SASC else if(decsa) return decsa->SetCaPid(ca_pid); #endif //!SASC @@ -2583,9 +2583,7 @@ bool cCam::SetCaPid(ca_pid_t *ca_pid) void cCam::DumpAV7110(void) { -#ifndef SASC devplugin->DumpAV(device); -#endif //!SASC } int cCam::GetFreeIndex(void) diff --git a/contrib/sasc-ng/sc/sasccam.cpp b/contrib/sasc-ng/sc/sasccam.cpp index 277176b..0704aa5 100644 --- a/contrib/sasc-ng/sc/sasccam.cpp +++ b/contrib/sasc-ng/sc/sasccam.cpp @@ -35,9 +35,6 @@ #define DVBDEVICE cDvbDevice #define OWN_SETCA #include "device-tmpl.c" -#undef SCDEVICE -#undef DVBDEVICE -#undef OWN_SETCA extern void _SetCaDescr(int adapter, ca_descr_t *ca_descr); extern void _SetCaPid(int adapter, ca_pid_t *ca_pid); -- 2.39.5