[SCM] kodi-pvr-hts/master: Merge pull request #122 from Glenn-1990/dvr_conflict

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

Parse subscriptionError also for dvr entries
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: da14e25d0ec59a47da93dd88bdc66e1c16d94238
X-Git-Newrev: 4dc398ff1337ec61dea38685719108f1cd20f7b0

The following commit has been merged in the master branch:
commit a7fa1d65bd47ed5adeb95f9a7785e8fa1bb81cb7
Merge: 3ad525de9680bcfb45ce81a6276f03d4f2a3ddb2 777a99d93cf242eefd887c419612d1d393d6f21d
Author: Sam Stenvall <Jalle19 at users.noreply.github.com>
Date:   Thu Oct 22 10:11:03 2015 +0300

    Merge pull request #122 from Glenn-1990/dvr_conflict
    
    Parse subscriptionError also for dvr entries

diff --combined src/Tvheadend.cpp
index 7277770,c2128a7..0b5321b
--- a/src/Tvheadend.cpp
+++ b/src/Tvheadend.cpp
@@@ -1717,7 -1717,7 +1717,7 @@@ void CTvheadend::ParseRecordingAddOrUpd
      else if (strstr(state, "missed") != NULL)
        rec.SetState(PVR_TIMER_STATE_ERROR);
      else if (strstr(state, "invalid") != NULL)
 -      rec.SetStart(PVR_TIMER_STATE_ERROR);
 +      rec.SetState(PVR_TIMER_STATE_ERROR);
    }
  
    /* Add optional fields */
@@@ -1750,6 -1750,19 +1750,19 @@@
        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)
    {

-- 
kodi-pvr-hts packaging