diff options
| author | Alwin Esch <alwin.esch@web.de> | 2021-12-20 19:54:47 +0100 |
|---|---|---|
| committer | Alwin Esch <alwin.esch@web.de> | 2021-12-28 18:34:28 +0100 |
| commit | fe82c51a68a123e412c5c1adf426a7877e218678 (patch) | |
| tree | 4008c6388b14560109491e9ffbeec244be80c1d4 | |
| parent | af30e10c76060566ccae660050ff0f04c7f8b371 (diff) | |
[addons] remove not used function values on "ADDON_Create"
In ADDON_Create there were previously two values which are not used, they are removed because a MIN version increase is required.
Part of the previous cleanup of the API.
| -rw-r--r-- | xbmc/addons/binary-addons/AddonDll.cpp | 3 | ||||
| -rw-r--r-- | xbmc/addons/binary-addons/DllAddon.h | 4 | ||||
| -rw-r--r-- | xbmc/addons/kodi-dev-kit/include/kodi/AddonBase.h | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/xbmc/addons/binary-addons/AddonDll.cpp b/xbmc/addons/binary-addons/AddonDll.cpp index 661ebf97a2..7351c0f1f8 100644 --- a/xbmc/addons/binary-addons/AddonDll.cpp +++ b/xbmc/addons/binary-addons/AddonDll.cpp @@ -181,8 +181,7 @@ ADDON_STATUS CAddonDll::Create(KODI_HANDLE firstKodiInstance) /* Call Create to make connections, initializing data or whatever is needed to become the AddOn running */ - ADDON_STATUS status = - m_pDll->Create(&m_interface, kodi::addon::GetTypeVersion(ADDON_GLOBAL_MAIN), nullptr); + ADDON_STATUS status = m_pDll->Create(&m_interface); if (status == ADDON_STATUS_OK) { diff --git a/xbmc/addons/binary-addons/DllAddon.h b/xbmc/addons/binary-addons/DllAddon.h index d5b5e48fd0..dbcf89301e 100644 --- a/xbmc/addons/binary-addons/DllAddon.h +++ b/xbmc/addons/binary-addons/DllAddon.h @@ -15,7 +15,7 @@ class DllAddonInterface { public: virtual ~DllAddonInterface() = default; - virtual ADDON_STATUS Create(void* cb, const char* globalApiVersion, void* info) = 0; + virtual ADDON_STATUS Create(void* cb) = 0; virtual const char* GetAddonTypeVersion(int type)=0; virtual const char* GetAddonTypeMinVersion(int type) = 0; }; @@ -24,7 +24,7 @@ class DllAddon : public DllDynamic, public DllAddonInterface { public: DECLARE_DLL_WRAPPER_TEMPLATE(DllAddon) - DEFINE_METHOD3(ADDON_STATUS, Create, (void* p1, const char* p2, void* p3)) + DEFINE_METHOD1(ADDON_STATUS, Create, (void* p1)) DEFINE_METHOD1(const char*, GetAddonTypeVersion, (int p1)) DEFINE_METHOD1(const char*, GetAddonTypeMinVersion, (int p1)) bool GetAddonTypeMinVersion_available() { return m_GetAddonTypeMinVersion != nullptr; } diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/AddonBase.h b/xbmc/addons/kodi-dev-kit/include/kodi/AddonBase.h index 577afdc14d..b05eca1f79 100644 --- a/xbmc/addons/kodi-dev-kit/include/kodi/AddonBase.h +++ b/xbmc/addons/kodi-dev-kit/include/kodi/AddonBase.h @@ -1385,7 +1385,7 @@ inline void* GetInterface(const std::string& name, const std::string& version) /// As information, the following functions are exported using this macro: /// \table_start /// \table_h3{ Function, Use, Description } -/// \table_row3{ <b>`ADDON_Create(KODI_HANDLE addonInterface\, const char* globalApiVersion\, void* unused)`</b>, +/// \table_row3{ <b>`ADDON_Create(KODI_HANDLE addonInterface)`</b>, /// \anchor ADDON_Create /// _required_, /// <b>Addon creation call.</b> @@ -1438,8 +1438,7 @@ inline void* GetInterface(const std::string& name, const std::string& version) /// \table_end /// #define ADDONCREATOR(AddonClass) \ - extern "C" ATTR_DLL_EXPORT ADDON_STATUS ADDON_Create( \ - KODI_HANDLE addonInterface, const char* /*globalApiVersion*/, void* /*unused*/) \ + extern "C" ATTR_DLL_EXPORT ADDON_STATUS ADDON_Create(KODI_HANDLE addonInterface) \ { \ kodi::addon::CPrivateBase::m_interface = static_cast<AddonGlobalInterface*>(addonInterface); \ kodi::addon::CPrivateBase::m_interface->addonBase = new AddonClass; \ |