Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
HTSP: subtitle fixes - build dvrentry & update dvrentry
  • Loading branch information
perexg committed May 29, 2015
1 parent 6c6a797 commit 63c7b79
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/htsp_server.c
Expand Up @@ -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)
Expand Down Expand Up @@ -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;

Expand Down

3 comments on commit 63c7b79

@ksooo
Copy link
Contributor

@ksooo ksooo commented on 63c7b79 May 29, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please merge this fix for 4.0?

@perexg
Copy link
Contributor Author

@perexg perexg commented on 63c7b79 May 29, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, I merged all language related patches (I think they're serious).

@ksooo
Copy link
Contributor

@ksooo ksooo commented on 63c7b79 May 29, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool. Thanks.

Please sign in to comment.