Fix for gui split from after PR xbmc/xbmc#6571

margro · Mar 6, 2015 · d27d470 · d27d470
1 parent 87422e6
commit d27d470
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 20 deletions.
diff --git a/pvr.mediaportal.tvserver/addon.xml b/pvr.mediaportal.tvserver/addon.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.mediaportal.tvserver"
-  version="1.10.1"
+  version="1.10.2"
   name="MediaPortal PVR Client"
   provider-name="Marcel Groothuis">
   <requires>
     <c-pluff version="0.1"/>
-    <import addon="xbmc.pvr" version="1.9.4"/>
+    <import addon="xbmc.pvr" version="1.9.5"/>
     <import addon="xbmc.gui" version="5.8.0"/>
   </requires>
   <extension

diff --git a/pvr.mediaportal.tvserver/changelog.txt b/pvr.mediaportal.tvserver/changelog.txt
@@ -1,3 +1,6 @@
+v1.10.2
+- Updated to PVR API v1.9.5
+
 v1.10.1
 - Updated to PVR API v1.9.4
 - Updated to GUI API v5.8.0

diff --git a/src/GUIDialogRecordSettings.cpp b/src/GUIDialogRecordSettings.cpp
@@ -21,7 +21,7 @@
 
 #include "client.h"
 #include "GUIDialogRecordSettings.h"
-#include "kodi/libXBMC_gui.h"
+#include "kodi/libKODI_guilib.h"
 #include "timers.h"
 #include "utils.h"
 #include "DateTime.h"

diff --git a/src/client.cpp b/src/client.cpp
@@ -48,13 +48,13 @@ bool             g_bFastChannelSwitch   = true;                          ///< Do
 bool             g_bUseRTSP             = false;                         ///< Use RTSP streaming when using the tsreader
 
 /* Client member variables */
-ADDON_STATUS           m_CurStatus    = ADDON_STATUS_UNKNOWN;
-cPVRClientMediaPortal *g_client       = NULL;
-std::string            g_szUserPath   = "";
-std::string            g_szClientPath = "";
-CHelper_libXBMC_addon *XBMC           = NULL;
-CHelper_libXBMC_pvr   *PVR            = NULL;
-CHelper_libXBMC_gui   *GUI            = NULL;
+ADDON_STATUS            m_CurStatus    = ADDON_STATUS_UNKNOWN;
+cPVRClientMediaPortal  *g_client       = NULL;
+std::string             g_szUserPath   = "";
+std::string             g_szClientPath = "";
+CHelper_libXBMC_addon  *XBMC           = NULL;
+CHelper_libXBMC_pvr    *PVR            = NULL;
+CHelper_libKODI_guilib *GUI = NULL;
 
 extern "C" {
 
@@ -90,7 +90,7 @@ ADDON_STATUS ADDON_Create(void* hdl, void* props)
     return ADDON_STATUS_PERMANENT_FAILURE;
   }
 
-  GUI = new CHelper_libXBMC_gui;
+  GUI = new CHelper_libKODI_guilib;
   if (!GUI->RegisterMe(hdl))
   {
     SAFE_DELETE(GUI);
@@ -452,14 +452,12 @@ const char* GetMininumPVRAPIVersion(void)
 
 const char* GetGUIAPIVersion(void)
 {
-  static const char *strGuiApiVersion = XBMC_GUI_API_VERSION;
-  return strGuiApiVersion;
+  return KODI_GUILIB_API_VERSION;
 }
 
 const char* GetMininumGUIAPIVersion(void)
 {
-  static const char *strMinGuiApiVersion = XBMC_GUI_MIN_API_VERSION;
-  return strMinGuiApiVersion;
+  return KODI_GUILIB_MIN_API_VERSION;
 }
 
 //-- GetAddonCapabilities -----------------------------------------------------

diff --git a/src/client.h b/src/client.h
@@ -27,7 +27,7 @@
 #include "kodi/util/StdString.h"
 #include "kodi/libXBMC_addon.h"
 #include "kodi/libXBMC_pvr.h"
-#include "kodi/libXBMC_gui.h"
+#include "kodi/libKODI_guilib.h"
 
 enum eStreamingMethod
 {
@@ -74,7 +74,7 @@ extern eStreamingMethod g_eStreamingMethod;
 
 extern ADDON::CHelper_libXBMC_addon *XBMC;
 extern CHelper_libXBMC_pvr          *PVR;
-extern CHelper_libXBMC_gui          *GUI;
+extern CHelper_libKODI_guilib       *GUI;
 
 extern int              g_iTVServerXBMCBuild;
 

diff --git a/src/pvrclient-mediaportal.cpp b/src/pvrclient-mediaportal.cpp
@@ -43,13 +43,13 @@ using namespace ADDON;
 int g_iTVServerXBMCBuild = 0;
 
 /* PVR client version (don't forget to update also the addon.xml and the Changelog.txt files) */
-#define PVRCLIENT_MEDIAPORTAL_VERSION_STRING    "1.9.15"
+#define PVRCLIENT_MEDIAPORTAL_VERSION_STRING    "1.10.2"
 
 /* TVServerXBMC plugin supported versions */
 #define TVSERVERXBMC_MIN_VERSION_STRING         "1.1.7.107"
 #define TVSERVERXBMC_MIN_VERSION_BUILD          107
-#define TVSERVERXBMC_RECOMMENDED_VERSION_STRING "1.2.3.122, 1.3.0.122, 1.4.0.124, 1.5.0.125 or 1.6.0.126"
-#define TVSERVERXBMC_RECOMMENDED_VERSION_BUILD  122
+#define TVSERVERXBMC_RECOMMENDED_VERSION_STRING "1.2.3.122 till 1.10.0.127"
+#define TVSERVERXBMC_RECOMMENDED_VERSION_BUILD  127
 
 /************************************************************/
 /** Class interface */