sync with upstream

1 files changed, 47 insertions, 41 deletions

diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h
index fa90f77..b9d37b4 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h
@@ -41,8 +41,8 @@
  * overview.
  */
 
-#define ADDON_GLOBAL_VERSION_MAIN                     "1.0.7"
-#define ADDON_GLOBAL_VERSION_MAIN_MIN                 "1.0.2"
+#define ADDON_GLOBAL_VERSION_MAIN                     "1.0.10"
+#define ADDON_GLOBAL_VERSION_MAIN_MIN                 "1.0.10"
 #define ADDON_GLOBAL_VERSION_MAIN_XML_ID              "kodi.binary.global.main"
 #define ADDON_GLOBAL_VERSION_MAIN_DEPENDS             "AddonBase.h" \
                                                       "xbmc_addon_dll.h" \
@@ -50,8 +50,8 @@
                                                       "libXBMC_addon.h" \
                                                       "addon-instance/"
 
-#define ADDON_GLOBAL_VERSION_GENERAL                  "1.0.0"
-#define ADDON_GLOBAL_VERSION_GENERAL_MIN              "1.0.0"
+#define ADDON_GLOBAL_VERSION_GENERAL                  "1.0.2"
+#define ADDON_GLOBAL_VERSION_GENERAL_MIN              "1.0.2"
 #define ADDON_GLOBAL_VERSION_GENERAL_XML_ID           "kodi.binary.global.general"
 #define ADDON_GLOBAL_VERSION_GENERAL_DEPENDS          "General.h"
 
@@ -75,24 +75,20 @@
 #define ADDON_GLOBAL_VERSION_NETWORK_XML_ID           "kodi.binary.global.network"
 #define ADDON_GLOBAL_VERSION_NETWORK_DEPENDS          "Network.h"
 
-#define ADDON_INSTANCE_VERSION_ADSP                   "0.1.10"
-#define ADDON_INSTANCE_VERSION_ADSP_MIN               "0.1.10"
+#define ADDON_INSTANCE_VERSION_ADSP                   "0.2.0"
+#define ADDON_INSTANCE_VERSION_ADSP_MIN               "0.2.0"
 #define ADDON_INSTANCE_VERSION_ADSP_XML_ID            "kodi.binary.instance.adsp"
-#define ADDON_INSTANCE_VERSION_ADSP_DEPENDS           "kodi_adsp_dll.h" \
-                                                      "kodi_adsp_types.h" \
-                                                      "libKODI_adsp.h"
+#define ADDON_INSTANCE_VERSION_ADSP_DEPENDS           "addon-instance/AudioDSP.h"
 
-#define ADDON_INSTANCE_VERSION_AUDIODECODER           "1.0.1"
-#define ADDON_INSTANCE_VERSION_AUDIODECODER_MIN       "1.0.1"
+#define ADDON_INSTANCE_VERSION_AUDIODECODER           "2.0.0"
+#define ADDON_INSTANCE_VERSION_AUDIODECODER_MIN       "2.0.0"
 #define ADDON_INSTANCE_VERSION_AUDIODECODER_XML_ID    "kodi.binary.instance.audiodecoder"
-#define ADDON_INSTANCE_VERSION_AUDIODECODER_DEPENDS   "kodi_audiodec_dll.h" \
-                                                      "kodi_audiodec_types.h"
+#define ADDON_INSTANCE_VERSION_AUDIODECODER_DEPENDS   "addon-instance/AudioDecoder.h"
 
-#define ADDON_INSTANCE_VERSION_AUDIOENCODER           "1.0.1"
-#define ADDON_INSTANCE_VERSION_AUDIOENCODER_MIN       "1.0.1"
+#define ADDON_INSTANCE_VERSION_AUDIOENCODER           "2.0.0"
+#define ADDON_INSTANCE_VERSION_AUDIOENCODER_MIN       "2.0.0"
 #define ADDON_INSTANCE_VERSION_AUDIOENCODER_XML_ID    "kodi.binary.instance.audioencoder"
-#define ADDON_INSTANCE_VERSION_AUDIOENCODER_DEPENDS   "xbmc_audioenc_dll.h" \
-                                                      "xbmc_audioenc_types.h"
+#define ADDON_INSTANCE_VERSION_AUDIOENCODER_DEPENDS   "addon-instance/AudioEncoder.h"
 
 #define ADDON_INSTANCE_VERSION_GAME                   "1.0.32"
 #define ADDON_INSTANCE_VERSION_GAME_MIN               "1.0.32"
@@ -101,29 +97,24 @@
                                                       "kodi_game_types.h" \
                                                       "libKODI_game.h"
 
-#define ADDON_INSTANCE_VERSION_IMAGEDECODER           "1.0.1"
-#define ADDON_INSTANCE_VERSION_IMAGEDECODER_MIN       "1.0.1"
+#define ADDON_INSTANCE_VERSION_IMAGEDECODER           "2.0.0"
+#define ADDON_INSTANCE_VERSION_IMAGEDECODER_MIN       "2.0.0"
 #define ADDON_INSTANCE_VERSION_IMAGEDECODER_XML_ID    "kodi.binary.instance.imagedecoder"
-#define ADDON_INSTANCE_VERSION_IMAGEDECODER_DEPENDS   "kodi_imagedec_dll.h" \
-                                                      "kodi_imagedec_types.h"
+#define ADDON_INSTANCE_VERSION_IMAGEDECODER_DEPENDS   "addon-instance/ImageDecoder.h"
 
-#define ADDON_INSTANCE_VERSION_INPUTSTREAM            "1.0.8"
-#define ADDON_INSTANCE_VERSION_INPUTSTREAM_MIN        "1.0.8"
+#define ADDON_INSTANCE_VERSION_INPUTSTREAM            "2.0.2"
+#define ADDON_INSTANCE_VERSION_INPUTSTREAM_MIN        "2.0.2"
 #define ADDON_INSTANCE_VERSION_INPUTSTREAM_XML_ID     "kodi.binary.instance.inputstream"
-#define ADDON_INSTANCE_VERSION_INPUTSTREAM_DEPENDS    "libKODI_inputstream.h" \
-                                                      "kodi_inputstream_dll.h" \
-                                                      "kodi_inputstream_types.h"
+#define ADDON_INSTANCE_VERSION_INPUTSTREAM_DEPENDS    "addon-instance/Inputstream.h"
 
 #define ADDON_INSTANCE_VERSION_PERIPHERAL             "1.3.3"
 #define ADDON_INSTANCE_VERSION_PERIPHERAL_MIN         "1.3.3"
 #define ADDON_INSTANCE_VERSION_PERIPHERAL_XML_ID      "kodi.binary.instance.peripheral"
-#define ADDON_INSTANCE_VERSION_PERIPHERAL_DEPENDS     "kodi_peripheral_dll.h" \
-                                                      "kodi_peripheral_types.h" \
-                                                      "kodi_peripheral_utils.hpp" \
-                                                      "libKODI_peripheral.h"
+#define ADDON_INSTANCE_VERSION_PERIPHERAL_DEPENDS     "addon-instance/Peripheral.h" \
+                                                      "addon-instance/PeripheralUtils.h"
 
-#define ADDON_INSTANCE_VERSION_PVR                    "5.2.4"
-#define ADDON_INSTANCE_VERSION_PVR_MIN                "5.2.4"
+#define ADDON_INSTANCE_VERSION_PVR                    "5.3.0"
+#define ADDON_INSTANCE_VERSION_PVR_MIN                "5.3.0"
 #define ADDON_INSTANCE_VERSION_PVR_XML_ID             "kodi.binary.instance.pvr"
 #define ADDON_INSTANCE_VERSION_PVR_DEPENDS            "xbmc_pvr_dll.h" \
                                                       "xbmc_pvr_types.h" \
@@ -135,18 +126,22 @@
 #define ADDON_INSTANCE_VERSION_SCREENSAVER_XML_ID     "kodi.binary.instance.screensaver"
 #define ADDON_INSTANCE_VERSION_SCREENSAVER_DEPENDS    "addon-instance/Screensaver.h"
 
-#define ADDON_INSTANCE_VERSION_VFS                    "1.0.1"
-#define ADDON_INSTANCE_VERSION_VFS_MIN                "1.0.1"
+#define ADDON_INSTANCE_VERSION_VFS                    "2.0.0"
+#define ADDON_INSTANCE_VERSION_VFS_MIN                "2.0.0"
 #define ADDON_INSTANCE_VERSION_VFS_XML_ID             "kodi.binary.instance.vfs"
-#define ADDON_INSTANCE_VERSION_VFS_DEPENDS            "kodi_vfs_dll.h" \
-                                                      "kodi_vfs_types.h" \
-                                                      "kodi_vfs_utils.hpp"
+#define ADDON_INSTANCE_VERSION_VFS_DEPENDS            "addon-instance/VFS.h"
 
-#define ADDON_INSTANCE_VERSION_VISUALIZATION          "1.0.1"
-#define ADDON_INSTANCE_VERSION_VISUALIZATION_MIN      "1.0.1"
+#define ADDON_INSTANCE_VERSION_VISUALIZATION          "2.0.1"
+#define ADDON_INSTANCE_VERSION_VISUALIZATION_MIN      "2.0.0"
 #define ADDON_INSTANCE_VERSION_VISUALIZATION_XML_ID   "kodi.binary.instance.visualization"
-#define ADDON_INSTANCE_VERSION_VISUALIZATION_DEPENDS  "xbmc_vis_dll.h" \
-                                                      "xbmc_vis_types.h"
+#define ADDON_INSTANCE_VERSION_VISUALIZATION_DEPENDS  "addon-instance/Visualization.h"
+
+#define ADDON_INSTANCE_VERSION_VIDEOCODEC             "1.0.1"
+#define ADDON_INSTANCE_VERSION_VIDEOCODEC_MIN         "1.0.1"
+#define ADDON_INSTANCE_VERSION_VIDEOCODEC_XML_ID      "kodi.binary.instance.videocodec"
+#define ADDON_INSTANCE_VERSION_VIDEOCODEC_DEPENDS     "addon-instance/VideoCodec.h" \
+                                                      "StreamCodec.h" \
+                                                      "StreamCrypto.h"
 
 ///
 /// The currently available instance types for Kodi add-ons
@@ -179,6 +174,7 @@ typedef enum ADDON_TYPE
   ADDON_INSTANCE_VISUALIZATION = 109,
   ADDON_INSTANCE_VFS = 110,
   ADDON_INSTANCE_IMAGEDECODER = 111,
+  ADDON_INSTANCE_VIDEOCODEC = 112,
 } ADDON_TYPE;
 
 #ifdef __cplusplus
@@ -271,6 +267,10 @@ inline const char* GetTypeVersion(int type)
     case ADDON_INSTANCE_VISUALIZATION:
       return ADDON_INSTANCE_VERSION_VISUALIZATION;
 #endif
+#if !defined(BUILD_KODI_ADDON) || defined(ADDON_INSTANCE_VERSION_VIDEOCODEC_USED)
+    case ADDON_INSTANCE_VIDEOCODEC:
+      return ADDON_INSTANCE_VERSION_VIDEOCODEC;
+#endif
   }
   return "0.0.0";
 }
@@ -324,6 +324,8 @@ inline const char* GetTypeMinVersion(int type)
       return ADDON_INSTANCE_VERSION_VFS_MIN;
     case ADDON_INSTANCE_VISUALIZATION:
       return ADDON_INSTANCE_VERSION_VISUALIZATION_MIN;
+    case ADDON_INSTANCE_VIDEOCODEC:
+      return ADDON_INSTANCE_VERSION_VIDEOCODEC_MIN;
   }
   return "0.0.0";
 }
@@ -374,6 +376,8 @@ inline const char* GetTypeName(int type)
       return "ScreenSaver";
     case ADDON_INSTANCE_VISUALIZATION:
       return "Visualization";
+    case ADDON_INSTANCE_VIDEOCODEC:
+      return "VideoCodec";
   }
   return "unknown";
 }
@@ -425,6 +429,8 @@ inline int GetTypeId(const char* name)
       return ADDON_INSTANCE_VFS;
     else if (strcmp(name, "visualization") == 0)
       return ADDON_INSTANCE_VISUALIZATION;
+    else if (strcmp(name, "videocodec") == 0)
+      return ADDON_INSTANCE_VIDEOCODEC;
   }
   return -1;
 }