From c91061f84b1654eb1383dd4a6b58f3dd47641f61 Mon Sep 17 00:00:00 2001
From: Kai Sommerfeld <kai.sommerfeld@gmx.com>
Date: Tue, 23 Apr 2019 23:30:46 +0200
Subject: [PATCH] Implement PVR addon API v6.0.0

---
 pvr.octonet/addon.xml.in | 2 +-
 src/OctonetData.cpp      | 4 ++--
 src/OctonetData.h        | 2 +-
 src/client.cpp           | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pvr.octonet/addon.xml.in b/pvr.octonet/addon.xml.in
index 80957b2..6e5a6af 100644
--- a/pvr.octonet/addon.xml.in
+++ b/pvr.octonet/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
 	id="pvr.octonet"
-	version="0.7.0"
+	version="1.0.0"
 	name="Digital Devices Octopus NET Client"
 	provider-name="digitaldevices">
 	<requires>@ADDON_DEPENDS@</requires>
diff --git a/src/OctonetData.cpp b/src/OctonetData.cpp
index 7f549c4..a2da257 100644
--- a/src/OctonetData.cpp
+++ b/src/OctonetData.cpp
@@ -228,12 +228,12 @@ PVR_ERROR OctonetData::getChannels(ADDON_HANDLE handle, bool bRadio)
 	return PVR_ERROR_NO_ERROR;
 }
 
-PVR_ERROR OctonetData::getEPG(ADDON_HANDLE handle, const PVR_CHANNEL &channel, time_t start, time_t end)
+PVR_ERROR OctonetData::getEPG(ADDON_HANDLE handle, int iChannelUid, time_t start, time_t end)
 {
 	for (unsigned int i = 0; i < channels.size(); i++)
 	{
 		OctonetChannel &chan = channels.at(i);
-		if (channel.iUniqueId != chan.id)
+		if (iChannelUid != chan.id)
 			continue;
 
 		if(chan.epg.empty()) {
diff --git a/src/OctonetData.h b/src/OctonetData.h
index dbfcb13..62af0a0 100644
--- a/src/OctonetData.h
+++ b/src/OctonetData.h
@@ -69,7 +69,7 @@ class OctonetData : public P8PLATFORM::CThread
 		virtual PVR_ERROR getGroups(ADDON_HANDLE handle, bool bRadio);
 		virtual PVR_ERROR getGroupMembers(ADDON_HANDLE handle, const PVR_CHANNEL_GROUP &group);
 
-		virtual PVR_ERROR getEPG(ADDON_HANDLE handle, const PVR_CHANNEL &channel, time_t start, time_t end);
+		virtual PVR_ERROR getEPG(ADDON_HANDLE handle, int iChannelUid, time_t start, time_t end);
 		const std::string& getUrl(int id) const;
 		const std::string& getName(int id) const;
 
diff --git a/src/client.cpp b/src/client.cpp
index f2e5a9e..3eb7a45 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -156,9 +156,9 @@ void OnPowerSavingActivated() {}
 void OnPowerSavingDeactivated() {}
 
 /* EPG */
-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)
 {
-	return data->getEPG(handle, channel, iStart, iEnd);
+	return data->getEPG(handle, iChannelUid, iStart, iEnd);
 }
 
 PVR_ERROR IsEPGTagRecordable(const EPG_TAG*, bool*) { return PVR_ERROR_NOT_IMPLEMENTED; }
@@ -266,9 +266,9 @@ void DemuxReset(void) {}
 void DemuxAbort(void) {}
 void DemuxFlush(void) {}
 DemuxPacket* DemuxRead(void) { return NULL; }
+void FillBuffer(bool mode) {}
 
 /* Various helper functions */
-bool IsTimeshifting(void) { return false; }
 bool CanPauseStream() { return false; }
 bool CanSeekStream() { return false; }