Merge pull request #2 from flubshi/pvr-api-6-0-0

Implement PVR addon API v6.0.0
flubshi · Apr 25, 2019 · 7ad499e · 7ad499e
2 parents 093e4b1 + d4c881f
commit 7ad499e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/depends/common/rapidjson/rapidjson.sha256 b/depends/common/rapidjson/rapidjson.sha256
@@ -0,0 +1 @@
+bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e
diff --git a/pvr.waipu/addon.xml.in b/pvr.waipu/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.waipu"
-  version="0.1.0"
+  version="0.5.0"
   name="waipu.tv PVR Client"
   provider-name="flubshi">
   <requires>@ADDON_DEPENDS@</requires>
@@ -26,6 +26,7 @@
     <screenshot>resources/screenshots/screenshot-02.jpg</screenshot>
   </assets>
   <news>
+- 0.5.0 Update to PVR addon API v6.0.0
 - 0.1.0 adjust dst workaround; fix stoi
 - 0.0.9 Improve handling of recordings, update user-agent, readme and description  
 - 0.0.8 Check for JSON parse errors

diff --git a/src/WaipuData.cpp b/src/WaipuData.cpp
@@ -372,15 +372,15 @@ PVR_ERROR WaipuData::GetChannelGroupMembers(ADDON_HANDLE handle, const PVR_CHANN
   return PVR_ERROR_NOT_IMPLEMENTED;
 }
 
-PVR_ERROR WaipuData::GetEPGForChannel(ADDON_HANDLE handle, const PVR_CHANNEL &channel, time_t iStart, time_t iEnd)
+PVR_ERROR WaipuData::GetEPGForChannel(ADDON_HANDLE handle, int iChannelUid, time_t iStart, time_t iEnd)
 {
   if (!ApiLogin()){
 	return PVR_ERROR_SERVER_ERROR;
   }
   for (unsigned int iChannelPtr = 0; iChannelPtr < m_channels.size(); iChannelPtr++)
   {
     WaipuChannel &myChannel = m_channels.at(iChannelPtr);
-    if (myChannel.iUniqueId != (int) channel.iUniqueId)
+    if (myChannel.iUniqueId != iChannelUid)
       continue;
 
     char startTime[100];

diff --git a/src/WaipuData.h b/src/WaipuData.h
@@ -72,7 +72,7 @@ class WaipuData
 
   virtual string GetChannelStreamUrl(int uniqueId, const string& protocol);
 
-  PVR_ERROR GetEPGForChannel(ADDON_HANDLE handle, const PVR_CHANNEL &channel, time_t iStart, time_t iEnd);
+  PVR_ERROR GetEPGForChannel(ADDON_HANDLE handle, int iChannelUid, time_t iStart, time_t iEnd);
 
   int GetRecordingsAmount(bool bDeleted);
   PVR_ERROR GetRecordings(ADDON_HANDLE handle, bool bDeleted);

diff --git a/src/client.cpp b/src/client.cpp
@@ -208,11 +208,11 @@ PVR_ERROR GetDriveSpace(long long *iTotal, long long *iUsed)
   return PVR_ERROR_NOT_IMPLEMENTED;
 }
 
-PVR_ERROR GetEPGForChannel(ADDON_HANDLE handle, const PVR_CHANNEL &channel, time_t iStart, time_t iEnd)
+PVR_ERROR GetEPGForChannel(ADDON_HANDLE handle, int iChannelUid, time_t iStart, time_t iEnd)
 {
 
   if (m_data)
-    return m_data->GetEPGForChannel(handle, channel, iStart, iEnd);
+    return m_data->GetEPGForChannel(handle, iChannelUid, iStart, iEnd);
 
   return PVR_ERROR_SERVER_ERROR;
 }
@@ -417,6 +417,7 @@ long long SeekRecordedStream(long long iPosition, int iWhence /* = SEEK_SET */)
 long long LengthRecordedStream(void) { return 0; }
 void DemuxReset(void) {}
 void DemuxFlush(void) {}
+void FillBuffer(bool mode) {}
 bool OpenLiveStream(const PVR_CHANNEL&) { return false; }
 void CloseLiveStream(void) {}
 int ReadLiveStream(unsigned char *pBuffer, unsigned int iBufferSize) { return 0; }
@@ -435,7 +436,6 @@ bool CanPauseStream(void) { return false; }
 bool CanSeekStream(void) { return false; }
 bool SeekTime(double,bool,double*) { return false; }
 void SetSpeed(int) {};
-bool IsTimeshifting(void) { return false; }
 bool IsRealTimeStream(void) { return true; }
 PVR_ERROR UndeleteRecording(const PVR_RECORDING& recording) { return PVR_ERROR_NOT_IMPLEMENTED; }
 PVR_ERROR DeleteAllRecordingsFromTrash() { return PVR_ERROR_NOT_IMPLEMENTED; }