From 8cdf8dec703d882b46ca50a769fabb95ffc48e2c Mon Sep 17 00:00:00 2001 From: manuel Date: Thu, 24 Nov 2016 21:27:41 +0100 Subject: sync with upstream --- .../kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h') diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h index 700f912..a769328 100644 --- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h +++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h @@ -27,16 +27,12 @@ #include "xbmc_pvr_types.h" #include "libXBMC_addon.h" -#ifdef _WIN32 -#define PVR_HELPER_DLL "\\library.xbmc.pvr\\libXBMC_pvr" ADDON_HELPER_EXT -#else -#define PVR_HELPER_DLL_NAME "libXBMC_pvr-" ADDON_HELPER_ARCH ADDON_HELPER_EXT -#define PVR_HELPER_DLL "/library.xbmc.pvr/" PVR_HELPER_DLL_NAME -#endif +#define PVR_HELPER_DLL_NAME XBMC_DLL_NAME("pvr") +#define PVR_HELPER_DLL XBMC_DLL("pvr") #define DVD_TIME_BASE 1000000 -//TODO original definition is in DVDClock.h +//! @todo original definition is in DVDClock.h #define DVD_NOPTS_VALUE 0xFFF0000000000000 class CHelper_libXBMC_pvr @@ -70,15 +66,6 @@ public: libBasePath = ((cb_array*)m_Handle)->libPath; libBasePath += PVR_HELPER_DLL; -#if defined(ANDROID) - struct stat st; - if(stat(libBasePath.c_str(),&st) != 0) - { - std::string tempbin = getenv("XBMC_ANDROID_LIBS"); - libBasePath = tempbin + "/" + PVR_HELPER_DLL_NAME; - } -#endif - m_libXBMC_pvr = dlopen(libBasePath.c_str(), RTLD_LAZY); if (m_libXBMC_pvr == NULL) { -- cgit v1.2.3