From 5f8335c1e49ce108ef3481863833c98efa00411b Mon Sep 17 00:00:00 2001 From: manuel Date: Thu, 2 Jul 2020 23:09:26 +0200 Subject: sync with upstream --- .../include/kodi/addon-instance/VideoCodec.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VideoCodec.h') diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VideoCodec.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VideoCodec.h index 9c33fbf..54246f0 100644 --- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VideoCodec.h +++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VideoCodec.h @@ -80,13 +80,13 @@ extern "C" int64_t pts; - void *buffer; //< will be passed in release_frame_buffer + KODI_HANDLE buffer; //< will be passed in release_frame_buffer }; enum VIDEOCODEC_RETVAL { VC_NONE = 0, //< noop - VC_ERROR, //< an error occured, no other messages will be returned + VC_ERROR, //< an error occurred, no other messages will be returned VC_BUFFER, //< the decoder needs more data VC_PICTURE, //< the decoder got a picture VC_EOF, //< the decoder signals EOF @@ -143,11 +143,13 @@ namespace kodi namespace addon { - class CInstanceVideoCodec : public IAddonInstance + class ATTRIBUTE_HIDDEN CInstanceVideoCodec : public IAddonInstance { public: - explicit CInstanceVideoCodec(KODI_HANDLE instance) - : IAddonInstance(ADDON_INSTANCE_VIDEOCODEC) + explicit CInstanceVideoCodec(KODI_HANDLE instance, const std::string& kodiVersion = "") + : IAddonInstance(ADDON_INSTANCE_VIDEOCODEC, + !kodiVersion.empty() ? kodiVersion + : GetKodiTypeVersion(ADDON_INSTANCE_VIDEOCODEC)) { if (CAddonBase::m_interface->globalSingleInstance != nullptr) throw std::logic_error("kodi::addon::CInstanceVideoCodec: Creation of multiple together with single instance way is not allowed!"); -- cgit v1.2.3