From 7ae54095c6cc7d99f658a45d4db66a4568ed4d4d Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Mon, 27 Apr 2020 17:38:19 +0200 Subject: [PATCH 1/4] [API related] change PVR_PROPERTIES to AddonProperties_PVR --- src/client.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client.cpp b/src/client.cpp index 5e4ae15a..7eb7d51c 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -113,7 +113,7 @@ ADDON_STATUS ADDON_Create(void *hdl, void *props) return ADDON_STATUS_PERMANENT_FAILURE; } XBMC->Log(LOG_DEBUG, "Checking props...done"); - PVR_PROPERTIES* pvrprops = (PVR_PROPERTIES*)props; + AddonProperties_PVR* pvrprops = (AddonProperties_PVR*)props; XBMC->Log(LOG_DEBUG, "Register handle @ libXBMC_pvr..."); PVR = new CHelper_libXBMC_pvr; From 896aade37a3813276111f9424a00738d05a7ac07 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Mon, 27 Apr 2020 18:15:58 +0200 Subject: [PATCH 2/4] [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 7eb7d51c..c7fa57c1 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -710,7 +710,7 @@ ADDON_STATUS ADDON_SetSetting(const char *settingName, const void *settingValue) * PVR Client AddOn specific public library functions ***********************************************************/ -PVR_ERROR GetAddonCapabilities(PVR_ADDON_CAPABILITIES *pCapabilities) +PVR_ERROR GetCapabilities(PVR_ADDON_CAPABILITIES *pCapabilities) { if (g_client != NULL) { From 84bf2ccef87c8bff269ef624aef52186f77f8658 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Wed, 29 Apr 2020 17:01:39 +0200 Subject: [PATCH 3/4] [API related] change SignalStatus and GetDescrambleInfo (channelUid added) --- src/client.cpp | 6 +++--- src/pvrclient-mythtv.cpp | 16 ++++++++-------- src/pvrclient-mythtv.h | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/client.cpp b/src/client.cpp index c7fa57c1..23ff0b3d 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -1061,12 +1061,12 @@ int ReadLiveStream(unsigned char *pBuffer, unsigned int iBufferSize) return dataread; } -PVR_ERROR SignalStatus(PVR_SIGNAL_STATUS &signalStatus) +PVR_ERROR GetSignalStatus(int channelUid, PVR_SIGNAL_STATUS *signalStatus) { if (g_client == NULL) return PVR_ERROR_SERVER_ERROR; - return g_client->SignalStatus(signalStatus); + return g_client->GetSignalStatus(signalStatus); } void PauseStream(bool bPaused) @@ -1174,7 +1174,7 @@ void DemuxReset() {} void FillBuffer(bool mode) {} void SetSpeed(int) {}; 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; } diff --git a/src/pvrclient-mythtv.cpp b/src/pvrclient-mythtv.cpp index 8eeb32d2..178c256d 100644 --- a/src/pvrclient-mythtv.cpp +++ b/src/pvrclient-mythtv.cpp @@ -2254,7 +2254,7 @@ long long PVRClientMythTV::LengthLiveStream() return retval; } -PVR_ERROR PVRClientMythTV::SignalStatus(PVR_SIGNAL_STATUS &signalStatus) +PVR_ERROR PVRClientMythTV::GetSignalStatus(PVR_SIGNAL_STATUS *signalStatus) { if (g_bExtraDebug) XBMC->Log(LOG_DEBUG, "%s", __FUNCTION__); @@ -2265,18 +2265,18 @@ PVR_ERROR PVRClientMythTV::SignalStatus(PVR_SIGNAL_STATUS &signalStatus) char buf[50]; sprintf(buf, "Myth Recorder %u", (unsigned)m_liveStream->GetCardId()); - PVR_STRCPY(signalStatus.strAdapterName, buf); + PVR_STRCPY(signalStatus->strAdapterName, buf); Myth::SignalStatusPtr signal = m_liveStream->GetSignal(); if (signal) { if (signal->lock) - PVR_STRCPY(signalStatus.strAdapterStatus, "Locked"); + PVR_STRCPY(signalStatus->strAdapterStatus, "Locked"); else - PVR_STRCPY(signalStatus.strAdapterStatus, "No lock"); - signalStatus.iSignal = signal->signal; - signalStatus.iBER = signal->ber; - signalStatus.iSNR = signal->snr; - signalStatus.iUNC = signal->ucb; + PVR_STRCPY(signalStatus->strAdapterStatus, "No lock"); + signalStatus->iSignal = signal->signal; + signalStatus->iBER = signal->ber; + signalStatus->iSNR = signal->snr; + signalStatus->iUNC = signal->ucb; } if (g_bExtraDebug) diff --git a/src/pvrclient-mythtv.h b/src/pvrclient-mythtv.h index 02908ea7..aa123c26 100644 --- a/src/pvrclient-mythtv.h +++ b/src/pvrclient-mythtv.h @@ -119,7 +119,7 @@ class PVRClientMythTV : public Myth::EventSubscriber int ReadLiveStream(unsigned char *pBuffer, unsigned int iBufferSize); long long SeekLiveStream(long long iPosition, int iWhence); long long LengthLiveStream(); - PVR_ERROR SignalStatus(PVR_SIGNAL_STATUS &signalStatus); + PVR_ERROR GetSignalStatus(PVR_SIGNAL_STATUS *signalStatus); bool IsRealTimeStream() const { return m_liveStream ? true : false; } PVR_ERROR GetStreamTimes(PVR_STREAM_TIMES *pStreamTimes); From 1f0e588f9b92cd8bd99be059edd8ddbb7922cddf Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Wed, 29 Apr 2020 16:57:54 +0200 Subject: [PATCH 4/4] increase version to 6.4.3 --- pvr.mythtv/addon.xml.in | 2 +- pvr.mythtv/changelog.txt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pvr.mythtv/addon.xml.in b/pvr.mythtv/addon.xml.in index b5f2094c..88a69e6c 100644 --- a/pvr.mythtv/addon.xml.in +++ b/pvr.mythtv/addon.xml.in @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ diff --git a/pvr.mythtv/changelog.txt b/pvr.mythtv/changelog.txt index 06a99d0b..86063018 100644 --- a/pvr.mythtv/changelog.txt +++ b/pvr.mythtv/changelog.txt @@ -1,3 +1,6 @@ +v6.4.3 +- Update PVR API 6.5.0 + v6.4.2 - Update PVR API 6.4.0