Merge pull request #23 from ksooo/pvr-api-4-0-0

Update to PVR addon API v4.0.0
kodi-pvr · Sep 14, 2015 · f933e8e · f933e8e
2 parents 11529b2 + 984c976
commit f933e8e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/pvr.vuplus/addon.xml.in b/pvr.vuplus/addon.xml.in
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.vuplus"
-  version="1.11.4"
+  version="1.11.5"
   name="VU+ / Enigma2 Client"
   provider-name="Joerg Dembski">
   <requires>
     <c-pluff version="0.1"/>
-    <import addon="xbmc.pvr" version="3.0.0"/>
+    <import addon="xbmc.pvr" version="4.0.0"/>
   </requires>
   <extension
     point="xbmc.pvrclient"

diff --git a/pvr.vuplus/changelog.txt b/pvr.vuplus/changelog.txt
@@ -1,3 +1,6 @@
+1.11.5
+- Updated to PVR API v4.0.0
+
 1.11.4
 - Updated to PVR API v3.0.0 (API 1.9.7 compatibility mode)
 

diff --git a/src/VuData.h b/src/VuData.h
@@ -87,7 +87,7 @@ struct VuTimer
   time_t startTime;
   time_t endTime;
   int iWeekdays;
-  int iEpgID;
+  unsigned int iEpgID;
   PVR_TIMER_STATE state; 
   int iUpdateState;
   unsigned int iClientIndex;

diff --git a/src/client.cpp b/src/client.cpp
@@ -463,12 +463,11 @@ PVR_ERROR AddTimer(const PVR_TIMER &timer)
   return VuData->AddTimer(timer);
 }
 
-PVR_ERROR DeleteTimer(const PVR_TIMER &timer, bool bForceDelete, bool /*bDeleteScheduled*/)
+PVR_ERROR DeleteTimer(const PVR_TIMER &timer, bool bForceDelete)
 {
   if (!VuData || !VuData->IsConnected())
     return PVR_ERROR_SERVER_ERROR;
 
-  /* TODO: Change implementation to support bDeleteScheduled (introduced with PVR API 1.9.7 */
   return VuData->DeleteTimer(timer);
 }