stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

service check: text cleanups, add help text, re-enable service when they're broadcasted again, fixes #2595

Browse source
This commit is contained in:
Jaroslav Kysela 2015-01-06 10:33:19 +01:00
parent 1027f294d0
commit 1afee1663a
3 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docs/html/config_services.html
View file

@ -18,6 +18,12 @@
<dt>Enabled <dt>Enabled
<dd>Whether or not this service is available for use <dd>Whether or not this service is available for use
<dt>Automatic Checking
<dd>Check for the service presence. If service is no longer broadcasted,
this field will become as "Missing In PAT/SDT". The
check can be also disabled for given service using this
column.
<dt>Channel <dt>Channel
<dd>The channel to which the service is mapped <dd>The channel to which the service is mapped

11
src/input/mpegts/dvb_psi.c
View file

@ -1052,6 +1052,10 @@ dvb_pat_callback
tvhdebug("pat", " sid %04X (%d) on pid %04X (%d)", sid, sid, pid, pid); tvhdebug("pat", " sid %04X (%d) on pid %04X (%d)", sid, sid, pid, pid);
int save = 0; int save = 0;
if ((s = mpegts_service_find(mm, sid, pid, 1, &save))) { if ((s = mpegts_service_find(mm, sid, pid, 1, &save))) {
if (!s->s_enabled && s->s_auto == SERVICE_AUTO_PAT_MISSING) {
tvhinfo("mpegts", "enabling service %s (found in PAT)", s->s_nicename);
s->s_enabled = 1;
}
s->s_dvb_check_seen = dispatch_clock; s->s_dvb_check_seen = dispatch_clock;
mpegts_table_add(mm, DVB_PMT_BASE, DVB_PMT_MASK, dvb_pmt_callback, mpegts_table_add(mm, DVB_PMT_BASE, DVB_PMT_MASK, dvb_pmt_callback,
NULL, "pmt", MT_CRC | MT_QUICKREQ | MT_SCANSUBS, NULL, "pmt", MT_CRC | MT_QUICKREQ | MT_SCANSUBS,
@ -1588,8 +1592,13 @@ dvb_sdt_callback
s = mpegts_service_find(mm, service_id, 0, 1, &save); s = mpegts_service_find(mm, service_id, 0, 1, &save);
charset = dvb_charset_find(mn, mm, s); charset = dvb_charset_find(mn, mm, s);
if (s) if (s) {
if (!s->s_enabled && s->s_auto == SERVICE_AUTO_PAT_MISSING) {
tvhinfo("mpegts", "enabling service %s (found in SDT)", s->s_nicename);
s->s_enabled = 1;
}
s->s_dvb_check_seen = dispatch_clock; s->s_dvb_check_seen = dispatch_clock;
}
/* Descriptor loop */ /* Descriptor loop */
DVB_DESC_EACH(lptr, llen, dtag, dlen, dptr) { DVB_DESC_EACH(lptr, llen, dtag, dlen, dptr) {

6
src/service.c
View file

@ -181,9 +181,9 @@ static htsmsg_t *
service_class_auto_list ( void *o ) service_class_auto_list ( void *o )
{ {
static const struct strtab tab[] = { static const struct strtab tab[] = {
{ "", 0 }, { "Auto Check Enabled", 0 },
{ "No Auto (Disabled)", 1 }, { "Auto Check Disabled", 1 },
{ "Missing In PAT/SDT", 2 } { "Missing In PAT/SDT", 2 }
}; };
return strtab2htsmsg(tab); return strtab2htsmsg(tab);
} }