diff -Nru kodi-pvr-argustv-2.5.6/CMakeLists.txt kodi-pvr-argustv-3.5.4/CMakeLists.txt --- kodi-pvr-argustv-2.5.6/CMakeLists.txt 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/CMakeLists.txt 2018-10-26 07:45:14.000000000 +0000 @@ -64,7 +64,7 @@ endif(WIN32) # Make sure that CMake adds the headers to the MSVC project -list(APPEND ARGUSTV_SOURCES ${ARGUSTV_HEADERS} ${RESOURCE_FILES}) +list(APPEND ARGUSTV_SOURCES ${ARGUSTV_HEADERS}) set(DEPLIBS ${p8-platform_LIBRARIES} tsreader) diff -Nru kodi-pvr-argustv-2.5.6/debian/changelog kodi-pvr-argustv-3.5.4/debian/changelog --- kodi-pvr-argustv-2.5.6/debian/changelog 2018-04-30 15:11:41.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/debian/changelog 2018-12-24 10:00:57.000000000 +0000 @@ -1,159 +1,7 @@ -kodi-pvr-argustv (2.5.6-1~bionic) bionic; urgency=low +kodi-pvr-argustv (3.5.4-1~bionic) bionic; urgency=low [ kodi ] * autogenerated dummy changelog - [ wsnipex ] - * v2.5.0 (20-09-2016) - Correct PVR API reference to v5.2.0 - Disable - unsubscribing from events (at least for v17 Krypton) Allows clean - exiting of Kodi v2.4.2 (20-08-2016) - Updated language files from - Transifex v2.4.1 (18-06-2016) - Updated language files from - Transifex v2.4.0 (18-05-2016) - Cmake: rename find_package kodi to - Kodi v2.3.0 (13-05-2016) - Update to PVR addon API v5.2.0 - Fix - includes v2.2.0 (08-03-2016) - Update to PVR addon API v5.1.0 v2.1.0 - (14-02-2016) - Update to PVR addon API v5.0.0 v2.0.1 (23-01-2016) - - Updated language files from Transifex v2.0.0 (17-01-2016) - Initial - Kodi Krypton version. v1.11.9 (10-01-2016) - Updated language files - from Transifex v1.11.8 (03-01-2016) - Updated language files from - Transifex v1.11.7 (08-12-2015) - Updated language files from - Transifex v1.11.6 (19-09-2015) - Update to PVR addon API v4.1.0 - v1.11.5 (09-09-2015) - Updated to PVR API v4.0.0 v1.11.4 (04-08- - 2015) - Updated to PVR API v3.0.0 (API 1.9.7 compatibility mode) - v1.11.3 (19-07-2015) - Updated to PVR API v2.1.0 - Automatically - fill in platform and library name v1.11.2 (17-07-2015) - Debian - packaging: fix library install path - Miscellaneous backend fixes - v1.11.1 (04-07-2015) - Updated to PVR API v2.0.0 v1.11.0 (03-07- - 2015) - Updated to PVR API v1.9.7 v1.10.9 (29-06-2015) - Coverity - fixes v1.10.8 (28-06-2015) - Updated language files from Transifex - v1.10.7 (11-04-2015) - Added option for all recordings to be in - folders v1.10.6 (04-05-2015) - Updated to use new libplatform-dev - v1.10.5 (09-04-2015) - Fix race condition on Channel GUID cache - v1.10.4 (28-03-2015) - Updated to PVR API v1.9.6 v1.10.3 (14-03- - 2015) - TSReader: attempt to fix a crash on RPi due to - xbmc/xbmc#6306 This PR introduced a 2nd FileReader class in Kodi - which conflicts with the PVR addon one... The PVR FileReader class - is now inside an ArgusTV namespace v1.10.2 (08-03-2015) - Updated to - PVR API v1.9.5 v1.10.1 (17-02-2015) - Updated to PVR API v1.9.4 - v1.9.189 (21-01-2015) - Updated language files from Transifex - - Minor changes to conform with C++11 v1.9.188 (13-01-2015) - Updated - language files from Transifex v1.9.187 (28-12-2014) - added - getBackendHostname function v1.9.186 (27-12-2014) - Fixed mime-type - for MPEG-TS v1.9.185 (02-12-2014) - Updated language files from - Transifex v1.9.184 (26-11-2014) - change library name to Kodi - v1.9.183 (12-11-2014) - fixed deadlock when activating the addon on - some darwin (osx, ios) runtimes v1.9.182 (11-11-2014) - Updated - language files from Transifex v1.9.181 (10-11-2014) - Updated - language files from Transifex v1.9.180 (03-09-2014) - Updated to API - v1.9.2 v1.9.178 (01-07-2014) - Updated language files from Transifex - v1.9.177 (01-05-2014) - fill initial last played position for - recordings v1.9.176 (22-04-2014) - improved timer conflicts - detection - fix threads on OS X v1.9.175 (17-03-2014) - Updated - language files from Transifex v1.9.174 (03-03-2014) - Updated - language files from Transifex v1.9.173 (30-01-2014) - added service - events monitor v1.9.172 (23-12-2013) - base new timers on templates - retrieved from ARGUS TV server v1.9.171 (11-12-2013) - removed - redundant notification v1.9.170 (28-09-2013) - add timeshift buffer - functions v1.8.170 (23-10-2013) - Fixes deleting of recordings - (regression) - Improves load time of recordings v1.8.169 (28-09- - 2013) - Fixes playing recordings on Windows - Migrated all UNC share - name handling to single method v1.8.168 (12-09-2013) - Minimum ARGUS - TV version 2.1 required - Switched to integer ID's v1.8.167 (29-08- - 2013) - Fixed Live-TV XBMC Gotham v1.8.166 (08-06-2013) - sync with - PVR API v1.8.0 v1.7.166 (13-03-2013) - Fixed error when adding - timers with " in their title v1.7.165 (07-03-2013) - Bump after PVR - API version bump v1.6.165 (19-01-2013) - Do not disable the add-on - when it can not connect to the ARGUS-TV server. v1.6.164 (18-01- - 2013) - EPG genre will contain the ARGUS TV "Category" string. - v1.6.163 (01-01-2013) - Updated language files from Transifex - v1.6.162 (15-12-2012) - Updated language files from Transifex - v1.6.161 (12-12-2012) - New version number by Team XBMC v1.6.160.145 - (11-12-2012) - Support ARGUS TV channel numbers on XBMC, switch on: - Settings / Live-TV / General / "Use backend channels..." and "Always - use the channel order..." - New version number by Team XBMC - v1.0.150.144 (18-11-2012) - First ARGUS TV implementation - Support - XBMC play count v1.0.150.143 (03-11-2012) - Bump version to 1 for - Frodo :) - Version number: major.minor.apiversion.buildnumber - - Fully supports setting and retrieving lastplayed position on the FTR - server for recordings - Support Timer conflict notification - Add - episode name to epg title - Credit Team Mediaportal for original - TsReader code v0.0.1.142 (06-09-2012) - Use the XBMC lifetime - setting for a recording when possible - Now can delete scheduled - recordings/programs on the FTR server that were created by other - clients - At startup try to connect to FTR for 30 seconds, This - fixes startup problems on linux systems where the add-on is started - before the network interface is up (eg. OpenElec) - Notify user when - no free tuner is found, channel is scrambled etc. - Shorter keep- - alive delay to fix loosing Live-TV in certain cases v0.0.1.141 (04- - 09-2012) - Updated to Frodo PVR API - Add timeshift support for - Frodo v0.0.1.140 (03-06-2012) - Fixed deletion of recordings due to - api change - Fixed instant-record failed due to start time set to - 1970 by XBMC v0.0.1.138 (02-06-2012) - Full support for timeshift - implemented in the add-on v0.0.1.137 (18-05-2012) - Fixed playing - recording with national characters in names on Windows v0.0.1.136 - (01-05-2012) - Aggressively optimised TsReader class - Added new - configurable delay in milliseconds after tuning a channel v0.0.1.135 - (12-04-2012) - Small regression fixes after switch to new platform - library When ForTheRecord returns 'NoRetunePossible' close the - current live stream and then try to tune again v0.0.1.134 (07-04- - 2012) - Internal change: Switch to new platform library for - threading and lock mechanisms v0.0.1.133 (31-03-2012) - The add-on - now sets the time a recording was last watched on the server - v0.0.1.132 (20-03-2012) - Small fix to correct one invalid GUID - error message at start v0.0.1.131 (16-03-2012) - Added many internal - verifications to the to channel mappings. - External factors can break the mapping and these checks will - hopefully warn the user to reset the PVR database v0.0.1.130 (11-03- - 2012) - Fixed 64-bit Linux .tsbuffer processing v0.0.1.129 (04-03- - 2012) - Media Portal TV-Server will now work with the FTR - FTR - Addon - XBMC combination Recording titles with trailing periods - '...' will show up in XBMC, NOTICE: this requires FTR 1.6.1.0 Beta 5 - or newer v0.0.1.128 (23-01-2012) - Added: System Info - PVR - Information now shows FTR version info Timers do no longer retrieve - the cancelled 'upcomingprograms' from ForTheRecord v0.0.1.127 (20-01- - 2012) - Added: System Info - PVR Information now shows total and - used disk sizes v0.0.1.126 (10-01-2012) - Added: titles of - recordings changed to be more descriptive v0.0.1.125 (04-01-2012) - - Added: validation of the shares for all ForTheRecord tuners at - startup v0.0.1.124 (01-01-2012) - Fixed Linux mutex initialisation, - caused by C++ not having static constructors v0.0.1.123 (20-12-2011) - - Pressing 'record' while viewing will schedule the recording of the - show watched - Delete Timer: will abort an active recording, will - remove the upcoming program from the server will remove the - corresponding schedule from the server (the schedule name MUST be: - "XBMC - " + timer title, this is the case when the schedule was - added by the addon and unchanged by the user) v0.0.1.122 (07-12- - 2011) - Signal quality retrieval implemented v0.0.1.121 (04-12-2011) - - Channel logo retrieval added v0.0.1.120 (07-11-2011) - Windows, - Linux and OSX version using TsReader - Reliable switching between - channels with HD and SD content - TsReader streamlined v0.0.1.117 - (unreleased) - Adaptation to many changes within XBMC v0.0.1.116 (16- - 06-2011) - Greatly improved channel zapping - Add timer will now - force a recording when no matching show title is found in the - channel epg data on the server - Add timer fixed: new PVR API - GUI - update triggers added: new PVR API v0.0.1.115 (10-05-2011) - First - implementation of channelgroups v0.0.1.114 (26-02-2011) - Delete - recording is now actually working... v0.0.1.113 (26-02-2011) - - Upcoming recordings now showing as timers in EPG and timerlist - - Delete timer implemented - Add timer implemented v0.0.1.112 (23-02- - 2011) - Fixed bad bug that caused loss of epg data every 10 minutes - v0.0.1.111 (01-02-2011) - EPG loading optimised. Programme - descriptions only loaded for ForTheRecord 1.5.1. - EPG loads 48 - hours of data now. - Tune live stream now also supports radio. - v0.0.1.110 (22-01-2011) - Delete recording implemented, needs - ForTheRecord 1.5.1.0 Beta 6 or newer - Programme descriptions added - to EPG and TV channels screen - More fixes to memory handling - v0.0.1.109 (13-01-2011) - Initial support for retrieval of - recordings on the ForTheRecord Argus server - Overview of - recordings, grouped by Title - Viewing of a selected recording via - the ForTheRecord shares - Fixes some memory corruptions - Support - for retrieval of recordings on the ForTheRecord Argus server - - Overview of recordings, grouped by Title, including recording - starttime, and description - Credits: Red-F v0.0.1.108 (08-01-2011) - - EPG data retrieval fixed for dates where month and day have less - than 2 digits (credits: Red-F) v0.0.1.107 (27-11-2010) - First - release of the ForTheRecord PVR client (Windows only, TSReader) - - Implemented: Channel retrieval, tuning of live TV and live radio - (tsbuffer only, no rtsp), basic EPG - Tested ForTheRecord Argus - version: v1.5.0.3 + -- Nobody Sat, 01 Jun 2013 00:59:22 +0200 - -- wsnipex Mon, 30 Apr 2018 17:11:41 +0200 diff -Nru kodi-pvr-argustv-2.5.6/debian/changelog.tmp kodi-pvr-argustv-3.5.4/debian/changelog.tmp --- kodi-pvr-argustv-2.5.6/debian/changelog.tmp 2018-04-30 15:11:35.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/debian/changelog.tmp 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -kodi-pvr-argustv (2.5.6-1~#DIST#) #DIST#; urgency=low - - [ kodi ] - * autogenerated dummy changelog - - -- Nobody Sat, 01 Jun 2013 00:59:22 +0200 - diff -Nru kodi-pvr-argustv-2.5.6/debian/control kodi-pvr-argustv-3.5.4/debian/control --- kodi-pvr-argustv-2.5.6/debian/control 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/debian/control 2018-10-26 07:45:14.000000000 +0000 @@ -1,8 +1,8 @@ Source: kodi-pvr-argustv Priority: extra Maintainer: Arne Morten Kvarving -Build-Depends: debhelper (>= 9.0.0), cmake, kodi-pvr-dev, - libkodiplatform-dev (>= 16.0.0), kodi-addon-dev, libjsoncpp-dev +Build-Depends: debhelper (>= 9.0.0), cmake, libkodiplatform-dev (>= 16.0.0), + kodi-addon-dev, libjsoncpp-dev Standards-Version: 3.9.4 Section: libs Homepage: diff -Nru kodi-pvr-argustv-2.5.6/debian/kodi-pvr-argustv.install kodi-pvr-argustv-3.5.4/debian/kodi-pvr-argustv.install --- kodi-pvr-argustv-2.5.6/debian/kodi-pvr-argustv.install 2018-04-30 15:11:36.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/debian/kodi-pvr-argustv.install 2018-10-26 07:45:14.000000000 +0000 @@ -1,2 +1,2 @@ -usr/lib -usr/share +usr/lib/* +usr/share/* diff -Nru kodi-pvr-argustv-2.5.6/depends/common/jsoncpp/CMakeLists.txt kodi-pvr-argustv-3.5.4/depends/common/jsoncpp/CMakeLists.txt --- kodi-pvr-argustv-2.5.6/depends/common/jsoncpp/CMakeLists.txt 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/depends/common/jsoncpp/CMakeLists.txt 2018-10-26 07:45:14.000000000 +0000 @@ -1,7 +1,10 @@ project(jsoncpp) -cmake_minimum_required(VERSION 2.6) +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(SOURCES src/lib_json/json_reader.cpp src/lib_json/json_value.cpp diff -Nru kodi-pvr-argustv-2.5.6/depends/common/jsoncpp/jsoncpp.sha256 kodi-pvr-argustv-3.5.4/depends/common/jsoncpp/jsoncpp.sha256 --- kodi-pvr-argustv-2.5.6/depends/common/jsoncpp/jsoncpp.sha256 1970-01-01 00:00:00.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/depends/common/jsoncpp/jsoncpp.sha256 2018-10-26 07:45:14.000000000 +0000 @@ -0,0 +1 @@ +3671ba6051e0f30849942cc66d1798fdf0362d089343a83f704c09ee7156604f diff -Nru kodi-pvr-argustv-2.5.6/depends/common/jsoncpp/jsoncpp.txt kodi-pvr-argustv-3.5.4/depends/common/jsoncpp/jsoncpp.txt --- kodi-pvr-argustv-2.5.6/depends/common/jsoncpp/jsoncpp.txt 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/depends/common/jsoncpp/jsoncpp.txt 2018-10-26 07:45:14.000000000 +0000 @@ -1 +1 @@ -jsoncpp http://mirrors.kodi.tv/build-deps/sources/jsoncpp-src-0.5.0.tar.gz +jsoncpp http://mirrors.kodi.tv/build-deps/sources/jsoncpp-1.8.3.tar.gz diff -Nru kodi-pvr-argustv-2.5.6/Jenkinsfile kodi-pvr-argustv-3.5.4/Jenkinsfile --- kodi-pvr-argustv-2.5.6/Jenkinsfile 1970-01-01 00:00:00.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/Jenkinsfile 2018-11-21 23:58:08.000000000 +0000 @@ -0,0 +1 @@ +buildPlugin() diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/addon.xml.in kodi-pvr-argustv-3.5.4/pvr.argustv/addon.xml.in --- kodi-pvr-argustv-2.5.6/pvr.argustv/addon.xml.in 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/addon.xml.in 2018-11-22 22:04:16.000000000 +0000 @@ -1,22 +1,19 @@ - + - - - - + @ADDON_DEPENDS@ Kodi voorprogram vir die ARGUS TV PVR http://www.argus-tv.com// Kodi frontend for the ARGUS TV PVR http://www.argus-tv.com// - Kodi клиент за ARGUS TV ПВР http://www.argus-tv.com// + Клиент за ПВР „ARGUS TV“ – http://www.argus-tv.com// Frontal de Kodi per al PVR ARGUS TV http://www.argus-tv.com// - Rozhraní Kodi pro ARGUS TV PVR http://www.argus-tv.com// + Rozhraní Kodi pro nahrávač videa ARGUS TV http://www.argus-tv.com/ Pen blaen Kodi ar gyfer ARGUS TV PVR http://www.argus-tv.com// Kodi frontend til ARGUS TV PVR http://www.argus-tv.com// Kodi Oberfläche für ARGUS TV PVR http://www.argus-tv.com// @@ -28,9 +25,10 @@ Frontend de Kodi para ARGUS TV PVR http://www.argus-tv.com// Frontend de Kodi para ARGUS TV PVR http://www.argus-tv.com// Frontend de Kodi para ARGUS TV PVR http://www.argus-tv.com// - Kodi esi ARGUS TV PVRile http://www.argus-tv.com// + Kodi liides ARGUS TV PVR'ile http://www.argus-tv.com// + Kodiren interfazea ARGUS TV PVRrako http://www.argus-tv.com// Kodin ARGUS TV -asiakasohjelma http:/www.argus-tv.com/ - Frontal Kodi pour le numériscope ARGUS TV http://www.argus-tv.com/ + Frontale Kodi pour le numériscope ARGUS TV http://www.argus-tv.com/ Interface logicielle pour l'enregistreur vidéo (PVR) ARGUS TV http://www.argus-tv.com/ Interface de Kodi para o PRV de ARGUS TV http://www.argus-tv.com// לקוח טלוויזיה חיה עבור ARGUS TV מהכתובת http://www.argus-tv.com @@ -47,8 +45,8 @@ Kodi интерфејс за ARGUS TV PVR http://www.argus-tv.com// Bahagian hadapan Kodi untuk PVR ARGUS TV http://www.argus-tv.com// Faċċata tal-Kodi għall- ARGUS TV PVR http://www.argus-tv.com// - Kodi-klientdel til ARGUS TV PVR http://www.argus-tv.com/ - Kodi frontend voor het ARGUS-TV PVR http://www.argus-tv.com// + Kodi-grenseflate til ARGUS TV-PVR http://www.argus-tv.com/ + Kodi frontend voor het ARGUS-TV PVR http://www.argus-tv.com/ Klient telewizji dla ARGUS TV http://www.argus-tv.com// Frontend do Kodi para o PVR ARGUS TV http://www.argus-tv.com// Interface Kodi para ARGUS TV PVR http://www.argus-tv.com// @@ -69,7 +67,7 @@ ARGUS TV PVR 'http://www.argus-tv.com//' 可使用的Kodi前端 ARGUS TV PVR voorprogram. Ondersteun stroom van Lewendige TV & Opnames, luister na Radio kanale, EPG en skedules. ARGUS TV PVR frontend. Supports streaming of Live TV & Recordings, listening to Radio channels, EPG and schedules. - ARGUS TV ПВР клиент. Поддържа поточна телевизия и записване, слушане на радио канали, електронен програмен справочник и разписания. + Клиент за ПВР „ARGUS TV“. Поддържа телевизия на живо и записване, слушане на радио канали, електронен програмен справочник и графици. Frontal del PVR ARGUS TV. És compatible amb les transmissions en línia de TV en directe i enregistraments, escolta d'emissores de ràdio, guia electrònica de programació (EPG) i programacions. Rozhraní ARGUS TV PVR. Podporuje streamování živého vysílání a nahrávání, poslech kanálů rádia, televizní program a plánování. Pen blaen ARGUS TV PVR. Mae'n cynnal ffrydio Teledu Byw a Recordiadau, gwrando ar sianeli Radio ac Amserlenni Rhaglenni Electronig. @@ -83,9 +81,10 @@ Frontend de ARGUS TV PVR. Soporta transmisiones de TV en Vivo y Grabaciones, escuchar canales de Radio, Guía Electrónica de Programas (GEP) y temporizadores. Frontend de ARGUS TV PVR. Soporta transmisiones de TV en Vivo y Grabaciones, escuchar canales de Radio, Guía Electrónica de Programas (EPG) y temporizadores. Frontend de ARGUS TV PVR. Soporta transmisiones de TV en vivo y grabaciones, escuchar canales de Radio, Guía Electrónica de Programas y temporizadores. - ARGUS TV PVR esi. Toetab telekanalite striimimist ja salvestamist, raadio kuulamist ja elektroonilist saatekava. + ARGUS TV PVR'i liides. Toetab telekanalite striimimist ja salvestamist, raadio kuulamist ja elektroonilist saatekava. + ARGUS TV PVR interfazea. Ondokoa ahalbidetzen du: zuzeneko telebistaren streaming-a eta grabazioak, irrati kateak entzutea, PGEa eta programatzeko egutegiak. ARGUS TV -asiakasohjelma. Tukee suoria tv-lähetyksiä, tallentamista, radiokanavia ja ohjelmaopasta. - Frontal de numériscope pour ARGUS TV, prenant en charge la diffusion en continu des télés en direct & les enregistrements, l'écoute de chaînes radio, le GÉP et les horaires. + Frontale de numériscope pour ARGUS TV, prenant en charge la diffusion en continu des télés en direct et les enregistrements, l’écoute de chaînes radio, le GÉP et les horaires. Interface logicielle pour l'enregistreur vidéo (PVR) ARGUS TV. Gère la diffusion de la TV en direct, l'enregistrement, l'écoute de radios, le guide électronique des programmes TV et les programmations. Interface do PVR de ARGUS TV. Soporta transmisión de TV en directo e Gravacións, escoita de canles de radio, Guía e programacións. לקוח טלוויזיה חיה של ARGUS TV PVR. תומך בהזרמת שידורים חיים והקלטות, האזנה לרדיו, הצגת לוח שידורים ותזמון הקלטות. @@ -93,7 +92,7 @@ ARGUS TV PVR előtét. Élő adások, felvételek és rádiócsatornák támogatása, EPG-vel és időzítésekkel. ARGUS TV PVR արտաքին տեսքը: TV հիմա, Ձայնագրություններ, Ռադիո ալիքների ունկնդրում, EPG և ժամանակացույցի հնարավորություն: Antarmuka PVR ARGUS TV. Mendukung streaming TV dan Rekaman langsung, mendengarkan kanal radio, EPG dan jadwal. - ARGUS TV framendi; styður streymingu á beinum sjónvarpi og upptökum, hlustun á útvarpsstöðvar sjónvarpsvísum (EGP) og dagskráryfirlitum. + ARGUS TV framendi; styður streymingu á beinum útsendingum og upptökum, hlustun á útvarpsstöðvar sjónvarpsvísum (EGP) og dagskráryfirlitum. Frontend ARGUS TV PVR. Supporta lo streaming e la registrazione di Live TV, l'ascolto dei canali radio, la guida ai programmi e gli orari. ARGUS TV PVR フロントエンドです。テレビ放送のストリーミング、録画、ラジオチャンネルの視聴、EPG、録画予約をサポートしています。 ARGUS TV PVR 프론트엔드. 라이브 TV 스트리밍과 녹화, 라디오 청취, EPG와 예약 지원. @@ -103,7 +102,7 @@ Bahagian hadapan PVR ARGUS TV; menyokong penstirman TV Langsung & Rakaman, mendengar saluran Radio, EPG dan jadual. Faċċata tal- ARGUS TV PVR. Jiflaħ għal streaming ta' TV Lajv u Rekordings, smiegħ ta' stazzjonijiet tar- Radju, EPG u skedi. ARGUS TV PVR-klientdel Støtter visning av direkte-TV, opptak, lytting til radiokanaler, EPG og tidsopptak. - ARGUS TV PVR frontend. Ondersteunt het bekijken van Live TV en opnames, het beluisteren van radio zenders, het tonen van de EPG en het inplannen/beheren van nieuwe opnames (Timers). + ARGUS TV PVR frontend. Ondersteunt het bekijken van Live-TV en opnames, het beluisteren van radiozenders, het tonen van de EPG en het inplannen/beheren van nieuwe opnames (Timers). Klient telewizji dla ARGUS TV obsługuje transmisję kanałów radiowych i telewizyjnych, nagrywanie i harmonogram nagrań oraz funkcje przewodnika telewizyjnego. Frontend do PVR ARGUS TV. Suporta streaming de TV Local & Gravações, sintonização de canais de Rádio, guia de programação eletrônica (GPE) e agendamento. Interface ARGUS TV PVR. Suporta transmissão e gravação de TV em direto, audição de estações de rádio, EPG e agendamentos. @@ -115,7 +114,7 @@ ARGUS TV PVR frontend. Përkrahën transmetimin e Live TV's & Rregjistrime, dëgjimin të radio-kanaleve, EPG'së dhe orarin. ARGUS ТВ PVR интерфејс. Подржава стримовање ТВ Уживо & Снимака, слушање Радио канала, EPG и распореде. ARGUS TV PVR interfejs. Podržava strimovanje TV Uživo & Snimaka, slušanje Radio kanala, EPG i rasporede. - ARGUS TV PVR frontend. Stödjer strömmning av direktsänd TV & inspelningar, lyssna på radiokanaler, EPG och schemaläggning. + ARGUS TV PVR frontend. Stödjer strömmning av Live-TV & inspelningar, lyssna på radiokanaler, EPG och schemaläggning. Klijynt telewizyjny dlŏ ARGUS TV PVR podpiyrŏ szpricowanie kanałōw radyjowych i telewizyjnych, nagrowanie aji funkcyje EPG. ARGUS TV PVR ön ucu. Canlı TV akışı ve kayıt yapabilme, radyo kanalları dinleme, EPG ve zamanlayıcıları destekler. Накладка для ARGUS TV. Підтримує потокове Live TV і запис, прослуховування радіо каналів, телегід та планування. @@ -124,9 +123,9 @@ ARGUS TV PVR前端。支援的串流媒體包括有：電視直播和節目錄影，收聽廣播頻道，電子節目表和時間表。 Hierdie is onstabiele sagteware! Die outeurs is op geen manier verantwoordelik vir gefaalde opnames, inkorrekte tydhouers, gemorsde ure, of enige ander ongewensde effekte. This is unstable software! The authors are in no way responsible for failed recordings, incorrect timers, wasted hours, or any other undesirable effects.. - Тази програма е нестабилна! Авторите не носят отговорност за неуспешно записване, некоректни броячи, пропиляното време и други нежелани ефекти. + Тази програма е нестабилна! Авторите не носят отговорност за неуспешно записване, некоректни броячи, пропиляно време и други нежелани ефекти. Aquest és programari inestable! Els autors no són de cap manera responsables dels enregistraments que fallin, temporitzadors incorrectes, hores perdudes, o qualsevol altre efecte indesitjat.. - Tento software není stabilní! Autoři nejsou žádným způsobem zodpovědní za neúspěšná nahrávání, chybné časovače, ztracený čas nebo jakékoliv jiné nežádoucí výsledky... + Tento software není stabilní! Autoři nejsou žádným způsobem zodpovědní za neúspěšná nahrávání, chybné časovače, ztracený čas nebo jakékoliv jiné nežádoucí výsledky… Mae'r feddalwedd hon yn ansefydlog! Nid yw'r awduron yn gyfrifol mewn unrhyw ffordd am fethu recordio, amseru gwallus, oriau wedi eu gwastraffu, nac effeithiau annymunol eraill. Dette er ustabil software! Ophavsmændene er på ingen måde ansvarlige for mislykkede optagelser, fejlagtige timere, spildte timer, eller andre uønskede konsekvenser. Dies ist instabile Software! Die Autoren sind in keiner Weise verantwortlich für fehlgeschlagene Aufnahmen, falsche Timer, verschwendete Zeit oder andere ungewünschte Effekte. @@ -138,11 +137,12 @@ ¡Este software es inestable! Los autores no se responsabilizan por grabaciones fallidas, temporizadores incorrectos, horas perdidas, o cualquier otro efecto no deseado.. ¡Este software es aún inestable! Los autores no son responsables en forma alguna por grabaciones fallidas, temporizaciones incorrectas, tiempo perdido o ningún otro efecto no deseado. ¡Esto es software inestable! Los autores no son de ninguna manera responsables por grabaciones fallidas, temporizadores incorrectos, horas perdidas o cualquier otro efecto no deseado... - See on ebastabiilne tarkvara! Autorid ei ole kuidagi moodi vastutavad nurjunud salvestiste, ebaõige aegrelee, raisatud tundide ega muude soovimatute asjade eest. + See on ebastabiilne tarkvara! Autorid ei ole kuidagi moodi vastutavad nurjunud salvestiste, vale taimeri, raisatud aja ega muude soovimatute asjade eest. + Software hau ezegonkorra da! Egilea ez da arduratzen grabazio-erroreetaz, kronometro-erroreetaz, ordu galduetaz edo beste edozein ondorio ezerosoetaz. Tämä on epävakaa ohjelma! Sen tekijät eivät ole millään muotoa vastuussa epäonnistuneista tallennuksista, virheellisistä ajastuksista, haaskatusta ajasta, verenpaineen noususta tai mistään muusta epäsuotuisasta vaikutuksesta. - Ce logiciel est instable! Les auteurs ne sont aucunement responsables des enregistrements défaillants, des minuteries erronées, des heures perdues ou tout autre effet indésirable. + Ce logiciel est instable ! Les auteurs ne sont aucunement responsables des enregistrements défaillants, des minuteries erronées, des heures perdues ou tout autre effet indésirable. Logiciel en cours d'élaboration ! Les auteurs ne sont en aucun cas responsables de l'échec des enregistrements, programmations défectueuses, temps perdu ou autres effets indésirables. - Software non estable, os autores non se fan responsábeis dos erros nas gravacións, temporizadores incorrectos, e outros efectos non desexados. + Software non estable! Os autores non se fan responsábeis dos erros nas gravacións, temporizadores incorrectos, e outros efectos non desexados. זוהי איננה הרחבה יציבה! המפתחים אינם אחראים על כשלון בניגון, זמנים שגויים במדריך השידורים, שעות מבוזבזות או כל תופעה לא רצויה אחרת. Ovo je nestabilan softver! Autori nisu ni na koji način odgovorani za neuspjelo snimanje, netočna zakazana snimanja, izgubjene sate, ili bilo koje druge neželjene učinke .. Ez nem stabil szoftver! A készítők nem vállalnak felelősséget, a hibás felvételért, rossz időzítésért, elvesztegetett időért... @@ -159,7 +159,7 @@ Ini merupakan perisian tidak stabil! Pengarang tidak bertanggungjawab atas kegagalan rakaman, pemasa tidak betul, masa yang dibazirkan, atau apa jua kesan yang tidak dikehendaki.. Dan il-programm mhuwiex stabbli! L-Awturi m'humiex responsabbli bl-ebda mod għal rekordings li ma jirnexxewx, arloġġi żbaljati, siegħat moħlija, jew kwalunkwe effett ieħor mhux mixtieq. Dette er ustabil programvare! Skaperne har på ingen måte ansvar for ødelagte opptak, feilstilte tidsur, bortkastede timer, eller andre uønskede effekter… - Deze software is niet 100% stabiel! De auteurs zijn op geen enkele wijze aansprakelijk voor mislukte opnames, verspilde tijd, of enig ander ongewild neveneffect.. + Deze software is niet 100% stabiel! De auteurs zijn op geen enkele wijze aansprakelijk voor mislukte opnames, verspilde tijd, of enig ander ongewild neveneffect. Oprogramowanie nadal jest w fazie rozwoju i jest niestabilne! Autorzy w żaden sposób nie są odpowiedzialni za nieudane nagrania, błędy w harmonogramie nagrań, zmarnowany czas ani jakiekolwiek inne niepożądane efekty. Este é um software instável! Os autores não são responsáveis por falhas nas gravações, agendamentos incorretos, horas desperdiçadas, ou quaisquer outros efeitos indesejáveis. Este software é instável! Os autores não podem ser responsabilizados por gravações falhadas, temporizadores incorretos, horas desperdiçadas ou qualquer outro tipo de efeitos indesejáveis... diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/changelog.txt kodi-pvr-argustv-3.5.4/pvr.argustv/changelog.txt --- kodi-pvr-argustv-2.5.6/pvr.argustv/changelog.txt 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/changelog.txt 2018-10-26 07:45:14.000000000 +0000 @@ -1,3 +1,44 @@ +v3.5.0 +- Update to PVR addon API v5.10.0 + +v3.4.2 +- Update to PVR addon API v5.9.0 + +v3.4.0 +- Update to PVR addon API v5.8.0 + +v3.3.3 +- Change to non deprecated jsoncpp methods + +v3.3.2 +- Use account info for smb shares if added in settings + +v3.3.1 +- Bump jsoncpp to version 1.8.3 + +v3.3.0 +- Update to PVR addon API v5.7.0 + +v3.2.0 +- Update to PVR addon API v5.5.0 +- Get rid of StdString +- Fix uwp build +v3.1.0 +- Update to PVR addon API v5.3.0 +v3.0.4 (22-05-2017) +- Remove of never used addon interface function +v3.0.3 (17-05-2017) +- Update Debian package control +- PVR addon callback way changes +v3.0.2 (16-05-2017) +- Removed old no more needed version functions +v3.0.1 (12-05-2017) +- Language updates +- Set dependency versions automatic during build +- Removed never used kodi to addon functions +- Build system fixes +v3.0.0 (05-12-2016) +- Initial Kodi v18 version v2.5.0 (20-09-2016) - Correct PVR API reference to v5.2.0 - Disable unsubscribing from events (at least for v17 Krypton) diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.af_za/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.af_za/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.af_za/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.af_za/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.am_et/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.am_et/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.am_et/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.am_et/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" @@ -30,7 +30,7 @@ msgctxt "#30005" msgid "Password" -msgstr "የመግቢያ ቃል" +msgstr "የ መግቢያ ቃል" msgctxt "#30006" msgid "Delay after tuning (ms)" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.ar_sa/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.ar_sa/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.ar_sa/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.ar_sa/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.be_by/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.be_by/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.be_by/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.be_by/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" @@ -38,7 +38,7 @@ msgctxt "#30005" msgid "Password" -msgstr "Password" +msgstr "Пароль" msgctxt "#30006" msgid "Delay after tuning (ms)" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.bg_bg/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.bg_bg/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.bg_bg/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.bg_bg/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" @@ -18,23 +18,23 @@ msgctxt "#30000" msgid "ARGUS TV Hostname" -msgstr "ARGUS TV хост" +msgstr "Име на хоста на ARGUS TV" msgctxt "#30001" msgid "ARGUS TV webserver port" -msgstr "Порт на уеб сървъра за ARGUS TV" +msgstr "Порт на уеб сървъра на ARGUS TV" msgctxt "#30002" msgid "Include Radio" -msgstr "Включи радиото" +msgstr "Включване и на радиата" msgctxt "#30003" msgid "Connect timeout (s)" -msgstr "Време на изчакване при свързване (с)" +msgstr "Време на изчакване при свързване (сек)" msgctxt "#30004" msgid "Windows user account" -msgstr "Windows потребителски профил" +msgstr "Потребител на Windows" msgctxt "#30005" msgid "Password" @@ -42,4 +42,8 @@ msgctxt "#30006" msgid "Delay after tuning (ms)" -msgstr "Забавяне след настройката (мс)" +msgstr "Забавяне след настройката (мсек)" + +msgctxt "#30007" +msgid "Single recordings in folder" +msgstr "Единични записи в папка" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.bs_ba/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.bs_ba/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.bs_ba/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.bs_ba/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.ca_es/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.ca_es/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.ca_es/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.ca_es/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.cs_cz/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.cs_cz/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.cs_cz/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.cs_cz/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.cy_gb/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.cy_gb/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.cy_gb/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.cy_gb/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.da_dk/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.da_dk/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.da_dk/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.da_dk/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.de_de/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.de_de/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.de_de/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.de_de/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.el_gr/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.el_gr/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.el_gr/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.el_gr/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.en_au/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.en_au/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.en_au/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.en_au/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.en_gb/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.en_gb/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.en_gb/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.en_gb/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.en_nz/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.en_nz/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.en_nz/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.en_nz/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.en_us/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.en_us/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.en_us/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.en_us/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.eo/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.eo/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.eo/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.eo/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.es_ar/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.es_ar/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.es_ar/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.es_ar/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.es_es/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.es_es/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.es_es/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.es_es/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.es_mx/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.es_mx/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.es_mx/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.es_mx/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.et_ee/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.et_ee/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.et_ee/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.et_ee/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" @@ -43,3 +43,7 @@ msgctxt "#30006" msgid "Delay after tuning (ms)" msgstr "Viivitus peale häälestust (ms)" + +msgctxt "#30007" +msgid "Single recordings in folder" +msgstr "Üksikud salvestised kaustas" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.eu_es/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.eu_es/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.eu_es/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.eu_es/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" @@ -16,6 +16,14 @@ "Language: eu_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +msgctxt "#30000" +msgid "ARGUS TV Hostname" +msgstr "ARGUS TV ostalari-izena" + +msgctxt "#30001" +msgid "ARGUS TV webserver port" +msgstr "ARGUS TV web-zerbitzariaren ataka" + msgctxt "#30002" msgid "Include Radio" msgstr "Irratia Barne Hartu" @@ -31,3 +39,11 @@ msgctxt "#30005" msgid "Password" msgstr "Pasahitza" + +msgctxt "#30006" +msgid "Delay after tuning (ms)" +msgstr "Sintonizatu osteko atzerapena (ms)" + +msgctxt "#30007" +msgid "Single recordings in folder" +msgstr "Grabazio bakarreko karpetak" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.fa_af/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.fa_af/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.fa_af/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.fa_af/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.fa_ir/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.fa_ir/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.fa_ir/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.fa_ir/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.fi_fi/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.fi_fi/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.fi_fi/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.fi_fi/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.fo_fo/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.fo_fo/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.fo_fo/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.fo_fo/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.fr_ca/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.fr_ca/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.fr_ca/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.fr_ca/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" @@ -18,7 +18,7 @@ msgctxt "#30000" msgid "ARGUS TV Hostname" -msgstr "Nom d'hôte ARGUS TV" +msgstr "Nom d’hôte ARGUS TV" msgctxt "#30001" msgid "ARGUS TV webserver port" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.fr_fr/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.fr_fr/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.fr_fr/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.fr_fr/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.gl_es/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.gl_es/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.gl_es/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.gl_es/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" @@ -30,11 +30,11 @@ msgctxt "#30003" msgid "Connect timeout (s)" -msgstr "Tempo de espera da conexión (s)" +msgstr "Tempo de espera da(s) conexión(s)" msgctxt "#30004" msgid "Windows user account" -msgstr "conta do usuario de Windows" +msgstr "Conta do usuario de Windows" msgctxt "#30005" msgid "Password" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.he_il/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.he_il/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.he_il/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.he_il/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.hr_hr/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.hr_hr/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.hr_hr/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.hr_hr/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.hu_hu/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.hu_hu/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.hu_hu/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.hu_hu/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.hy_am/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.hy_am/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.hy_am/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.hy_am/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.id_id/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.id_id/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.id_id/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.id_id/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.is_is/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.is_is/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.is_is/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.is_is/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.it_it/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.it_it/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.it_it/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.it_it/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.ja_jp/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.ja_jp/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.ja_jp/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.ja_jp/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.ko_kr/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.ko_kr/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.ko_kr/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.ko_kr/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.lt_lt/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.lt_lt/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.lt_lt/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.lt_lt/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.lv_lv/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.lv_lv/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.lv_lv/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.lv_lv/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.mi/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.mi/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.mi/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.mi/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.mk_mk/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.mk_mk/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.mk_mk/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.mk_mk/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.mn_mn/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.mn_mn/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.mn_mn/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.mn_mn/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.ms_my/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.ms_my/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.ms_my/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.ms_my/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.mt_mt/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.mt_mt/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.mt_mt/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.mt_mt/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.my_mm/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.my_mm/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.my_mm/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.my_mm/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.nb_no/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.nb_no/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.nb_no/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.nb_no/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.nl_nl/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.nl_nl/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.nl_nl/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.nl_nl/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" @@ -18,11 +18,11 @@ msgctxt "#30000" msgid "ARGUS TV Hostname" -msgstr "ARGUS TV hostnaam" +msgstr "ARGUS TV-hostnaam" msgctxt "#30001" msgid "ARGUS TV webserver port" -msgstr "ARGUS TV webserver poort" +msgstr "ARGUS TV-webserverpoort" msgctxt "#30002" msgid "Include Radio" @@ -30,7 +30,7 @@ msgctxt "#30003" msgid "Connect timeout (s)" -msgstr "Verbindingstimeout (s)" +msgstr "Verbindingstimeout(s)" msgctxt "#30004" msgid "Windows user account" @@ -46,4 +46,4 @@ msgctxt "#30007" msgid "Single recordings in folder" -msgstr "Enkele opnamen in map" +msgstr "Enkelvoudige opnamen in map" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.pl_pl/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.pl_pl/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.pl_pl/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.pl_pl/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.pt_br/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.pt_br/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.pt_br/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.pt_br/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.pt_pt/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.pt_pt/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.pt_pt/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.pt_pt/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.ro_ro/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.ro_ro/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.ro_ro/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.ro_ro/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.ru_ru/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.ru_ru/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.ru_ru/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.ru_ru/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.si_lk/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.si_lk/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.si_lk/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.si_lk/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.sk_sk/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.sk_sk/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.sk_sk/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.sk_sk/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.sl_si/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.sl_si/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.sl_si/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.sl_si/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.sq_al/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.sq_al/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.sq_al/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.sq_al/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.sr_rs/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.sr_rs/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.sr_rs/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.sr_rs/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.sr_rs@latin/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.sr_rs@latin/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.sr_rs@latin/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.sr_rs@latin/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.sv_se/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.sv_se/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.sv_se/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.sv_se/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.szl/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.szl/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.szl/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.szl/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.ta_in/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.ta_in/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.ta_in/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.ta_in/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.te_in/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.te_in/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.te_in/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.te_in/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.tg_tj/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.tg_tj/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.tg_tj/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.tg_tj/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.th_th/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.th_th/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.th_th/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.th_th/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.tr_tr/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.tr_tr/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.tr_tr/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.tr_tr/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.uk_ua/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.uk_ua/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.uk_ua/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.uk_ua/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.uz_uz/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.uz_uz/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.uz_uz/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.uz_uz/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.vi_vn/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.vi_vn/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.vi_vn/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.vi_vn/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.zh_cn/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.zh_cn/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.zh_cn/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.zh_cn/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.zh_tw/strings.po kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.zh_tw/strings.po --- kodi-pvr-argustv-2.5.6/pvr.argustv/resources/language/resource.language.zh_tw/strings.po 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/pvr.argustv/resources/language/resource.language.zh_tw/strings.po 2018-11-21 23:58:08.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KODI Main\n" -"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/xbmc/issues/\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" diff -Nru kodi-pvr-argustv-2.5.6/README.md kodi-pvr-argustv-3.5.4/README.md --- kodi-pvr-argustv-2.5.6/README.md 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/README.md 2018-10-26 07:45:14.000000000 +0000 @@ -11,7 +11,7 @@ 1. `git clone 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/project/cmake/addons` +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` 5. `make` ##### Useful links diff -Nru kodi-pvr-argustv-2.5.6/src/argustvrpc.cpp kodi-pvr-argustv-3.5.4/src/argustvrpc.cpp --- kodi-pvr-argustv-2.5.6/src/argustvrpc.cpp 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/src/argustvrpc.cpp 2018-10-26 07:45:15.000000000 +0000 @@ -23,6 +23,7 @@ * Tested under Windows and Linux */ +#include #include #include #include "p8-platform/os.h" @@ -31,8 +32,10 @@ #include "utils.h" #include "argustvrpc.h" #include "p8-platform/threads/mutex.h" -#include "p8-platform/util/StdString.h" - +#include "p8-platform/util/StringUtils.h" +#ifdef TARGET_WINDOWS_STORE +#include "p8-platform/windows/CharsetConverter.h" +#endif using namespace ADDON; // Some version dependent API strings @@ -123,13 +126,13 @@ if (XBMC->CURLOpen(hFile, XFILE::READ_NO_CACHE)) { - byte buffer[1024]; + unsigned char buffer[1024]; int bytesRead = 0; retval = 0; do { bytesRead = XBMC->ReadFile(hFile, buffer, sizeof(buffer)); - int written = fwrite(buffer, sizeof(byte), bytesRead, ofile); + int written = fwrite(buffer, sizeof(unsigned char), bytesRead, ofile); if (bytesRead != written) { XBMC->Log(LOG_ERROR, "Error while writing to %s (%d bytes written, while asked to write %d bytes).", @@ -169,15 +172,15 @@ #endif if (response.length() != 0) { - Json::Reader reader; - - bool parsingSuccessful = reader.parse(response, json_response); + std::string jsonReaderError; + Json::CharReaderBuilder jsonReaderBuilder; + std::unique_ptr const reader(jsonReaderBuilder.newCharReader()); - if ( !parsingSuccessful ) + if (!reader->parse(response.c_str(), response.c_str() + response.size(), &json_response, &jsonReaderError)) { XBMC->Log(LOG_DEBUG, "Failed to parse %s: \n%s\n", response.c_str(), - reader.getFormatedErrorMessages().c_str() ); + jsonReaderError.c_str() ); return E_FAILED; } } @@ -201,8 +204,14 @@ 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 #elif defined(TARGET_LINUX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) std::string tmppath = "/tmp/"; #else @@ -481,8 +490,8 @@ int AreRecordingSharesAccessible(Json::Value& thisplugin, Json::Value& response) { XBMC->Log(LOG_DEBUG, "AreRecordingSharesAccessible"); - Json::FastWriter writer; - std::string arguments = writer.write(thisplugin); + Json::StreamWriterBuilder wbuilder; + std::string arguments = Json::writeString(wbuilder, thisplugin); int retval = ArgusTVJSONRPC("ArgusTV/Control/AreRecordingSharesAccessible", arguments, response); @@ -534,8 +543,8 @@ std::string arguments = command; if (!g_current_livestream.empty()) { - Json::FastWriter writer; - arguments.append(writer.write(g_current_livestream)).append("}"); + Json::StreamWriterBuilder wbuilder; + arguments.append(Json::writeString(wbuilder, g_current_livestream)).append("}"); } else { @@ -593,8 +602,8 @@ { if(!g_current_livestream.empty()) { - Json::FastWriter writer; - std::string arguments = writer.write(g_current_livestream); + Json::StreamWriterBuilder wbuilder; + std::string arguments = Json::writeString(wbuilder, g_current_livestream); std::string response; int retval = ArgusTVRPC("ArgusTV/Control/StopLiveStream", arguments, response); @@ -624,8 +633,8 @@ { if(!g_current_livestream.empty()) { - Json::FastWriter writer; - std::string arguments = writer.write(g_current_livestream); + Json::StreamWriterBuilder wbuilder; + std::string arguments = Json::writeString(wbuilder, g_current_livestream); int retval = ArgusTVJSONRPC("ArgusTV/Control/GetLiveStreamTuningDetails", arguments, response); @@ -650,8 +659,8 @@ //true if(!g_current_livestream.empty()) { - Json::FastWriter writer; - std::string arguments = writer.write(g_current_livestream); + Json::StreamWriterBuilder wbuilder; + std::string arguments = Json::writeString(wbuilder, g_current_livestream); Json::Value response; int retval = ArgusTVJSONRPC("ArgusTV/Control/KeepLiveStreamAlive", arguments, response); @@ -720,8 +729,8 @@ jsArgument["ProgramTitle"] = title; jsArgument["Category"] = Json::nullValue; jsArgument["ChannelId"] = Json::nullValue; - Json::FastWriter writer; - std::string arguments = writer.write(jsArgument); + Json::StreamWriterBuilder wbuilder; + std::string arguments = Json::writeString(wbuilder, jsArgument); int retval = ArgusTV::ArgusTVJSONRPC(command, arguments, response); if (retval < 0) @@ -1023,8 +1032,8 @@ XBMC->Log(LOG_DEBUG, "AbortActiveRecording"); - Json::FastWriter writer; - std::string arguments = writer.write(activeRecording); + Json::StreamWriterBuilder wbuilder; + std::string arguments = Json::writeString(wbuilder, activeRecording); std::string response; retval = ArgusTVRPC("ArgusTV/Control/AbortActiveRecording", arguments, response); @@ -1110,8 +1119,8 @@ if (ArgusTV::GetEmptySchedule(newSchedule) < 0) return retval; // Fill relevant members - CStdString modifiedtitle = title; - modifiedtitle.Replace("\"", "\\\""); + std::string modifiedtitle = title; + StringUtils::Replace(modifiedtitle, "\"", "\\\""); newSchedule["KeepUntilMode"] = Json::Value(lifetimeToKeepUntilMode(lifetime)); newSchedule["KeepUntilValue"] = Json::Value(lifetimeToKeepUntilValue(lifetime)); @@ -1146,8 +1155,8 @@ rule["Type"] = Json::Value("Channels"); newSchedule["Rules"].append(rule); - Json::FastWriter writer; - std::string tmparguments = writer.write(newSchedule); + Json::StreamWriterBuilder wbuilder; + std::string tmparguments = Json::writeString(wbuilder, newSchedule); retval = ArgusTVJSONRPC("ArgusTV/Scheduler/SaveSchedule", tmparguments.c_str(), response); @@ -1189,8 +1198,8 @@ if (ArgusTV::GetEmptySchedule(newSchedule) < 0) return retval; // Fill relevant members - CStdString modifiedtitle = title; - modifiedtitle.Replace("\"", "\\\""); + std::string modifiedtitle = title; + StringUtils::Replace(modifiedtitle, "\"", "\\\""); newSchedule["IsOneTime"] = Json::Value(true); newSchedule["KeepUntilMode"] = Json::Value(lifetimeToKeepUntilMode(lifetime)); @@ -1218,8 +1227,8 @@ rule["Type"] = Json::Value("Channels"); newSchedule["Rules"].append(rule); - Json::FastWriter writer; - std::string tmparguments = writer.write(newSchedule); + Json::StreamWriterBuilder wbuilder; + std::string tmparguments = Json::writeString(wbuilder, newSchedule); retval = ArgusTVJSONRPC("ArgusTV/Scheduler/SaveSchedule", tmparguments, response); @@ -1272,8 +1281,8 @@ XBMC->Log(LOG_DEBUG, "GetUpcomingProgramsForSchedule"); char arguments[1024]; - Json::FastWriter writer; - snprintf( arguments, sizeof(arguments), "{\"IncludeCancelled\":true,\"Schedule\":%s}", writer.write(schedule).c_str()); + Json::StreamWriterBuilder wbuilder; + snprintf( arguments, sizeof(arguments), "{\"IncludeCancelled\":true,\"Schedule\":%s}", Json::writeString(wbuilder, schedule).c_str()); retval = ArgusTVJSONRPC("ArgusTV/Scheduler/UpcomingProgramsForSchedule", arguments, response); diff -Nru kodi-pvr-argustv-2.5.6/src/client.cpp kodi-pvr-argustv-3.5.4/src/client.cpp --- kodi-pvr-argustv-2.5.6/src/client.cpp 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/src/client.cpp 2018-10-26 07:45:15.000000000 +0000 @@ -21,6 +21,7 @@ #include "pvrclient-argustv.h" #include "utils.h" #include "uri.h" +#include "p8-platform/util/util.h" using namespace std; using namespace ADDON; @@ -209,20 +210,6 @@ return m_CurStatus; } -//-- HasSettings -------------------------------------------------------------- -// Report "true", yes this AddOn have settings -//----------------------------------------------------------------------------- -bool ADDON_HasSettings() -{ - return true; -} - -unsigned int ADDON_GetSettings(ADDON_StructSetting ***sSet) -{ - NOTUSED(sSet); - return 0; -} - //-- SetSetting --------------------------------------------------------------- // Called everytime a setting is changed by the user and to inform AddOn about // new setting and to do required stuff to apply it. @@ -289,16 +276,6 @@ return ADDON_STATUS_OK; } -void ADDON_Stop() -{ - ADDON_Destroy(); -} - -void ADDON_FreeSettings() -{ - -} - /*********************************************************** * PVR Client AddOn specific public library functions ***********************************************************/ @@ -319,28 +296,6 @@ { } -const char* GetPVRAPIVersion(void) -{ - static const char *strApiVersion = XBMC_PVR_API_VERSION; - return strApiVersion; -} - -const char* GetMininumPVRAPIVersion(void) -{ - static const char *strMinApiVersion = XBMC_PVR_MIN_API_VERSION; - return strMinApiVersion; -} - -const char* GetGUIAPIVersion(void) -{ - return ""; // GUI API not used -} - -const char* GetMininumGUIAPIVersion(void) -{ - return ""; // GUI API not used -} - //-- GetAddonCapabilities ----------------------------------------------------- // Tell XBMC our requirements //----------------------------------------------------------------------------- @@ -360,6 +315,9 @@ pCapabilities->bSupportsChannelScan = false; pCapabilities->bSupportsLastPlayedPosition = true; pCapabilities->bSupportsRecordingPlayCount = true; + pCapabilities->bSupportsRecordingsRename = true; + pCapabilities->bSupportsRecordingsLifetimeChange = false; + pCapabilities->bSupportsDescrambleInfo = false; return PVR_ERROR_NO_ERROR; } @@ -436,7 +394,6 @@ return g_client->GetEpg(handle, channel, iStart, iEnd); } - /*******************************************/ /** PVR Channel Functions **/ @@ -592,21 +549,11 @@ } -long long PositionLiveStream(void) -{ - return g_client->PositionLiveStream(); -} - long long LengthLiveStream(void) { return g_client->LengthLiveStream(); } -bool SwitchChannel(const PVR_CHANNEL &channelinfo) -{ - return g_client->SwitchChannel(channelinfo); -} - PVR_ERROR SignalStatus(PVR_SIGNAL_STATUS &signalStatus) { return g_client->SignalStatus(signalStatus); @@ -635,11 +582,6 @@ return g_client->SeekRecordedStream(iPosition, iWhence); } -long long PositionRecordedStream(void) -{ - return g_client->PositionRecordedStream(); -} - long long LengthRecordedStream(void) { return g_client->LengthRecordedStream(); @@ -673,21 +615,27 @@ } /** UNUSED API FUNCTIONS */ -PVR_ERROR MoveChannel(const PVR_CHANNEL &channel) { NOTUSED(channel); return PVR_ERROR_NOT_IMPLEMENTED; } DemuxPacket* DemuxRead(void) { return NULL; } void DemuxAbort(void) {} void DemuxReset(void) {} void DemuxFlush(void) {} PVR_ERROR GetRecordingEdl(const PVR_RECORDING&, PVR_EDL_ENTRY[], int*) { return PVR_ERROR_NOT_IMPLEMENTED; }; -unsigned int GetChannelSwitchDelay(void) { return 0; } 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; } +PVR_ERROR GetDescrambleInfo(PVR_DESCRAMBLE_INFO*) { return PVR_ERROR_NOT_IMPLEMENTED; } +PVR_ERROR SetRecordingLifetime(const PVR_RECORDING*) { return PVR_ERROR_NOT_IMPLEMENTED; } +PVR_ERROR GetStreamTimes(PVR_STREAM_TIMES*) { return PVR_ERROR_NOT_IMPLEMENTED; } +PVR_ERROR GetChannelStreamProperties(const PVR_CHANNEL*, PVR_NAMED_VALUE*, unsigned int*) { return PVR_ERROR_NOT_IMPLEMENTED; } +PVR_ERROR GetRecordingStreamProperties(const PVR_RECORDING*, PVR_NAMED_VALUE*, unsigned int*) { return PVR_ERROR_NOT_IMPLEMENTED; } +PVR_ERROR IsEPGTagPlayable(const EPG_TAG*, bool*) { return PVR_ERROR_NOT_IMPLEMENTED; } +PVR_ERROR IsEPGTagRecordable(const EPG_TAG*, bool*) { return PVR_ERROR_NOT_IMPLEMENTED; } +PVR_ERROR GetEPGTagStreamProperties(const EPG_TAG*, PVR_NAMED_VALUE*, unsigned int*) { return PVR_ERROR_NOT_IMPLEMENTED; } +PVR_ERROR GetEPGTagEdl(const EPG_TAG* epgTag, PVR_EDL_ENTRY edl[], int *size) { return PVR_ERROR_NOT_IMPLEMENTED; } +PVR_ERROR GetStreamReadChunkSize(int* chunksize) { return PVR_ERROR_NOT_IMPLEMENTED; } + } //end extern "C" diff -Nru kodi-pvr-argustv-2.5.6/src/client.h kodi-pvr-argustv-3.5.4/src/client.h --- kodi-pvr-argustv-2.5.6/src/client.h 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/src/client.h 2018-10-26 07:45:15.000000000 +0000 @@ -23,7 +23,6 @@ #ifndef CLIENT_H #define CLIENT_H -#include "p8-platform/util/StdString.h" #include "libXBMC_addon.h" #include "libXBMC_pvr.h" diff -Nru kodi-pvr-argustv-2.5.6/src/lib/tsreader/MultiFileReader.cpp kodi-pvr-argustv-3.5.4/src/lib/tsreader/MultiFileReader.cpp --- kodi-pvr-argustv-2.5.6/src/lib/tsreader/MultiFileReader.cpp 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/src/lib/tsreader/MultiFileReader.cpp 2018-10-26 07:45:15.000000000 +0000 @@ -38,15 +38,16 @@ #include "utils.h" #include #include "p8-platform/util/timeutils.h" -#include "p8-platform/util/StdString.h" #include #if !defined(TARGET_WINDOWS) #include #include "p8-platform/os.h" +#if !defined(TARGET_DARWIN) #define SUCCEEDED(hr) (((HRESULT)(hr)) >= 0) #endif +#endif using namespace ADDON; using namespace P8PLATFORM; diff -Nru kodi-pvr-argustv-2.5.6/src/lib/tsreader/TSReader.cpp kodi-pvr-argustv-3.5.4/src/lib/tsreader/TSReader.cpp --- kodi-pvr-argustv-2.5.6/src/lib/tsreader/TSReader.cpp 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/src/lib/tsreader/TSReader.cpp 2018-10-26 07:45:15.000000000 +0000 @@ -32,6 +32,7 @@ #include "MultiFileReader.h" #include "utils.h" #include "p8-platform/os.h" +#include "p8-platform/util/util.h" using namespace ADDON; diff -Nru kodi-pvr-argustv-2.5.6/src/lib/tsreader/TSReader.h kodi-pvr-argustv-3.5.4/src/lib/tsreader/TSReader.h --- kodi-pvr-argustv-2.5.6/src/lib/tsreader/TSReader.h 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/src/lib/tsreader/TSReader.h 2018-10-26 07:45:15.000000000 +0000 @@ -30,7 +30,6 @@ #include "client.h" #include "FileReader.h" -#include "p8-platform/util/StdString.h" namespace ArgusTV { @@ -55,7 +54,7 @@ bool m_bTimeShifting; bool m_bRecording; bool m_bLiveTv; - CStdString m_fileName; + std::string m_fileName; FileReader* m_fileReader; #if defined(TARGET_WINDOWS) LARGE_INTEGER liDelta; diff -Nru kodi-pvr-argustv-2.5.6/src/pvrclient-argustv.cpp kodi-pvr-argustv-3.5.4/src/pvrclient-argustv.cpp --- kodi-pvr-argustv-2.5.6/src/pvrclient-argustv.cpp 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/src/pvrclient-argustv.cpp 2018-10-26 07:45:15.000000000 +0000 @@ -30,10 +30,12 @@ #include "pvrclient-argustv.h" #include "argustvrpc.h" #include "p8-platform/util/timeutils.h" -#include "p8-platform/util/StdString.h" +#include "p8-platform/util/util.h" #include "lib/tsreader/TSReader.h" +#include + using namespace std; using namespace ADDON; @@ -349,7 +351,7 @@ m_epg_id_offset++; broadcast.iUniqueBroadcastId = m_epg_id_offset; broadcast.strTitle = epg.Title(); - broadcast.iChannelNumber = channel.iUniqueId; + broadcast.iUniqueChannelId = channel.iUniqueId; broadcast.startTime = epg.StartTime(); broadcast.endTime = epg.EndTime(); broadcast.strPlotOutline = epg.Subtitle(); @@ -474,8 +476,6 @@ tag.iEncryptionSystem = (unsigned int) -1; //How to fetch this from ARGUS TV?? tag.bIsRadio = (channel->Type() == ArgusTV::Radio ? true : false); tag.bIsHidden = false; - //Use OpenLiveStream to read from the timeshift .ts file or an rtsp stream - memset(tag.strStreamURL, 0, sizeof(tag.strStreamURL)); PVR_STRCPY(tag.strInputFormat, "video/mp2t"); tag.iChannelNumber = channel->LCN(); @@ -666,6 +666,8 @@ int retval = -1; int iNumRecordings = 0; + m_RecordingsMap.clear(); + XBMC->Log(LOG_DEBUG, "RequestRecordingsList()"); int64_t t = GetTimeMs(); retval = ArgusTV::GetRecordingGroupByTitle(recordinggroupresponse); @@ -714,7 +716,8 @@ } PVR_STRCPY(tag.strTitle, recording.Title()); PVR_STRCPY(tag.strPlotOutline, recording.SubTitle()); - PVR_STRCPY(tag.strStreamURL, recording.RecordingFileName()); + + m_RecordingsMap[tag.strRecordingId] = recording.RecordingFileName(); /* TODO: PVR API 5.0.0: Implement this */ tag.iChannelUid = PVR_CHANNEL_INVALID_UID; @@ -738,15 +741,19 @@ PVR_ERROR cPVRClientArgusTV::DeleteRecording(const PVR_RECORDING &recinfo) { PVR_ERROR rc = PVR_ERROR_FAILED; + std::string UNCname; - XBMC->Log(LOG_DEBUG, "->DeleteRecording(%s)", recinfo.strRecordingId); - std::string UNCname = ToUNC(recinfo.strStreamURL); + if (!FindRecEntryUNC(recinfo.strRecordingId, UNCname)) + return PVR_ERROR_FAILED; + + XBMC->Log(LOG_DEBUG, "->DeleteRecording(%s)", UNCname.c_str()); XBMC->Log(LOG_DEBUG, "->DeleteRecording(%s == \"%s\")", recinfo.strRecordingId, UNCname.c_str()); // JSONify the stream_url Json::Value recordingname (UNCname); - Json::FastWriter writer; - std::string jsonval = writer.write(recordingname); + Json::StreamWriterBuilder wbuilder; + std::string jsonval = Json::writeString(wbuilder, recordingname); + if (ArgusTV::DeleteRecording(jsonval) >= 0) { // Trigger XBMC to update it's list @@ -765,14 +772,17 @@ PVR_ERROR cPVRClientArgusTV::SetRecordingLastPlayedPosition(const PVR_RECORDING &recinfo, int lastplayedposition) { - XBMC->Log(LOG_DEBUG, "->SetRecordingLastPlayedPosition(index=%s [%s], %d)", recinfo.strRecordingId, recinfo.strStreamURL, lastplayedposition); + std::string recordingfilename; - std::string recordingfilename = ToUNC(recinfo.strStreamURL); + if (!FindRecEntryUNC(recinfo.strRecordingId, recordingfilename)) + return PVR_ERROR_FAILED; + + XBMC->Log(LOG_DEBUG, "->SetRecordingLastPlayedPosition(index=%s [%s], %d)", recinfo.strRecordingId, recordingfilename.c_str(), lastplayedposition); // JSONify the stream_url Json::Value recordingname (recordingfilename); - Json::FastWriter writer; - std::string jsonval = writer.write(recordingname); + Json::StreamWriterBuilder wbuilder; + std::string jsonval = Json::writeString(wbuilder, recordingname); int retval = ArgusTV::SetRecordingLastWatchedPosition(jsonval, lastplayedposition); if (retval < 0) { @@ -785,15 +795,18 @@ int cPVRClientArgusTV::GetRecordingLastPlayedPosition(const PVR_RECORDING &recinfo) { - XBMC->Log(LOG_DEBUG, "->GetRecordingLastPlayedPosition(index=%s [%s])", recinfo.strRecordingId, recinfo.strStreamURL); + std::string recordingfilename; + + if (!FindRecEntryUNC(recinfo.strRecordingId, recordingfilename)) + return 0; - std::string recordingfilename = ToUNC(recinfo.strStreamURL); + XBMC->Log(LOG_DEBUG, "->GetRecordingLastPlayedPosition(index=%s [%s])", recinfo.strRecordingId, recordingfilename.c_str()); // JSONify the stream_url Json::Value response; Json::Value recordingname (recordingfilename); - Json::FastWriter writer; - std::string jsonval = writer.write(recordingname); + Json::StreamWriterBuilder wbuilder; + std::string jsonval = Json::writeString(wbuilder, recordingname); int retval = ArgusTV::GetRecordingLastWatchedPosition(jsonval, response); if (retval < 0) { @@ -802,21 +815,24 @@ } retval = response.asInt(); - XBMC->Log(LOG_DEBUG, "GetRecordingLastPlayedPosition(index=%s [%s]) returns %d.\n", recinfo.strRecordingId, recinfo.strStreamURL, retval); + XBMC->Log(LOG_DEBUG, "GetRecordingLastPlayedPosition(index=%s [%s]) returns %d.\n", recinfo.strRecordingId, recordingfilename.c_str(), retval); return retval; } PVR_ERROR cPVRClientArgusTV::SetRecordingPlayCount(const PVR_RECORDING &recinfo, int playcount) { - XBMC->Log(LOG_DEBUG, "->SetRecordingPlayCount(index=%s [%s], %d)", recinfo.strRecordingId, recinfo.strStreamURL, playcount); + std::string recordingfilename; - std::string recordingfilename = ToUNC(recinfo.strStreamURL); + if (!FindRecEntryUNC(recinfo.strRecordingId, recordingfilename)) + return PVR_ERROR_FAILED; + + XBMC->Log(LOG_DEBUG, "->SetRecordingPlayCount(index=%s [%s], %d)", recinfo.strRecordingId, recordingfilename.c_str(), playcount); // JSONify the stream_url Json::Value recordingname (recordingfilename); - Json::FastWriter writer; - std::string jsonval = writer.write(recordingname); + Json::StreamWriterBuilder wbuilder; + std::string jsonval = Json::writeString(wbuilder, recordingname); int retval = ArgusTV::SetRecordingFullyWatchedCount(jsonval, playcount); if (retval < 0) { @@ -971,14 +987,14 @@ timerinfo.iClientChannelUid, pChannel->Guid().c_str()); // Try to get original EPG data from ARGUS - struct tm* convert = localtime(&timerinfo.startTime); - struct tm tm_start = *convert; - convert = localtime(&timerinfo.endTime); - struct tm tm_end = *convert; + time_t startTime = timerinfo.startTime; + struct tm* tm_start = localtime(&startTime); + time_t endTime = timerinfo.endTime; + struct tm* tm_end = localtime(&endTime); Json::Value epgResponse; XBMC->Log(LOG_DEBUG, "%s: Getting EPG Data for ARGUS TV channel %s", __FUNCTION__, pChannel->GuideChannelID().c_str()); - int retval = ArgusTV::GetEPGData(pChannel->GuideChannelID(), tm_start, tm_end, epgResponse); + int retval = ArgusTV::GetEPGData(pChannel->GuideChannelID(), *tm_start, *tm_end, epgResponse); std::string programTitle = timerinfo.strTitle; if (retval >= 0) @@ -1208,24 +1224,26 @@ case ArgusTV::NoFreeCardFound: XBMC->Log(LOG_INFO, "No free tuner found."); XBMC->QueueNotification(QUEUE_ERROR, "No free tuner found!"); - break; + return false; case ArgusTV::IsScrambled: XBMC->Log(LOG_INFO, "Scrambled channel."); XBMC->QueueNotification(QUEUE_ERROR, "Scrambled channel!"); - break; + return false; case ArgusTV::ChannelTuneFailed: XBMC->Log(LOG_INFO, "Tuning failed."); XBMC->QueueNotification(QUEUE_ERROR, "Tuning failed!"); - break; + return false; default: XBMC->Log(LOG_ERROR, "Tuning failed, unknown error"); XBMC->QueueNotification(QUEUE_ERROR, "Unknown error!"); - break; + return false; } } filename = ToCIFS(filename); + InsertUser(filename); + if (retval != E_SUCCESS || filename.length() == 0) { XBMC->Log(LOG_ERROR, "Could not start the timeshift for channel %i (%s)", channelinfo.iUniqueId, channel->Guid().c_str()); @@ -1421,25 +1439,6 @@ } } - -bool cPVRClientArgusTV::SwitchChannel(const PVR_CHANNEL &channelinfo) -{ - XBMC->Log(LOG_DEBUG, "->SwitchChannel(%i)", channelinfo.iUniqueId); - bool fRc = false; - - if (g_iTuneDelay == 0) - { - // Close existing live stream before opening a new one. - // This is slower, but it helps XBMC playback when the streams change types (e.g. SD->HD). - // It also gives a better tuner allocation when using multiple clients with a limited count of tuners. - CloseLiveStream(); - } - fRc = OpenLiveStream(channelinfo); - - return fRc; -} - - PVR_ERROR cPVRClientArgusTV::SignalStatus(PVR_SIGNAL_STATUS &signalStatus) { static PVR_SIGNAL_STATUS tag; @@ -1490,13 +1489,41 @@ return PVR_ERROR_NO_ERROR; } +bool cPVRClientArgusTV::FindRecEntryUNC(const std::string &recId, std::string &recEntryURL) +{ + auto iter = m_RecordingsMap.find(recId); + if (iter == m_RecordingsMap.end()) + return false; + + recEntryURL = ToUNC(iter->second); + if (recEntryURL == "") + return false; + + return true; +} + +bool cPVRClientArgusTV::FindRecEntry(const std::string &recId, std::string &recEntryURL) +{ + auto iter = m_RecordingsMap.find(recId); + if (iter == m_RecordingsMap.end()) + return false; + + recEntryURL = iter->second; + InsertUser(recEntryURL); + + return !recEntryURL.empty(); +} /************************************************************/ /** Record stream handling */ bool cPVRClientArgusTV::OpenRecordedStream(const PVR_RECORDING &recinfo) { - XBMC->Log(LOG_DEBUG, "->OpenRecordedStream(%s)", recinfo.strStreamURL); - std::string UNCname = ToUNC(recinfo.strStreamURL); + std::string UNCname; + + if (!FindRecEntry(recinfo.strRecordingId, UNCname)) + return false; + + XBMC->Log(LOG_DEBUG, "->OpenRecordedStream(%s)", UNCname.c_str()); if (m_tsreader != NULL) { diff -Nru kodi-pvr-argustv-2.5.6/src/pvrclient-argustv.h kodi-pvr-argustv-3.5.4/src/pvrclient-argustv.h --- kodi-pvr-argustv-2.5.6/src/pvrclient-argustv.h 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/src/pvrclient-argustv.h 2018-10-26 07:45:15.000000000 +0000 @@ -114,6 +114,8 @@ void FreeChannels(std::vector m_Channels); void Close(); bool _OpenLiveStream(const PVR_CHANNEL &channel); + bool FindRecEntryUNC(const std::string &recId, std::string &recEntryURL); + bool FindRecEntry(const std::string &recId, std::string &recEntryURL); int m_iCurrentChannel; bool m_bConnected; @@ -128,6 +130,7 @@ P8PLATFORM::CMutex m_ChannelCacheMutex; std::vector m_TVChannels; // Local TV channel cache list needed for id to guid conversion std::vector m_RadioChannels; // Local Radio channel cache list needed for id to guid conversion + std::map m_RecordingsMap; // int m_epg_id_offset; int m_signalqualityInterval; ArgusTV::CTsReader* m_tsreader; diff -Nru kodi-pvr-argustv-2.5.6/src/tools.h kodi-pvr-argustv-3.5.4/src/tools.h --- kodi-pvr-argustv-2.5.6/src/tools.h 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/src/tools.h 2018-10-26 07:45:15.000000000 +0000 @@ -23,7 +23,6 @@ #define __TOOLS_H #include "client.h" -#include "p8-platform/util/StdString.h" #include #include #include diff -Nru kodi-pvr-argustv-2.5.6/src/utils.cpp kodi-pvr-argustv-3.5.4/src/utils.cpp --- kodi-pvr-argustv-2.5.6/src/utils.cpp 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/src/utils.cpp 2018-10-26 07:45:15.000000000 +0000 @@ -144,6 +144,27 @@ return CIFSname; } +bool InsertUser(std::string& UNCName) +{ + if (g_szUser.empty()) + return false; + + if (UNCName.find("smb://") == 0) + { + std::string SMBPrefix = "smb://" + g_szUser; + + if (!g_szPass.empty()) + SMBPrefix.append(":" + g_szPass); + + SMBPrefix.append("@"); + + UNCName.replace(0, std::string("smb://").length(), SMBPrefix); + XBMC->Log(LOG_DEBUG, "Account Info added to SMB url"); + return true; + } + return false; +} + // transform [smb://user:password@nascat/qrecordings/NCIS/2012-05-15_20-30_SBS 6_NCIS.ts] // into [\\nascat\qrecordings\NCIS\2012-05-15_20-30_SBS 6_NCIS.ts] @@ -166,236 +187,5 @@ std::string temp = CIFSName; return ToUNC(temp); } -#if defined(TARGET_WINDOWS) -////////////////////////////////////////////////////////////////////////////// -// -// *** Routines to convert between Unicode UTF-8 and Unicode UTF-16 *** -// -// By Giovanni Dicanio -// -// Last update: 2010, January 2nd -// -// -// These routines use ::MultiByteToWideChar and ::WideCharToMultiByte -// Win32 API functions to convert between Unicode UTF-8 and UTF-16. -// -// UTF-16 strings are stored in instances of CStringW. -// UTF-8 strings are stored in instances of CStringA. -// -// On error, the conversion routines use AtlThrow to signal the -// error condition. -// -// If input string pointers are NULL, empty strings are returned. -// -// -// Prefixes used in these routines: -// -------------------------------- -// -// - cch : count of characters (CHAR's or WCHAR's) -// - cb : count of bytes -// - psz : pointer to a NUL-terminated string (CHAR* or WCHAR*) -// - str : instance of CString(A/W) class -// -// -// -// Useful Web References: -// ---------------------- -// -// WideCharToMultiByte Function -// http://msdn.microsoft.com/en-us/library/dd374130.aspx -// -// MultiByteToWideChar Function -// http://msdn.microsoft.com/en-us/library/dd319072.aspx -// -// AtlThrow -// http://msdn.microsoft.com/en-us/library/z325eyx0.aspx -// -// -// Developed on VC9 (Visual Studio 2008 SP1) -// -// -////////////////////////////////////////////////////////////////////////////// - - - -namespace UTF8Util -{ - //---------------------------------------------------------------------------- - // FUNCTION: ConvertUTF8ToUTF16 - // DESC: Converts Unicode UTF-8 text to Unicode UTF-16 (Windows default). - //---------------------------------------------------------------------------- - CStdStringW ConvertUTF8ToUTF16(const char* pszTextUTF8) - { - // - // Special case of NULL or empty input string - // - if ( (pszTextUTF8 == NULL) || (*pszTextUTF8 == '\0') ) - { - // Return empty string - return L""; - } - - // - // Consider CHAR's count corresponding to total input string length, - // including end-of-string (\0) character - // - const size_t cchUTF8Max = INT_MAX - 1; - size_t cchUTF8 = strlen(pszTextUTF8); - - // Consider also terminating \0 - ++cchUTF8; - - // Convert to 'int' for use with MultiByteToWideChar API - int cbUTF8 = static_cast( cchUTF8 ); - - // - // Get size of destination UTF-16 buffer, in WCHAR's - // - int cchUTF16 = ::MultiByteToWideChar( - CP_UTF8, // convert from UTF-8 - MB_ERR_INVALID_CHARS, // error on invalid chars - pszTextUTF8, // source UTF-8 string - cbUTF8, // total length of source UTF-8 string, - // in CHAR's (= bytes), including end-of-string \0 - NULL, // unused - no conversion done in this step - 0 // request size of destination buffer, in WCHAR's - ); - - if ( cchUTF16 == 0 ) - { - DWORD dwErr = GetLastError(); - XBMC->Log(LOG_ERROR, "ConvertUTF8ToUTF16 failed lasterror == 0x%X.", dwErr); - return L""; - } - - - // - // Allocate destination buffer to store UTF-16 string - // - CStdStringW strUTF16; - WCHAR * pszUTF16 = strUTF16.GetBuffer( cchUTF16 ); - - // - // Do the conversion from UTF-8 to UTF-16 - // - int result = ::MultiByteToWideChar( - CP_UTF8, // convert from UTF-8 - MB_ERR_INVALID_CHARS, // error on invalid chars - pszTextUTF8, // source UTF-8 string - cbUTF8, // total length of source UTF-8 string, - // in CHAR's (= bytes), including end-of-string \0 - pszUTF16, // destination buffer - cchUTF16 // size of destination buffer, in WCHAR's - ); - - if ( result == 0 ) - { - DWORD dwErr = GetLastError(); - XBMC->Log(LOG_ERROR, "ConvertUTF8ToUTF16 failed lasterror == 0x%X.", dwErr); - return L""; - } - - // Release internal CString buffer - strUTF16.ReleaseBuffer(); - - // Return resulting UTF16 string - return strUTF16; - } - - - //---------------------------------------------------------------------------- - // FUNCTION: ConvertUTF16ToUTF8 - // DESC: Converts Unicode UTF-16 (Windows default) text to Unicode UTF-8. - //---------------------------------------------------------------------------- - CStdStringA ConvertUTF16ToUTF8(const WCHAR * pszTextUTF16) - { - // - // Special case of NULL or empty input string - // - if ( (pszTextUTF16 == NULL) || (*pszTextUTF16 == L'\0') ) - { - // Return empty string - return ""; - } - - // - // Consider WCHAR's count corresponding to total input string length, - // including end-of-string (L'\0') character. - // - const size_t cchUTF16Max = INT_MAX - 1; - size_t cchUTF16 = wcslen(pszTextUTF16); - - // Consider also terminating \0 - ++cchUTF16; - - // - // WC_ERR_INVALID_CHARS flag is set to fail if invalid input character - // is encountered. - // This flag is supported on Windows Vista and later. - // Don't use it on Windows XP and previous. - // -#if (WINVER >= 0x0600) - DWORD dwConversionFlags = WC_ERR_INVALID_CHARS; -#else - DWORD dwConversionFlags = 0; -#endif - - // - // Get size of destination UTF-8 buffer, in CHAR's (= bytes) - // - int cbUTF8 = ::WideCharToMultiByte( - CP_UTF8, // convert to UTF-8 - dwConversionFlags, // specify conversion behavior - pszTextUTF16, // source UTF-16 string - static_cast( cchUTF16 ), // total source string length, in WCHAR's, - // including end-of-string \0 - NULL, // unused - no conversion required in this step - 0, // request buffer size - NULL, NULL // unused - ); - - if ( cbUTF8 == 0 ) - { - DWORD dwErr = GetLastError(); - XBMC->Log(LOG_ERROR, "ConvertUTF16ToUTF8 failed lasterror == 0x%X.", dwErr); - return L""; - } - - // - // Allocate destination buffer for UTF-8 string - // - CStdStringA strUTF8; - int cchUTF8 = cbUTF8; // sizeof(CHAR) = 1 byte - CHAR * pszUTF8 = strUTF8.GetBuffer( cchUTF8 ); - - // - // Do the conversion from UTF-16 to UTF-8 - // - int result = ::WideCharToMultiByte( - CP_UTF8, // convert to UTF-8 - dwConversionFlags, // specify conversion behavior - pszTextUTF16, // source UTF-16 string - static_cast( cchUTF16 ), // total source string length, in WCHAR's, - // including end-of-string \0 - pszUTF8, // destination buffer - cbUTF8, // destination buffer size, in bytes - NULL, NULL // unused - ); - - if ( result == 0 ) - { - DWORD dwErr = GetLastError(); - XBMC->Log(LOG_ERROR, "ConvertUTF16ToUTF8 failed lasterror == 0x%X.", dwErr); - return L""; - } - - // Release internal CString buffer - strUTF8.ReleaseBuffer(); - - // Return resulting UTF-8 string - return strUTF8; - } -} // namespace UTF8Util -#endif ////////////////////////////////////////////////////////////////////////////// diff -Nru kodi-pvr-argustv-2.5.6/src/utils.h kodi-pvr-argustv-3.5.4/src/utils.h --- kodi-pvr-argustv-2.5.6/src/utils.h 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/src/utils.h 2018-10-26 07:45:15.000000000 +0000 @@ -19,8 +19,6 @@ #include #include -#include "p8-platform/util/StdString.h" -#include "p8-platform/util/util.h" // don't use the UNUSED macro from StdString.h as it will generate "error: statement has no effect [-Werror=unused-value]" #define NOTUSED(x) ((void) x) @@ -44,11 +42,5 @@ std::string ToCIFS(std::string& UNCName); std::string ToUNC(std::string& CIFSName); std::string ToUNC(const char* CIFSName); +bool InsertUser(std::string& UNCName); -#if defined(TARGET_WINDOWS) -namespace UTF8Util -{ - CStdStringW ConvertUTF8ToUTF16(const char* pszTextUTF8); - CStdStringA ConvertUTF16ToUTF8(const WCHAR * pszTextUTF16); -} -#endif diff -Nru kodi-pvr-argustv-2.5.6/.travis.yml kodi-pvr-argustv-3.5.4/.travis.yml --- kodi-pvr-argustv-2.5.6/.travis.yml 2017-03-24 20:31:17.000000000 +0000 +++ kodi-pvr-argustv-3.5.4/.travis.yml 2018-11-21 23:58:08.000000000 +0000 @@ -3,24 +3,28 @@ # # 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 +# Travis defaults to building on Ubuntu Trusty when building on +# Linux. We need Xenial in order to get up to date versions of # cmake and g++. # +env: + global: + - app_id=pvr.argustv + 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 + osx_image: xcode9.4 # # The addon source is automatically checked out in $TRAVIS_BUILD_DIR, @@ -29,7 +33,9 @@ before_script: - cd $TRAVIS_BUILD_DIR/.. - git clone --depth=1 https://github.com/xbmc/xbmc.git - - cd pvr.argustv && mkdir build && cd build - - cmake -DADDONS_TO_BUILD=pvr.argustv -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 + - 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