]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
HTSP: subtitle fixes - build dvrentry & update dvrentry
authorJaroslav Kysela <perex@perex.cz>
Fri, 29 May 2015 16:09:46 +0000 (18:09 +0200)
committerJaroslav Kysela <perex@perex.cz>
Fri, 29 May 2015 16:09:46 +0000 (18:09 +0200)
src/htsp_server.c

index 0886ce235857c66fe491f3d2f683fba18f519467..48489e47a6051b9c23f9096051d94c06e1f8070f 100644 (file)
@@ -693,6 +693,8 @@ htsp_build_dvrentry(dvr_entry_t *de, const char *method, const char *lang)
 
   if(de->de_title && (s = lang_str_get(de->de_title, lang)))
     htsmsg_add_str(out, "title", s);
+  if(de->de_title && (s = lang_str_get(de->de_subtitle, lang)))
+    htsmsg_add_str(out, "subtitle", s);
   if(de->de_desc && (s = lang_str_get(de->de_desc, lang)))
     htsmsg_add_str(out, "description", s);
   if(de->de_owner)
@@ -1563,7 +1565,7 @@ htsp_method_updateDvrEntry(htsp_connection_t *htsp, htsmsg_t *in)
   retention   = htsmsg_get_u32_or_default(in, "retention",  0);
   priority    = htsmsg_get_u32_or_default(in, "priority",   DVR_PRIO_NORMAL);
   title       = htsmsg_get_str(in, "title");
-  subtitle    = htsmsg_get_str(in, "title");
+  subtitle    = htsmsg_get_str(in, "subtitle");
   desc        = htsmsg_get_str(in, "description");
   lang        = htsmsg_get_str(in, "language") ?: htsp->htsp_language;