From cf85cccfdb1aa57b6246641f606563288e0870e5 Mon Sep 17 00:00:00 2001 From: manuel Date: Mon, 29 Apr 2019 12:23:35 +0200 Subject: sync with upstream --- xbmc/addons/AddonBindings.cmake | 2 +- .../kodi-addon-dev-kit/include/kodi/AddonBase.h | 55 ++++++++++++++++++++-- .../kodi-addon-dev-kit/include/kodi/gui/Window.h | 2 +- .../include/kodi/kodi_game_dll.h | 28 +++++++---- .../include/kodi/kodi_game_types.h | 21 ++++++--- .../kodi-addon-dev-kit/include/kodi/libKODI_game.h | 18 +++---- .../kodi-addon-dev-kit/include/kodi/versions.h | 6 +-- .../include/kodi/xbmc_addon_dll.h | 5 ++ .../kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h | 4 +- 9 files changed, 107 insertions(+), 34 deletions(-) (limited to 'xbmc/addons') diff --git a/xbmc/addons/AddonBindings.cmake b/xbmc/addons/AddonBindings.cmake index 213b3e2..53a9801 100644 --- a/xbmc/addons/AddonBindings.cmake +++ b/xbmc/addons/AddonBindings.cmake @@ -6,7 +6,7 @@ set(CORE_ADDON_BINDINGS_FILES ${CORE_SOURCE_DIR}/xbmc/cores/AudioEngine/Utils/AEChannelData.h ${CORE_SOURCE_DIR}/xbmc/filesystem/IFileTypes.h - ${CORE_SOURCE_DIR}/xbmc/input/ActionIDs.h + ${CORE_SOURCE_DIR}/xbmc/input/actions/ActionIDs.h ${CORE_SOURCE_DIR}/xbmc/input/XBMC_vkeys.h ) diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/AddonBase.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/AddonBase.h index 42ce2e7..db39f86 100644 --- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/AddonBase.h +++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/AddonBase.h @@ -43,6 +43,20 @@ #define ATTRIBUTE_HIDDEN #endif +#ifdef _MSC_VER + #define ATTRIBUTE_FORCEINLINE __forceinline +#elif defined(__GNUC__) + #define ATTRIBUTE_FORCEINLINE inline __attribute__((__always_inline__)) +#elif defined(__CLANG__) + #if __has_attribute(__always_inline__) + #define ATTRIBUTE_FORCEINLINE inline __attribute__((__always_inline__)) + #else + #define ATTRIBUTE_FORCEINLINE inline + #endif +#else + #define ATTRIBUTE_FORCEINLINE inline +#endif + #include "versions.h" namespace kodi { namespace addon { class CAddonBase; }} @@ -179,6 +193,7 @@ typedef struct KodiToAddonFuncTable_Addon ADDON_STATUS (*create_instance)(int instanceType, const char* instanceID, KODI_HANDLE instance, KODI_HANDLE* addonInstance, KODI_HANDLE parent); void (*destroy_instance)(int instanceType, KODI_HANDLE instance); ADDON_STATUS (*set_setting)(const char *settingName, const void *settingValue); + ADDON_STATUS(*create_instance_ex)(int instanceType, const char* instanceID, KODI_HANDLE instance, KODI_HANDLE* addonInstance, KODI_HANDLE parent, const char* version); } KodiToAddonFuncTable_Addon; /* @@ -237,6 +252,11 @@ public: return ADDON_STATUS_NOT_IMPLEMENTED; } + virtual ADDON_STATUS CreateInstanceEx(int instanceType, std::string instanceID, KODI_HANDLE instance, KODI_HANDLE& addonInstance, const std::string &version) + { + return CreateInstance(instanceType, instanceID, instance, addonInstance); + } + const ADDON_TYPE m_type; }; } /* namespace addon */ @@ -278,6 +298,9 @@ public: CAddonBase::m_interface->toAddon->create_instance = ADDONBASE_CreateInstance; CAddonBase::m_interface->toAddon->destroy_instance = ADDONBASE_DestroyInstance; CAddonBase::m_interface->toAddon->set_setting = ADDONBASE_SetSetting; + // If version is present, we know that kodi has create_instance_ex implemented + if (!CAddonBase::m_strGlobalApiVersion.empty()) + CAddonBase::m_interface->toAddon->create_instance_ex = ADDONBASE_CreateInstanceEx; } virtual ~CAddonBase() = default; @@ -306,8 +329,14 @@ public: return ADDON_STATUS_UNKNOWN; } + virtual ADDON_STATUS CreateInstanceEx(int instanceType, std::string instanceID, KODI_HANDLE instance, KODI_HANDLE& addonInstance, const std::string &version) + { + return CreateInstance(instanceType, instanceID, instance, addonInstance); + } + /* Global variables of class */ static AddonGlobalInterface* m_interface; // Interface function table to hold addresses on add-on and from kodi + static std::string m_strGlobalApiVersion; /*private:*/ /* Needed public as long the old call functions becomes used! */ static inline void ADDONBASE_Destroy() @@ -324,17 +353,22 @@ public: } static inline ADDON_STATUS ADDONBASE_CreateInstance(int instanceType, const char* instanceID, KODI_HANDLE instance, KODI_HANDLE* addonInstance, KODI_HANDLE parent) + { + return ADDONBASE_CreateInstanceEx(instanceType, instanceID, instance, addonInstance, parent, ""); + } + + static inline ADDON_STATUS ADDONBASE_CreateInstanceEx(int instanceType, const char* instanceID, KODI_HANDLE instance, KODI_HANDLE* addonInstance, KODI_HANDLE parent, const char* version) { ADDON_STATUS status = ADDON_STATUS_NOT_IMPLEMENTED; if (parent != nullptr) - status = static_cast(parent)->CreateInstance(instanceType, instanceID, instance, *addonInstance); + status = static_cast(parent)->CreateInstanceEx(instanceType, instanceID, instance, *addonInstance, version); if (status == ADDON_STATUS_NOT_IMPLEMENTED) - status = CAddonBase::m_interface->addonBase->CreateInstance(instanceType, instanceID, instance, *addonInstance); + status = CAddonBase::m_interface->addonBase->CreateInstanceEx(instanceType, instanceID, instance, *addonInstance, version); if (*addonInstance == nullptr) - throw std::logic_error("kodi::addon::CAddonBase CreateInstance returns a empty instance pointer!"); + throw std::logic_error("kodi::addon::CAddonBase CreateInstanceEx returns a empty instance pointer!"); if (static_cast<::kodi::addon::IAddonInstance*>(*addonInstance)->m_type != instanceType) - throw std::logic_error("kodi::addon::CAddonBase CreateInstance with difference on given and returned instance type!"); + throw std::logic_error("kodi::addon::CAddonBase CreateInstanceEx with difference on given and returned instance type!"); return status; } @@ -636,6 +670,11 @@ inline void* GetInterface(const std::string &name, const std::string &version) kodi::addon::CAddonBase::m_interface->addonBase = new AddonClass; \ return kodi::addon::CAddonBase::m_interface->addonBase->Create(); \ } \ + extern "C" __declspec(dllexport) ADDON_STATUS ADDON_CreateEx(KODI_HANDLE addonInterface, const char* globalApiVersion, void *unused) \ + { \ + kodi::addon::CAddonBase::m_strGlobalApiVersion = globalApiVersion; \ + return ADDON_Create(addonInterface, unused); \ + } \ extern "C" __declspec(dllexport) void ADDON_Destroy() \ { \ kodi::addon::CAddonBase::ADDONBASE_Destroy(); \ @@ -652,4 +691,10 @@ inline void* GetInterface(const std::string &name, const std::string &version) { \ return kodi::addon::GetTypeVersion(type); \ } \ - AddonGlobalInterface* kodi::addon::CAddonBase::m_interface = nullptr; + extern "C" __declspec(dllexport) const char* ADDON_GetTypeMinVersion(int type) \ + { \ + return kodi::addon::GetTypeMinVersion(type); \ + } \ + AddonGlobalInterface* kodi::addon::CAddonBase::m_interface = nullptr; \ + std::string kodi::addon::CAddonBase::m_strGlobalApiVersion; + diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h index f188f34..e7a8a05 100644 --- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h +++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h @@ -14,7 +14,7 @@ #ifdef BUILD_KODI_ADDON #include "../ActionIDs.h" #else -#include "input/ActionIDs.h" +#include "input/actions/ActionIDs.h" #endif namespace kodi diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_dll.h index 478f81b..4338606 100644 --- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_dll.h +++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_dll.h @@ -152,32 +152,43 @@ game_input_topology* GetTopology(); */ void FreeTopology(game_input_topology* topology); +/*! + * \brief Set the layouts for known controllers + * + * \param controllers The controller layouts + * \param controller_count The number of items in the array + * + * After loading the input topology, the frontend will call this with + * controller layouts for all controllers discovered in the topology. + */ +void SetControllerLayouts(const game_controller_layout* controllers, unsigned int controller_count); + /*! * \brief Enable/disable keyboard input using the specified controller * * \param enable True to enable input, false otherwise - * \param controller The controller info if enabling, or unused if disabling + * \param controller_id The controller ID if enabling, or unused if disabling * * \return True if keyboard input was enabled, false otherwise */ -bool EnableKeyboard(bool enable, const game_controller* controller); +bool EnableKeyboard(bool enable, const char* controller_id); /*! * \brief Enable/disable mouse input using the specified controller * * \param enable True to enable input, false otherwise - * \param controller The controller info if enabling, or unused if disabling + * \param controller_id The controller ID if enabling, or unused if disabling * * \return True if mouse input was enabled, false otherwise */ -bool EnableMouse(bool enable, const game_controller* controller); +bool EnableMouse(bool enable, const char* controller_id); /*! * \brief Connect/disconnect a controller to a port on the virtual game console * * \param connect True to connect a controller, false to disconnect * \param port_address The address of the port - * \param controller The controller info if connecting, or unused if disconnecting + * \param controller_id The controller ID if connecting, or unused if disconnecting * \return True if the \p controller was (dis-)connected to the port, false otherwise * * The address is a string that allows traversal of the controller topology. @@ -203,17 +214,17 @@ bool EnableMouse(bool enable, const game_controller* controller); * To connect a multitap to the console's first port, the multitap's controller * info is set using the port address: * - * 1 + * /1 * * To connect a SNES controller to the second port of the multitap, the * controller info is next set using the address: * - * 1/game.controller.multitap/2 + * /1/game.controller.multitap/2 * * Any attempts to connect a controller to a port on a disconnected multitap * will return false. */ -bool ConnectController(bool connect, const char* port_address, const game_controller* controller); +bool ConnectController(bool connect, const char* port_address, const char* controller_id); /*! * \brief Notify the add-on of an input event @@ -310,6 +321,7 @@ void __declspec(dllexport) get_addon(void* ptr) pClient->toAddon.HasFeature = HasFeature; pClient->toAddon.GetTopology = GetTopology; pClient->toAddon.FreeTopology = FreeTopology; + pClient->toAddon.SetControllerLayouts = SetControllerLayouts; pClient->toAddon.EnableKeyboard = EnableKeyboard; pClient->toAddon.EnableMouse = EnableMouse; pClient->toAddon.ConnectController = ConnectController; diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_types.h index e3187d2..ec9d472 100644 --- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_types.h +++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_types.h @@ -446,19 +446,27 @@ typedef enum GAME_PORT_TYPE GAME_PORT_CONTROLLER, } GAME_PORT_TYPE; -typedef struct game_controller +typedef struct game_controller_layout { - const char* controller_id; + char* controller_id; bool provides_input; // False for multitaps + char** digital_buttons; unsigned int digital_button_count; + char** analog_buttons; unsigned int analog_button_count; + char** analog_sticks; unsigned int analog_stick_count; + char** accelerometers; unsigned int accelerometer_count; + char** keys; unsigned int key_count; + char** rel_pointers; unsigned int rel_pointer_count; + char** abs_pointers; unsigned int abs_pointer_count; + char** motors; unsigned int motor_count; -} ATTRIBUTE_PACKED game_controller; +} ATTRIBUTE_PACKED game_controller_layout; struct game_input_port; @@ -680,9 +688,10 @@ typedef struct KodiToAddonFuncTable_Game bool (__cdecl* HasFeature)(const char*, const char*); game_input_topology* (__cdecl* GetTopology)(); void (__cdecl* FreeTopology)(game_input_topology*); - bool (__cdecl* EnableKeyboard)(bool, const game_controller*); - bool (__cdecl* EnableMouse)(bool, const game_controller*); - bool (__cdecl* ConnectController)(bool, const char*, const game_controller*); + void (__cdecl* SetControllerLayouts)(const game_controller_layout*, unsigned int); + bool (__cdecl* EnableKeyboard)(bool, const char*); + bool (__cdecl* EnableMouse)(bool, const char*); + bool (__cdecl* ConnectController)(bool, const char*, const char*); bool (__cdecl* InputEvent)(const game_input_event*); size_t (__cdecl* SerializeSize)(void); GAME_ERROR (__cdecl* Serialize)(uint8_t*, size_t); diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_game.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_game.h index b518c28..2e6459b 100644 --- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_game.h +++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_game.h @@ -135,15 +135,15 @@ public: // --- Input callbacks ------------------------------------------------------- /*! - * \brief Notify the port of an input event - * - * \param event The input event - * - * Input events can arrive for the following sources: - * - GAME_INPUT_EVENT_MOTOR - * - * \return true if the event was handled, false otherwise - */ + * \brief Notify the port of an input event + * + * \param event The input event + * + * Input events can arrive for the following sources: + * - GAME_INPUT_EVENT_MOTOR + * + * \return true if the event was handled, false otherwise + */ bool InputEvent(const game_input_event& event) { return m_callbacks->toKodi.InputEvent(m_callbacks->toKodi.kodiInstance, &event); 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 5127f7e..06d75e0 100644 --- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h +++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h @@ -30,7 +30,7 @@ * overview. */ -#define ADDON_GLOBAL_VERSION_MAIN "1.0.13" +#define ADDON_GLOBAL_VERSION_MAIN "1.0.14" #define ADDON_GLOBAL_VERSION_MAIN_MIN "1.0.12" #define ADDON_GLOBAL_VERSION_MAIN_XML_ID "kodi.binary.global.main" #define ADDON_GLOBAL_VERSION_MAIN_DEPENDS "AddonBase.h" \ @@ -75,8 +75,8 @@ #define ADDON_INSTANCE_VERSION_AUDIOENCODER_XML_ID "kodi.binary.instance.audioencoder" #define ADDON_INSTANCE_VERSION_AUDIOENCODER_DEPENDS "addon-instance/AudioEncoder.h" -#define ADDON_INSTANCE_VERSION_GAME "1.0.38" -#define ADDON_INSTANCE_VERSION_GAME_MIN "1.0.38" +#define ADDON_INSTANCE_VERSION_GAME "1.1.0" +#define ADDON_INSTANCE_VERSION_GAME_MIN "1.1.0" #define ADDON_INSTANCE_VERSION_GAME_XML_ID "kodi.binary.instance.game" #define ADDON_INSTANCE_VERSION_GAME_DEPENDS "kodi_game_dll.h" \ "kodi_game_types.h" \ diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_dll.h index e9e7d9a..ce2bc98 100644 --- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_dll.h +++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_dll.h @@ -15,6 +15,7 @@ extern "C" { #endif ADDON_STATUS __declspec(dllexport) ADDON_Create(void *callbacks, void* props); + ADDON_STATUS __declspec(dllexport) ADDON_CreateEx(void *callbacks, const char* globalApiVersion, void* props); void __declspec(dllexport) ADDON_Destroy(); ADDON_STATUS __declspec(dllexport) ADDON_GetStatus(); ADDON_STATUS __declspec(dllexport) ADDON_SetSetting(const char *settingName, const void *settingValue); @@ -22,6 +23,10 @@ extern "C" { { return kodi::addon::GetTypeVersion(type); } + __declspec(dllexport) const char* ADDON_GetTypeMinVersion(int type) + { + return kodi::addon::GetTypeMinVersion(type); + } #ifdef __cplusplus }; diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h index 27fa800..42a2abd 100644 --- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h +++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h @@ -413,6 +413,7 @@ extern "C" * @param channel The channel to stream. * @return True if the stream has been opened successfully, false otherwise. * @remarks Required if bHandlesInputStream or bHandlesDemuxing is set to true. + * CloseLiveStream() will always be called by Kodi prior to calling this function. * Return false if this add-on won't provide this function. */ bool OpenLiveStream(const PVR_CHANNEL& channel); @@ -497,7 +498,7 @@ extern "C" * Get the stream properties of the stream that's currently being read. * @param pProperties The properties of the currently playing stream. * @return PVR_ERROR_NO_ERROR if the properties have been fetched successfully. - * @remarks Required if bHandlesInputStream or bHandlesDemuxing is set to true. + * @remarks Required if bHandlesDemuxing is set to true. * Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function. */ PVR_ERROR GetStreamProperties(PVR_STREAM_PROPERTIES* pProperties); @@ -523,6 +524,7 @@ extern "C" * @param recording The recording to open. * @return True if the stream has been opened successfully, false otherwise. * @remarks Optional, and only used if bSupportsRecordings is set to true. + * CloseRecordedStream() will always be called by Kodi prior to calling this function. * Return false if this add-on won't provide this function. */ bool OpenRecordedStream(const PVR_RECORDING& recording); -- cgit v1.2.3