From 612fd3474f9ebfda3dabc6e21b9fed644de20326 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Mon, 27 Apr 2020 18:16:25 +0200 Subject: [PATCH 1/3] [API related] rename GetAddonCapabilities to GetCapabilities --- src/client.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client.cpp b/src/client.cpp index e11613b3..4f599f4c 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -350,7 +350,7 @@ void OnPowerSavingDeactivated() { } -PVR_ERROR GetAddonCapabilities(PVR_ADDON_CAPABILITIES* pCapabilities) +PVR_ERROR GetCapabilities(PVR_ADDON_CAPABILITIES* pCapabilities) { pCapabilities->bSupportsEPG = true; pCapabilities->bSupportsRecordings = true; From 205f1f00e77d2c53510d63812befc7adccc655e3 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Thu, 30 Apr 2020 08:46:58 +0200 Subject: [PATCH 2/3] [API related] change SignalStatus and GetDescrambleInfo (channelUid added) --- src/VNSIDemux.cpp | 14 +++++++------- src/VNSIDemux.h | 2 +- src/client.cpp | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/VNSIDemux.cpp b/src/VNSIDemux.cpp index d7baa0f2..bef2b1af 100644 --- a/src/VNSIDemux.cpp +++ b/src/VNSIDemux.cpp @@ -323,17 +323,17 @@ bool cVNSIDemux::SwitchChannel(const PVR_CHANNEL &channelinfo) return true; } -bool cVNSIDemux::GetSignalStatus(PVR_SIGNAL_STATUS &qualityinfo) +bool cVNSIDemux::GetSignalStatus(PVR_SIGNAL_STATUS *qualityinfo) { if (m_Quality.fe_name.empty()) return true; - strncpy(qualityinfo.strAdapterName, m_Quality.fe_name.c_str(), sizeof(qualityinfo.strAdapterName)); - strncpy(qualityinfo.strAdapterStatus, m_Quality.fe_status.c_str(), sizeof(qualityinfo.strAdapterStatus)); - qualityinfo.iSignal = (uint16_t)m_Quality.fe_signal; - qualityinfo.iSNR = (uint16_t)m_Quality.fe_snr; - qualityinfo.iBER = (uint32_t)m_Quality.fe_ber; - qualityinfo.iUNC = (uint32_t)m_Quality.fe_unc; + strncpy(qualityinfo->strAdapterName, m_Quality.fe_name.c_str(), sizeof(qualityinfo->strAdapterName)); + strncpy(qualityinfo->strAdapterStatus, m_Quality.fe_status.c_str(), sizeof(qualityinfo->strAdapterStatus)); + qualityinfo->iSignal = (uint16_t)m_Quality.fe_signal; + qualityinfo->iSNR = (uint16_t)m_Quality.fe_snr; + qualityinfo->iBER = (uint32_t)m_Quality.fe_ber; + qualityinfo->iUNC = (uint32_t)m_Quality.fe_unc; return true; } diff --git a/src/VNSIDemux.h b/src/VNSIDemux.h index edd27aa9..a299454f 100644 --- a/src/VNSIDemux.h +++ b/src/VNSIDemux.h @@ -54,7 +54,7 @@ class cVNSIDemux : public cVNSISession DemuxPacket* Read(); bool SwitchChannel(const PVR_CHANNEL &channelinfo); int CurrentChannel() { return m_channelinfo.iChannelNumber; } - bool GetSignalStatus(PVR_SIGNAL_STATUS &qualityinfo); + bool GetSignalStatus(PVR_SIGNAL_STATUS *qualityinfo); bool IsTimeshift() { return m_bTimeshift; } bool SeekTime(int time, bool backwards, double *startpts); bool GetStreamTimes(PVR_STREAM_TIMES *times); diff --git a/src/client.cpp b/src/client.cpp index 4f599f4c..041ca881 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -798,7 +798,7 @@ PVR_ERROR GetStreamTimes(PVR_STREAM_TIMES *times) return PVR_ERROR_SERVER_ERROR; } -PVR_ERROR SignalStatus(PVR_SIGNAL_STATUS &signalStatus) +PVR_ERROR GetSignalStatus(int channelUid, PVR_SIGNAL_STATUS *signalStatus) { if (!VNSIDemuxer) return PVR_ERROR_SERVER_ERROR; @@ -978,7 +978,7 @@ PVR_ERROR SetRecordingLastPlayedPosition(const PVR_RECORDING &recording, int las int GetRecordingLastPlayedPosition(const PVR_RECORDING &recording) { return -1; } PVR_ERROR GetRecordingSize(const PVR_RECORDING* recording, int64_t* sizeInBytes) { return PVR_ERROR_NOT_IMPLEMENTED; } PVR_ERROR SetEPGTimeFrame(int) { return PVR_ERROR_NOT_IMPLEMENTED; } -PVR_ERROR GetDescrambleInfo(PVR_DESCRAMBLE_INFO*) { return PVR_ERROR_NOT_IMPLEMENTED; } +PVR_ERROR GetDescrambleInfo(int, PVR_DESCRAMBLE_INFO*) { return PVR_ERROR_NOT_IMPLEMENTED; } PVR_ERROR SetRecordingLifetime(const PVR_RECORDING*) { return PVR_ERROR_NOT_IMPLEMENTED; } PVR_ERROR GetChannelStreamProperties(const PVR_CHANNEL*, PVR_NAMED_VALUE*, unsigned int*) { return PVR_ERROR_NOT_IMPLEMENTED; } PVR_ERROR GetRecordingStreamProperties(const PVR_RECORDING*, PVR_NAMED_VALUE*, unsigned int*) { return PVR_ERROR_NOT_IMPLEMENTED; } From 0da64cb3536a918facea820421f5bcbe9105b2cd Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Thu, 30 Apr 2020 08:48:18 +0200 Subject: [PATCH 3/3] increase version to 4.2.9 --- pvr.vdr.vnsi/addon.xml.in | 2 +- pvr.vdr.vnsi/changelog.txt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pvr.vdr.vnsi/addon.xml.in b/pvr.vdr.vnsi/addon.xml.in index 9fec26e7..b5f2b09d 100644 --- a/pvr.vdr.vnsi/addon.xml.in +++ b/pvr.vdr.vnsi/addon.xml.in @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ diff --git a/pvr.vdr.vnsi/changelog.txt b/pvr.vdr.vnsi/changelog.txt index 26712258..ae0e27dd 100644 --- a/pvr.vdr.vnsi/changelog.txt +++ b/pvr.vdr.vnsi/changelog.txt @@ -1,3 +1,6 @@ +4.2.9 +- Update PVR API 6.5.0 + 4.2.8 - Update PVR API 6.4.0 - Correct license name on addon.xml