sync with upstream

1 files changed, 22 insertions, 40 deletions

diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_dll.h
index f9d7482..b353316 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_dll.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_dll.h
@@ -1,5 +1,5 @@
 /*
- *      Copyright (C) 2014-2016 Team Kodi
+ *      Copyright (C) 2014-2017 Team Kodi
  *      http://kodi.tv
  *
  *  This Program is free software; you can redistribute it and/or modify
@@ -32,24 +32,6 @@ extern "C"
   /// @name Peripheral operations
   ///{
   /*!
-   * @brief  Get the PERIPHERAL_API_VERSION used to compile this peripheral add-on
-   * @return KODI_PERIPHERAL_API_VERSION from kodi_peripheral_types.h
-   * @remarks Valid implementation required
-   *
-   * Used to check if the implementation is compatible with the frontend.
-   */
-  const char* GetPeripheralAPIVersion(void);
-
-  /*!
-   * @brief Get the KODI_PERIPHERAL_MIN_API_VERSION used to compile this peripheral add-on
-   * @return KODI_PERIPHERAL_MIN_API_VERSION from kodi_peripheral_types.h
-   * @remarks Valid implementation required
-   *
-   * Used to check if the implementation is compatible with the frontend.
-   */
-  const char* GetMinimumPeripheralAPIVersion(void);
-
-  /*!
    * @brief Get the list of features that this add-on provides
    * @param pCapabilities The add-on's capabilities.
    * @return PERIPHERAL_NO_ERROR if the properties were fetched successfully.
@@ -230,30 +212,30 @@ extern "C"
    * pClient. Note that get_addon() is defined here, so it will be available in
    * all compiled peripheral add-ons.
    */
-  void __declspec(dllexport) get_addon(struct PeripheralAddon* pClient)
+  void __declspec(dllexport) get_addon(void* ptr)
   {
-    pClient->GetPeripheralAPIVersion        = GetPeripheralAPIVersion;
-    pClient->GetMinimumPeripheralAPIVersion = GetMinimumPeripheralAPIVersion;
-    pClient->GetAddonCapabilities           = GetAddonCapabilities;
-    pClient->PerformDeviceScan              = PerformDeviceScan;
-    pClient->FreeScanResults                = FreeScanResults;
-    pClient->GetEvents                      = GetEvents;
-    pClient->FreeEvents                     = FreeEvents;
-    pClient->SendEvent                      = SendEvent;
+    AddonInstance_Peripheral* pClient = static_cast<AddonInstance_Peripheral*>(ptr);
+
+    pClient->toAddon.GetAddonCapabilities           = GetAddonCapabilities;
+    pClient->toAddon.PerformDeviceScan              = PerformDeviceScan;
+    pClient->toAddon.FreeScanResults                = FreeScanResults;
+    pClient->toAddon.GetEvents                      = GetEvents;
+    pClient->toAddon.FreeEvents                     = FreeEvents;
+    pClient->toAddon.SendEvent                      = SendEvent;
 
 #ifdef PERIPHERAL_ADDON_JOYSTICKS
-    pClient->GetJoystickInfo                = GetJoystickInfo;
-    pClient->FreeJoystickInfo               = FreeJoystickInfo;
-    pClient->GetFeatures                    = GetFeatures;
-    pClient->FreeFeatures                   = FreeFeatures;
-    pClient->MapFeatures                    = MapFeatures;
-    pClient->GetIgnoredPrimitives           = GetIgnoredPrimitives;
-    pClient->FreePrimitives                 = FreePrimitives;
-    pClient->SetIgnoredPrimitives           = SetIgnoredPrimitives;
-    pClient->SaveButtonMap                  = SaveButtonMap;
-    pClient->RevertButtonMap                = RevertButtonMap;
-    pClient->ResetButtonMap                 = ResetButtonMap;
-    pClient->PowerOffJoystick               = PowerOffJoystick;
+    pClient->toAddon.GetJoystickInfo                = GetJoystickInfo;
+    pClient->toAddon.FreeJoystickInfo               = FreeJoystickInfo;
+    pClient->toAddon.GetFeatures                    = GetFeatures;
+    pClient->toAddon.FreeFeatures                   = FreeFeatures;
+    pClient->toAddon.MapFeatures                    = MapFeatures;
+    pClient->toAddon.GetIgnoredPrimitives           = GetIgnoredPrimitives;
+    pClient->toAddon.FreePrimitives                 = FreePrimitives;
+    pClient->toAddon.SetIgnoredPrimitives           = SetIgnoredPrimitives;
+    pClient->toAddon.SaveButtonMap                  = SaveButtonMap;
+    pClient->toAddon.RevertButtonMap                = RevertButtonMap;
+    pClient->toAddon.ResetButtonMap                 = ResetButtonMap;
+    pClient->toAddon.PowerOffJoystick               = PowerOffJoystick;
 #endif
   }