frodovdr
/
pvr.octonet
mirror of https://github.com/DigitalDevices/pvr.octonet.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #41 from AlwinEsch/Matrix-change 

[Matrix] API change updates
This commit is contained in:
Kai Sommerfeld 2020-04-30 23:15:16 +02:00 committed by GitHub
parent 3f04265d51 5f9342abdd
commit b01e24b0a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pvr.octonet/addon.xml.in
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<addon <addon
id="pvr.octonet" id="pvr.octonet"
version="1.2.5" version="1.2.6"
name="Digital Devices Octopus NET Client" name="Digital Devices Octopus NET Client"
provider-name="digitaldevices"> provider-name="digitaldevices">
<requires>@ADDON_DEPENDS@</requires> <requires>@ADDON_DEPENDS@</requires>

11
src/client.cpp
View File

@ -12,7 +12,6 @@
#include <kodi/xbmc_pvr_dll.h> #include <kodi/xbmc_pvr_dll.h>
#include <kodi/libXBMC_addon.h> #include <kodi/libXBMC_addon.h>
#include <p8-platform/util/util.h> #include <p8-platform/util/util.h>
#include <kodi/libKODI_guilib.h>
#include "OctonetData.h" #include "OctonetData.h"
#include "rtsp_client.hpp" #include "rtsp_client.hpp"
@ -46,7 +45,7 @@ ADDON_STATUS ADDON_Create(void *callbacks, void* props)
if (callbacks == NULL || props == NULL) if (callbacks == NULL || props == NULL)
return ADDON_STATUS_UNKNOWN; return ADDON_STATUS_UNKNOWN;
PVR_PROPERTIES *pvrprops = (PVR_PROPERTIES*)props; AddonProperties_PVR *pvrprops = (AddonProperties_PVR*)props;
libKodi = new CHelper_libXBMC_addon; libKodi = new CHelper_libXBMC_addon;
if (!libKodi->RegisterMe(callbacks)) { if (!libKodi->RegisterMe(callbacks)) {
libKodi->Log(LOG_ERROR, "%s: Failed to register octonet addon", __func__); libKodi->Log(LOG_ERROR, "%s: Failed to register octonet addon", __func__);
@ -98,7 +97,7 @@ ADDON_STATUS ADDON_SetSetting(const char *settingName, const void *settingValue)
extern "C" extern "C"
{ {
PVR_ERROR GetAddonCapabilities(PVR_ADDON_CAPABILITIES *pCapabilities) PVR_ERROR GetCapabilities(PVR_ADDON_CAPABILITIES *pCapabilities)
{ {
pCapabilities->bSupportsTV = true; pCapabilities->bSupportsTV = true;
pCapabilities->bSupportsRadio = true; pCapabilities->bSupportsRadio = true;
@ -232,15 +231,15 @@ long long SeekLiveStream(long long iPosition, int iWhence) { return -1; }
long long LengthLiveStream(void) { return -1; } long long LengthLiveStream(void) { return -1; }
bool IsRealTimeStream(void) { return true; } bool IsRealTimeStream(void) { return true; }
PVR_ERROR SignalStatus(PVR_SIGNAL_STATUS& signalStatus) { PVR_ERROR GetSignalStatus(int channelUid, PVR_SIGNAL_STATUS* signalStatus) {
memset(&signalStatus, 0, sizeof(PVR_SIGNAL_STATUS)); memset(signalStatus, 0, sizeof(PVR_SIGNAL_STATUS));
rtsp_fill_signal_status(signalStatus); rtsp_fill_signal_status(signalStatus);
return PVR_ERROR_NO_ERROR; return PVR_ERROR_NO_ERROR;
} }
PVR_ERROR GetStreamTimes(PVR_STREAM_TIMES *times) { return PVR_ERROR_NOT_IMPLEMENTED; } 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 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 */ /* Recording stream handling */
bool OpenRecordedStream(const PVR_RECORDING& recording) { return false; } bool OpenRecordedStream(const PVR_RECORDING& recording) { return false; }

8
src/rtsp_client.cpp
View File

@ -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) { if(rtsp) {
strncpy(signal_status.strServiceName, rtsp->name.c_str(), PVR_ADDON_NAME_STRING_LENGTH - 1); strncpy(signal_status->strServiceName, rtsp->name.c_str(), PVR_ADDON_NAME_STRING_LENGTH - 1);
signal_status.iSNR = 0x1111 * rtsp->quality; signal_status->iSNR = 0x1111 * rtsp->quality;
signal_status.iSignal = 0x101 * rtsp->level; signal_status->iSignal = 0x101 * rtsp->level;
} }
} }

2
src/rtsp_client.hpp
View File

@ -7,6 +7,6 @@
bool rtsp_open(const std::string& name, const std::string& url_str); bool rtsp_open(const std::string& name, const std::string& url_str);
void rtsp_close(); void rtsp_close();
int rtsp_read(void *buf, unsigned buf_size); 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 #endif