sasc: fix calling SetCaDescr

diff --git a/cam.c b/cam.c
index 6fc59f4577242d220f9a49cc2f8b2d061a671767..8f4f6d305980686d4aa683cc2e6471467308e5a0 100644 (file)
--- 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 277176b8a6ee11269925d4cde660d90789bc7fcb..0704aa56f7eef4251ca78d68f3271db5d9fc0045 100644 (file)
--- 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);