diff -Nru kodi-pvr-njoy-1.11.9/CMakeLists.txt kodi-pvr-njoy-2.4.2/CMakeLists.txt --- kodi-pvr-njoy-1.11.9/CMakeLists.txt 2016-01-10 21:41:24.000000000 +0000 +++ kodi-pvr-njoy-2.4.2/CMakeLists.txt 2016-12-11 22:08:38.000000000 +0000 @@ -9,12 +9,12 @@ option(PACKAGE_ZIP "Package Zip file?" OFF) find_package(TinyXML REQUIRED) -find_package(kodi REQUIRED) +find_package(Kodi REQUIRED) find_package(kodiplatform REQUIRED) -find_package(platform REQUIRED) +find_package(p8-platform REQUIRED) include_directories(${kodiplatform_INCLUDE_DIRS} - ${platform_INCLUDE_DIRS} + ${p8-platform_INCLUDE_DIRS} ${TINYXML_INCLUDE_DIR} ${KODI_INCLUDE_DIR}) @@ -22,7 +22,7 @@ src/N7Xml.cpp) set(DEPLIBS ${kodiplatform_LIBRARIES} - ${platform_LIBRARIES} + ${p8-platform_LIBRARIES} ${TINYXML_LIBRARIES}) build_addon(pvr.njoy NJOY DEPLIBS) diff -Nru kodi-pvr-njoy-1.11.9/debian/changelog kodi-pvr-njoy-2.4.2/debian/changelog --- kodi-pvr-njoy-1.11.9/debian/changelog 2016-01-21 07:58:01.000000000 +0000 +++ kodi-pvr-njoy-2.4.2/debian/changelog 2017-01-19 16:50:57.000000000 +0000 @@ -1,19 +1,22 @@ -kodi-pvr-njoy (1.11.9-1~trusty) trusty; urgency=low +kodi-pvr-njoy (2.4.2-3~trusty) trusty; urgency=low [ kodi ] * autogenerated dummy changelog [ wsnipex ] - * 1.11.9 - Updated Language files from Transifex 1.11.8 - Updated - Language files from Transifex 1.11.7 - Updated Language files from - Transifex 1.11.6 - Updated to PVR API v4.1.0 1.11.5 - Updated to PVR - API v4.0.0 1.11.4 - Updated to PVR API v3.0.0 (API 1.9.7 - compatibility mode) 1.11.3 - Updated to PVR API v2.1.0 - - Automatically fill in platform and library name 1.11.2 - Debian - packaging: fix library install path - Miscellaneous backend fixes - 1.11.1 - Updated to API 2.0.0 1.11.0 - Updated to API 1.9.7 1.10.5 - - Updated Language files from Transifex v1.10.4 - Updated to use new - libplatform-dev 1.10.3 - Updated to API 1.9.6 1.10.2 - Updated to - API 1.9.5 + * 2.4.0 - Cmake: rename find_package kodi to Kodi 2.3.1 - Fix includes + 2.3.0 - Updated to PVR addon API v5.2.0 2.2.0 - Updated to PVR addon + API v5.1.0 2.1.0 - Updated to PVR addon API v5.0.0 2.0.0 - Initial + Kodi Krypton version. 1.11.9 - Updated Language files from Transifex + 1.11.8 - Updated Language files from Transifex 1.11.7 - Updated + Language files from Transifex 1.11.6 - Updated to PVR API v4.1.0 + 1.11.5 - Updated to PVR API v4.0.0 1.11.4 - Updated to PVR API + v3.0.0 (API 1.9.7 compatibility mode) 1.11.3 - Updated to PVR API + v2.1.0 - Automatically fill in platform and library name 1.11.2 - + Debian packaging: fix library install path - Miscellaneous backend + fixes 1.11.1 - Updated to API 2.0.0 1.11.0 - Updated to API 1.9.7 + 1.10.5 - Updated Language files from Transifex v1.10.4 - Updated to + use new libplatform-dev 1.10.3 - Updated to API 1.9.6 1.10.2 - + Updated to API 1.9.5 - -- wsnipex Thu, 21 Jan 2016 08:58:01 +0100 + -- wsnipex Thu, 19 Jan 2017 17:50:57 +0100 diff -Nru kodi-pvr-njoy-1.11.9/debian/changelog.tmp kodi-pvr-njoy-2.4.2/debian/changelog.tmp --- kodi-pvr-njoy-1.11.9/debian/changelog.tmp 2016-01-21 07:57:25.000000000 +0000 +++ kodi-pvr-njoy-2.4.2/debian/changelog.tmp 2017-01-19 16:50:01.000000000 +0000 @@ -1,4 +1,4 @@ -kodi-pvr-njoy (1.11.9-1~#DIST#) #DIST#; urgency=low +kodi-pvr-njoy (2.4.2-3~#DIST#) #DIST#; urgency=low [ kodi ] * autogenerated dummy changelog diff -Nru kodi-pvr-njoy-1.11.9/debian/kodi-pvr-njoy.install kodi-pvr-njoy-2.4.2/debian/kodi-pvr-njoy.install --- kodi-pvr-njoy-1.11.9/debian/kodi-pvr-njoy.install 2016-01-10 21:41:24.000000000 +0000 +++ kodi-pvr-njoy-2.4.2/debian/kodi-pvr-njoy.install 2017-01-19 16:50:01.000000000 +0000 @@ -1,2 +1,2 @@ -usr/lib/*/addons/pvr.njoy/pvr.njoy.so* usr/lib/kodi/addons/pvr.njoy -usr/share/kodi/addons/pvr.njoy +usr/lib +usr/share diff -Nru kodi-pvr-njoy-1.11.9/pvr.njoy/addon.xml.in kodi-pvr-njoy-2.4.2/pvr.njoy/addon.xml.in --- kodi-pvr-njoy-1.11.9/pvr.njoy/addon.xml.in 2016-01-10 21:41:24.000000000 +0000 +++ kodi-pvr-njoy-2.4.2/pvr.njoy/addon.xml.in 2016-12-11 22:08:38.000000000 +0000 @@ -1,12 +1,12 @@ - + Cliente PVR Njoy N7 Cliente Njoy N7 PVR Njoy N7 PVR klient - Njoy N7:n PVR-asiakas + Kodin Njoy N7 -asiakasohjelma Client de numériscope Njoy N7 Client enregistreur vidéo (PVR) Njoy N7 Cliente PVR de Njoy N7 @@ -60,6 +60,7 @@ Njoy N7 PVR Клијент Njoy N7 PVR Klijent Njoy N7 PVR Klient + Klijynt Njoy N7 PVR Муштарии Njoy N7 PVR Njoy N7 PVR Client Njoy N7 PVR İstemcisi diff -Nru kodi-pvr-njoy-1.11.9/pvr.njoy/changelog.txt kodi-pvr-njoy-2.4.2/pvr.njoy/changelog.txt --- kodi-pvr-njoy-1.11.9/pvr.njoy/changelog.txt 2016-01-10 21:41:24.000000000 +0000 +++ kodi-pvr-njoy-2.4.2/pvr.njoy/changelog.txt 2016-12-11 22:08:38.000000000 +0000 @@ -1,3 +1,21 @@ +2.4.0 +- Cmake: rename find_package kodi to Kodi + +2.3.1 +- Fix includes + +2.3.0 +- Updated to PVR addon API v5.2.0 + +2.2.0 +- Updated to PVR addon API v5.1.0 + +2.1.0 +- Updated to PVR addon API v5.0.0 + +2.0.0 +- Initial Kodi Krypton version. + 1.11.9 - Updated Language files from Transifex diff -Nru kodi-pvr-njoy-1.11.9/pvr.njoy/resources/language/resource.language.szl/strings.po kodi-pvr-njoy-2.4.2/pvr.njoy/resources/language/resource.language.szl/strings.po --- kodi-pvr-njoy-1.11.9/pvr.njoy/resources/language/resource.language.szl/strings.po 1970-01-01 00:00:00.000000000 +0000 +++ kodi-pvr-njoy-2.4.2/pvr.njoy/resources/language/resource.language.szl/strings.po 2016-12-11 22:08:38.000000000 +0000 @@ -0,0 +1,25 @@ +# Kodi Media Center language file +# Addon Name: Njoy N7 PVR Client +# Addon id: pvr.njoy +# Addon Provider: Team Kodi +msgid "" +msgstr "" +"Project-Id-Version: KODI Main\n" +"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Kodi Translation Team\n" +"Language-Team: Silesian (http://www.transifex.com/projects/p/kodi-main/language/szl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: szl\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +msgctxt "#30000" +msgid "N7 IP" +msgstr "IP N7" + +msgctxt "#30001" +msgid "N7 Port" +msgstr "Port N7" diff -Nru kodi-pvr-njoy-1.11.9/pvr.njoy/resources/language/resource.language.zh_tw/strings.po kodi-pvr-njoy-2.4.2/pvr.njoy/resources/language/resource.language.zh_tw/strings.po --- kodi-pvr-njoy-1.11.9/pvr.njoy/resources/language/resource.language.zh_tw/strings.po 2016-01-10 21:41:24.000000000 +0000 +++ kodi-pvr-njoy-2.4.2/pvr.njoy/resources/language/resource.language.zh_tw/strings.po 2016-12-11 22:08:38.000000000 +0000 @@ -22,4 +22,4 @@ msgctxt "#30001" msgid "N7 Port" -msgstr "N7 端口" +msgstr "N7 連接埠" diff -Nru kodi-pvr-njoy-1.11.9/README.md kodi-pvr-njoy-2.4.2/README.md --- kodi-pvr-njoy-1.11.9/README.md 2016-01-10 21:41:24.000000000 +0000 +++ kodi-pvr-njoy-2.4.2/README.md 2016-12-11 22:08:38.000000000 +0000 @@ -1,6 +1,19 @@ +[![Build Status](https://travis-ci.org/kodi-pvr/pvr.njoy.svg?branch=master)](https://travis-ci.org/kodi-pvr/pvr.njoy) +[![Coverity Scan Build Status](https://scan.coverity.com/projects/5120/badge.svg)](https://scan.coverity.com/projects/5120) + # Njoy PVR Njoy N7 PVR client addon for [Kodi] (http://kodi.tv) +## Build instructions + +### Linux + +1. `git clone https://github.com/xbmc/xbmc.git` +2. `git clone https://github.com/kodi-pvr/pvr.njoy.git` +3. `cd pvr.njoy && mkdir build && cd build` +4. `cmake -DADDONS_TO_BUILD=pvr.njoy -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/addons -DPACKAGE_ZIP=1 ../../xbmc/project/cmake/addons` +5. `make` + ##### Useful links * [Kodi's PVR user support] (http://forum.kodi.tv/forumdisplay.php?fid=167) diff -Nru kodi-pvr-njoy-1.11.9/src/client.cpp kodi-pvr-njoy-2.4.2/src/client.cpp --- kodi-pvr-njoy-1.11.9/src/client.cpp 2016-01-10 21:41:24.000000000 +0000 +++ kodi-pvr-njoy-2.4.2/src/client.cpp 2016-12-11 22:08:38.000000000 +0000 @@ -20,10 +20,9 @@ */ #include "client.h" -#include "kodi/xbmc_pvr_dll.h" -#include "kodi/libKODI_guilib.h" +#include "xbmc_pvr_dll.h" #include "N7Xml.h" -#include "platform/util/util.h" +#include "p8-platform/util/util.h" using namespace std; using namespace ADDON; @@ -67,12 +66,12 @@ const char* GetGUIAPIVersion(void) { - return KODI_GUILIB_API_VERSION; + return ""; // GUI API not used } const char* GetMininumGUIAPIVersion(void) { - return KODI_GUILIB_MIN_API_VERSION; + return ""; // GUI API not used } ADDON_STATUS ADDON_Create(void* hdl, void* props) @@ -189,15 +188,26 @@ return; } -void ADDON_Announce(const char *flag, const char *sender, const char *message, const void *data) -{ - return; -} - /*********************************************************** * PVR Client AddOn specific public library functions ***********************************************************/ +void OnSystemSleep() +{ +} + +void OnSystemWake() +{ +} + +void OnPowerSavingActivated() +{ +} + +void OnPowerSavingDeactivated() +{ +} + PVR_ERROR GetAddonCapabilities(PVR_ADDON_CAPABILITIES *pCapabilities) { pCapabilities->bSupportsTV = true; @@ -260,7 +270,6 @@ PVR_ERROR OpenDialogChannelAdd(const PVR_CHANNEL &channel) { return PVR_ERROR_NOT_IMPLEMENTED; } bool OpenLiveStream(const PVR_CHANNEL &channel) { return false; } void CloseLiveStream(void) {} -int GetCurrentClientChannel() { return -1; } bool SwitchChannel(const PVR_CHANNEL &channelinfo) { return false; } PVR_ERROR SignalStatus(PVR_SIGNAL_STATUS &signalStatus) { return PVR_ERROR_NOT_IMPLEMENTED; }bool OpenRecordedStream(const PVR_RECORDING &recording) { return false; } void CloseRecordedStream(void) {} @@ -294,12 +303,14 @@ void PauseStream(bool bPaused) {} bool CanPauseStream(void) { return false; } bool CanSeekStream(void) { return false; } -bool SeekTime(int,bool,double*) { return false; } +bool SeekTime(double,bool,double*) { return false; } void SetSpeed(int) {}; bool IsTimeshifting(void) { return false; } time_t GetPlayingTime() { return 0; } time_t GetBufferTimeStart() { return 0; } time_t GetBufferTimeEnd() { return 0; } +bool IsRealTimeStream() { return true; } PVR_ERROR UndeleteRecording(const PVR_RECORDING& recording) { return PVR_ERROR_NOT_IMPLEMENTED; } PVR_ERROR DeleteAllRecordingsFromTrash() { return PVR_ERROR_NOT_IMPLEMENTED; } +PVR_ERROR SetEPGTimeFrame(int) { return PVR_ERROR_NOT_IMPLEMENTED; } } //end extern "C" diff -Nru kodi-pvr-njoy-1.11.9/src/client.h kodi-pvr-njoy-2.4.2/src/client.h --- kodi-pvr-njoy-1.11.9/src/client.h 2016-01-10 21:41:24.000000000 +0000 +++ kodi-pvr-njoy-2.4.2/src/client.h 2016-12-11 22:08:38.000000000 +0000 @@ -20,9 +20,9 @@ * */ -#include "platform/util/StdString.h" -#include "kodi/libXBMC_addon.h" -#include "kodi/libXBMC_pvr.h" +#include "p8-platform/util/StdString.h" +#include "libXBMC_addon.h" +#include "libXBMC_pvr.h" #define DEFAULT_HOST "127.0.0.1" #define DEFAULT_PORT 80 diff -Nru kodi-pvr-njoy-1.11.9/src/N7Xml.cpp kodi-pvr-njoy-2.4.2/src/N7Xml.cpp --- kodi-pvr-njoy-1.11.9/src/N7Xml.cpp 2016-01-10 21:41:24.000000000 +0000 +++ kodi-pvr-njoy-2.4.2/src/N7Xml.cpp 2016-12-11 22:08:38.000000000 +0000 @@ -2,7 +2,7 @@ #include "N7Xml.h" #include "tinyxml.h" -#include "kodi/util/XMLUtils.h" +#include "util/XMLUtils.h" using namespace ADDON; diff -Nru kodi-pvr-njoy-1.11.9/.travis.yml kodi-pvr-njoy-2.4.2/.travis.yml --- kodi-pvr-njoy-1.11.9/.travis.yml 1970-01-01 00:00:00.000000000 +0000 +++ kodi-pvr-njoy-2.4.2/.travis.yml 2016-12-11 22:08:38.000000000 +0000 @@ -0,0 +1,43 @@ +language: cpp + +# +# Define the build matrix +# +# Travis defaults to building on Ubuntu Precise when building on +# Linux. We need Trusty in order to get up to date versions of +# cmake and g++. +# +matrix: + include: + - os: linux + dist: trusty + sudo: required + compiler: gcc + - os: linux + dist: trusty + sudo: required + compiler: clang + - os: osx + osx_image: xcode7.3 + - 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 + +# +# The addon source is automatically checked out in $TRAVIS_BUILD_DIR, +# we'll put the Kodi source on the same level +# +before_script: + - cd $TRAVIS_BUILD_DIR/.. + - git clone --depth=1 https://github.com/xbmc/xbmc.git + - cd pvr.njoy && mkdir build && cd build + - cmake -DADDONS_TO_BUILD=pvr.njoy -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/project/cmake/addons + +script: make