From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 16 Feb 2017 08:14:10 +0000 (+0100)
Subject: SAT>IP server: allow to disable X_SATIPM3U tag, fixes #4225
X-Git-Tag: v4.2.1~107
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15731988c8f00206514269cdf24df78808ab99cd;p=thirdparty%2Ftvheadend.git

SAT>IP server: allow to disable X_SATIPM3U tag, fixes #4225
---

diff --git a/src/satip/server.c b/src/satip/server.c
index ecde43e1a..e0bf95c8a 100644
--- a/src/satip/server.c
+++ b/src/satip/server.c
@@ -106,7 +106,7 @@ satip_server_http_xml(http_connection_t *hc)
 </iconList>\n\
 <presentationURL>http://%s:%d</presentationURL>\n\
 <satip:X_SATIPCAP xmlns:satip=\"urn:ses-com:satip\">%s</satip:X_SATIPCAP>\n\
-<satip:X_SATIPM3U xmlns:satip=\"urn:ses-com:satip\">/playlist/satip/channels</satip:X_SATIPM3U>\n\
+%s\
 </device>\n\
 </root>\n"
 
@@ -195,7 +195,9 @@ satip_server_http_xml(http_connection_t *hc)
            http_server_ip, http_server_port,
            http_server_ip, http_server_port,
            http_server_ip, http_server_port,
-           devicelist ?: "");
+           devicelist ?: "",
+           satip_server_conf.satip_nom3u ? "" :
+             "<satip:X_SATIPM3U xmlns:satip=\"urn:ses-com:satip\">/playlist/satip/channels</satip:X_SATIPM3U>\n");
 
   free(devicelist);
 
@@ -672,6 +674,15 @@ const idclass_t satip_server_class = {
       .opts   = PO_EXPERT,
       .group  = 1,
     },
+    {
+      .type   = PT_BOOL,
+      .id     = "satip_nom3u",
+      .name   = N_("Disable X_SATIPM3U tag"),
+      .desc   = N_("Do not send X_SATIPM3U information in the XML description to clients."),
+      .off    = offsetof(struct satip_server_conf, satip_nom3u),
+      .opts   = PO_EXPERT,
+      .group  = 1,
+    },
     {
       .type   = PT_INT,
       .id     = "satip_dvbs",
diff --git a/src/satip/server.h b/src/satip/server.h
index 3955156ee..9aa9ebdf8 100644
--- a/src/satip/server.h
+++ b/src/satip/server.h
@@ -46,6 +46,7 @@ struct satip_server_conf {
   int satip_descramble;
   int satip_rewrite_pmt;
   int satip_muxcnf;
+  int satip_nom3u;
   int satip_dvbs;
   int satip_dvbs2;
   int satip_dvbt;