Merge pull request #32 from AlwinEsch/Leia-change

[Leia] update CMakeLists.txt to 3.5 and change include way

.travis.yml

@@ -7,28 +7,24 @@ language: cpp
 # Linux. We need Trusty in order to get up to date versions of
 # cmake and g++.
 #
+env:
+  global:
+    - app_id=pvr.octonet
+
 matrix:
   include:
     - os: linux
-      dist: trusty
+      dist: xenial
       sudo: required
       compiler: gcc
     - os: linux
-      dist: trusty
+      dist: xenial
       sudo: required
       compiler: clang
     - os: osx
-      osx_image: xcode7.3
+      osx_image: xcode9
     - os: osx
-      osx_image: xcode6.1
-
-#
-# Some of the OS X images don't have cmake, contrary to what people
-# on the Internet say
-#
-before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then which cmake || brew update        ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then which cmake || brew install cmake ; fi
+      osx_image: xcode9.4
 
 #
 # The addon source is automatically checked out in $TRAVIS_BUILD_DIR,
@@ -36,10 +32,10 @@ before_install:
 #
 before_script:
   - cd $TRAVIS_BUILD_DIR/..
-  - git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git
-  - mkdir -p xbmc/cmake/addons/addons/pvr.octonet
-  - echo "pvr.octonet https://github.com/DigitalDevices/pvr.octonet master" > xbmc/cmake/addons/addons/pvr.octonet/pvr.octonet.txt
-  - cd $TRAVIS_BUILD_DIR && mkdir build && cd build
-  - cmake -DADDONS_TO_BUILD=pvr.octonet -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/cmake/addons
+  - git clone --branch Leia --depth=1 https://github.com/xbmc/xbmc.git
+  - cd ${app_id} && mkdir build && cd build
+  - mkdir -p definition/${app_id}
+  - echo ${app_id} $TRAVIS_BUILD_DIR $TRAVIS_COMMIT > definition/${app_id}/${app_id}.txt
+  - cmake -DADDONS_TO_BUILD=${app_id} -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DADDONS_DEFINITION_DIR=$TRAVIS_BUILD_DIR/build/definition -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/cmake/addons
 
 script: make

CMakeLists.txt

@@ -1,17 +1,17 @@
+cmake_minimum_required(VERSION 3.5)
 project(pvr.octonet)
 
-cmake_minimum_required(VERSION 2.6)
-
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
-enable_language(CXX)
 
 find_package(Kodi REQUIRED)
+find_package(kodiplatform REQUIRED)
 find_package(p8-platform REQUIRED)
 find_package(JsonCpp REQUIRED)
 
 include_directories(
+	${kodiplatform_INCLUDE_DIRS}
 	${p8-platform_INCLUDE_DIRS}
-	${KODI_INCLUDE_DIR}
+	${KODI_INCLUDE_DIR}/.. # Hack way with "/..", need bigger Kodi cmake rework to match right include ways
 	${JSONCPP_INCLUDE_DIRS})
 
 set(DEPLIBS

Jenkinsfile

@@ -1 +1 @@
-buildPlugin(version: "Matrix")
+buildPlugin(version: "Leia")

README.md

@@ -20,7 +20,7 @@ $ git clone https://github.com/DigitalDevices/pvr.octonet.git
 Clone the Kodi repository:
 
 ```
-$ git clone --branch master https://github.com/xbmc/xbmc.git
+$ git clone --branch Leia https://github.com/xbmc/xbmc.git
 ```
 
 ```

appveyor.yml

@@ -29,7 +29,7 @@ artifacts:
 build_script:
   - cd ..
   - set ROOT=%cd%
-  - git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git
+  - git clone --branch Leia --depth=1 https://github.com/xbmc/xbmc.git
   - mkdir xbmc\cmake\addons\addons\pvr.octonet
   - echo pvr.octonet https://github.com/DigitalDevices/pvr.octonet master > xbmc\cmake\addons\addons\pvr.octonet\pvr.octonet.txt
   - cd %ADDON%

debian/control

@@ -2,7 +2,7 @@ Source: kodi-pvr-octonet
 Priority: extra
 Maintainer: Julian Scheel <julian@jusst.de>
 Build-Depends: debhelper (>= 9.0.0), cmake, libjsoncpp-dev,
-               libp8-platform-dev, kodi-addon-dev
+               libkodiplatform-dev (>= 16.0.0), kodi-addon-dev
 Standards-Version: 3.9.4
 Section: libs
 Homepage: https://github.com/DigitalDevices/pvr.octonet

depends/common/jsoncpp/CMakeLists.txt

@@ -1,7 +1,6 @@
+cmake_minimum_required(VERSION 3.5)
 project(jsoncpp)
 
-cmake_minimum_required(VERSION 3.1)
-enable_language(CXX)
 SET(CMAKE_CXX_STANDARD 11)
 SET(CMAKE_CXX_STANDARD_REQUIRED ON)
 SET(CMAKE_CXX_EXTENSIONS OFF)

pvr.octonet/addon.xml.in

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

src/OctonetData.cpp

@@ -227,12 +227,12 @@ PVR_ERROR OctonetData::getChannels(ADDON_HANDLE handle, bool bRadio)
 	return PVR_ERROR_NO_ERROR;
 }
 
-PVR_ERROR OctonetData::getEPG(ADDON_HANDLE handle, int iChannelUid, time_t start, time_t end)
+PVR_ERROR OctonetData::getEPG(ADDON_HANDLE handle, const PVR_CHANNEL &channel, time_t start, time_t end)
 {
 	for (unsigned int i = 0; i < channels.size(); i++)
 	{
 		OctonetChannel &chan = channels.at(i);
-		if (iChannelUid != chan.id)
+		if (channel.iUniqueId != chan.id)
 			continue;
 
 		if(chan.epg.empty()) {

src/OctonetData.h

@@ -68,7 +68,7 @@ class OctonetData : public P8PLATFORM::CThread
 		virtual PVR_ERROR getGroups(ADDON_HANDLE handle, bool bRadio);
 		virtual PVR_ERROR getGroupMembers(ADDON_HANDLE handle, const PVR_CHANNEL_GROUP &group);
 
-		virtual PVR_ERROR getEPG(ADDON_HANDLE handle, int iChannelUid, time_t start, time_t end);
+		virtual PVR_ERROR getEPG(ADDON_HANDLE handle, const PVR_CHANNEL &channel, time_t start, time_t end);
 		const std::string& getUrl(int id) const;
 		const std::string& getName(int id) const;
 

src/Socket.cpp

@@ -16,7 +16,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "libXBMC_addon.h"
+#include "kodi/libXBMC_addon.h"
 #include <string>
 #include "p8-platform/os.h"
 #include "client.h"

src/client.cpp

@@ -21,10 +21,10 @@
  */
 
 #include "client.h"
-#include <xbmc_pvr_dll.h>
-#include <libXBMC_addon.h>
+#include <kodi/xbmc_pvr_dll.h>
+#include <kodi/libXBMC_addon.h>
 #include <p8-platform/util/util.h>
-#include <libKODI_guilib.h>
+#include <kodi/libKODI_guilib.h>
 
 #include "OctonetData.h"
 #include "rtsp_client.hpp"
@@ -156,9 +156,9 @@ void OnPowerSavingActivated() {}
 void OnPowerSavingDeactivated() {}
 
 /* EPG */
-PVR_ERROR GetEPGForChannel(ADDON_HANDLE handle, int iChannelUid, time_t iStart, time_t iEnd)
+PVR_ERROR GetEPGForChannel(ADDON_HANDLE handle, const PVR_CHANNEL& channel, time_t iStart, time_t iEnd)
 {
-	return data->getEPG(handle, iChannelUid, iStart, iEnd);
+	return data->getEPG(handle, channel, iStart, iEnd);
 }
 
 PVR_ERROR IsEPGTagRecordable(const EPG_TAG*, bool*) { return PVR_ERROR_NOT_IMPLEMENTED; }
@@ -266,9 +266,9 @@ void DemuxReset(void) {}
 void DemuxAbort(void) {}
 void DemuxFlush(void) {}
 DemuxPacket* DemuxRead(void) { return NULL; }
-void FillBuffer(bool mode) {}
 
 /* Various helper functions */
+bool IsTimeshifting(void) { return false; }
 bool CanPauseStream() { return false; }
 bool CanSeekStream() { return false; }
 

src/client.h

@@ -21,8 +21,8 @@
  *
  */
 
-#include "libXBMC_addon.h"
-#include "libXBMC_pvr.h"
+#include "kodi/libXBMC_addon.h"
+#include "kodi/libXBMC_pvr.h"
 
 #ifndef __func__
 #define __func__ __FUNCTION__

src/rtsp_client.cpp

@@ -5,7 +5,7 @@
 #include "Socket.h"
 #include "client.h"
 #include <p8-platform/util/util.h>
-#include <libXBMC_addon.h>
+#include <kodi/libXBMC_addon.h>
 #include <cstring>
 #include <sstream>
 

src/rtsp_client.hpp

@@ -2,7 +2,7 @@
 #define _RTSP_CLIENT_HPP_
 
 #include <string>
-#include <xbmc_pvr_types.h>
+#include <kodi/xbmc_pvr_types.h>
 
 bool rtsp_open(const std::string& name, const std::string& url_str);
 void rtsp_close();