From: Mark Clarkstone <hello@markclarkstone.co.uk>
Date: Fri, 27 May 2016 14:20:23 +0000 (+0100)
Subject: mdhelp: add streaming profile property doc, fix a few descriptions
X-Git-Tag: v4.2.1~457
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=321fcc1b5fbdb9d940de630f0c38499f1b88f4ce;p=thirdparty%2Ftvheadend.git

mdhelp: add streaming profile property doc, fix a few descriptions
---

diff --git a/docs/property/streaming_profile.md b/docs/property/streaming_profile.md
new file mode 100644
index 000000000..74bfd06bc
--- /dev/null
+++ b/docs/property/streaming_profile.md
@@ -0,0 +1,6 @@
+:
+
+The default profile and priorities can be changed in the 
+[Stream Profiles](class/profile) tab. Note, when streaming using the 
+HTSP Protocol e.g. Kodi (via pvr.hts) or Movian the HTSP profile will 
+always be used.
diff --git a/src/access.c b/src/access.c
index e5e7baa53..54cfab266 100644
--- a/src/access.c
+++ b/src/access.c
@@ -1368,6 +1368,7 @@ PROP_DOC(viewlevel_access_entries)
 PROP_DOC(themes)
 PROP_DOC(connection_limit)
 PROP_DOC(persistent_viewlevel)
+PROP_DOC(streaming_profile)
 
 const idclass_t access_entry_class = {
   .ic_class      = "access",
@@ -1491,6 +1492,7 @@ const idclass_t access_entry_class = {
       .name     = N_("Streaming profiles"),
       .desc     = N_("The streaming profile to use/used. If not set, "
                      "the default will be used."),
+      .doc      = prop_doc_streaming_profile,
       .set      = access_entry_profile_set,
       .get      = access_entry_profile_get,
       .list     = profile_class_get_list,
diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c
index 4326f0e2b..fcce73a03 100644
--- a/src/dvr/dvr_db.c
+++ b/src/dvr/dvr_db.c
@@ -2951,7 +2951,7 @@ const idclass_t dvr_entry_class = {
       .type     = PT_STR,
       .id       = "disp_title",
       .name     = N_("Title"),
-      .desc     = N_("Title of the program (display)."),
+      .desc     = N_("Title of the program (display only)."),
       .get      = dvr_entry_class_disp_title_get,
       .set      = dvr_entry_class_disp_title_set,
       .opts     = PO_NOSAVE,
@@ -2968,7 +2968,7 @@ const idclass_t dvr_entry_class = {
       .type     = PT_STR,
       .id       = "disp_subtitle",
       .name     = N_("Subtitle"),
-      .desc     = N_("Subtitle of the program (if any)."),
+      .desc     = N_("Subtitle of the program (if any) (display only)."),
       .get      = dvr_entry_class_disp_subtitle_get,
       .set      = dvr_entry_class_disp_subtitle_set,
       .opts     = PO_NOSAVE,
@@ -2985,7 +2985,7 @@ const idclass_t dvr_entry_class = {
       .type     = PT_STR,
       .id       = "disp_description",
       .name     = N_("Description"),
-      .desc     = N_("Program synopsis (display)."),
+      .desc     = N_("Program synopsis (display only)."),
       .get      = dvr_entry_class_disp_description_get,
       .opts     = PO_RDONLY | PO_NOSAVE | PO_HIDDEN,
     },
@@ -2993,7 +2993,7 @@ const idclass_t dvr_entry_class = {
       .type     = PT_INT,
       .id       = "pri",
       .name     = N_("Priority"),
-      .desc     = N_("Priority of the recording. Higher-priority entries will take precedence and cancel lower-priority events."),
+      .desc     = N_("Priority of the recording. Higher priority entries will take precedence and cancel lower-priority events."),
       .off      = offsetof(dvr_entry_t, de_pri),
       .def.i    = DVR_PRIO_NORMAL,
       .set      = dvr_entry_class_pri_set,