]> 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 18:52:36 +0000 (20:52 +0200)
src/htsp_server.c

index a6b27730b2557ec79abe319dc652f352b27a9958..82d8b4f7d9ec760ddf4332063231e8ce3d15a2e4 100644 (file)
@@ -692,6 +692,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)
@@ -1552,7 +1554,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;