From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 1 Feb 2016 20:59:48 +0000 (+0100)
Subject: SAT>IP server: --disable-iptv fixes
X-Git-Tag: v4.2.1~1090
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eccb003cf129dcbc44a8083f44747e35c4478d4c;p=thirdparty%2Ftvheadend.git

SAT>IP server: --disable-iptv fixes
---

diff --git a/src/satip/rtsp.c b/src/satip/rtsp.c
index efdfb5192..a32327169 100644
--- a/src/satip/rtsp.c
+++ b/src/satip/rtsp.c
@@ -516,6 +516,7 @@ rtsp_start
           }
         }
       }
+#if ENABLE_IPTV
       if (idnode_is_instance(&mn->mn_id, &iptv_network_class)) {
         LIST_FOREACH(mux, &mn->mn_muxes, mm_network_link)
           if (deltaU32(rs->dmc.dmc_fe_freq, ((iptv_mux_t *)mux)->mm_iptv_satip_dvbt_freq) < 2000)
@@ -526,6 +527,7 @@ rtsp_start
           break;
         }
       }
+#endif
     }
     if (mux == NULL && mn2 &&
         (rtsp_muxcnf == MUXCNF_AUTO || rtsp_muxcnf == MUXCNF_KEEP)) {
diff --git a/src/satip/server.c b/src/satip/server.c
index c816f6fe1..8b6d3f5b9 100644
--- a/src/satip/server.c
+++ b/src/satip/server.c
@@ -112,7 +112,6 @@ satip_server_http_xml(http_connection_t *hc)
   char *devicelist = NULL;
   htsbuf_queue_t q;
   mpegts_network_t *mn;
-  mpegts_mux_t *mm;
   int dvbt = 0, dvbs = 0, dvbc = 0, atsc = 0;
   int srcs = 0, delim = 0, tuners = 0, i;
   struct xml_type_xtab *p;
@@ -147,13 +146,16 @@ satip_server_http_xml(http_connection_t *hc)
       dvbc++;
     else if (idnode_is_instance(&mn->mn_id, &dvb_network_atsc_t_class))
       atsc++;
+#if ENABLE_IPTV
     else if (idnode_is_instance(&mn->mn_id, &iptv_network_class)) {
+      mpegts_mux_t *mm;
       LIST_FOREACH(mm, &mn->mn_muxes, mm_network_link)
         if (((iptv_mux_t *)mm)->mm_iptv_satip_dvbt_freq) {
           dvbt++;
           break;
         }
     }
+#endif
   }
   for (p = xtab; p->id; p++) {
     i = *p->cptr;