mpegts service: small code shuffle

diff --git a/src/descrambler/dvbcam.h b/src/descrambler/dvbcam.h
index abdffbf78e39524c0736667be81fb7d979cfd409..a5ae76cf3892a578c8f2f6715908ea0142304d1f 100644 (file)
--- a/src/descrambler/dvbcam.h
+++ b/src/descrambler/dvbcam.h
@@ -19,6 +19,7 @@
 #ifndef __DVBCAM_H__
 #define __DVBCAM_H__
 
+struct service;
 struct mpegts_service;
 struct elementary_stream;
 
@@ -31,11 +32,12 @@ void dvbcam_register_cam(struct linuxdvb_ca *lca, uint16_t * caids, int num_caid
 void dvbcam_unregister_cam(struct linuxdvb_ca *lca);
 void dvbcam_pmt_data(struct mpegts_service *s, const uint8_t *ptr, int len);
 
-#if ENABLE_DDCI
-struct service;
-int dvbcam_is_ddci(struct service *t);
 #endif
 
+#if defined(ENABLE_LINUXDVB_CA) && defined(ENABLE_DDCI)
+int dvbcam_is_ddci(struct service *t);
+#else
+static inline int dvbcam_is_ddci(struct service_t *t) { return 0; }
 #endif
 
 #endif /* __DVBCAM_H__ */

diff --git a/src/input/mpegts/mpegts_service.c b/src/input/mpegts/mpegts_service.c
index e57562783be5ee27edd016753ff78e7ede95dc0d..de4a55232e48754e863c5335dbc58d4ca02a2309 100644 (file)
--- a/src/input/mpegts/mpegts_service.c
+++ b/src/input/mpegts/mpegts_service.c
@@ -26,9 +26,7 @@
 #include "dvb_charset.h"
 #include "config.h"
 #include "epggrab.h"
-#if ENABLE_DDCI
 #include "descrambler/dvbcam.h"
-#endif
 
 /* **************************************************************************
  * Class definition
@@ -1021,13 +1019,7 @@ mpegts_service_update_slave_pids ( mpegts_service_t *s, int del )
   mpegts_apids_t *pids;
   elementary_stream_t *st;
   int i;
-#if ENABLE_DDCI
-  int is_ddci = dvbcam_is_ddci((service_t*)s);
-#define IS_DDCI  is_ddci
-#else
-#define IS_DDCI  0
-#endif
-
+  const int is_ddci = dvbcam_is_ddci((service_t*)s);
 
   lock_assert(&s->s_stream_mutex);
 
@@ -1041,7 +1033,7 @@ mpegts_service_update_slave_pids ( mpegts_service_t *s, int del )
 
   /* Ensure that filtered PIDs are not send in ts_recv_raw */
   TAILQ_FOREACH(st, &s->s_filt_components, es_filt_link)
-    if ((IS_DDCI || s->s_scrambled_pass || st->es_type != SCT_CA) &&
+    if ((is_ddci || s->s_scrambled_pass || st->es_type != SCT_CA) &&
         st->es_pid >= 0 && st->es_pid < 8192)
       mpegts_pid_add(pids, st->es_pid, mpegts_mps_weight(st));