From 8cdf8dec703d882b46ca50a769fabb95ffc48e2c Mon Sep 17 00:00:00 2001 From: manuel Date: Thu, 24 Nov 2016 21:27:41 +0100 Subject: sync with upstream --- .../include/kodi/libKODI_audioengine.h | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) (limited to 'xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_audioengine.h') diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_audioengine.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_audioengine.h index be3b93d..7dbf7af 100644 --- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_audioengine.h +++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_audioengine.h @@ -38,12 +38,8 @@ #include "libXBMC_addon.h" -#ifdef _WIN32 -#define AUDIOENGINE_HELPER_DLL "\\library.kodi.audioengine\\libKODI_audioengine" ADDON_HELPER_EXT -#else -#define AUDIOENGINE_HELPER_DLL_NAME "libKODI_audioengine-" ADDON_HELPER_ARCH ADDON_HELPER_EXT -#define AUDIOENGINE_HELPER_DLL "/library.kodi.audioengine/" AUDIOENGINE_HELPER_DLL_NAME -#endif +#define AUDIOENGINE_HELPER_DLL KODI_DLL("audioengine") +#define AUDIOENGINE_HELPER_DLL_NAME KODI_DLL_NAME("audioengine") class CAddonAEStream; @@ -78,15 +74,6 @@ public: libBasePath = ((cb_array*)m_Handle)->libPath; libBasePath += AUDIOENGINE_HELPER_DLL; -#if defined(ANDROID) - struct stat st; - if(stat(libBasePath.c_str(),&st) != 0) - { - std::string tempbin = getenv("XBMC_ANDROID_LIBS"); - libBasePath = tempbin + "/" + AUDIOENGINE_HELPER_DLL; - } -#endif - m_libKODI_audioengine = dlopen(libBasePath.c_str(), RTLD_LAZY); if (m_libKODI_audioengine == NULL) { @@ -207,8 +194,8 @@ public: virtual bool IsBuffering(); /** - * Returns the time in seconds that it will take - * to underrun the cache if no sample is added. + * Returns the time in seconds of the stream's + * cached audio samples. Engine buffers excluded. * @return seconds */ virtual double GetCacheTime(); -- cgit v1.2.3