SAT>IP: Remove the full mux option like in linuxdvb

diff --git a/docs/html/config_tvadapters.html b/docs/html/config_tvadapters.html
index 9582a7e3a7abeecc2d1c4e158bc0164039df5e01..a4d9a36f275c847b5d0ac69f3ca23d164ad5e3b4 100644 (file)
--- a/docs/html/config_tvadapters.html
+++ b/docs/html/config_tvadapters.html
@@ -18,12 +18,6 @@
 
   <dt>Name</dt>
   <dd>The name of this tuner.</dd>
-
-  <dt>Full Mux Rx mode</dt>
-  <dd>If selected, the whole mux (transponder) will be received without any
-      filtering. It is not usually required to enable this option. It does
-      not have usually any benefit, because tvheadend will filter the
-      unwanted PIDs from the TS stream, except for the malfunctioning drivers.</dd>
 </dl>
 </p>
 

diff --git a/src/input/mpegts/satip/satip_frontend.c b/src/input/mpegts/satip/satip_frontend.c
index fdca0d6baacac3a5ab3ca4b0259f9ea3e207fa97..5c11938910e75e60a07b304cd2407255d7f93a1b 100644 (file)
--- a/src/input/mpegts/satip/satip_frontend.c
+++ b/src/input/mpegts/satip/satip_frontend.c
@@ -100,12 +100,6 @@ const idclass_t satip_frontend_class =
       .opts     = PO_RDONLY | PO_NOSAVE,
       .off      = offsetof(satip_frontend_t, sf_number),
     },
-    {
-      .type     = PT_BOOL,
-      .id       = "fullmux",
-      .name     = "Full Mux Rx mode",
-      .off      = offsetof(satip_frontend_t, sf_fullmux),
-    },
     {
       .type     = PT_INT,
       .id       = "udp_rtp_port",
@@ -750,8 +744,6 @@ satip_frontend_pid_changed( http_client_t *rtsp,
 
   if (lfe->sf_pids_count > lfe->sf_device->sd_pids_max)
     any = lfe->sf_device->sd_fullmux_ok ? 1 : 0;
-  if (lfe->sf_fullmux && lfe->sf_device->sd_fullmux_ok)
-    any = 1;
 
   if (any) {
 

diff --git a/src/input/mpegts/satip/satip_private.h b/src/input/mpegts/satip/satip_private.h
index 32285336df0189f5aaf6c13d02fb23d0f21464f4..6423eb3bfa8bb53126e1a2bc4877cf484de2af88 100644 (file)
--- a/src/input/mpegts/satip/satip_private.h
+++ b/src/input/mpegts/satip/satip_private.h
@@ -100,7 +100,6 @@ struct satip_frontend
   char                      *sf_type_override;
   int                        sf_master;
   int                        sf_udp_rtp_port;
-  int                        sf_fullmux;
   int                        sf_play2;
 
   /*