DVR / WEBUI: Mark view levels for DVR tabs, add PO_NOUI, remove de_mc…

… (unused)
tvheadend · Dec 2, 2015 · 09a33b6 · 09a33b6
1 parent b9f687f
commit 09a33b6
Show file tree

Hide file tree

Showing 10 changed files with 106 additions and 102 deletions.
diff --git a/src/dvr/dvr.h b/src/dvr/dvr.h
@@ -177,7 +177,6 @@ typedef struct dvr_entry {
   int de_pri;
   int de_dont_reschedule;
   int de_dont_rerecord;
-  int de_mc;
   uint32_t de_retention;
   uint32_t de_removal;
 

diff --git a/src/dvr/dvr_autorec.c b/src/dvr/dvr_autorec.c
@@ -939,8 +939,8 @@ dvr_autorec_entry_class_owner_opts(void *o)
   dvr_autorec_entry_t *dae = (dvr_autorec_entry_t *)o;
   if (dae && dae->dae_id.in_access &&
       !access_verify2(dae->dae_id.in_access, ACCESS_ADMIN))
-    return 0;
-  return PO_RDONLY;
+    return PO_ADVANCED;
+  return PO_RDONLY | PO_ADVANCED;
 }
 
 const idclass_t dvr_autorec_entry_class = {
@@ -1000,6 +1000,7 @@ const idclass_t dvr_autorec_entry_class = {
       .get      = dvr_autorec_entry_class_tag_get,
       .rend     = dvr_autorec_entry_class_tag_rend,
       .list     = channel_tag_class_get_list,
+      .opts     = PO_ADVANCED
     },
     {
       .type     = PT_STR,
@@ -1025,15 +1026,15 @@ const idclass_t dvr_autorec_entry_class = {
       .name     = N_("Extra start time"),
       .off      = offsetof(dvr_autorec_entry_t, dae_start_extra),
       .list     = dvr_autorec_entry_class_extra_list,
-      .opts     = PO_DURATION | PO_SORTKEY
+      .opts     = PO_DURATION | PO_SORTKEY | PO_ADVANCED
     },
     {
       .type     = PT_TIME,
       .id       = "stop_extra",
       .name     = N_("Extra stop time"),
       .off      = offsetof(dvr_autorec_entry_t, dae_stop_extra),
       .list     = dvr_autorec_entry_class_extra_list,
-      .opts     = PO_DURATION | PO_SORTKEY
+      .opts     = PO_DURATION | PO_SORTKEY | PO_ADVANCED
     },
     {
       .type     = PT_U32,
@@ -1052,20 +1053,23 @@ const idclass_t dvr_autorec_entry_class = {
       .name     = N_("Minimum duration"),
       .list     = dvr_autorec_entry_class_minduration_list,
       .off      = offsetof(dvr_autorec_entry_t, dae_minduration),
+      .opts     = PO_ADVANCED
     },
     {
       .type     = PT_INT,
       .id       = "maxduration",
       .name     = N_("Maximum duration"),
       .list     = dvr_autorec_entry_class_maxduration_list,
       .off      = offsetof(dvr_autorec_entry_t, dae_maxduration),
+      .opts     = PO_ADVANCED
     },
     {
       .type     = PT_U32,
       .id       = "content_type",
       .name     = N_("Content type"),
       .list     = dvr_autorec_entry_class_content_type_list,
       .off      = offsetof(dvr_autorec_entry_t, dae_content_type),
+      .opts     = PO_ADVANCED
     },
     {
       .type     = PT_U32,
@@ -1074,6 +1078,7 @@ const idclass_t dvr_autorec_entry_class = {
       .list     = dvr_entry_class_pri_list,
       .def.i    = DVR_PRIO_NORMAL,
       .off      = offsetof(dvr_autorec_entry_t, dae_pri),
+      .opts     = PO_ADVANCED
     },
     {
       .type     = PT_U32,
@@ -1082,34 +1087,35 @@ const idclass_t dvr_autorec_entry_class = {
       .def.i    = DVR_AUTOREC_RECORD_ALL,
       .off      = offsetof(dvr_autorec_entry_t, dae_record),
       .list     = dvr_autorec_entry_class_dedup_list,
+      .opts     = PO_ADVANCED
     },
     {
       .type     = PT_U32,
       .id       = "retention",
       .name     = N_("DVR log retention (days)"),
       .off      = offsetof(dvr_autorec_entry_t, dae_retention),
-      .opts     = PO_HIDDEN,
+      .opts     = PO_HIDDEN | PO_EXPERT,
     },
     {
       .type     = PT_U32,
       .id       = "removal",
       .name     = N_("DVR file retention period (days)"),
       .off      = offsetof(dvr_autorec_entry_t, dae_removal),
-      .opts     = PO_HIDDEN,
+      .opts     = PO_HIDDEN | PO_EXPERT,
     },
     {
       .type     = PT_U32,
       .id       = "maxcount",
       .name     = N_("Maximum count (0=default)"),
       .off      = offsetof(dvr_autorec_entry_t, dae_max_count),
-      .opts     = PO_HIDDEN,
+      .opts     = PO_HIDDEN | PO_EXPERT,
     },
     {
       .type     = PT_U32,
       .id       = "maxsched",
       .name     = N_("Maximum schedules limit (0=default)"),
       .off      = offsetof(dvr_autorec_entry_t, dae_max_sched_count),
-      .opts     = PO_HIDDEN,
+      .opts     = PO_HIDDEN | PO_EXPERT,
     },
     {
       .type     = PT_STR,
@@ -1119,30 +1125,31 @@ const idclass_t dvr_autorec_entry_class = {
       .get      = dvr_autorec_entry_class_config_name_get,
       .rend     = dvr_autorec_entry_class_config_name_rend,
       .list     = dvr_entry_class_config_name_list,
+      .opts     = PO_ADVANCED
     },
     {
       .type     = PT_STR,
       .id       = "brand",
       .name     = N_("Brand"),
       .set      = dvr_autorec_entry_class_brand_set,
       .get      = dvr_autorec_entry_class_brand_get,
-      .opts     = PO_RDONLY,
+      .opts     = PO_RDONLY | PO_ADVANCED,
     },
     {
       .type     = PT_STR,
       .id       = "season",
       .name     = N_("Season"),
       .set      = dvr_autorec_entry_class_season_set,
       .get      = dvr_autorec_entry_class_season_get,
-      .opts     = PO_RDONLY,
+      .opts     = PO_RDONLY | PO_ADVANCED,
     },
     {
       .type     = PT_STR,
       .id       = "serieslink",
       .name     = N_("Series link"),
       .set      = dvr_autorec_entry_class_series_link_set,
       .get      = dvr_autorec_entry_class_series_link_get,
-      .opts     = PO_RDONLY,
+      .opts     = PO_RDONLY | PO_ADVANCED,
     },
     {
       .type     = PT_STR,