Fixed: UHD was not handled in tags and stream profiles

tvheadend · Oct 17, 2016 · fd0dec0 · fd0dec0 · anthonytex · Oct 18, 2016
1 parent 39108ce
commit fd0dec0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/src/profile.c b/src/profile.c
@@ -263,9 +263,10 @@ static htsmsg_t *
 profile_class_svfilter_list ( void *o, const char *lang )
 {
   static const struct strtab tab[] = {
-    { N_("None"),                    PROFILE_SVF_NONE },
-    { N_("SD: standard definition"), PROFILE_SVF_SD },
-    { N_("HD: high definition"),     PROFILE_SVF_HD },
+    { N_("None"),                       PROFILE_SVF_NONE },
+    { N_("SD: standard definition"),    PROFILE_SVF_SD },
+    { N_("HD: high definition"),        PROFILE_SVF_HD },
+    { N_("UHD: ultra high definition"), PROFILE_SVF_UHD },
   };
   return strtab2htsmsg(tab, 1, lang);
 }

diff --git a/src/profile.h b/src/profile.h
@@ -40,7 +40,8 @@ typedef enum {
 typedef enum {
   PROFILE_SVF_NONE = 0,
   PROFILE_SVF_SD,
-  PROFILE_SVF_HD
+  PROFILE_SVF_HD,
+  PROFILE_SVF_UHD
 } profile_svfilter_t;
 
 struct profile;

diff --git a/src/service.c b/src/service.c
@@ -760,7 +760,8 @@ service_find_instance
         if (pro == NULL ||
             pro->pro_svfilter == PROFILE_SVF_NONE ||
             (pro->pro_svfilter == PROFILE_SVF_SD && service_is_sdtv(s)) ||
-            (pro->pro_svfilter == PROFILE_SVF_HD && service_is_hdtv(s))) {
+            (pro->pro_svfilter == PROFILE_SVF_HD && service_is_hdtv(s)) ||
+            (pro->pro_svfilter == PROFILE_SVF_UHD && service_is_uhdtv(s))) {
           r1 = s->s_enlist(s, ti, sil, flags, weight);
           if (r1 == 0)
             enlisted++;

diff --git a/src/service_mapper.c b/src/service_mapper.c
@@ -238,14 +238,18 @@ service_mapper_process
 
     /* Type tags */
     if (conf->type_tags) {
-      if (service_is_hdtv(s)) {
+      if (service_is_uhdtv(s)) {
+        channel_tag_map(channel_tag_find_by_name("TV channels", 1), chn, chn);
+        channel_tag_map(channel_tag_find_by_name("UHDTV", 1), chn, chn);
+      } else if (service_is_hdtv(s)) {
         channel_tag_map(channel_tag_find_by_name("TV channels", 1), chn, chn);
         channel_tag_map(channel_tag_find_by_name("HDTV", 1), chn, chn);
       } else if (service_is_sdtv(s)) {
         channel_tag_map(channel_tag_find_by_name("TV channels", 1), chn, chn);
         channel_tag_map(channel_tag_find_by_name("SDTV", 1), chn, chn);
       } else if (service_is_radio(s)) {
-        channel_tag_map(channel_tag_find_by_name("Radio", 1), chn, chn);
+        if (!channel_tag_map(channel_tag_find_by_name("Radio", 0), chn, chn))
+          channel_tag_map(channel_tag_find_by_name("Radio channels", 1), chn, chn);
       }
     }