diff -Nru kodi-pvr-filmon-2.4.4/azure-pipelines.yml kodi-pvr-filmon-2.4.6/azure-pipelines.yml --- kodi-pvr-filmon-2.4.4/azure-pipelines.yml 1970-01-01 00:00:00.000000000 +0000 +++ kodi-pvr-filmon-2.4.6/azure-pipelines.yml 2013-05-31 22:59:22.000000000 +0000 @@ -0,0 +1,65 @@ +variables: + app_id: 'pvr.filmon' + +trigger: + branches: + include: + - Leia + - releases/* + paths: + include: + - '*' + exclude: + - 'debian/*' + +jobs: + - job: Windows + + pool: + vmImage: 'VS2017-Win2016' + + strategy: + matrix: + Win32: + GENERATOR: "Visual Studio 15 2017" + ARCHITECTURE: Win32 + CONFIGURATION: Release + Win64: + GENERATOR: "Visual Studio 15 2017" + ARCHITECTURE: x64 + CONFIGURATION: Release + Win64-UWP: + GENERATOR: "Visual Studio 15 2017" + ARCHITECTURE: x64 + CONFIGURATION: Release + WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.16299.0" + ARM64-UWP: + GENERATOR: "Visual Studio 15 2017" + ARCHITECTURE: ARM64 + CONFIGURATION: Release + WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.16299.0" + + workspace: + clean: all + + steps: + + - script: | + cd .. + git clone --branch Leia --depth=1 https://github.com/xbmc/xbmc.git kodi + cd $(Build.SourcesDirectory) + mkdir build + cd build + mkdir "definition/$(app_id)" + echo $(app_id) . . > definition/$(app_id)/$(app_id).txt + mklink /J "$(Pipeline.Workspace)/$(app_id)" "$(Build.SourcesDirectory)" + + - task: CMake@1 + inputs: + workingDirectory: 'build' + cmakeArgs: '-T host=x64 -G "$(GENERATOR)" -A $(ARCHITECTURE) $(WINSTORE) -DADDONS_TO_BUILD=$(app_id) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DADDONS_DEFINITION_DIR=$(Pipeline.Workspace)/$(app_id)/build/definition -DADDON_SRC_PREFIX=../.. -DCMAKE_INSTALL_PREFIX=../../kodi/addons -DPACKAGE_ZIP=1 ../../kodi/cmake/addons' + + - task: CMake@1 + inputs: + workingDirectory: 'build' + cmakeArgs: '--build . --config $(CONFIGURATION) --target $(app_id)' diff -Nru kodi-pvr-filmon-2.4.4/CMakeLists.txt kodi-pvr-filmon-2.4.6/CMakeLists.txt --- kodi-pvr-filmon-2.4.4/CMakeLists.txt 2018-11-10 20:30:11.000000000 +0000 +++ kodi-pvr-filmon-2.4.6/CMakeLists.txt 2013-05-31 22:59:22.000000000 +0000 @@ -1,11 +1,8 @@ +cmake_minimum_required(VERSION 3.5) project(pvr.filmon) -cmake_minimum_required(VERSION 2.6) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}) -enable_language(CXX) - find_package(Kodi REQUIRED) find_package(kodiplatform REQUIRED) find_package(p8-platform REQUIRED) @@ -14,7 +11,7 @@ include_directories(${kodiplatform_INCLUDE_DIRS} ${p8-platform_INCLUDE_DIRS} ${JSONCPP_INCLUDE_DIRS} - ${KODI_INCLUDE_DIR}) + ${KODI_INCLUDE_DIR}/..) # Hack way with "/..", need bigger Kodi cmake rework to match right include ways set(DEPLIBS ${p8-platform_LIBRARIES} ${JSONCPP_LIBRARIES}) @@ -28,6 +25,10 @@ src/md5.h src/PVRFilmonData.h) +if(WIN32) + add_compile_options(/wd4996) +endif() + build_addon(pvr.filmon FILMON DEPLIBS) include(CPack) diff -Nru kodi-pvr-filmon-2.4.4/debian/changelog kodi-pvr-filmon-2.4.6/debian/changelog --- kodi-pvr-filmon-2.4.4/debian/changelog 2018-12-24 10:01:14.000000000 +0000 +++ kodi-pvr-filmon-2.4.6/debian/changelog 2013-05-31 22:59:22.000000000 +0000 @@ -1,4 +1,4 @@ -kodi-pvr-filmon (2.4.4-1~bionic) bionic; urgency=low +kodi-pvr-filmon (2.4.6-1~bionic) bionic; urgency=low [ kodi ] * autogenerated dummy changelog diff -Nru kodi-pvr-filmon-2.4.4/depends/common/jsoncpp/CMakeLists.txt kodi-pvr-filmon-2.4.6/depends/common/jsoncpp/CMakeLists.txt --- kodi-pvr-filmon-2.4.4/depends/common/jsoncpp/CMakeLists.txt 2018-11-10 20:30:11.000000000 +0000 +++ kodi-pvr-filmon-2.4.6/depends/common/jsoncpp/CMakeLists.txt 2013-05-31 22:59:22.000000000 +0000 @@ -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) @@ -12,6 +11,10 @@ include_directories(${PROJECT_SOURCE_DIR}/include) +if(WIN32) + add_compile_options(/wd4996) +endif() + add_library(jsoncpp ${SOURCES}) install(TARGETS jsoncpp DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) diff -Nru kodi-pvr-filmon-2.4.4/FindJsonCpp.cmake kodi-pvr-filmon-2.4.6/FindJsonCpp.cmake --- kodi-pvr-filmon-2.4.4/FindJsonCpp.cmake 2018-11-10 20:30:11.000000000 +0000 +++ kodi-pvr-filmon-2.4.6/FindJsonCpp.cmake 2013-05-31 22:59:22.000000000 +0000 @@ -1,15 +1,15 @@ find_package(PkgConfig) if(PKG_CONFIG_FOUND) - pkg_check_modules (JSONCPP jsoncpp) + pkg_check_modules(PC_JSONCPP jsoncpp) endif() -if(NOT JSONCPP_FOUND) - find_path(JSONCPP_INCLUDE_DIRS json/json.h - PATH_SUFFIXES jsoncpp) - find_library(JSONCPP_LIBRARIES jsoncpp) -endif() +find_path(JSONCPP_INCLUDE_DIRS json/json.h + PATHS ${PC_JSONCPP_INCLUDEDIR} + PATH_SUFFIXES jsoncpp) +find_library(JSONCPP_LIBRARIES jsoncpp + PATHS ${PC_JSONCPP_LIBDIR}) include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(JsonCpp DEFAULT_MSG JSONCPP_LIBRARIES JSONCPP_INCLUDE_DIRS) +find_package_handle_standard_args(JsonCpp REQUIRED_VARS JSONCPP_LIBRARIES JSONCPP_INCLUDE_DIRS) mark_as_advanced(JSONCPP_INCLUDE_DIRS JSONCPP_LIBRARIES) diff -Nru kodi-pvr-filmon-2.4.4/Jenkinsfile kodi-pvr-filmon-2.4.6/Jenkinsfile --- kodi-pvr-filmon-2.4.4/Jenkinsfile 2018-11-10 20:30:11.000000000 +0000 +++ kodi-pvr-filmon-2.4.6/Jenkinsfile 2013-05-31 22:59:22.000000000 +0000 @@ -1 +1 @@ -buildPlugin() +buildPlugin(version: "Leia") diff -Nru kodi-pvr-filmon-2.4.4/pvr.filmon/addon.xml.in kodi-pvr-filmon-2.4.6/pvr.filmon/addon.xml.in --- kodi-pvr-filmon-2.4.4/pvr.filmon/addon.xml.in 2018-11-22 22:04:43.000000000 +0000 +++ kodi-pvr-filmon-2.4.6/pvr.filmon/addon.xml.in 2013-05-31 22:59:22.000000000 +0000 @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ diff -Nru kodi-pvr-filmon-2.4.4/pvr.filmon/changelog.txt kodi-pvr-filmon-2.4.6/pvr.filmon/changelog.txt --- kodi-pvr-filmon-2.4.4/pvr.filmon/changelog.txt 2018-11-10 20:30:11.000000000 +0000 +++ kodi-pvr-filmon-2.4.6/pvr.filmon/changelog.txt 2013-05-31 22:59:22.000000000 +0000 @@ -1,3 +1,20 @@ +2.4.6: +- Fully implement IsRealTimeStream() + +2.4.5 +Update build system version and cleanup +Fix package check for JsonCpp +Added AppVeyor for Windows related build tests + +2.4.4 +Updated Language files from Transifex + +2.4.3 +Updated Language files from Transifex + +2.4.2 +Updated Language files from Transifex + 2.4.1 Update to PVR addon API v5.10.1 diff -Nru kodi-pvr-filmon-2.4.4/README.md kodi-pvr-filmon-2.4.6/README.md --- kodi-pvr-filmon-2.4.4/README.md 2018-11-10 20:30:11.000000000 +0000 +++ kodi-pvr-filmon-2.4.6/README.md 2013-05-31 22:59:22.000000000 +0000 @@ -1,14 +1,15 @@ -[![Build Status](https://travis-ci.org/kodi-pvr/pvr.filmon.svg?branch=master)](https://travis-ci.org/kodi-pvr/pvr.filmon) +[![Build Status](https://travis-ci.org/kodi-pvr/pvr.filmon.svg?branch=Leia)](https://travis-ci.org/kodi-pvr/pvr.filmon/branches) +[![Build Status](https://dev.azure.com/teamkodi/kodi-pvr/_apis/build/status/kodi-pvr.pvr.filmon?branchName=Leia)](https://dev.azure.com/teamkodi/kodi-pvr/_build/latest?definitionId=60&branchName=Leia) [![Coverity Scan Build Status](https://scan.coverity.com/projects/5120/badge.svg)](https://scan.coverity.com/projects/5120) # Filmon PVR -Filmon PVR client addon for [Kodi] (http://kodi.tv) +Filmon PVR client addon for [Kodi] (https://kodi.tv) ## Build instructions ### Linux -1. `git clone https://github.com/xbmc/xbmc.git` +1. `git clone --branch Leia https://github.com/xbmc/xbmc.git` 2. `git clone https://github.com/kodi-pvr/pvr.filmon.git` 3. `cd pvr.filmon && mkdir build && cd build` 4. `cmake -DADDONS_TO_BUILD=pvr.filmon -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons` @@ -16,5 +17,5 @@ ##### Useful links -* [Kodi's PVR user support] (http://forum.kodi.tv/forumdisplay.php?fid=167) -* [Kodi's PVR development support] (http://forum.kodi.tv/forumdisplay.php?fid=136) +* [Kodi's PVR user support] (https://forum.kodi.tv/forumdisplay.php?fid=167) +* [Kodi's PVR development support] (https://forum.kodi.tv/forumdisplay.php?fid=136) diff -Nru kodi-pvr-filmon-2.4.4/src/client.cpp kodi-pvr-filmon-2.4.6/src/client.cpp --- kodi-pvr-filmon-2.4.4/src/client.cpp 2018-11-10 20:30:11.000000000 +0000 +++ kodi-pvr-filmon-2.4.6/src/client.cpp 2013-05-31 22:59:22.000000000 +0000 @@ -24,7 +24,7 @@ #include "p8-platform/util/util.h" #include "PVRFilmonData.h" -#include "xbmc_pvr_dll.h" +#include "kodi/xbmc_pvr_dll.h" using namespace std; using namespace ADDON; @@ -38,6 +38,7 @@ PVRFilmonData *m_data = NULL; bool m_bIsPlaying = false; PVRFilmonChannel m_currentChannel; +bool m_bRecordingPlayback = false; /* User adjustable settings are saved here. * Default values are defined inside client.h @@ -352,6 +353,8 @@ if (!m_data) return PVR_ERROR_SERVER_ERROR; + m_bRecordingPlayback = false; + return m_data->GetChannelStreamProperties(channel, properties, iPropertiesCount); } @@ -359,6 +362,8 @@ if (!m_data) return PVR_ERROR_SERVER_ERROR; + m_bRecordingPlayback = true; + return m_data->GetRecordingStreamProperties(recording, properties, iPropertiesCount); } @@ -463,8 +468,8 @@ } void SetSpeed(int) { } -bool IsRealTimeStream() { - return true; +bool IsRealTimeStream() { + return !m_bRecordingPlayback; } PVR_ERROR UndeleteRecording(const PVR_RECORDING& recording) { return PVR_ERROR_NOT_IMPLEMENTED; diff -Nru kodi-pvr-filmon-2.4.4/src/client.h kodi-pvr-filmon-2.4.6/src/client.h --- kodi-pvr-filmon-2.4.4/src/client.h 2018-11-10 20:30:11.000000000 +0000 +++ kodi-pvr-filmon-2.4.6/src/client.h 2013-05-31 22:59:22.000000000 +0000 @@ -20,8 +20,8 @@ * */ -#include "libXBMC_addon.h" -#include "libXBMC_pvr.h" +#include "kodi/libXBMC_addon.h" +#include "kodi/libXBMC_pvr.h" extern bool m_bCreated; extern std::string g_strUserPath; diff -Nru kodi-pvr-filmon-2.4.4/src/PVRFilmonData.h kodi-pvr-filmon-2.4.6/src/PVRFilmonData.h --- kodi-pvr-filmon-2.4.4/src/PVRFilmonData.h 2018-11-10 20:30:11.000000000 +0000 +++ kodi-pvr-filmon-2.4.6/src/PVRFilmonData.h 2013-05-31 22:59:22.000000000 +0000 @@ -24,7 +24,7 @@ #include #include "p8-platform/threads/mutex.h" #include "client.h" -#include "libXBMC_pvr.h" +#include "kodi/libXBMC_pvr.h" #include "FilmonAPI.h" #define FILMON_CACHE_TIME 10800 // 3 hours diff -Nru kodi-pvr-filmon-2.4.4/.travis.yml kodi-pvr-filmon-2.4.6/.travis.yml --- kodi-pvr-filmon-2.4.4/.travis.yml 2018-11-10 20:30:11.000000000 +0000 +++ kodi-pvr-filmon-2.4.6/.travis.yml 2013-05-31 22:59:22.000000000 +0000 @@ -32,7 +32,7 @@ # before_script: - cd $TRAVIS_BUILD_DIR/.. - - git clone --depth=1 https://github.com/xbmc/xbmc.git + - 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