diff -Nru kodi-pvr-argustv-3.5.4/azure-pipelines.yml kodi-pvr-argustv-3.5.6/azure-pipelines.yml --- kodi-pvr-argustv-3.5.4/azure-pipelines.yml 1970-01-01 00:00:00.000000000 +0000 +++ kodi-pvr-argustv-3.5.6/azure-pipelines.yml 2013-05-31 22:59:22.000000000 +0000 @@ -0,0 +1,65 @@ +variables: + app_id: 'pvr.argustv' + +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-argustv-3.5.4/CMakeLists.txt kodi-pvr-argustv-3.5.6/CMakeLists.txt --- kodi-pvr-argustv-3.5.4/CMakeLists.txt 2018-10-26 07:45:14.000000000 +0000 +++ kodi-pvr-argustv-3.5.6/CMakeLists.txt 2013-05-31 22:59:22.000000000 +0000 @@ -1,24 +1,17 @@ +cmake_minimum_required(VERSION 3.5) project(pvr.argustv) -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) 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 ${PROJECT_SOURCE_DIR}/src) -if(NOT WIN32) - add_options(ALL_LANGUAGES ALL_BUILDS "-fPIC") -endif() - # Source files set(ARGUSTV_SOURCES src/activerecording.cpp src/argustvrpc.cpp @@ -61,6 +54,7 @@ pvr.argustv/resources/settings.xml pvr.argustv/resources/language/resource.language.en_gb/strings.po) source_group("Resource Files" FILES ${RESOURCE_FILES}) +add_compile_options(/wd4996) endif(WIN32) # Make sure that CMake adds the headers to the MSVC project diff -Nru kodi-pvr-argustv-3.5.4/debian/changelog kodi-pvr-argustv-3.5.6/debian/changelog --- kodi-pvr-argustv-3.5.4/debian/changelog 2018-12-24 10:01:01.000000000 +0000 +++ kodi-pvr-argustv-3.5.6/debian/changelog 2013-05-31 22:59:22.000000000 +0000 @@ -1,4 +1,4 @@ -kodi-pvr-argustv (3.5.4-1~xenial) xenial; urgency=low +kodi-pvr-argustv (3.5.6-1~xenial) xenial; urgency=low [ kodi ] * autogenerated dummy changelog diff -Nru kodi-pvr-argustv-3.5.4/depends/common/jsoncpp/CMakeLists.txt kodi-pvr-argustv-3.5.6/depends/common/jsoncpp/CMakeLists.txt --- kodi-pvr-argustv-3.5.4/depends/common/jsoncpp/CMakeLists.txt 2018-10-26 07:45:14.000000000 +0000 +++ kodi-pvr-argustv-3.5.6/depends/common/jsoncpp/CMakeLists.txt 2013-05-31 22:59:22.000000000 +0000 @@ -1,10 +1,9 @@ +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) +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_CXX_EXTENSIONS OFF) set(SOURCES src/lib_json/json_reader.cpp src/lib_json/json_value.cpp @@ -12,7 +11,12 @@ include_directories(${PROJECT_SOURCE_DIR}/include) +if(WIN32) + add_compile_options(/wd4996) +endif() + add_library(jsoncpp ${SOURCES}) +set_property(TARGET jsoncpp PROPERTY POSITION_INDEPENDENT_CODE ON) install(TARGETS jsoncpp DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) install(DIRECTORY include/json DESTINATION ${CMAKE_INSTALL_PREFIX}/include/jsoncpp) diff -Nru kodi-pvr-argustv-3.5.4/FindJsonCpp.cmake kodi-pvr-argustv-3.5.6/FindJsonCpp.cmake --- kodi-pvr-argustv-3.5.4/FindJsonCpp.cmake 2018-10-26 07:45:14.000000000 +0000 +++ kodi-pvr-argustv-3.5.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-argustv-3.5.4/Jenkinsfile kodi-pvr-argustv-3.5.6/Jenkinsfile --- kodi-pvr-argustv-3.5.4/Jenkinsfile 2018-11-21 23:58:08.000000000 +0000 +++ kodi-pvr-argustv-3.5.6/Jenkinsfile 2013-05-31 22:59:22.000000000 +0000 @@ -1 +1 @@ -buildPlugin() +buildPlugin(version: "Leia") diff -Nru kodi-pvr-argustv-3.5.4/pvr.argustv/addon.xml.in kodi-pvr-argustv-3.5.6/pvr.argustv/addon.xml.in --- kodi-pvr-argustv-3.5.4/pvr.argustv/addon.xml.in 2018-11-22 22:04:16.000000000 +0000 +++ kodi-pvr-argustv-3.5.6/pvr.argustv/addon.xml.in 2013-05-31 22:59:22.000000000 +0000 @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ diff -Nru kodi-pvr-argustv-3.5.4/pvr.argustv/changelog.txt kodi-pvr-argustv-3.5.6/pvr.argustv/changelog.txt --- kodi-pvr-argustv-3.5.4/pvr.argustv/changelog.txt 2018-10-26 07:45:14.000000000 +0000 +++ kodi-pvr-argustv-3.5.6/pvr.argustv/changelog.txt 2013-05-31 22:59:22.000000000 +0000 @@ -1,3 +1,24 @@ +v3.5.6 +- Fixed: Set correct is realtime flag for recordings +- Fix GetTempPath call for window + +v3.5.5 +- Update build system version and cleanup +- Fix package check for JsonCpp +- Added AppVeyor for Windows related build tests + +v3.5.4 +- Updated language files from Transifex + +v3.5.3 +- Updated language files from Transifex + +v3.5.2 +- Updated language files from Transifex + +v3.5.1 +- Updated language files from Transifex + v3.5.0 - Update to PVR addon API v5.10.0 diff -Nru kodi-pvr-argustv-3.5.4/README.md kodi-pvr-argustv-3.5.6/README.md --- kodi-pvr-argustv-3.5.4/README.md 2018-10-26 07:45:14.000000000 +0000 +++ kodi-pvr-argustv-3.5.6/README.md 2013-05-31 22:59:22.000000000 +0000 @@ -1,14 +1,15 @@ -[![Build Status](https://travis-ci.org/kodi-pvr/pvr.argustv.svg?branch=master)](https://travis-ci.org/kodi-pvr/pvr.argustv) +[![Build Status](https://travis-ci.org/kodi-pvr/pvr.argustv.svg?branch=Leia)](https://travis-ci.org/kodi-pvr/pvr.argustv/branches) +[![Build Status](https://dev.azure.com/teamkodi/kodi-pvr/_apis/build/status/kodi-pvr.pvr.argustv?branchName=Leia)](https://dev.azure.com/teamkodi/kodi-pvr/_build/latest?definitionId=58&branchName=Leia) [![Coverity Scan Build Status](https://scan.coverity.com/projects/5120/badge.svg)](https://scan.coverity.com/projects/5120) # ARGUS TV PVR -ARGUS TV PVR client addon for [Kodi] (http://kodi.tv) +ARGUS TV 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.argustv.git` 3. `cd pvr.argustv && mkdir build && cd build` 4. `cmake -DADDONS_TO_BUILD=pvr.argustv -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-argustv-3.5.4/src/activerecording.h kodi-pvr-argustv-3.5.6/src/activerecording.h --- kodi-pvr-argustv-3.5.4/src/activerecording.h 2018-10-26 07:45:15.000000000 +0000 +++ kodi-pvr-argustv-3.5.6/src/activerecording.h 2013-05-31 22:59:22.000000000 +0000 @@ -19,7 +19,7 @@ * */ -#include "libXBMC_pvr.h" +#include "kodi/libXBMC_pvr.h" #include #include diff -Nru kodi-pvr-argustv-3.5.4/src/argustvrpc.cpp kodi-pvr-argustv-3.5.6/src/argustvrpc.cpp --- kodi-pvr-argustv-3.5.4/src/argustvrpc.cpp 2018-10-26 07:45:15.000000000 +0000 +++ kodi-pvr-argustv-3.5.6/src/argustvrpc.cpp 2013-05-31 22:59:22.000000000 +0000 @@ -204,14 +204,8 @@ std::string GetChannelLogo(const std::string& channelGUID) { #if defined(TARGET_WINDOWS) -#if defined(TARGET_WINDOWS_STORE) - wchar_t wpath[MAX_PATH]; - GetTempPath(MAX_PATH, wpath); - std::string tmppath = p8::windows::FromW(wpath); -#else char tmppath[MAX_PATH]; - GetTempPath(MAX_PATH, tmppath); -#endif + GetTempPathA(MAX_PATH, tmppath); #elif defined(TARGET_LINUX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) std::string tmppath = "/tmp/"; #else diff -Nru kodi-pvr-argustv-3.5.4/src/channel.h kodi-pvr-argustv-3.5.6/src/channel.h --- kodi-pvr-argustv-3.5.4/src/channel.h 2018-10-26 07:45:15.000000000 +0000 +++ kodi-pvr-argustv-3.5.6/src/channel.h 2013-05-31 22:59:22.000000000 +0000 @@ -19,7 +19,7 @@ * */ -#include "libXBMC_pvr.h" +#include "kodi/libXBMC_pvr.h" #include #include #include "argustvrpc.h" diff -Nru kodi-pvr-argustv-3.5.4/src/client.cpp kodi-pvr-argustv-3.5.6/src/client.cpp --- kodi-pvr-argustv-3.5.4/src/client.cpp 2018-10-26 07:45:15.000000000 +0000 +++ kodi-pvr-argustv-3.5.6/src/client.cpp 2013-05-31 22:59:22.000000000 +0000 @@ -17,7 +17,7 @@ */ #include "client.h" -#include "xbmc_pvr_dll.h" +#include "kodi/xbmc_pvr_dll.h" #include "pvrclient-argustv.h" #include "utils.h" #include "uri.h" @@ -52,6 +52,7 @@ std::string g_szClientPath = ""; CHelper_libXBMC_addon *XBMC = NULL; CHelper_libXBMC_pvr *PVR = NULL; +bool m_bRecordingPlayback = false; extern "C" { @@ -564,11 +565,18 @@ bool OpenRecordedStream(const PVR_RECORDING &recording) { - return g_client->OpenRecordedStream(recording); + bool recordingOpenSuccess = g_client->OpenRecordedStream(recording); + + if (recordingOpenSuccess) + m_bRecordingPlayback = true; + + return recordingOpenSuccess; } void CloseRecordedStream(void) { + m_bRecordingPlayback = false; + return g_client->CloseRecordedStream(); } @@ -579,7 +587,7 @@ long long SeekRecordedStream(long long iPosition, int iWhence) { - return g_client->SeekRecordedStream(iPosition, iWhence); + return g_client->SeekRecordedStream(iPosition, iWhence); } long long LengthRecordedStream(void) @@ -614,6 +622,11 @@ return false; } +bool IsRealTimeStream() +{ + return !m_bRecordingPlayback; +} + /** UNUSED API FUNCTIONS */ DemuxPacket* DemuxRead(void) { return NULL; } void DemuxAbort(void) {} @@ -623,7 +636,6 @@ bool SeekTime(double,bool,double*) { return false; } void SetSpeed(int) {}; bool IsTimeshifting(void) { return false; } -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; } diff -Nru kodi-pvr-argustv-3.5.4/src/client.h kodi-pvr-argustv-3.5.6/src/client.h --- kodi-pvr-argustv-3.5.4/src/client.h 2018-10-26 07:45:15.000000000 +0000 +++ kodi-pvr-argustv-3.5.6/src/client.h 2013-05-31 22:59:22.000000000 +0000 @@ -23,8 +23,8 @@ #ifndef CLIENT_H #define CLIENT_H -#include "libXBMC_addon.h" -#include "libXBMC_pvr.h" +#include "kodi/libXBMC_addon.h" +#include "kodi/libXBMC_pvr.h" #define DEFAULT_HOST "127.0.0.1" #define DEFAULT_PORT 49943 diff -Nru kodi-pvr-argustv-3.5.4/src/epg.h kodi-pvr-argustv-3.5.6/src/epg.h --- kodi-pvr-argustv-3.5.4/src/epg.h 2018-10-26 07:45:15.000000000 +0000 +++ kodi-pvr-argustv-3.5.6/src/epg.h 2013-05-31 22:59:22.000000000 +0000 @@ -23,9 +23,9 @@ #define __EPG_H #include -#include "xbmc_addon_types.h" -#include "libXBMC_addon.h" -#include "libXBMC_pvr.h" +#include "kodi/xbmc_addon_types.h" +#include "kodi/libXBMC_addon.h" +#include "kodi/libXBMC_pvr.h" #include class cEpg diff -Nru kodi-pvr-argustv-3.5.4/src/guideprogram.h kodi-pvr-argustv-3.5.6/src/guideprogram.h --- kodi-pvr-argustv-3.5.4/src/guideprogram.h 2018-10-26 07:45:15.000000000 +0000 +++ kodi-pvr-argustv-3.5.6/src/guideprogram.h 2013-05-31 22:59:22.000000000 +0000 @@ -19,7 +19,7 @@ * */ -#include "libXBMC_pvr.h" +#include "kodi/libXBMC_pvr.h" #include #include #include "argustvrpc.h" diff -Nru kodi-pvr-argustv-3.5.4/src/lib/tsreader/CMakeLists.txt kodi-pvr-argustv-3.5.6/src/lib/tsreader/CMakeLists.txt --- kodi-pvr-argustv-3.5.4/src/lib/tsreader/CMakeLists.txt 2018-10-26 07:45:15.000000000 +0000 +++ kodi-pvr-argustv-3.5.6/src/lib/tsreader/CMakeLists.txt 2013-05-31 22:59:22.000000000 +0000 @@ -1,19 +1,21 @@ -PROJECT(TSReader) - -ENABLE_LANGUAGE(CXX) - -CMAKE_MINIMUM_REQUIRED(VERSION 2.6) +cmake_minimum_required(VERSION 3.5) +project(TSReader) # Source files -SET(SOURCES FileReader.cpp +set(SOURCES FileReader.cpp MultiFileReader.cpp TSReader.cpp) # Header files -SET(HEADERS FileReader.h +set(HEADERS FileReader.h MultiFileReader.h TSReader.h) -SOURCE_GROUP("Header Files" FILES ${HEADERS}) +source_group("Header Files" FILES ${HEADERS}) + +if(WIN32) + add_compile_options(/wd4996) +endif() -ADD_LIBRARY(tsreader STATIC ${HEADERS} ${SOURCES}) +add_library(tsreader STATIC ${HEADERS} ${SOURCES}) +set_property(TARGET tsreader PROPERTY POSITION_INDEPENDENT_CODE ON) diff -Nru kodi-pvr-argustv-3.5.4/src/pvrclient-argustv.h kodi-pvr-argustv-3.5.6/src/pvrclient-argustv.h --- kodi-pvr-argustv-3.5.4/src/pvrclient-argustv.h 2018-10-26 07:45:15.000000000 +0000 +++ kodi-pvr-argustv-3.5.6/src/pvrclient-argustv.h 2013-05-31 22:59:22.000000000 +0000 @@ -22,7 +22,7 @@ #include /* Master defines for client control */ -#include "xbmc_pvr_types.h" +#include "kodi/xbmc_pvr_types.h" #include "channel.h" #include "recording.h" diff -Nru kodi-pvr-argustv-3.5.4/src/recordinggroup.h kodi-pvr-argustv-3.5.6/src/recordinggroup.h --- kodi-pvr-argustv-3.5.4/src/recordinggroup.h 2018-10-26 07:45:15.000000000 +0000 +++ kodi-pvr-argustv-3.5.6/src/recordinggroup.h 2013-05-31 22:59:22.000000000 +0000 @@ -19,7 +19,7 @@ * */ -#include "libXBMC_pvr.h" +#include "kodi/libXBMC_pvr.h" #include #include #include "argustvrpc.h" diff -Nru kodi-pvr-argustv-3.5.4/src/recording.h kodi-pvr-argustv-3.5.6/src/recording.h --- kodi-pvr-argustv-3.5.4/src/recording.h 2018-10-26 07:45:15.000000000 +0000 +++ kodi-pvr-argustv-3.5.6/src/recording.h 2013-05-31 22:59:22.000000000 +0000 @@ -19,7 +19,7 @@ * */ -#include "libXBMC_pvr.h" +#include "kodi/libXBMC_pvr.h" #include #include #include "argustvrpc.h" diff -Nru kodi-pvr-argustv-3.5.4/src/upcomingrecording.h kodi-pvr-argustv-3.5.6/src/upcomingrecording.h --- kodi-pvr-argustv-3.5.4/src/upcomingrecording.h 2018-10-26 07:45:15.000000000 +0000 +++ kodi-pvr-argustv-3.5.6/src/upcomingrecording.h 2013-05-31 22:59:22.000000000 +0000 @@ -19,7 +19,7 @@ * */ -#include "libXBMC_pvr.h" +#include "kodi/libXBMC_pvr.h" #include #include diff -Nru kodi-pvr-argustv-3.5.4/.travis.yml kodi-pvr-argustv-3.5.6/.travis.yml --- kodi-pvr-argustv-3.5.4/.travis.yml 2018-11-21 23:58:08.000000000 +0000 +++ kodi-pvr-argustv-3.5.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