Merge pull request #7408 from ksooo/pvr-addon-api-version-2-0-0

[PVR] Bump PVR addon API to version 2.0.0, bump addons
xbmc · Jul 6, 2015 · 138481f · 138481f
2 parents c0e5267 + 40a6c44
commit 138481f
Show file tree

Hide file tree

Showing 20 changed files with 22 additions and 22 deletions.
diff --git a/addons/xbmc.pvr/addon.xml b/addons/xbmc.pvr/addon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="xbmc.pvr" version="1.9.7" provider-name="Team-Kodi">
-  <backwards-compatibility abi="1.9.7"/>
+<addon id="xbmc.pvr" version="2.0.0" provider-name="Team-Kodi">
+  <backwards-compatibility abi="2.0.0"/>
   <requires>
     <import addon="xbmc.core" version="0.1.0"/>
   </requires>

diff --git a/project/cmake/addons/addons/pvr.argustv/pvr.argustv.txt b/project/cmake/addons/addons/pvr.argustv/pvr.argustv.txt
@@ -1 +1 @@
-pvr.argustv https://github.com/kodi-pvr/pvr.argustv 8b1e82c
+pvr.argustv https://github.com/kodi-pvr/pvr.argustv b9e2b28
diff --git a/project/cmake/addons/addons/pvr.demo/pvr.demo.txt b/project/cmake/addons/addons/pvr.demo/pvr.demo.txt
@@ -1 +1 @@
-pvr.demo https://github.com/kodi-pvr/pvr.demo adfe362
+pvr.demo https://github.com/kodi-pvr/pvr.demo 40efb47
diff --git a/project/cmake/addons/addons/pvr.dvblink/pvr.dvblink.txt b/project/cmake/addons/addons/pvr.dvblink/pvr.dvblink.txt
@@ -1 +1 @@
-pvr.dvblink https://github.com/kodi-pvr/pvr.dvblink 0d7df9b
+pvr.dvblink https://github.com/kodi-pvr/pvr.dvblink 820a938
diff --git a/project/cmake/addons/addons/pvr.dvbviewer/pvr.dvbviewer.txt b/project/cmake/addons/addons/pvr.dvbviewer/pvr.dvbviewer.txt
@@ -1 +1 @@
-pvr.dvbviewer https://github.com/kodi-pvr/pvr.dvbviewer 5d11134
+pvr.dvbviewer https://github.com/kodi-pvr/pvr.dvbviewer 1e1da02
diff --git a/project/cmake/addons/addons/pvr.filmon/pvr.filmon.txt b/project/cmake/addons/addons/pvr.filmon/pvr.filmon.txt
@@ -1 +1 @@
-pvr.filmon https://github.com/kodi-pvr/pvr.filmon 2c16527
+pvr.filmon https://github.com/kodi-pvr/pvr.filmon c4858f8
diff --git a/project/cmake/addons/addons/pvr.hts/pvr.hts.txt b/project/cmake/addons/addons/pvr.hts/pvr.hts.txt
@@ -1 +1 @@
-pvr.hts https://github.com/kodi-pvr/pvr.hts 108b15a
+pvr.hts https://github.com/kodi-pvr/pvr.hts f5c5afb
diff --git a/project/cmake/addons/addons/pvr.iptvsimple/pvr.iptvsimple.txt b/project/cmake/addons/addons/pvr.iptvsimple/pvr.iptvsimple.txt
@@ -1 +1 @@
-pvr.iptvsimple https://github.com/kodi-pvr/pvr.iptvsimple 3260a53
+pvr.iptvsimple https://github.com/kodi-pvr/pvr.iptvsimple 10626b4
diff --git a/project/cmake/addons/addons/pvr.mediaportal.tvserver/pvr.mediaportal.tvserver.txt b/project/cmake/addons/addons/pvr.mediaportal.tvserver/pvr.mediaportal.tvserver.txt
@@ -1 +1 @@
-pvr.mediaportal.tvserver https://github.com/kodi-pvr/pvr.mediaportal.tvserver 70f95b9
+pvr.mediaportal.tvserver https://github.com/kodi-pvr/pvr.mediaportal.tvserver 100d1df
diff --git a/project/cmake/addons/addons/pvr.mythtv/pvr.mythtv.txt b/project/cmake/addons/addons/pvr.mythtv/pvr.mythtv.txt
@@ -1 +1 @@
-pvr.mythtv https://github.com/kodi-pvr/pvr.mythtv 8da190f
+pvr.mythtv https://github.com/kodi-pvr/pvr.mythtv db1d3cd
diff --git a/project/cmake/addons/addons/pvr.nextpvr/pvr.nextpvr.txt b/project/cmake/addons/addons/pvr.nextpvr/pvr.nextpvr.txt
@@ -1 +1 @@
-pvr.nextpvr https://github.com/kodi-pvr/pvr.nextpvr df7b4f4
+pvr.nextpvr https://github.com/kodi-pvr/pvr.nextpvr e4a2d79
diff --git a/project/cmake/addons/addons/pvr.njoy/pvr.njoy.txt b/project/cmake/addons/addons/pvr.njoy/pvr.njoy.txt
@@ -1 +1 @@
-pvr.njoy https://github.com/kodi-pvr/pvr.njoy 682c389
+pvr.njoy https://github.com/kodi-pvr/pvr.njoy 45c2380
diff --git a/project/cmake/addons/addons/pvr.pctv/pvr.pctv.txt b/project/cmake/addons/addons/pvr.pctv/pvr.pctv.txt
@@ -1 +1 @@
-pvr.pctv https://github.com/kodi-pvr/pvr.pctv e29db86
+pvr.pctv https://github.com/kodi-pvr/pvr.pctv efa92a7
diff --git a/project/cmake/addons/addons/pvr.stalker/pvr.stalker.txt b/project/cmake/addons/addons/pvr.stalker/pvr.stalker.txt
@@ -1 +1 @@
-pvr.stalker https://github.com/kodi-pvr/pvr.stalker a388c6e
+pvr.stalker https://github.com/kodi-pvr/pvr.stalker 506c16f
diff --git a/project/cmake/addons/addons/pvr.vbox/pvr.vbox.txt b/project/cmake/addons/addons/pvr.vbox/pvr.vbox.txt
@@ -1 +1 @@
-pvr.vbox https://github.com/kodi-pvr/pvr.vbox d43c785
+pvr.vbox https://github.com/kodi-pvr/pvr.vbox aba5a4a
diff --git a/project/cmake/addons/addons/pvr.vdr.vnsi/pvr.vdr.vnsi.txt b/project/cmake/addons/addons/pvr.vdr.vnsi/pvr.vdr.vnsi.txt
@@ -1 +1 @@
-pvr.vdr.vnsi https://github.com/kodi-pvr/pvr.vdr.vnsi e2221a6
+pvr.vdr.vnsi https://github.com/kodi-pvr/pvr.vdr.vnsi 7aace22
diff --git a/project/cmake/addons/addons/pvr.vuplus/pvr.vuplus.txt b/project/cmake/addons/addons/pvr.vuplus/pvr.vuplus.txt
@@ -1 +1 @@
-pvr.vuplus https://github.com/kodi-pvr/pvr.vuplus 1838f10
+pvr.vuplus https://github.com/kodi-pvr/pvr.vuplus 20edf9d
diff --git a/project/cmake/addons/addons/pvr.wmc/pvr.wmc.txt b/project/cmake/addons/addons/pvr.wmc/pvr.wmc.txt
@@ -1 +1 @@
-pvr.wmc https://github.com/kodi-pvr/pvr.wmc 001a939
+pvr.wmc https://github.com/kodi-pvr/pvr.wmc 3907c8b
diff --git a/xbmc/addons/include/xbmc_pvr_types.h b/xbmc/addons/include/xbmc_pvr_types.h
@@ -78,10 +78,10 @@ struct DemuxPacket;
 #define PVR_STREAM_MAX_STREAMS 20
 
 /* current PVR API version */
-#define XBMC_PVR_API_VERSION "1.9.7"
+#define XBMC_PVR_API_VERSION "2.0.0"
 
 /* min. PVR API version */
-#define XBMC_PVR_MIN_API_VERSION "1.9.7"
+#define XBMC_PVR_MIN_API_VERSION "2.0.0"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/xbmc/pvr/addons/PVRClient.cpp b/xbmc/pvr/addons/PVRClient.cpp
@@ -425,7 +425,7 @@ bool CPVRClient::GetAddonProperties(void)
       if (retval == PVR_ERROR_NOT_IMPLEMENTED)
       {
         // begin compat section
-        CLog::Log(LOGWARNING, "%s - Addon %s does not support timer types. It will work, but not benefit from the timer features introduced with PVR Addon API 1.9.7.", __FUNCTION__, strFriendlyName.c_str());
+        CLog::Log(LOGWARNING, "%s - Addon %s does not support timer types. It will work, but not benefit from the timer features introduced with PVR Addon API 2.0.0", __FUNCTION__, strFriendlyName.c_str());
 
         // Create standard timer types (mostly) matching the timer functionality available in Isengard.
         // This is for migration only and does not make changes to the addons obsolete. Addons should