bouquets: allow compilation without ENABLE_MPEGTS_DVB, fixes #2458

tvheadend · Nov 10, 2014 · f35f00f · f35f00f
1 parent 1a9f8d4
commit f35f00f
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 3 deletions.
diff --git a/src/input/mpegts/dvb_psi.c b/src/input/mpegts/dvb_psi.c
@@ -457,6 +457,8 @@ dvb_desc_local_channel
   return 0;
 }
 
+#if ENABLE_MPEGTS_DVB
+
 /*
  * UK FreeSat
  */
@@ -785,6 +787,7 @@ dvb_bskyb_local_channels
   }
 }
 
+#endif /* ENABLE_MPEGTS_DVB */
 
 /* **************************************************************************
  * Tables
@@ -1167,7 +1170,6 @@ dvb_bat_completed
 {
   dvb_bat_id_t *bi;
   dvb_bat_svc_t *bs;
-  char src[64];
   bouquet_t *bq;
 
   b->complete = 1;
@@ -1181,14 +1183,17 @@ dvb_bat_completed
     }
 
     if (bi->freesat || bi->bskyb) {
+#if ENABLE_MPEGTS_DVB
       dvb_freesat_completed(b, bi, dstr);
+#endif
       goto complete;
     }
 
     bq = NULL;
 
 #if ENABLE_MPEGTS_DVB
     if (tableid == 0x4A /* BAT */) {
+      char src[64] = "";
       if (idnode_is_instance(&mux->mm_id, &dvb_mux_dvbs_class)) {
         dvb_mux_conf_t *mc = &((dvb_mux_t *)mux)->lm_tuning;
         if (mc->u.dmc_fe_qpsk.orbital_dir) {
@@ -1230,7 +1235,10 @@ dvb_nit_callback
   (mpegts_table_t *mt, const uint8_t *ptr, int len, int tableid)
 {
   int save = 0;
-  int r, sect, last, ver, fsat = 0, p02 = 0;
+  int r, sect, last, ver;
+#if ENABLE_MPEGTS_DVB
+  int fsat = 0, p02 = 0;
+#endif
   uint8_t  dtag;
   int llen, dllen, dlen;
   const uint8_t *lptr, *dlptr, *dptr;
@@ -1324,16 +1332,20 @@ dvb_nit_callback
         // TODO: implement this?
         break;
       case DVB_DESC_PRIVATE_DATA:
+#if ENABLE_MPEGTS_DVB
         if (tableid == 0x4A && dlen == 4) {
           if (!memcmp(dptr, "FSAT", 4))
             fsat = 1;
           else if (!memcmp(dptr, "\x00\x00\x00\x02", 4))
             p02 = 1;
         }
+#endif
         break;
       case DVB_DESC_FREESAT_REGIONS:
+#if ENABLE_MPEGTS_DVB
         if (fsat)
           dvb_freesat_regions(bi, mt->mt_name, dptr, dlen);
+#endif
         break;
     }
   }
@@ -1434,22 +1446,28 @@ dvb_nit_callback
             return -1;
           break;
         case DVB_DESC_PRIVATE_DATA:
+#if ENABLE_MPEGTS_DVB
           if (dlen == 4 && !memcmp(dptr, "FSAT", 4))
             fsat = 1;
           else if (!memcmp(dptr, "\x00\x00\x00\x02", 4))
             p02 = 1;
+#endif
           break;
         case DVB_DESC_FREESAT_LCN:
+#if ENABLE_MPEGTS_DVB
           if (tableid == 0x4A && fsat) {
             dvb_freesat_local_channels(bi, mt->mt_name, dptr, dlen);
             bi->freesat = 1;
           }
+#endif
           break;
         case DVB_DESC_BSKYB_LCN:
+#if ENABLE_MPEGTS_DVB
           if (tableid == 0x4A && p02) {
             dvb_bskyb_local_channels(bi, mt->mt_name, dptr, dlen, mux);
             bi->bskyb = 1;
           }
+#endif
           break;
       }
     }

diff --git a/src/input/mpegts/fastscan.c b/src/input/mpegts/fastscan.c
@@ -22,6 +22,8 @@
 #include "dvb.h"
 #include "fastscan.h"
 
+#if ENABLE_MPEGTS_DVB
+
 typedef struct dvb_fastscan_item {
   LIST_ENTRY(dvb_fastscan_item) ilink;
 
@@ -174,3 +176,15 @@ void dvb_fastscan_done ( void )
   }
   SKEL_FREE(fastscan_rb_skel);
 }
+
+#else
+
+void dvb_fastscan_init ( void )
+{
+}
+
+void dvb_fastscan_done ( void )
+{
+}
+
+#endif
diff --git a/src/input/mpegts/fastscan.h b/src/input/mpegts/fastscan.h
@@ -19,13 +19,17 @@
 #ifndef __TVH_DVB_FASTSCAN_H__
 #define __TVH_DVB_FASTSCAN_H__
 
+#if ENABLE_MPEGTS_DVB
+
 struct bouquet;
 
 void
 dvb_fastscan_each(void *aux, int position, uint32_t frequency,
                   void (*job)(void *aux, struct bouquet *,
                               const char *name, int pid));
 
+#endif
+
 void dvb_fastscan_init ( void );
 void dvb_fastscan_done ( void );
 

diff --git a/src/input/mpegts/mpegts_network_scan.c b/src/input/mpegts/mpegts_network_scan.c
@@ -239,6 +239,7 @@ mpegts_network_scan_queue_add ( mpegts_mux_t *mm, int weight, int delay )
  * Bouquet helper
  *****************************************************************************/
 
+#if ENABLE_MPEGTS_DVB
 static ssize_t
 startswith( const char *str, const char *start )
 {
@@ -247,14 +248,15 @@ startswith( const char *str, const char *start )
     return len;
   return -1;
 }
+#endif
 
 void
 mpegts_mux_bouquet_rescan ( const char *src, const char *extra )
 {
+#if ENABLE_MPEGTS_DVB
   mpegts_network_t *mn;
   mpegts_mux_t *mm;
   ssize_t l;
-#if ENABLE_MPEGTS_DVB
   const idclass_t *ic;
   uint32_t freq;
   int satpos;