Merge pull request #433 from ksooo/fix-recording-user-stop

Fixed: 'Stop recording' no longer aborts in-progress recordings (HTSP…
kodi-pvr · Oct 26, 2019 · bfb35bc · bfb35bc
2 parents d5488d2 + ecc542c
commit bfb35bc
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 14 deletions.
diff --git a/pvr.hts/addon.xml.in b/pvr.hts/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.hts"
-  version="4.4.19"
+  version="4.4.20"
   name="Tvheadend HTSP Client"
   provider-name="Adam Sutton, Sam Stenvall, Lars Op den Kamp, Kai Sommerfeld">
   <requires>@ADDON_DEPENDS@</requires>

diff --git a/pvr.hts/changelog.txt b/pvr.hts/changelog.txt
@@ -1,3 +1,6 @@
+4.4.20
+- Fixed: 'Stop recording' no longer aborts in-progress recordings (HTSP v26)
+
 4.4.19
 - Update build system version and cleanup
 - Change kodi header include way

diff --git a/src/Tvheadend.cpp b/src/Tvheadend.cpp
@@ -1241,6 +1241,27 @@ PVR_ERROR CTvheadend::AddTimer ( const PVR_TIMER &timer )
 
 PVR_ERROR CTvheadend::DeleteTimer(const PVR_TIMER &timer, bool)
 {
+  {
+    CLockObject lock(m_mutex);
+
+    const auto& it = m_recordings.find(timer.iClientIndex);
+    if (it != m_recordings.end() && it->second.IsRecording())
+    {
+      // This is a request to stop an active recording.
+      if (m_conn->GetProtocol() >= 26)
+      {
+        // gracefully stop the recording (mark as success in tvh)
+        return SendDvrDelete(timer.iClientIndex, "stopDvrEntry");
+      }
+      else
+      {
+        // abort the recording (mark as failure in tvh) - no other choice,
+        // because graceful stop HTSP method was not available before HTSP v26.
+        return SendDvrDelete(timer.iClientIndex, "cancelDvrEntry");
+      }
+    }
+  }
+
   if ((timer.iTimerType == TIMER_ONCE_MANUAL) ||
       (timer.iTimerType == TIMER_ONCE_EPG))
   {
@@ -1262,19 +1283,8 @@ PVR_ERROR CTvheadend::DeleteTimer(const PVR_TIMER &timer, bool)
            (timer.iTimerType == TIMER_ONCE_CREATED_BY_AUTOREC))
   {
     /* Read-only timer created by autorec or timerec */
-    CLockObject lock(m_mutex);
-
-    const auto &it = m_recordings.find(timer.iClientIndex);
-    if (it != m_recordings.end() && it->second.IsRecording())
-    {
-      /* This is actually a request to cancel an active recording. */
-      return SendDvrDelete(timer.iClientIndex, "cancelDvrEntry");
-    }
-    else
-    {
-      Logger::Log(LogLevel::LEVEL_ERROR, "timer is read-only");
-      return PVR_ERROR_INVALID_PARAMETERS;
-    }
+    Logger::Log(LogLevel::LEVEL_ERROR, "timer is read-only");
+    return PVR_ERROR_INVALID_PARAMETERS;
   }
   else
   {