[SCM] kodi-pvr-vdr-vnsi/upstream: bump protocol to 10, fixes for search timers

tiber-guest at users.alioth.debian.org tiber-guest at users.alioth.debian.org
Sat Jan 7 11:28:39 UTC 2017


The following commit has been merged in the upstream branch:
commit 4149574c9098c2cc47542c7def49d05f8cef7823
Author: Rainer Hochecker <fernetmenta at online.de>
Date:   Fri Dec 23 17:28:20 2016 +0100

    bump protocol to 10, fixes for search timers

diff --git a/src/VNSIData.cpp b/src/VNSIData.cpp
index 8e0a13d..3e084bf 100644
--- a/src/VNSIData.cpp
+++ b/src/VNSIData.cpp
@@ -398,6 +398,11 @@ PVR_ERROR cVNSIData::GetTimerInfo(unsigned int timernumber, PVR_TIMER &tag)
     strncpy(tag.strEpgSearchString, epgSearch, sizeof(tag.strEpgSearchString) - 1);
   }
 
+  if (GetProtocol() >= 10)
+  {
+    tag.iParentClientIndex = vresp->extract_U32();
+  }
+
   return PVR_ERROR_NO_ERROR;
 }
 
@@ -455,6 +460,11 @@ bool cVNSIData::GetTimersList(ADDON_HANDLE handle)
         strncpy(tag.strEpgSearchString, epgSearch, sizeof(tag.strEpgSearchString) - 1);
       }
 
+      if (GetProtocol() >= 10)
+      {
+        tag.iParentClientIndex = vresp->extract_U32();
+      }
+
       if (tag.startTime == 0)
 	tag.bStartAnyTime = true;
       if (tag.endTime == 0)
@@ -548,6 +558,12 @@ PVR_ERROR cVNSIData::AddTimer(const PVR_TIMER &timerinfo)
     vrp.add_String(timerinfo.strEpgSearchString);
   }
 
+  if (GetProtocol() >= 10)
+  {
+    vrp.add_U32(timerinfo.iMarginStart*60);
+    vrp.add_U32(timerinfo.iMarginEnd*60);
+  }
+
   auto vresp = ReadResult(&vrp);
   if (vresp == NULL || vresp->noResponse())
   {
diff --git a/src/vnsicommand.h b/src/vnsicommand.h
index 495d747..68b7598 100644
--- a/src/vnsicommand.h
+++ b/src/vnsicommand.h
@@ -23,7 +23,7 @@
 #define VNSI_COMMAND_H
 
 /** Current VNSI Protocol Version number */
-#define VNSI_PROTOCOLVERSION 9
+#define VNSI_PROTOCOLVERSION 10
 
 /** Start of RDS support protocol Version */
 #define VNSI_RDS_PROTOCOLVERSION 8

-- 
kodi-pvr-vdr-vnsi packaging



More information about the pkg-multimedia-commits mailing list