Merge pull request #36 from ksooo/pvr-api-5-0-0

Implement PVR API 5.0.0
kodi-pvr · Feb 16, 2016 · 2aa58b2 · 2aa58b2
2 parents 8327f88 + b9af112
commit 2aa58b2
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 30 deletions.
diff --git a/pvr.wmc/addon.xml.in b/pvr.wmc/addon.xml.in
@@ -1,13 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.wmc"
-  version="1.0.2"
+  version="1.1.0"
   name="PVR WMC Client"
   provider-name="KrustyReturns and scarecrow420">
   <requires>
     <c-pluff version="0.1"/>
-    <import addon="xbmc.pvr" version="4.2.0"/>
-    <import addon="kodi.guilib" version="5.10.0"/>
+    <import addon="xbmc.pvr" version="5.0.0"/>
   </requires>
   <extension
     point="xbmc.pvrclient"

diff --git a/pvr.wmc/changelog.txt b/pvr.wmc/changelog.txt
@@ -1,4 +1,7 @@
-1.0.2
+1.1.0
+- Updated to PVR addon API v5.0.0
+
+1.0.2
 - Updated to PVR API v4.2.0
 
 1.0.1

diff --git a/src/client.cpp b/src/client.cpp
@@ -20,7 +20,6 @@
 
 #include "client.h"
 #include "kodi/xbmc_pvr_dll.h"
-#include "kodi/libKODI_guilib.h"
 #include "pvr2wmc.h"
 #include "utilities.h"
 #include "p8-platform/util/util.h"
@@ -67,7 +66,6 @@ CStdString		g_AddonDataCustom	= "";					// location of custom addondata settings
 
 CHelper_libXBMC_addon   *XBMC           = NULL;
 CHelper_libXBMC_pvr   	*PVR            = NULL;
-CHelper_libKODI_guilib  *GUI            = NULL; 
 
 #define LOCALHOST "127.0.0.1"
 
@@ -174,21 +172,11 @@ extern "C" {
 			return ADDON_STATUS_PERMANENT_FAILURE;
 		}
 
-		// register gui
-		GUI = new CHelper_libKODI_guilib;
-		if (!GUI->RegisterMe(hdl))
-		{
-			SAFE_DELETE(GUI);
-			SAFE_DELETE(XBMC);
-			return ADDON_STATUS_PERMANENT_FAILURE;
-		}
-
 		// register as pvr
 		PVR = new CHelper_libXBMC_pvr;	
 		if (!PVR->RegisterMe(hdl))
 		{
 			SAFE_DELETE(PVR);
-			SAFE_DELETE(GUI);
 			SAFE_DELETE(XBMC);
 			return ADDON_STATUS_PERMANENT_FAILURE;
 		}
@@ -207,7 +195,6 @@ extern "C" {
 		{
 			SAFE_DELETE(_wmc);
 			SAFE_DELETE(PVR);
-			SAFE_DELETE(GUI);
 			SAFE_DELETE(XBMC);
 			_CurStatus = ADDON_STATUS_LOST_CONNECTION;
 		}
@@ -240,7 +227,6 @@ extern "C" {
 		if (_wmc)
 			_wmc->UnLoading();
 		SAFE_DELETE(PVR);
-		SAFE_DELETE(GUI);
 		_bCreated = false;
 		_CurStatus = ADDON_STATUS_UNKNOWN;
 	}
@@ -308,12 +294,12 @@ extern "C" {
 
 	const char* GetGUIAPIVersion(void)
 	{
-	  return KODI_GUILIB_API_VERSION;
+		return ""; // GUI API not used
 	}
 
 	const char* GetMininumGUIAPIVersion(void)
 	{
-	  return KODI_GUILIB_MIN_API_VERSION;
+		return ""; // GUI API not used
 	}
 
 	PVR_ERROR GetAddonCapabilities(PVR_ADDON_CAPABILITIES* pCapabilities)
@@ -377,11 +363,6 @@ extern "C" {
 		return PVR_ERROR_SERVER_ERROR;
 	}
 
-	int GetCurrentClientChannel(void)
-	{
-		return _currentChannel.iUniqueId;
-	}
-
 	PVR_ERROR GetStreamProperties(PVR_STREAM_PROPERTIES* pProperties)
 	{
 		return PVR_ERROR_NOT_IMPLEMENTED;
@@ -726,5 +707,6 @@ extern "C" {
 	PVR_ERROR GetRecordingEdl(const PVR_RECORDING&, PVR_EDL_ENTRY[], int*) { return PVR_ERROR_NOT_IMPLEMENTED; };
 	PVR_ERROR UndeleteRecording(const PVR_RECORDING& recording) { return PVR_ERROR_NOT_IMPLEMENTED; }
 	PVR_ERROR DeleteAllRecordingsFromTrash() { return PVR_ERROR_NOT_IMPLEMENTED; }
+	PVR_ERROR SetEPGTimeFrame(int) { return PVR_ERROR_NOT_IMPLEMENTED; }
 
 }
diff --git a/src/client.h b/src/client.h
@@ -38,7 +38,6 @@ extern int								g_signalThrottle;
 extern bool								g_bEnableMultiResume;
 extern ADDON::CHelper_libXBMC_addon		*XBMC;
 extern CHelper_libXBMC_pvr				*PVR;
-extern CHelper_libKODI_guilib			*GUI;
 extern CStdString						g_strServerMAC;
 extern bool								g_bWakeOnLAN;
 extern CStdString						g_AddonDataCustom;

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -21,5 +21,5 @@
 
 inline CStdString PVRWMC_GetClientVersion()
 {
-	return "1.0.2";	// ALSO CHANGE IN REV NUMBER in 'pvr.wmc/addon.xml.in'
+	return "1.1.0";	// ALSO CHANGE IN REV NUMBER in 'pvr.wmc/addon.xml.in'
 }
diff --git a/src/pvr2wmc.cpp b/src/pvr2wmc.cpp
@@ -1142,6 +1142,9 @@ PVR_ERROR Pvr2Wmc::GetRecordings(ADDON_HANDLE handle)
 			xRec.iEpgEventId = atoi(v[18].c_str());
 		}
 
+		/* TODO: PVR API 5.0.0: Implement this */
+		xRec.iChannelUid = PVR_CHANNEL_INVALID_UID;
+
 		PVR->TransferRecordingEntry(handle, &xRec);
 	}
 
@@ -1673,8 +1676,6 @@ PVR_ERROR Pvr2Wmc::SignalStatus(PVR_SIGNAL_STATUS &signalStatus)
 				snprintf(cachedSignalStatus.strServiceName, sizeof(cachedSignalStatus.strServiceName), "%s", results[3].c_str());
 				snprintf(cachedSignalStatus.strMuxName, sizeof(cachedSignalStatus.strMuxName), "%s", results[4].c_str());
 				cachedSignalStatus.iSignal = (int)(atoi(results[5]) * 655.35);
-				cachedSignalStatus.dVideoBitrate = atof(results[6]);
-				cachedSignalStatus.dAudioBitrate = atof(results[7]);
 
 				bool error = atoi(results[8]) == 1;
 				if (error)