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 31e25e64cdaed9c6c38909b3b1a44190b4178f62..f8f8def6cac12fe693155faaedaad97a42f89329 100644 (file)
--- 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 2bf84aa20af0c4142e4c998f78d06ceecd7373eb..7851f5c27c95d3c4d56f18fab78aa9b7cce78cc8 100644 (file)
--- 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 *