diff --git a/CMakeLists.txt b/CMakeLists.txt index 8796b7a..2075856 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,19 +5,19 @@ cmake_minimum_required(VERSION 2.6) list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}) enable_language(CXX) -find_package(kodi REQUIRED) +find_package(Kodi REQUIRED) find_package(kodiplatform REQUIRED) -find_package(platform REQUIRED) +find_package(p8-platform REQUIRED) find_package(JsonCpp REQUIRED) include_directories( ${kodiplatform_INCLUDE_DIRS} - ${platform_INCLUDE_DIRS} + ${p8-platform_INCLUDE_DIRS} ${KODI_INCLUDE_DIR} ${JSONCPP_INCLUDE_DIRS}) set(DEPLIBS - ${platform_LIBRARIES} + ${p8-platform_LIBRARIES} ${JSONCPP_LIBRARIES}) set(OCTONET_SOURCES diff --git a/pvr.octonet/addon.xml b/pvr.octonet/addon.xml index 2bb7848..b3ee46c 100644 --- a/pvr.octonet/addon.xml +++ b/pvr.octonet/addon.xml @@ -1,12 +1,12 @@ - + #include "OctonetData.h" -#include "platform/util/StringUtils.h" +#include "p8-platform/util/StringUtils.h" -#ifndef timegm +#ifdef __WINDOWS__ #define timegm _mkgmtime #endif diff --git a/src/OctonetData.h b/src/OctonetData.h index e457696..471c277 100644 --- a/src/OctonetData.h +++ b/src/OctonetData.h @@ -24,8 +24,8 @@ #include -#include "platform/threads/threads.h" -#include "platform/util/StdString.h" +#include "p8-platform/threads/threads.h" +#include "p8-platform/util/StdString.h" #include "client.h" struct OctonetEpgEntry @@ -56,7 +56,7 @@ struct OctonetGroup std::vector members; }; -class OctonetData : public PLATFORM::CThread +class OctonetData : public P8PLATFORM::CThread { public: OctonetData(void); diff --git a/src/client.cpp b/src/client.cpp index 0511e32..d5f006b 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -23,7 +23,7 @@ #include "client.h" #include #include -#include +#include #include #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 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 */ 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 PositionLiveStream(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; } PVR_ERROR SignalStatus(PVR_SIGNAL_STATUS& signalStatus) { return PVR_ERROR_NOT_IMPLEMENTED; } const char* GetLiveStreamURL(const PVR_CHANNEL& channel) { return NULL; } @@ -271,6 +284,7 @@ bool CanSeekStream() { return false; } void PauseStream(bool bPaused) {} bool SeekTime(int time, bool backwards, double *startpts) { return false; } void SetSpeed(int speed) {} +PVR_ERROR SetEPGTimeFrame(int) { return PVR_ERROR_NOT_IMPLEMENTED; } time_t GetPlayingTime() { return 0; } time_t GetBufferTimeStart() { return 0; }