From 3d47c712fd88feafa7af4600c21159bcb2f5889d Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Mon, 27 Apr 2020 11:16:50 +0200 Subject: [PATCH 1/5] remove not used GUI addon interface include --- src/client.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/client.cpp b/src/client.cpp index aaa93fc..e4a70bc 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -12,7 +12,6 @@ #include #include #include -#include #include "OctonetData.h" #include "rtsp_client.hpp" From ace4891f7818f7bdcb6f8e1fe52bc5ec7d21e2af Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Mon, 27 Apr 2020 17:38:29 +0200 Subject: [PATCH 2/5] [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 e4a70bc..a69f562 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -45,7 +45,7 @@ ADDON_STATUS ADDON_Create(void *callbacks, void* props) if (callbacks == NULL || props == NULL) return ADDON_STATUS_UNKNOWN; - PVR_PROPERTIES *pvrprops = (PVR_PROPERTIES*)props; + AddonProperties_PVR *pvrprops = (AddonProperties_PVR*)props; libKodi = new CHelper_libXBMC_addon; if (!libKodi->RegisterMe(callbacks)) { libKodi->Log(LOG_ERROR, "%s: Failed to register octonet addon", __func__); From 360fb031453d942059d0633540853e93fb920f0b Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Mon, 27 Apr 2020 18:16:06 +0200 Subject: [PATCH 3/5] [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 a69f562..a46961b 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -97,7 +97,7 @@ ADDON_STATUS ADDON_SetSetting(const char *settingName, const void *settingValue) extern "C" { -PVR_ERROR GetAddonCapabilities(PVR_ADDON_CAPABILITIES *pCapabilities) +PVR_ERROR GetCapabilities(PVR_ADDON_CAPABILITIES *pCapabilities) { pCapabilities->bSupportsTV = true; pCapabilities->bSupportsRadio = true; From cc34e523691b548479cf3b9a28921c74d1027ca0 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Wed, 29 Apr 2020 20:47:22 +0200 Subject: [PATCH 4/5] [API related] change SignalStatus and GetDescrambleInfo (channelUid added) --- src/client.cpp | 6 +++--- src/rtsp_client.cpp | 8 ++++---- src/rtsp_client.hpp | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/client.cpp b/src/client.cpp index a46961b..3843772 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -231,15 +231,15 @@ long long SeekLiveStream(long long iPosition, int iWhence) { return -1; } long long LengthLiveStream(void) { return -1; } bool IsRealTimeStream(void) { return true; } -PVR_ERROR SignalStatus(PVR_SIGNAL_STATUS& signalStatus) { - memset(&signalStatus, 0, sizeof(PVR_SIGNAL_STATUS)); +PVR_ERROR GetSignalStatus(int channelUid, PVR_SIGNAL_STATUS* signalStatus) { + memset(signalStatus, 0, sizeof(PVR_SIGNAL_STATUS)); rtsp_fill_signal_status(signalStatus); return PVR_ERROR_NO_ERROR; } PVR_ERROR GetStreamTimes(PVR_STREAM_TIMES *times) { return PVR_ERROR_NOT_IMPLEMENTED; } PVR_ERROR GetStreamProperties(PVR_STREAM_PROPERTIES* pProperties) { 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; } /* Recording stream handling */ bool OpenRecordedStream(const PVR_RECORDING& recording) { return false; } diff --git a/src/rtsp_client.cpp b/src/rtsp_client.cpp index fee28c0..68ad800 100644 --- a/src/rtsp_client.cpp +++ b/src/rtsp_client.cpp @@ -471,10 +471,10 @@ void rtsp_close() } } -void rtsp_fill_signal_status(PVR_SIGNAL_STATUS& signal_status) { +void rtsp_fill_signal_status(PVR_SIGNAL_STATUS* signal_status) { if(rtsp) { - strncpy(signal_status.strServiceName, rtsp->name.c_str(), PVR_ADDON_NAME_STRING_LENGTH - 1); - signal_status.iSNR = 0x1111 * rtsp->quality; - signal_status.iSignal = 0x101 * rtsp->level; + strncpy(signal_status->strServiceName, rtsp->name.c_str(), PVR_ADDON_NAME_STRING_LENGTH - 1); + signal_status->iSNR = 0x1111 * rtsp->quality; + signal_status->iSignal = 0x101 * rtsp->level; } } diff --git a/src/rtsp_client.hpp b/src/rtsp_client.hpp index 9538766..bcd893b 100644 --- a/src/rtsp_client.hpp +++ b/src/rtsp_client.hpp @@ -7,6 +7,6 @@ bool rtsp_open(const std::string& name, const std::string& url_str); void rtsp_close(); int rtsp_read(void *buf, unsigned buf_size); -void rtsp_fill_signal_status(PVR_SIGNAL_STATUS& signal_status); +void rtsp_fill_signal_status(PVR_SIGNAL_STATUS* signal_status); #endif From 5f9342abddd988770146997429b8beb36e5b37b2 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Wed, 29 Apr 2020 20:47:48 +0200 Subject: [PATCH 5/5] increase version to 1.2.6 --- pvr.octonet/addon.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pvr.octonet/addon.xml.in b/pvr.octonet/addon.xml.in index 16f3a4d..bb9c4c3 100644 --- a/pvr.octonet/addon.xml.in +++ b/pvr.octonet/addon.xml.in @@ -1,7 +1,7 @@ @ADDON_DEPENDS@