Partial revert of "mpegts: add PMT monitoring option"

- removed the pmtmon option
- kept the PMT table handling for given service
This commit is contained in:
Jaroslav Kysela 2014-04-23 13:22:18 +02:00
parent e113c3bc22
commit 39de95b04a
3 changed files with 2 additions and 15 deletions

View file

@ -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;

View file

@ -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);

View file

@ -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,
},
{}
}
};