Merge pull request #2 from opdenkamp/fixbuild

fixed: removed guilib dep

pvr.hts/addon.xml

@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.hts"
-  version="2.1.2"
+  version="2.1.3"
   name="Tvheadend HTSP Client"
   provider-name="Adam Sutton, Sam Stenvall, Lars Op den Kamp">
   <requires>
     <c-pluff version="0.1"/>
     <import addon="xbmc.pvr" version="1.9.5"/>
     <import addon="xbmc.codec" version="1.0.1"/>
-    <import addon="xbmc.gui" version="5.8.0"/>
   </requires>
   <extension
     point="xbmc.pvrclient"

pvr.hts/changelog.txt

@@ -1,5 +1,10 @@
-2.1.2
+2.1.3
 - Updated to PVR API v1.9.5
+- added: avahi discovery
+- fixed: lock on exit
+- fixed: race when seeking within recordings
+- fixed: CHTSPVFS::Read() needs the mutex locked
+- removed guilib dep
 
 2.1.1
 - Updated to PVR API v1.9.4

src/client.cpp

@@ -59,7 +59,6 @@ bool       g_bAsyncEpg           = false;
  */
 CHelper_libXBMC_addon *XBMC      = NULL;
 CHelper_libXBMC_pvr   *PVR       = NULL;
-CHelper_libXBMC_gui   *GUI       = NULL;
 CHelper_libXBMC_codec *CODEC     = NULL;
 PVR_MENUHOOK          *menuHook  = NULL;
 CTvheadend            *tvh       = NULL;
@@ -112,16 +111,14 @@ ADDON_STATUS ADDON_Create(void* hdl, void* _unused(props))
 
   /* Instantiate helpers */
   XBMC  = new CHelper_libXBMC_addon;
-  GUI   = new CHelper_libXBMC_gui;
   CODEC = new CHelper_libXBMC_codec;
   PVR   = new CHelper_libXBMC_pvr;
 
-  if (!XBMC->RegisterMe(hdl) || !GUI->RegisterMe(hdl) ||
+  if (!XBMC->RegisterMe(hdl) ||
       !CODEC->RegisterMe(hdl) || !PVR->RegisterMe(hdl))
   {
     SAFE_DELETE(PVR);
     SAFE_DELETE(CODEC);
-    SAFE_DELETE(GUI);
     SAFE_DELETE(XBMC);
     return ADDON_STATUS_PERMANENT_FAILURE;
   }
@@ -154,7 +151,6 @@ ADDON_STATUS ADDON_Create(void* hdl, void* _unused(props))
     SAFE_DELETE(tvh);
     SAFE_DELETE(PVR);
     SAFE_DELETE(CODEC);
-    SAFE_DELETE(GUI);
     SAFE_DELETE(XBMC);
     return ADDON_STATUS_LOST_CONNECTION;
   }
@@ -180,7 +176,6 @@ void ADDON_Destroy()
   SAFE_DELETE(tvh);
   SAFE_DELETE(PVR);
   SAFE_DELETE(CODEC);
-  SAFE_DELETE(GUI);
   SAFE_DELETE(XBMC);
   SAFE_DELETE(menuHook);
   m_CurStatus = ADDON_STATUS_UNKNOWN;
@@ -284,22 +279,6 @@ const char* GetMininumPVRAPIVersion(void)
   return strMinApiVersion;
 }
 
-#ifdef XBMC_GUI_API_VERSION
-const char* GetGUIAPIVersion(void)
-{
-  static const char *strGuiApiVersion = XBMC_GUI_API_VERSION;
-  return strGuiApiVersion;
-}
-#endif
-
-#ifdef XBMC_GUI_MIN_API_VERSION
-const char* GetMininumGUIAPIVersion(void)
-{
-  static const char *strMinGuiApiVersion = XBMC_GUI_MIN_API_VERSION;
-  return strMinGuiApiVersion;
-}
-#endif
-
 /* **************************************************************************
  * Capabilities / Info
  * *************************************************************************/

src/client.h

@@ -24,12 +24,10 @@
 #include "kodi/threads/mutex.h"
 #include "kodi/libXBMC_addon.h"
 #include "kodi/libXBMC_pvr.h"
-#include "kodi/libXBMC_gui.h"
 #include "kodi/libXBMC_codec.h"
 
 extern ADDON::CHelper_libXBMC_addon*  XBMC;
 extern CHelper_libXBMC_pvr*           PVR;
-extern CHelper_libXBMC_gui*           GUI;
 extern CHelper_libXBMC_codec*         CODEC;
 
 #define DEFAULT_HOST             "127.0.0.1"