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

Update to PVR 5.2.0/Kodi 17 

Signed-off-by: Julian Scheel <julian@jusst.de>
This commit is contained in:
Julian Scheel 2016-09-27 16:05:03 +02:00
parent c20c24d0da
commit 20f92c44bc
5 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -5,19 +5,19 @@ cmake_minimum_required(VERSION 2.6)
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}) list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
enable_language(CXX) enable_language(CXX)
find_package(kodi REQUIRED) find_package(Kodi REQUIRED)
find_package(kodiplatform REQUIRED) find_package(kodiplatform REQUIRED)
find_package(platform REQUIRED) find_package(p8-platform REQUIRED)
find_package(JsonCpp REQUIRED) find_package(JsonCpp REQUIRED)
include_directories( include_directories(
${kodiplatform_INCLUDE_DIRS} ${kodiplatform_INCLUDE_DIRS}
${platform_INCLUDE_DIRS} ${p8-platform_INCLUDE_DIRS}
${KODI_INCLUDE_DIR} ${KODI_INCLUDE_DIR}
${JSONCPP_INCLUDE_DIRS}) ${JSONCPP_INCLUDE_DIRS})
set(DEPLIBS set(DEPLIBS
${platform_LIBRARIES} ${p8-platform_LIBRARIES}
${JSONCPP_LIBRARIES}) ${JSONCPP_LIBRARIES})
set(OCTONET_SOURCES set(OCTONET_SOURCES

4
pvr.octonet/addon.xml
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<addon <addon
id="pvr.octonet" id="pvr.octonet"
version="0.2" version="0.3"
name="PVR DigitalDevices Octonet Client" name="PVR DigitalDevices Octonet Client"
provider-name="digitaldevices"> provider-name="digitaldevices">
<requires> <requires>
<c-pluff version="0.1" /> <c-pluff version="0.1" />
<import addon="xbmc.pvr" version="4.1.0" /> <import addon="xbmc.pvr" version="5.2.0" />
</requires> </requires>
<extension <extension
point="xbmc.pvrclient" point="xbmc.pvrclient"

4
src/OctonetData.cpp
View File

@ -26,9 +26,9 @@
#include <json/json.h> #include <json/json.h>
#include "OctonetData.h" #include "OctonetData.h"
#include "platform/util/StringUtils.h" #include "p8-platform/util/StringUtils.h"
#ifndef timegm #ifdef __WINDOWS__
#define timegm _mkgmtime #define timegm _mkgmtime
#endif #endif

6
src/OctonetData.h
View File

@ -24,8 +24,8 @@
#include <vector> #include <vector>
#include "platform/threads/threads.h" #include "p8-platform/threads/threads.h"
#include "platform/util/StdString.h" #include "p8-platform/util/StdString.h"
#include "client.h" #include "client.h"
struct OctonetEpgEntry struct OctonetEpgEntry
@ -56,7 +56,7 @@ struct OctonetGroup
std::vector<int> members; std::vector<int> members;
}; };
class OctonetData : public PLATFORM::CThread class OctonetData : public P8PLATFORM::CThread
{ {
public: public:
OctonetData(void); OctonetData(void);

18
src/client.cpp
View File

@ -23,7 +23,7 @@
#include "client.h" #include "client.h"
#include <kodi/xbmc_pvr_dll.h> #include <kodi/xbmc_pvr_dll.h>
#include <kodi/libXBMC_addon.h> #include <kodi/libXBMC_addon.h>
#include <platform/util/util.h> #include <p8-platform/util/util.h>
#include <kodi/libKODI_guilib.h> #include <kodi/libKODI_guilib.h>
#include "OctonetData.h" #include "OctonetData.h"
@ -172,6 +172,19 @@ const char* GetConnectionString(void)
PVR_ERROR GetDriveSpace(long long* iTotal, long long* iUsed) { return PVR_ERROR_NOT_IMPLEMENTED; } PVR_ERROR GetDriveSpace(long long* iTotal, long long* iUsed) { return PVR_ERROR_NOT_IMPLEMENTED; }
PVR_ERROR CallMenuHook(const PVR_MENUHOOK& menuhook, const PVR_MENUHOOK_DATA &item) { return PVR_ERROR_NOT_IMPLEMENTED; } PVR_ERROR CallMenuHook(const PVR_MENUHOOK& menuhook, const PVR_MENUHOOK_DATA &item) { return PVR_ERROR_NOT_IMPLEMENTED; }
void OnSystemSleep() {
kodi->Log(LOG_INFO, "Received event: %s", __FUNCTION__);
// FIXME: Disconnect?
}
void OnSystemWake() {
kodi->Log(LOG_INFO, "Received event: %s", __FUNCTION__);
// FIXME:Reconnect?
}
void OnPowerSavingActivated() {}
void OnPowerSavingDeactivated() {}
/* EPG */ /* EPG */
PVR_ERROR GetEPGForChannel(ADDON_HANDLE handle, const PVR_CHANNEL& channel, time_t iStart, time_t iEnd) PVR_ERROR GetEPGForChannel(ADDON_HANDLE handle, const PVR_CHANNEL& channel, time_t iStart, time_t iEnd)
{ {
@ -240,7 +253,7 @@ int ReadLiveStream(unsigned char* pBuffer, unsigned int iBufferSize) { return -1
long long SeekLiveStream(long long iPosition, int iWhence) { return -1; } long long SeekLiveStream(long long iPosition, int iWhence) { return -1; }
long long PositionLiveStream(void) { return -1; } long long PositionLiveStream(void) { return -1; }
long long LengthLiveStream(void) { return -1; } long long LengthLiveStream(void) { return -1; }
int GetCurrentClientChannel(void) { return -1; } bool IsRealTimeStream(void) { return true; }
bool SwitchChannel(const PVR_CHANNEL& channel) { return false; } bool SwitchChannel(const PVR_CHANNEL& channel) { return false; }
PVR_ERROR SignalStatus(PVR_SIGNAL_STATUS& signalStatus) { return PVR_ERROR_NOT_IMPLEMENTED; } PVR_ERROR SignalStatus(PVR_SIGNAL_STATUS& signalStatus) { return PVR_ERROR_NOT_IMPLEMENTED; }
const char* GetLiveStreamURL(const PVR_CHANNEL& channel) { return NULL; } const char* GetLiveStreamURL(const PVR_CHANNEL& channel) { return NULL; }
@ -271,6 +284,7 @@ bool CanSeekStream() { return false; }
void PauseStream(bool bPaused) {} void PauseStream(bool bPaused) {}
bool SeekTime(int time, bool backwards, double *startpts) { return false; } bool SeekTime(int time, bool backwards, double *startpts) { return false; }
void SetSpeed(int speed) {} void SetSpeed(int speed) {}
PVR_ERROR SetEPGTimeFrame(int) { return PVR_ERROR_NOT_IMPLEMENTED; }
time_t GetPlayingTime() { return 0; } time_t GetPlayingTime() { return 0; }
time_t GetBufferTimeStart() { return 0; } time_t GetBufferTimeStart() { return 0; }