diff -Nru kodi-pvr-pctv-0.2.11/CMakeLists.txt kodi-pvr-pctv-1.4.5/CMakeLists.txt --- kodi-pvr-pctv-0.2.11/CMakeLists.txt 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-pctv-1.4.5/CMakeLists.txt 2016-12-25 20:06:41.000000000 +0000 @@ -6,17 +6,17 @@ enable_language(CXX) -find_package(kodi REQUIRED) +find_package(Kodi REQUIRED) find_package(kodiplatform REQUIRED) -find_package(platform REQUIRED) +find_package(p8-platform REQUIRED) find_package(JsonCpp REQUIRED) include_directories(${kodiplatform_INCLUDE_DIRS} - ${platform_INCLUDE_DIRS} + ${p8-platform_INCLUDE_DIRS} ${JSONCPP_INCLUDE_DIRS} ${KODI_INCLUDE_DIR}) -set(DEPLIBS ${platform_LIBRARIES} +set(DEPLIBS ${p8-platform_LIBRARIES} ${JSONCPP_LIBRARIES}) set(PCTV_SOURCES src/client.cpp diff -Nru kodi-pvr-pctv-0.2.11/debian/changelog kodi-pvr-pctv-1.4.5/debian/changelog --- kodi-pvr-pctv-0.2.11/debian/changelog 2016-04-27 11:43:27.000000000 +0000 +++ kodi-pvr-pctv-1.4.5/debian/changelog 2017-01-19 16:53:45.000000000 +0000 @@ -1,12 +1,16 @@ -kodi-pvr-pctv (0.2.11-1~xenial) xenial; urgency=low +kodi-pvr-pctv (1.4.5-3~xenial) xenial; urgency=low [ kodi ] * autogenerated dummy changelog [ wsnipex ] - * 0.2.11 - Updated Language files from Transifex 0.2.10 - Updated - Language files from Transifex 0.2.9 - Updated Language files from - Transifex 0.2.8 - Updated Language files from Transifex 0.2.7 - + * 1.4.2 - Updated Language files from Transifex 1.4.1 - Updated + Language files from Transifex 1.4.0 - Cmake: rename find_package + kodi to Kodi 1.3.1 - Fix includes 1.3.0 - Updated to PVR addon API + v5.2.0 1.2.0 - Updated to PVR addon API v5.1.0 1.1.0 - Updated to + PVR addon API v5.0.0 1.0.1 - Updated Language files from Transifex + 1.0.0 - Initial Kodi Krypton version. 0.2.9 - Updated Language files + from Transifex 0.2.8 - Updated Language files from Transifex 0.2.7 - Updated Language files from Transifex 0.2.6 - Updated to PVR API v4.1.0 0.2.5 - Updated to PVR API v4.0.0 0.2.4 - Updated to PVR API v3.0.0 (API 1.9.7 Compatibility Mode) 0.2.3 - Updated to PVR API @@ -20,4 +24,4 @@ space - minor changes 0.1.2 - sort all channels by name (almost like Broadway) 0.1.1 - fix: add timer 0.1.0 - initial version - -- wsnipex Wed, 27 Apr 2016 13:43:27 +0200 + -- wsnipex Thu, 19 Jan 2017 17:53:45 +0100 diff -Nru kodi-pvr-pctv-0.2.11/debian/changelog.tmp kodi-pvr-pctv-1.4.5/debian/changelog.tmp --- kodi-pvr-pctv-0.2.11/debian/changelog.tmp 2016-04-27 11:43:25.000000000 +0000 +++ kodi-pvr-pctv-1.4.5/debian/changelog.tmp 2017-01-19 16:53:24.000000000 +0000 @@ -1,4 +1,4 @@ -kodi-pvr-pctv (0.2.11-1~#DIST#) #DIST#; urgency=low +kodi-pvr-pctv (1.4.5-3~#DIST#) #DIST#; urgency=low [ kodi ] * autogenerated dummy changelog diff -Nru kodi-pvr-pctv-0.2.11/debian/kodi-pvr-pctv.install kodi-pvr-pctv-1.4.5/debian/kodi-pvr-pctv.install --- kodi-pvr-pctv-0.2.11/debian/kodi-pvr-pctv.install 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-pctv-1.4.5/debian/kodi-pvr-pctv.install 2017-01-19 16:53:24.000000000 +0000 @@ -1,2 +1,2 @@ -usr/lib/*/addons/pvr.pctv/pvr.pctv.so* usr/lib/kodi/addons/pvr.pctv -usr/share/kodi/addons/pvr.pctv +usr/lib +usr/share diff -Nru kodi-pvr-pctv-0.2.11/pvr.pctv/addon.xml.in kodi-pvr-pctv-1.4.5/pvr.pctv/addon.xml.in --- kodi-pvr-pctv-0.2.11/pvr.pctv/addon.xml.in 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-pctv-1.4.5/pvr.pctv/addon.xml.in 2016-12-25 20:06:41.000000000 +0000 @@ -1,12 +1,12 @@ - + PVR Client to connect PCTV Systems Broadway to Kodi Cliente PVR para conectar a Kodi PCTV Systems Broadway Cliente PVR para conectar el sistema PCTV a Kodi - Kodin PVR-asiakasohjelma PCTV Systems Broadwaylle + Cliente PVR para conectar PCTV Systems Broadway a Kodi + Kodin PCTV Systems Broadway -asiakasohjelma Client de numériscope pour connecter Broadway de PCTV Systems à Kodi Client enregistreur vidéo pour connecter le Broadway de PCTV Systems à Kodi Cliente PVR para conectar os sistemas de transmisión PCTV ao Kodi @@ -33,13 +34,14 @@ Klien PVR untuk menghubungkan PCTV Sistem Broadway ke Kodi Upptökubiðlari til að tengja PCTV Systems Broadway til Kodi Client PVR per connettere Dispositivi Broadway PCTV a Kodi + PCTV 시스템 브로드웨이를 Kodi로 연결하는 PVR 클라이언트 PVR klientas PCTV Systems Broadway sujungimui su Kodi Klien PVR untuk sambung PCTV Systems Broadway ke Kodi PVR Klient for å koble PCTV System Broadway til Kodi PVR-cliënt verbindt PCTV Systems Broadway met Kodi Klient telewizji dla systemu PCTV Systems Broadway Cliente de PVR para conectar ao Sistema PCTV Broadway via Kodi - Cliente PVR para ligar o Broadway de sistemas PCTV ao Kodi + Cliente PVR para ligar PCTV Systems Broadway ao Kodi Client PVR pentru conectarea dispozitivului „Broadway” de la „PCTV Systems” la Kodi Клиент PVR для подключения PCTV Systems Broadway к Kodi PVR klient na pripojenie systémov PCTV Broadway ku systému Kodi @@ -48,9 +50,11 @@ PVR Klijent za povezivanje PCTV Systems Broadway sa Kodi PVR-klient för anslutning av PCTV Systems Broadway till Kodi Klijynt PVR do kuplowaniŏ PCTV Systems Broadway ze Kodi + PCTV Sistemleri Broadway'i Kodi'ye bağlayan PVR İstemcisi Kodi 连接 PCTV 系统的 PVR 客户端 + 連接至PCTV Systems Broadway的Kodi PVR用戶端 PCTV Systems voorprogram. Ondersteun stroom van Lewendige TV & Opnames, EPG vertoon, Tydhouers. - Frontend PCTV Systems. Donar suport a la transmissió de TV en viu i enregistraments, guia electrònica de programació (EPG), temporitzadors. + Frontal dels sistemes PCTV. És compatible amb les transmissions de TV en directe i enregistraments, guia electrònica de programació (EPG), temporitzadors. PCTV Systems frontend. Podporuje streamování TV vysílání & Nahrávek, EPG zobrazení, Časovače. PCTV Systems. Understøtter streaming af Live TV & optagelse, EPG visning og Timere. PCTV Systemfrondend. Unterstütz das Streamen von Live TV & Aufnahmen, EPG Ansicht und Timern. @@ -59,7 +63,8 @@ PCTV Systems frontend. Supporting streaming of Live TV & Recordings, EPG View, Timers. Interfaz PCTV. Soporta TV en vivo y Grabacion desde guias o eventos Frontend PCTV Systems. Soporta TV en vivo, grabaciones, guía de programación EPG y temporizadores. - PCTV; tukee reaaliaikaisen television ja nauhoituksien streamausta, EPGtä ja nauhoituksien ajastusta. + PCTV Systems frontend. Soporta transmisión de TV en directo y grabaciones, ver EPG, Temporizadores. + PCTV Systems-asiakasohjelma. Tukee suorien tv-lähetysten ja tallennusten katsomista, ohjelmaopasta ja ohjelmien ajastamista. Frontal PCTV Systems. Prenant en charge la diffusion en continu de la télé en direct et des enregistrements, la visualisation du GÉP et des minuteries. Interface logicielle de PCTV Systems. Prend en charge la diffusion de la TV en direct et des enregistrements, la vue du guide électronique des programmes TV et les programmations. Interface PCTV; soporta TV en directo, gravacións, Guía de programación e temporizadores. @@ -69,12 +74,13 @@ Paling depan Sistem PCTV. Mendukung streaming TV Live & Rekaman, EPG View, Timers. PCTV Systems framendi. Styður straum frá beinum útsendingum og upptökum, rafræna dagskrárvísa og tímastillingar. Frontend PCTV Systems. Supporta lo streaming Live TV, le registrazioni, la visualizzazione dell'EPG e i Timers. + PCTV 시스템 프론트엔드. 라이브 TV 스트리밍 & 녹화, EPG, 타이머 지원. PCTV Systems naudotojo sąsaja. Palaiko TV transliacijas ir įrašymą, EPG rodymą, laikmačius. PCTV sistēmu galasistēma. Atbalsta tiešraides TV straumēšanu & ierakstus, EPG skatu, taimerus. Bahagian hadapan PCTV Systems. Menyokong penstriman TV Langsung & Rakaman, Paparan EPG, Pemasa. PCTV frontend. Støtte for Live TV & Opptak, EPG, Timere. PCTV Systeem frontend. Ondersteunt het streamen van Live TV & opnames, EPG overzicht, Timers. - Klient telewizyjny dla systemu PCTV obsługuje strumieniowanie kanałów telewizyjnych, nagrywanie i harmonogram nagrań oraz funkcje przewodnika telewizyjnego. + Klient telewizji dla systemu PCTV obsługuje transmisję kanałów telewizyjnych, nagrywanie i harmonogram nagrań oraz funkcje przewodnika telewizyjnego. Frontend para PCTV Systems. Suporta streaming de Tv ao Vivo & Gravações, Visualização de EPG, Agendamentos. Interface para sistemas PCTV. Suporta transmissão e gravação de TV em direto, EPG e temporizadores. Partea din față pentru PCTV Systems. Suportă difuzarea în flux a televiziuniii în direct & Înregistrări, EPG Vizualizare, Cronometre. @@ -85,10 +91,12 @@ PCTV Systems interfejs. Podržava strimovanje TV Uživo & Snimaka, pregled EPG-a, Tajmere. PCTV Systems frontend. Stöder strömning av Live TV & Inspelningar, EPG-vy, Timers. Frontend PCTV Systems. Podpiyrŏ strumiyniowaniy TV i nagrań, pokŏzuje EPG i minutniki. + PCTV Sistemleri ön arayüzü. Canlı yayını, kayıtları, Elektronik Program Rehberini ve zamanlayıcıları destekler. PCTV 系统的前端。支持直播电视播放及录像、电子节目单浏览、定时器。 + PCTV Systems前端介面。支援即時電視串流及錄影,電子節目表,定時器。 Hierdie is onstabiele sagteware! Die outeurs is op geen manier verantwoordelik vir gefaalde spele, inkorrekte EPG tye, vermorsde ure, of enige ander ongewensde effekte. Тази програма е нестабилна! Авторите не носят отговорност за неуспешно възпроизвеждане, некоректнени часове електронния програмен справочник, пропиляното време и други нежелани ефекти. - Aquest programari és inestable! Els autors no es fan responsables de reproduccions fallides, horaris incorrectes a l'EPG, hores perdudes o qualsevol altre efecte no desitjat. + Aquest programari és inestable! Els autors no es fan responsables de reproduccions fallides, horaris incorrectes a la guia electrònica de programació (EPG), hores perdudes o qualsevol altre efecte no desitjat. Tento software není stabilní. Autoři nejsou žádným způsobem zodpovědní za selhání při nahrávání, neplatné časovače, ztracený čas, či jakékoliv jiné nežádoucí události... Mae hwn yn feddalwedd ansad! Nid yw'r awduron yn gyfrifol mewn unrhyw ffordd am fethu recordio, amseru gwallus, oriau wedi eu gwastraffu nac effeithiau anymunol eraill. Dette er ustabil software! Ophavsmændene er på ingen måde ansvarlig for mislykkede afspilninger, forkerte EPG tider, spildte timer, eller andre bivirkninger. @@ -100,7 +108,8 @@ This is unstable software! The authors are in no way responsible for failed playings, incorrect EPG times, wasted hours, or any other undesirable effects. Este es un software inestable. El autor no se hace responsable por reproducciones fallidas, datos de GEP incorrectos, horas perdidas o cualquier otro efecto indeseable. Este es un software inestable. El autor no se hace responsable por reproducciones fallidas, datos de EPG incorrectos, horas perdidas o cualquier otro efecto indeseable. - Tämä on epävakaa ohjelma! Ohjelman kirjoittavat eivät vastaa millään tavalla epäonnistuneista toistoista, vääristä EPG ajoista, hukatusta ajasta tai muista ei-halutuista tapahtumista. + ¡Este es un software inestable! Los autores no son responsables en absoluto de reproducciones fallidas, tiempos EPG incorrectos, desperdicio de horas, o cualquier otro efecto indeseable. + 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 lectures défaillantes, d'horaires erronés du GÉP, 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. Este software non é estábel! Os autores non se fan responsábeis dos erros na reproducción, horarios incorrectos na Guía, horas vencidas, e otros efectos non desexados. @@ -122,7 +131,7 @@ 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 reproduções, horários incorretos no EPG, horas perdidas ou quaisquer outros efeitos indesejáveis. Este software é instável! Os autores não são de forma alguma responsáveis por gravações falhadas, temporizadores incorretos, horas desperdiçadas ou qualquer outro tipo de efeitos indesejáveis. - Acest software este instabil! Autorii nu sunt responsabili în nici un fel pentru înregistrări eșuate, cronometrări EPG incorecte, ore pierdute sau orice alte efecte nedorite. + Această parte din program nu este stabilă! Autorii nu sunt responsabili în nici un fel pentru înregistrări eșuate, cronometrări EPG incorecte, ore pierdute sau orice alte efecte nedorite. Это нестабильная программа! Авторы не несут ответственности за неудачные воспроизведение, неверные время EPG, потраченное время и прочие нежелательные эффекты. Toto je nestabilný softvér! Autori nie sú v žiadnom prípade zodpovední za chybné prehrávanie, nesprávne časy EPG, premrhané hodiny alebo akékoľvek iné nežiadúce účinky. To je nestabilna programska oprema! Avtorji niso odgovorni za neuspela predvajanja, nepravilne čase v EPG, zapravljen čas in katerikoli drug neželen učinek. @@ -132,6 +141,7 @@ To je niystabilny softwer! Autōry niy sōm ôdpedzialne za niypodarzōne graniy, niynŏleżne godziny EPG, stracōne godziny i inksze niychciane efekty. Bu kararsız bir yazılımdır! Yazanlar oynatma hatası, yanlış EPG zamanları, harcanmış saatler ya da diğer etkilerden sorumlu değiller. 这是不稳定版的软件!作者不对录像失败、错误定时造成时间浪费或其它不良影响负责。 + 這是測試中的軟體!原創作者無法針對以下情況負責:包括播放失敗,不正確的電子節目表,多餘的時數,或任何不可預期的不良影響。 @PLATFORM@ diff -Nru kodi-pvr-pctv-0.2.11/pvr.pctv/changelog.txt kodi-pvr-pctv-1.4.5/pvr.pctv/changelog.txt --- kodi-pvr-pctv-0.2.11/pvr.pctv/changelog.txt 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-pctv-1.4.5/pvr.pctv/changelog.txt 2016-12-25 20:06:41.000000000 +0000 @@ -1,9 +1,30 @@ -0.2.11 +1.4.2 - Updated Language files from Transifex -0.2.10 +1.4.1 - Updated Language files from Transifex +1.4.0 +- Cmake: rename find_package kodi to Kodi + +1.3.1 +- Fix includes + +1.3.0 +- Updated to PVR addon API v5.2.0 + +1.2.0 +- Updated to PVR addon API v5.1.0 + +1.1.0 +- Updated to PVR addon API v5.0.0 + +1.0.1 +- Updated Language files from Transifex + +1.0.0 +- Initial Kodi Krypton version. + 0.2.9 - Updated Language files from Transifex diff -Nru kodi-pvr-pctv-0.2.11/pvr.pctv/resources/language/resource.language.az_az/strings.po kodi-pvr-pctv-1.4.5/pvr.pctv/resources/language/resource.language.az_az/strings.po --- kodi-pvr-pctv-0.2.11/pvr.pctv/resources/language/resource.language.az_az/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-pctv-1.4.5/pvr.pctv/resources/language/resource.language.az_az/strings.po 2016-12-25 20:06:41.000000000 +0000 @@ -19,3 +19,7 @@ msgctxt "#30001" msgid "Port" msgstr "Port" + +msgctxt "#30100" +msgid "General" +msgstr "Ümumi" diff -Nru kodi-pvr-pctv-0.2.11/pvr.pctv/resources/language/resource.language.ca_es/strings.po kodi-pvr-pctv-1.4.5/pvr.pctv/resources/language/resource.language.ca_es/strings.po --- kodi-pvr-pctv-0.2.11/pvr.pctv/resources/language/resource.language.ca_es/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-pctv-1.4.5/pvr.pctv/resources/language/resource.language.ca_es/strings.po 2016-12-25 20:06:41.000000000 +0000 @@ -18,7 +18,7 @@ msgctxt "#30000" msgid "Hostname or IP address" -msgstr "Nom del servidor o adreça IP" +msgstr "Nom d'amfitrió o adreça IP" msgctxt "#30001" msgid "Port" @@ -30,7 +30,7 @@ msgctxt "#30010" msgid "Automatic Host Detection" -msgstr "Detecció Automàtica de Host" +msgstr "Detecció automàtica de l'amfitrió" msgctxt "#30020" msgid "Transcode" @@ -42,7 +42,7 @@ msgctxt "#30030" msgid "Video Bitrate (Kbps)" -msgstr "Video Bitrate (Kbps)" +msgstr "Taxa de bits del vídeo (Kbps)" msgctxt "#30100" msgid "General" diff -Nru kodi-pvr-pctv-0.2.11/pvr.pctv/resources/language/resource.language.es_mx/strings.po kodi-pvr-pctv-1.4.5/pvr.pctv/resources/language/resource.language.es_mx/strings.po --- kodi-pvr-pctv-0.2.11/pvr.pctv/resources/language/resource.language.es_mx/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-pctv-1.4.5/pvr.pctv/resources/language/resource.language.es_mx/strings.po 2016-12-25 20:06:41.000000000 +0000 @@ -16,10 +16,34 @@ "Language: es_MX\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +msgctxt "#30000" +msgid "Hostname or IP address" +msgstr "Nombre de host o dirección IP" + msgctxt "#30001" msgid "Port" msgstr "Puerto" +msgctxt "#30002" +msgid "PIN" +msgstr "PIN" + +msgctxt "#30010" +msgid "Automatic Host Detection" +msgstr "Automatic Host Detection" + +msgctxt "#30020" +msgid "Transcode" +msgstr "Transcodificar" + +msgctxt "#30021" +msgid "PIN required" +msgstr "PIN Requerido" + +msgctxt "#30030" +msgid "Video Bitrate (Kbps)" +msgstr "Tasa de transferencia de video (kbps)" + msgctxt "#30100" msgid "General" msgstr "General" diff -Nru kodi-pvr-pctv-0.2.11/pvr.pctv/resources/language/resource.language.fi_fi/strings.po kodi-pvr-pctv-1.4.5/pvr.pctv/resources/language/resource.language.fi_fi/strings.po --- kodi-pvr-pctv-0.2.11/pvr.pctv/resources/language/resource.language.fi_fi/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-pctv-1.4.5/pvr.pctv/resources/language/resource.language.fi_fi/strings.po 2016-12-25 20:06:41.000000000 +0000 @@ -26,7 +26,7 @@ msgctxt "#30002" msgid "PIN" -msgstr "PIN" +msgstr "PIN-koodi" msgctxt "#30010" msgid "Automatic Host Detection" @@ -38,11 +38,11 @@ msgctxt "#30021" msgid "PIN required" -msgstr "PIN vaaditaan" +msgstr "Käytä PIN-koodia" msgctxt "#30030" msgid "Video Bitrate (Kbps)" -msgstr "Videon bittinopeus (Kbps)" +msgstr "Videon bittinopeus (kbit/s)" msgctxt "#30100" msgid "General" diff -Nru kodi-pvr-pctv-0.2.11/pvr.pctv/resources/language/resource.language.nb_no/strings.po kodi-pvr-pctv-1.4.5/pvr.pctv/resources/language/resource.language.nb_no/strings.po --- kodi-pvr-pctv-0.2.11/pvr.pctv/resources/language/resource.language.nb_no/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-pctv-1.4.5/pvr.pctv/resources/language/resource.language.nb_no/strings.po 2016-12-25 20:06:41.000000000 +0000 @@ -42,7 +42,7 @@ msgctxt "#30030" msgid "Video Bitrate (Kbps)" -msgstr "Bilde Bitrate (Kbps)" +msgstr "Video Bitrate (kbps)" msgctxt "#30100" msgid "General" diff -Nru kodi-pvr-pctv-0.2.11/pvr.pctv/resources/language/resource.language.zh_tw/strings.po kodi-pvr-pctv-1.4.5/pvr.pctv/resources/language/resource.language.zh_tw/strings.po --- kodi-pvr-pctv-0.2.11/pvr.pctv/resources/language/resource.language.zh_tw/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-pctv-1.4.5/pvr.pctv/resources/language/resource.language.zh_tw/strings.po 2016-12-25 20:06:41.000000000 +0000 @@ -24,6 +24,26 @@ msgid "Port" msgstr "連接埠" +msgctxt "#30002" +msgid "PIN" +msgstr "PIN碼" + +msgctxt "#30010" +msgid "Automatic Host Detection" +msgstr "自動偵測主機" + +msgctxt "#30020" +msgid "Transcode" +msgstr "轉碼" + +msgctxt "#30021" +msgid "PIN required" +msgstr "需要PIN碼" + +msgctxt "#30030" +msgid "Video Bitrate (Kbps)" +msgstr "影像码率(kbps)" + msgctxt "#30100" msgid "General" msgstr "一般設定" diff -Nru kodi-pvr-pctv-0.2.11/README.md kodi-pvr-pctv-1.4.5/README.md --- kodi-pvr-pctv-0.2.11/README.md 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-pctv-1.4.5/README.md 2016-12-25 20:06:41.000000000 +0000 @@ -1,4 +1,4 @@ -[![Build Status](https://travis-ci.org/kodi-pvr/pvr.pctv.svg?branch=Jarvis)](https://travis-ci.org/kodi-pvr/pvr.pctv) +[![Build Status](https://travis-ci.org/kodi-pvr/pvr.pctv.svg?branch=master)](https://travis-ci.org/kodi-pvr/pvr.pctv) [![Coverity Scan Build Status](https://scan.coverity.com/projects/5120/badge.svg)](https://scan.coverity.com/projects/5120) # PCTV PVR diff -Nru kodi-pvr-pctv-0.2.11/src/client.cpp kodi-pvr-pctv-1.4.5/src/client.cpp --- kodi-pvr-pctv-0.2.11/src/client.cpp 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-pctv-1.4.5/src/client.cpp 2016-12-25 20:06:41.000000000 +0000 @@ -21,11 +21,10 @@ */ #include "client.h" -#include "kodi/xbmc_pvr_dll.h" -#include "kodi/libKODI_guilib.h" +#include "xbmc_pvr_dll.h" #include #include "PctvData.h" -#include "platform/util/util.h" +#include "p8-platform/util/util.h" using namespace std; using namespace ADDON; @@ -306,14 +305,26 @@ { } -void ADDON_Announce(const char *flag, const char *sender, const char *message, const void *data) -{ -} - /*********************************************************** * PVR Client AddOn specific public library functions ***********************************************************/ +void OnSystemSleep() +{ +} + +void OnSystemWake() +{ +} + +void OnPowerSavingActivated() +{ +} + +void OnPowerSavingDeactivated() +{ +} + const char* GetPVRAPIVersion(void) { static const char *strApiVersion = XBMC_PVR_API_VERSION; @@ -328,12 +339,12 @@ const char* GetGUIAPIVersion(void) { - return KODI_GUILIB_API_VERSION; + return ""; // GUI API not used } const char* GetMininumGUIAPIVersion(void) { - return KODI_GUILIB_MIN_API_VERSION; + return ""; // GUI API not used } PVR_ERROR GetAddonCapabilities(PVR_ADDON_CAPABILITIES* pCapabilities) @@ -437,11 +448,6 @@ return OpenLiveStream(channel); } -int GetCurrentClientChannel(void) -{ - return m_currentChannel.iUniqueId; -} - PVR_ERROR GetEPGForChannel(ADDON_HANDLE handle, const PVR_CHANNEL &channel, time_t iStart, time_t iEnd) { if (!PctvData || !PctvData->IsConnected()) @@ -560,15 +566,17 @@ void PauseStream(bool bPaused) {} bool CanPauseStream(void) { return false; } bool CanSeekStream(void) { return false; } -bool SeekTime(int, bool, double*) { return false; } +bool SeekTime(double, bool, double*) { return false; } void SetSpeed(int) {}; bool IsTimeshifting(void) { return false; } time_t GetPlayingTime() { return 0; } time_t GetBufferTimeStart() { return 0; } time_t GetBufferTimeEnd() { return 0; } +bool IsRealTimeStream() { return true; } PVR_ERROR UndeleteRecording(const PVR_RECORDING& recording) { return PVR_ERROR_NOT_IMPLEMENTED; } PVR_ERROR DeleteAllRecordingsFromTrash() { return PVR_ERROR_NOT_IMPLEMENTED; } PVR_ERROR OpenDialogChannelScan(void) { return PVR_ERROR_NOT_IMPLEMENTED; } PVR_ERROR OpenDialogChannelSettings(const PVR_CHANNEL &channel) { return PVR_ERROR_NOT_IMPLEMENTED; } PVR_ERROR OpenDialogChannelAdd(const PVR_CHANNEL &channel) { return PVR_ERROR_NOT_IMPLEMENTED; } +PVR_ERROR SetEPGTimeFrame(int) { return PVR_ERROR_NOT_IMPLEMENTED; } } diff -Nru kodi-pvr-pctv-0.2.11/src/client.h kodi-pvr-pctv-1.4.5/src/client.h --- kodi-pvr-pctv-0.2.11/src/client.h 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-pctv-1.4.5/src/client.h 2016-12-25 20:06:41.000000000 +0000 @@ -21,8 +21,8 @@ * */ -#include "kodi/libXBMC_addon.h" -#include "kodi/libXBMC_pvr.h" +#include "libXBMC_addon.h" +#include "libXBMC_pvr.h" #define DEFAULT_HOST "192.168.1.20" #define DEFAULT_WEB_PORT 80 diff -Nru kodi-pvr-pctv-0.2.11/src/md5.h kodi-pvr-pctv-1.4.5/src/md5.h --- kodi-pvr-pctv-0.2.11/src/md5.h 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-pctv-1.4.5/src/md5.h 2016-12-25 20:06:41.000000000 +0000 @@ -24,7 +24,7 @@ #include #include -#include "platform/util/StdString.h" +#include "p8-platform/util/StdString.h" struct MD5Context { uint32_t buf[4]; diff -Nru kodi-pvr-pctv-0.2.11/src/PctvData.cpp kodi-pvr-pctv-1.4.5/src/PctvData.cpp --- kodi-pvr-pctv-0.2.11/src/PctvData.cpp 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-pctv-1.4.5/src/PctvData.cpp 2016-12-25 20:06:41.000000000 +0000 @@ -28,7 +28,7 @@ using namespace std; using namespace ADDON; -using namespace PLATFORM; +using namespace P8PLATFORM; @@ -422,6 +422,12 @@ tag.recordingTime = recording.startTime; tag.iDuration = recording.iDuration; + /* TODO: PVR API 5.0.0: Implement this */ + tag.iChannelUid = PVR_CHANNEL_INVALID_UID; + + /* TODO: PVR API 5.1.0: Implement this */ + tag.channelType = PVR_RECORDING_CHANNEL_TYPE_UNKNOWN; + PVR->TransferRecordingEntry(handle, &tag); } } diff -Nru kodi-pvr-pctv-0.2.11/src/PctvData.h kodi-pvr-pctv-1.4.5/src/PctvData.h --- kodi-pvr-pctv-0.2.11/src/PctvData.h 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-pctv-1.4.5/src/PctvData.h 2016-12-25 20:06:41.000000000 +0000 @@ -1,10 +1,10 @@ #pragma once //#include -#include "platform/util/StdString.h" +#include "p8-platform/util/StdString.h" #include "client.h" #include "rest.h" -#include "platform/threads/threads.h" +#include "p8-platform/threads/threads.h" //#include "tinyxml/tinyxml.h" #include @@ -134,7 +134,7 @@ } }; -class Pctv : public PLATFORM::CThread +class Pctv : public P8PLATFORM::CThread { public: /* Class interface */ @@ -154,7 +154,6 @@ unsigned int GetChannelsAmount(void); bool GetChannel(const PVR_CHANNEL &channel, PctvChannel &myChannel); PVR_ERROR GetChannels(ADDON_HANDLE handle, bool bRadio); - int GetCurrentClientChannel(void); /* Groups */ unsigned int GetChannelGroupsAmount(void); @@ -223,8 +222,8 @@ void *Process(void); // members - PLATFORM::CMutex m_mutex; - PLATFORM::CCondition m_started; + P8PLATFORM::CMutex m_mutex; + P8PLATFORM::CCondition m_started; bool m_bIsConnected; std::string m_strHostname; diff -Nru kodi-pvr-pctv-0.2.11/src/rest.cpp kodi-pvr-pctv-1.4.5/src/rest.cpp --- kodi-pvr-pctv-0.2.11/src/rest.cpp 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-pctv-1.4.5/src/rest.cpp 2016-12-25 20:06:41.000000000 +0000 @@ -89,7 +89,7 @@ int httpRequest(const std::string& command, const std::string& arguments, const bool write, std::string& json_response) { - //PLATFORM::CLockObject critsec(communication_mutex); + //P8PLATFORM::CLockObject critsec(communication_mutex); std::string strUrl = command; if (write) { // POST http request diff -Nru kodi-pvr-pctv-0.2.11/.travis.yml kodi-pvr-pctv-1.4.5/.travis.yml --- kodi-pvr-pctv-0.2.11/.travis.yml 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-pctv-1.4.5/.travis.yml 2016-12-25 20:06:41.000000000 +0000 @@ -19,17 +19,8 @@ compiler: clang - os: osx osx_image: xcode7.3 - -# -# Some of the OS X images don't have cmake, contrary to what people -# on the Internet say -# -before_install: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then which cmake || brew update ; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then which cmake || brew install cmake ; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install jsoncpp ; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq ; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -qq -y libjsoncpp-dev ; fi + - os: osx + osx_image: xcode6.1 # # The addon source is automatically checked out in $TRAVIS_BUILD_DIR, @@ -37,8 +28,8 @@ # before_script: - cd $TRAVIS_BUILD_DIR/.. - - git clone -b Jarvis --depth=1 https://github.com/xbmc/xbmc.git + - git clone --depth=1 https://github.com/xbmc/xbmc.git - cd pvr.pctv && mkdir build && cd build - - cmake -DADDONS_TO_BUILD=pvr.pctv -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/addons -DPACKAGE_ZIP=1 ../../xbmc/project/cmake/addons + - cmake -DADDONS_TO_BUILD=pvr.pctv -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/project/cmake/addons script: make