[SCM] kodi-pvr-hts/master: Parse subscriptionError also for dvr entries

[tiber-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 777a99d93cf242eefd887c419612d1d393d6f21d
Author: Glenn-1990 <g_christiaensen at msn.com>
Date:   Tue Oct 20 19:43:00 2015 +0200

    Parse subscriptionError also for dvr entries

diff --git a/src/Tvheadend.cpp b/src/Tvheadend.cpp
index 7b0af86..c2128a7 100644
--- a/src/Tvheadend.cpp
+++ b/src/Tvheadend.cpp
@@ -1750,6 +1750,19 @@ void CTvheadend::ParseRecordingAddOrUpdate ( htsmsg_t *msg, bool bAdd )
       rec.SetError(str);
   }
   
+  /* A running recording will have an active subscription assigned to it */
+  if (rec.GetState() == PVR_TIMER_STATE_RECORDING)
+  {
+    /* Parse subscription error */
+    /* This field is absent when everything is fine or when htsp version < 20 */
+    if ((str = htsmsg_get_str(msg, "subscriptionError")) != NULL)
+    {
+      /* No free adapter, AKA subscription conflict */
+      if (!strcmp("noFreeAdapter", str))
+        rec.SetState(PVR_TIMER_STATE_CONFLICT_NOK);
+    }
+  }
+
   /* Update */
   if (rec != comparison)
   {
diff --git a/src/tvheadend/entity/Recording.h b/src/tvheadend/entity/Recording.h
index abb9242..d6ef4a0 100644
--- a/src/tvheadend/entity/Recording.h
+++ b/src/tvheadend/entity/Recording.h
@@ -93,13 +93,15 @@ namespace tvheadend
       {
         return m_state == PVR_TIMER_STATE_COMPLETED ||
                m_state == PVR_TIMER_STATE_ABORTED ||
-               m_state == PVR_TIMER_STATE_RECORDING;
+               m_state == PVR_TIMER_STATE_RECORDING ||
+               m_state == PVR_TIMER_STATE_CONFLICT_NOK;
       }
 
       bool IsTimer() const
       {
         return m_state == PVR_TIMER_STATE_SCHEDULED ||
-               m_state == PVR_TIMER_STATE_RECORDING;
+               m_state == PVR_TIMER_STATE_RECORDING ||
+               m_state == PVR_TIMER_STATE_CONFLICT_NOK;
       }
 
       /**

-- 
kodi-pvr-hts packaging