From b6d01b53353615ca252f54dbfbc8bde3db3ca8c8 Mon Sep 17 00:00:00 2001 From: ksooo <3226626+ksooo@users.noreply.github.com> Date: Tue, 22 Oct 2024 12:44:18 +0200 Subject: [PATCH] PVR Add-on API v9.2.0 --- pvr.argustv/addon.xml.in | 2 +- pvr.argustv/changelog.txt | 3 +++ src/pvrclient-argustv.cpp | 10 +++++----- src/pvrclient-argustv.h | 10 +++++----- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/pvr.argustv/addon.xml.in b/pvr.argustv/addon.xml.in index be18653b..02953577 100644 --- a/pvr.argustv/addon.xml.in +++ b/pvr.argustv/addon.xml.in @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ diff --git a/pvr.argustv/changelog.txt b/pvr.argustv/changelog.txt index 43eb3dba..6d49fe5a 100644 --- a/pvr.argustv/changelog.txt +++ b/pvr.argustv/changelog.txt @@ -1,3 +1,6 @@ +v22.2.0 +- PVR Add-on API v9.2.0 + v22.1.0 - PVR Add-on API v9.0.0 diff --git a/src/pvrclient-argustv.cpp b/src/pvrclient-argustv.cpp index 854c893d..79dcdb67 100644 --- a/src/pvrclient-argustv.cpp +++ b/src/pvrclient-argustv.cpp @@ -1615,7 +1615,7 @@ bool cPVRClientArgusTV::FindRecEntry(const std::string& recId, std::string& recE /************************************************************/ /** Record stream handling */ -bool cPVRClientArgusTV::OpenRecordedStream(const kodi::addon::PVRRecording& recinfo) +bool cPVRClientArgusTV::OpenRecordedStream(const kodi::addon::PVRRecording& recinfo, int64_t& streamId) { std::string UNCname; @@ -1642,7 +1642,7 @@ bool cPVRClientArgusTV::OpenRecordedStream(const kodi::addon::PVRRecording& reci return true; } -void cPVRClientArgusTV::CloseRecordedStream(void) +void cPVRClientArgusTV::CloseRecordedStream(int64_t streamId) { kodi::Log(ADDON_LOG_DEBUG, "->CloseRecordedStream()"); @@ -1656,7 +1656,7 @@ void cPVRClientArgusTV::CloseRecordedStream(void) } } -int cPVRClientArgusTV::ReadRecordedStream(unsigned char* pBuffer, unsigned int iBuffersize) +int cPVRClientArgusTV::ReadRecordedStream(int64_t streamId, unsigned char* pBuffer, unsigned int iBuffersize) { unsigned long read_done = 0; @@ -1673,7 +1673,7 @@ int cPVRClientArgusTV::ReadRecordedStream(unsigned char* pBuffer, unsigned int i return read_done; } -int64_t cPVRClientArgusTV::SeekRecordedStream(int64_t iPosition, int iWhence) +int64_t cPVRClientArgusTV::SeekRecordedStream(int64_t streamId, int64_t iPosition, int iWhence) { if (!m_tsreader) { @@ -1686,7 +1686,7 @@ int64_t cPVRClientArgusTV::SeekRecordedStream(int64_t iPosition, int iWhence) return m_tsreader->SetFilePointer(iPosition, iWhence); } -int64_t cPVRClientArgusTV::LengthRecordedStream(void) +int64_t cPVRClientArgusTV::LengthRecordedStream(int64_t streamId) { if (!m_tsreader) { diff --git a/src/pvrclient-argustv.h b/src/pvrclient-argustv.h index c0b592d5..b611622d 100644 --- a/src/pvrclient-argustv.h +++ b/src/pvrclient-argustv.h @@ -96,11 +96,11 @@ class cPVRClientArgusTV : public kodi::addon::CInstancePVRClient bool IsRealTimeStream() override { return !m_bRecordingPlayback; } /* Record stream handling */ - bool OpenRecordedStream(const kodi::addon::PVRRecording& recording) override; - void CloseRecordedStream() override; - int ReadRecordedStream(unsigned char* pBuffer, unsigned int iBufferSize) override; - int64_t SeekRecordedStream(int64_t iPosition, int iWhence) override; - int64_t LengthRecordedStream() override; + bool OpenRecordedStream(const kodi::addon::PVRRecording& recording, int64_t& streamId) override; + void CloseRecordedStream(int64_t streamId) override; + int ReadRecordedStream(int64_t streamId, unsigned char* pBuffer, unsigned int iBufferSize) override; + int64_t SeekRecordedStream(int64_t streamId, int64_t iPosition, int iWhence) override; + int64_t LengthRecordedStream(int64_t streamId) override; /* Used for rtsp streaming */ const char* GetLiveStreamURL(const kodi::addon::PVRChannel& channel);