Partial revert of "mpegts: add PMT monitoring option"

- removed the pmtmon option
- kept the PMT table handling for given service

diff --git a/src/input/mpegts.h b/src/input/mpegts.h
index 9d8359a40dcb401a87f9b60563686ce097fcda63..80a5a0a59642de1d62a2e6c10c4d0540de4ac64a 100644 (file)
--- a/src/input/mpegts.h
+++ b/src/input/mpegts.h
@@ -460,8 +460,6 @@ struct mpegts_input
 
   int mi_priority;
 
-  int mi_pmtmon;
-
   LIST_ENTRY(mpegts_input) mi_global_link;
 
   mpegts_network_link_list_t mi_networks;

diff --git a/src/input/mpegts/dvb_psi.c b/src/input/mpegts/dvb_psi.c
index 9f2ce048136b0c0b2d0c417b01c874b46c463eb9..f4ce6b1145050532d023bd8859494e73ab7e7bfc 100644 (file)
--- a/src/input/mpegts/dvb_psi.c
+++ b/src/input/mpegts/dvb_psi.c
@@ -591,12 +591,8 @@ dvb_pat_callback
       tvhdebug("pat", "  sid %04X (%d) on pid %04X (%d)", sid, sid, pid, pid);
       int save = 0;
       if ((s = mpegts_service_find(mm, sid, pid, 1, &save))) {
-        if (mm->mm_active && mm->mm_active->mmi_input) {
-          mpegts_input_t *mi = mm->mm_active->mmi_input;
-          if (mi->mi_pmtmon)
-            mpegts_table_add(mm, DVB_PMT_BASE, DVB_PMT_MASK, dvb_pmt_callback,
-                             NULL, "pmt", MT_CRC | MT_QUICKREQ, pid);
-        }
+        mpegts_table_add(mm, DVB_PMT_BASE, DVB_PMT_MASK, dvb_pmt_callback,
+                         NULL, "pmt", MT_CRC | MT_QUICKREQ, pid);
 
         if (save)
           service_request_save((service_t*)s, 1);

diff --git a/src/input/mpegts/mpegts_input.c b/src/input/mpegts/mpegts_input.c
index 3e0b33472cc6f2c61a46f21b961b8dc9fad606fc..fa9bbc355941add82590550ba11bf68c24b731a2 100644 (file)
--- a/src/input/mpegts/mpegts_input.c
+++ b/src/input/mpegts/mpegts_input.c
@@ -153,13 +153,6 @@ const idclass_t mpegts_input_class =
       .list     = mpegts_input_class_network_enum,
       .rend     = mpegts_input_class_network_rend,
     },
-    {
-      .type     = PT_BOOL,
-      .id       = "pmtmon",
-      .name     = "Enable PMT monitor",
-      .off      = offsetof(mpegts_input_t, mi_pmtmon),
-      .opts     = PO_ADVANCED,
-    },
     {}
   }
 };