From: Adam Sutton Date: Tue, 16 Apr 2013 20:50:52 +0000 (+0100) Subject: services: include info from SDT (for Other services) if they already exist. X-Git-Tag: 3.4patch1~25 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2285f141e13454420122859a747a2c7d61518bdc;p=thirdparty%2Ftvheadend.git services: include info from SDT (for Other services) if they already exist. Services can be added from a variety of other tables which probably indicates that they are in fact valid TV/Radio services, but we just don't know the type. This might help people to map these services manually within TVH. (cherry picked from commit 34e7acc08729f7ea114141eefbe6a364758a6518) --- diff --git a/src/dvb/dvb_service.c b/src/dvb/dvb_service.c index 31e25e64c..f8f8def6c 100644 --- a/src/dvb/dvb_service.c +++ b/src/dvb/dvb_service.c @@ -485,7 +485,10 @@ dvb_service_build_msg(service_t *t) htsmsg_add_u32(m, "pmt", t->s_pmt_pid); htsmsg_add_u32(m, "pcr", t->s_pcr_pid); - htsmsg_add_str(m, "type", service_servicetype_txt(t)); + snprintf(buf, sizeof(buf), "%s (0x%04X)", service_servicetype_txt(t), t->s_servicetype); + htsmsg_add_str(m, "type", buf); + htsmsg_add_str(m, "typestr", service_servicetype_txt(t)); + htsmsg_add_u32(m, "typenum", t->s_servicetype); htsmsg_add_str(m, "svcname", t->s_svcname ?: ""); htsmsg_add_str(m, "provider", t->s_provider ?: ""); diff --git a/src/service.c b/src/service.c index 2bf84aa20..7851f5c27 100644 --- a/src/service.c +++ b/src/service.c @@ -763,8 +763,8 @@ static struct strtab stypetab[] = { { "HDTV", ST_DN_HDTV }, { "SDTV", ST_SK_SDTV }, { "SDTV", ST_NE_SDTV }, - { "SDTV-AC", ST_AC_SDTV }, - { "HDTV-AC", ST_AC_HDTV }, + { "SDTV", ST_AC_SDTV }, + { "HDTV", ST_AC_HDTV }, }; const char *