From: Kai Sommerfeld <kai.sommerfeld@gmx.com>
Date: Thu, 8 Jun 2017 14:09:27 +0000 (+0200)
Subject: Fix dvr priorities after 33cc05b
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8d3bd9dd80087b1c238e666e8ce680ebdc309523;p=thirdparty%2Ftvheadend.git

Fix dvr priorities after 33cc05b
---

diff --git a/src/api/api_dvr.c b/src/api/api_dvr.c
index 22ae5dd69..b57a5c01d 100644
--- a/src/api/api_dvr.c
+++ b/src/api/api_dvr.c
@@ -233,7 +233,7 @@ api_dvr_entry_create_by_event
                                        e, 0, 0,
                                        perm->aa_username,
                                        perm->aa_representative,
-                                       NULL, DVR_PRIO_NORMAL, DVR_RET_REM_DVRCONFIG,
+                                       NULL, DVR_PRIO_DEFAULT, DVR_RET_REM_DVRCONFIG,
                                        DVR_RET_REM_DVRCONFIG, comment);
         if (de) {
           if (l == NULL)
diff --git a/src/dvr/dvr_rec.c b/src/dvr/dvr_rec.c
index 3598df967..6802345a8 100644
--- a/src/dvr/dvr_rec.c
+++ b/src/dvr/dvr_rec.c
@@ -75,7 +75,7 @@ dvr_rec_subscribe(dvr_entry_t *de)
   assert(de->de_chain == NULL);
 
   pri = de->de_pri;
-  if(pri == DVR_PRIO_NOTSET)
+  if(pri == DVR_PRIO_NOTSET || pri == DVR_PRIO_DEFAULT)
     pri = de->de_config->dvr_pri;
   if(pri >= 0 && pri < ARRAY_SIZE(prio2weight))
     weight = prio2weight[de->de_pri];
diff --git a/src/htsp_server.c b/src/htsp_server.c
index 6c1f51511..95caee062 100644
--- a/src/htsp_server.c
+++ b/src/htsp_server.c
@@ -641,7 +641,7 @@ htsp_serierec_convert(htsp_connection_t *htsp, htsmsg_t *in, channel_t *ch, int
   if (!(retval = htsmsg_get_u32(in, "removal", &u32)) || add)
     htsmsg_add_u32(conf, "removal", !retval ? u32 : DVR_RET_REM_DVRCONFIG);
   if(!(retval = htsmsg_get_u32(in, "priority", &u32)) || add)
-    htsmsg_add_u32(conf, "pri", !retval ? u32 : DVR_PRIO_NORMAL);
+    htsmsg_add_u32(conf, "pri", !retval ? u32 : DVR_PRIO_DEFAULT);
   if ((str = htsmsg_get_str(in, "name")) || add)
     htsmsg_add_str(conf, "name", str ?: "");
   if ((str = htsmsg_get_str(in, "comment")) || add)
@@ -1836,7 +1836,7 @@ htsp_method_addDvrEntry(htsp_connection_t *htsp, htsmsg_t *in)
     ch = e ? e->channel : ch;
   }
   if(htsmsg_get_u32(in, "priority", &priority))
-    priority = DVR_PRIO_NORMAL;
+    priority = DVR_PRIO_DEFAULT;
   if(htsmsg_get_u32(in, "retention", &retention))
     retention = DVR_RET_REM_DVRCONFIG;
   if(htsmsg_get_u32(in, "removal", &removal))
@@ -1971,7 +1971,7 @@ htsp_method_updateDvrEntry(htsp_connection_t *htsp, htsmsg_t *in)
   stop_extra  = htsmsg_get_s64_or_default(in, "stopExtra",  0);
   retention   = htsmsg_get_u32_or_default(in, "retention",  DVR_RET_REM_DVRCONFIG);
   removal     = htsmsg_get_u32_or_default(in, "removal",    DVR_RET_REM_DVRCONFIG);
-  priority    = htsmsg_get_u32_or_default(in, "priority",   DVR_PRIO_NOTSET);
+  priority    = htsmsg_get_u32_or_default(in, "priority",   DVR_PRIO_DEFAULT);
   title       = htsmsg_get_str(in, "title");
   subtitle    = htsmsg_get_str(in, "subtitle");
   desc        = htsmsg_get_str(in, "description");