Merge pull request #79 from ksooo/addon-api-9-2-0

PVR Add-on API v9.2.0

.github/workflows/build.yml

@@ -27,7 +27,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         repository: xbmc/xbmc
-        ref: Omega
+        ref: master
         path: xbmc
     - name: Checkout add-on repo
       uses: actions/checkout@v4
@@ -41,7 +41,7 @@ jobs:
       run: |
         if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id} && mkdir -p build && cd build; fi
         if [[ $DEBIAN_BUILD != true ]]; then cmake -DADDONS_TO_BUILD=${app_id} -DADDON_SRC_PREFIX=${{ github.workspace }} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/xbmc/addons -DPACKAGE_ZIP=1 ${{ github.workspace }}/xbmc/cmake/addons; fi
-        if [[ $DEBIAN_BUILD == true ]]; then wget https://raw.githubusercontent.com/xbmc/xbmc/Omega/xbmc/addons/kodi-dev-kit/tools/debian-addon-package-test.sh && chmod +x ./debian-addon-package-test.sh; fi
+        if [[ $DEBIAN_BUILD == true ]]; then wget https://raw.githubusercontent.com/xbmc/xbmc/master/xbmc/addons/kodi-dev-kit/tools/debian-addon-package-test.sh && chmod +x ./debian-addon-package-test.sh; fi
         if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get build-dep ${{ github.workspace }}/${app_id}; fi
     - name: Build
       env:

.github/workflows/increment-version.yml

@@ -2,7 +2,7 @@ name: Increment version when languages are updated
 
 on:
   push:
-    branches: [ Matrix, Nexus, Omega ]
+    branches: [ Matrix, Nexus, Omega, Piers ]
     paths:
       - '**resource.language.**strings.po'
 

.github/workflows/sync-addon-metadata-translations.yml

@@ -2,7 +2,7 @@ name: Sync addon metadata translations
 
 on:
   push:
-    branches: [ Matrix, Nexus, Omega ]
+    branches: [ Matrix, Nexus, Omega, Piers ]
     paths:
       - '**addon.xml.in'
       - '**resource.language.**strings.po'

Jenkinsfile

@@ -1 +1 @@
-buildPlugin(version: "Omega")
+buildPlugin(version: "Piers")

README.md

@@ -2,8 +2,8 @@
 Digital Devices [Octonet](http://www.digital-devices.eu/shop/de/netzwerk-tv/) PVR client addon for [Kodi](http://kodi.tv)
 
 [![License: GPL-2.0-or-later](https://img.shields.io/badge/License-GPL%20v2+-blue.svg)](LICENSE.md)
-[![Build and run tests](https://github.com/DigitalDevices/pvr.octonet/actions/workflows/build.yml/badge.svg?branch=Omega)](https://github.com/DigitalDevices/pvr.octonet/actions/workflows/build.yml)
+[![Build and run tests](https://github.com/DigitalDevices/pvr.octonet/actions/workflows/build.yml/badge.svg?branch=Piers)](https://github.com/DigitalDevices/pvr.octonet/actions/workflows/build.yml)
-[![Build Status](https://jenkins.kodi.tv/view/Addons/job/DigitalDevices/job/pvr.octonet/job/Omega/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/DigitalDevices%2Fpvr.octonet/branches/)
+[![Build Status](https://jenkins.kodi.tv/view/Addons/job/DigitalDevices/job/pvr.octonet/job/Piers/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/DigitalDevices%2Fpvr.octonet/branches/)
 
 # Building
 

pvr.octonet/addon.xml.in

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.octonet"
-  version="21.0.2"
+  version="22.2.0"
   name="Digital Devices Octopus NET Client"
   provider-name="digitaldevices">
   <requires>@ADDON_DEPENDS@
-    <import addon="inputstream.ffmpegdirect" minversion="21.0.2"/>
+    <import addon="inputstream.ffmpegdirect" minversion="21.0.1"/>
   </requires>
   <extension
     point="kodi.pvrclient"
@@ -15,10 +15,6 @@
     <license>GPL-2.0-or-later</license>
     <source>https://github.com/DigitalDevices/pvr.octonet</source>
     <news>
-v21.0.2
-- Translations updates from Weblate
-	- fi_fi, pt_br, ru_ru
-
 v21.0.1
 - Translations updates from Weblate
 	- af_za, am_et, ar_sa, ast_es, az_az, be_by, bg_bg, bs_ba, ca_es, cs_cz, cy_gb, da_dk, de_de, el_gr, en_au, en_nz, en_us, eo, es_ar, es_es, es_mx, et_ee, eu_es, fa_af, fa_ir, fi_fi, fo_fo, fr_ca, fr_fr, gl_es, he_il, hi_in, hr_hr, hu_hu, hy_am, id_id, is_is, it_it, ja_jp, ko_kr, lt_lt, lv_lv, mi, mk_mk, ml_in, mn_mn, ms_my, mt_mt, my_mm, nb_no, nl_nl, pl_pl, pt_br, pt_pt, ro_ro, ru_ru, si_lk, sk_sk, sl_si, sq_al, sr_rs, sr_rs@latin, sv_se, szl, ta_in, te_in, tg_tj, th_th, tr_tr, uk_ua, uz_uz, vi_vn, zh_cn, zh_tw

pvr.octonet/changelog.txt

@@ -1,6 +1,11 @@
-v21.0.2
+v22.2.0
-- Translations updates from Weblate
+- PVR Add-on API v9.2.0
-	- fi_fi, pt_br, ru_ru
+
+v22.1.0
+- PVR Add-on API v9.0.0
+
+v22.0.0
+- Initial release for Piers (PVR Add-on API v8.4.0)
 
 v21.0.1
 - Translations updates from Weblate

pvr.octonet/resources/language/resource.language.fi_fi/strings.po

@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: KODI Main\n"
 "Report-Msgid-Bugs-To: translations@kodi.tv\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: 2025-01-31 09:27+0000\n"
+"PO-Revision-Date: 2024-04-14 06:11+0000\n"
 "Last-Translator: Oskari Lavinto <olavinto@protonmail.com>\n"
 "Language-Team: Finnish <https://kodi.weblate.cloud/projects/kodi-add-ons-pvr-clients/pvr-octonet/fi_fi/>\n"
 "Language: fi_fi\n"
@@ -15,11 +15,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.9.2\n"
+"X-Generator: Weblate 5.4.3\n"
 
 msgctxt "Addon Summary"
 msgid "Kodi PVR Addon for Digital Devices Octopus NET Streams"
-msgstr "Kodin PVR-pääte Digital Devices Octopus Net -laitteille"
+msgstr ""
 
 msgctxt "#30000"
 msgid "Octonet Server Address"
@@ -27,7 +27,7 @@ msgstr "Octonet-palvelimen osoite"
 
 msgctxt "#30001"
 msgid "Could not load chanellist"
-msgstr "Kanavalistan lataus epäonnistui"
+msgstr ""
 
 msgctxt "#30002"
 msgid "Timeshift"
@@ -39,24 +39,24 @@ msgstr "Käytä ajansiirtoa"
 
 msgctxt "#30004"
 msgid "- Modify inputstream.ffmpegdirect settings..."
-msgstr "- Muokkaa Inputstream FFmpeg Direct -asetuksia..."
+msgstr ""
 
 msgctxt "#30005"
 msgid "Inputstream settings"
-msgstr "Inputstream-asetukset"
+msgstr ""
 
 #empty strings from id 30006 to 30599
 msgctxt "#30600"
 msgid "The IP/address of the octonet server. Note that in case of an address, the protocol (http://) has to be omitted."
-msgstr "Octonet-palvelimen IP-osoite. Huomioi, että URL-osoitteesta protokolla (http://) pitää jättää pois."
+msgstr ""
 
 msgctxt "#30601"
 msgid "General settings required by the add-on."
-msgstr "Lisäosan yleisasetukset."
+msgstr ""
 
 msgctxt "#30602"
 msgid "Timeshift settings for pausing/rewinding and fast-forwarding live streams."
-msgstr "Ajansiirron asetukset mahdollistavat suoran lähetyksen tauottamisen ja kelaamisen molempiin suuntiin."
+msgstr ""
 
 msgctxt "#30603"
 msgid "Enable the timeshift feature."
@@ -64,4 +64,4 @@ msgstr "Käytä ajansiirto-ominaisuutta."
 
 msgctxt "#30604"
 msgid "Open settings dialog for inputstream.ffmpegdirect for modification of timeshift and other settings."
-msgstr "Muokkaa ajansiirtoa ja muita asetuksia Inputstream FFmpeg Direct -lisäosan asetuksista."
+msgstr ""

pvr.octonet/resources/language/resource.language.pt_br/strings.po

@@ -7,27 +7,27 @@ msgstr ""
 "Project-Id-Version: KODI Main\n"
 "Report-Msgid-Bugs-To: translations@kodi.tv\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: 2025-01-26 08:41+0000\n"
+"PO-Revision-Date: 2024-04-13 11:37+0000\n"
-"Last-Translator: Havok Dan <havokdan@yahoo.com.br>\n"
+"Last-Translator: Christian Gade <gade@kodi.tv>\n"
 "Language-Team: Portuguese (Brazil) <https://kodi.weblate.cloud/projects/kodi-add-ons-pvr-clients/pvr-octonet/pt_br/>\n"
 "Language: pt_br\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.9.2\n"
+"X-Generator: Weblate 5.4.3\n"
 
 msgctxt "Addon Summary"
 msgid "Kodi PVR Addon for Digital Devices Octopus NET Streams"
-msgstr "Addon Kodi PVR para dispositivos digitais Octopus Net Streams"
+msgstr ""
 
 msgctxt "#30000"
 msgid "Octonet Server Address"
-msgstr "Endereço do Servidor Octonet"
+msgstr ""
 
 msgctxt "#30001"
 msgid "Could not load chanellist"
-msgstr "Não foi possível carregar a lista de canais"
+msgstr ""
 
 msgctxt "#30002"
 msgid "Timeshift"
@@ -43,16 +43,16 @@ msgstr "- Modificar as configurações do inputstream.ffmpegdirect..."
 
 msgctxt "#30005"
 msgid "Inputstream settings"
-msgstr "Configurações do InputStream"
+msgstr ""
 
 #empty strings from id 30006 to 30599
 msgctxt "#30600"
 msgid "The IP/address of the octonet server. Note that in case of an address, the protocol (http://) has to be omitted."
-msgstr "O IP/endereço do servidor octonet. Observe que no caso de um endereço, o protocolo (http://) deve ser omitido."
+msgstr ""
 
 msgctxt "#30601"
 msgid "General settings required by the add-on."
-msgstr "Configurações gerais exigidas pelo addon."
+msgstr ""
 
 msgctxt "#30602"
 msgid "Timeshift settings for pausing/rewinding and fast-forwarding live streams."

pvr.octonet/resources/language/resource.language.ru_ru/strings.po

@@ -7,27 +7,27 @@ msgstr ""
 "Project-Id-Version: KODI Main\n"
 "Report-Msgid-Bugs-To: translations@kodi.tv\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: 2024-08-14 05:26+0000\n"
+"PO-Revision-Date: 2024-04-13 11:37+0000\n"
-"Last-Translator: Alexey <signfinder@gmail.com>\n"
+"Last-Translator: Christian Gade <gade@kodi.tv>\n"
 "Language-Team: Russian <https://kodi.weblate.cloud/projects/kodi-add-ons-pvr-clients/pvr-octonet/ru_ru/>\n"
 "Language: ru_ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 5.6.2\n"
+"X-Generator: Weblate 5.4.3\n"
 
 msgctxt "Addon Summary"
 msgid "Kodi PVR Addon for Digital Devices Octopus NET Streams"
-msgstr "Аддон Kodi PVR для устройств Octopus NET Streams"
+msgstr ""
 
 msgctxt "#30000"
 msgid "Octonet Server Address"
-msgstr "Адрес сервера Octonet"
+msgstr ""
 
 msgctxt "#30001"
 msgid "Could not load chanellist"
-msgstr "Не удалось загрузить список каналов"
+msgstr ""
 
 msgctxt "#30002"
 msgid "Timeshift"
@@ -43,16 +43,16 @@ msgstr "- Изменить настройки inputstream.ffmpegdirect..."
 
 msgctxt "#30005"
 msgid "Inputstream settings"
-msgstr "Настройки входного потока"
+msgstr ""
 
 #empty strings from id 30006 to 30599
 msgctxt "#30600"
 msgid "The IP/address of the octonet server. Note that in case of an address, the protocol (http://) has to be omitted."
-msgstr "IP/имя сервера octonet. Обратите внимание, что при использовании имени протокол (http://) должен быть опущен."
+msgstr ""
 
 msgctxt "#30601"
 msgid "General settings required by the add-on."
-msgstr "Общие настройки, требуемые дополнению."
+msgstr ""
 
 msgctxt "#30602"
 msgid "Timeshift settings for pausing/rewinding and fast-forwarding live streams."

src/OctonetData.cpp

@@ -273,7 +273,7 @@ PVR_ERROR OctonetData::GetChannels(bool radio, kodi::addon::PVRChannelsResultSet
   return PVR_ERROR_NO_ERROR;
 }
 
-PVR_ERROR OctonetData::GetChannelStreamProperties(const kodi::addon::PVRChannel& channelinfo, std::vector<kodi::addon::PVRStreamProperty>& properties)
+PVR_ERROR OctonetData::GetChannelStreamProperties(const kodi::addon::PVRChannel& channelinfo, PVR_SOURCE source, std::vector<kodi::addon::PVRStreamProperty>& properties)
 {
   properties.emplace_back(PVR_STREAM_PROPERTY_INPUTSTREAM, "inputstream.ffmpegdirect");
   properties.emplace_back("inputstream.ffmpegdirect.is_realtime_stream", "true");

src/OctonetData.h

@@ -67,7 +67,9 @@ public:
   PVR_ERROR GetChannelGroups(bool radio, kodi::addon::PVRChannelGroupsResultSet& results) override;
   PVR_ERROR GetChannelGroupMembers(const kodi::addon::PVRChannelGroup& group,
                                    kodi::addon::PVRChannelGroupMembersResultSet& results) override;
-  PVR_ERROR GetChannelStreamProperties(const kodi::addon::PVRChannel& channel, std::vector<kodi::addon::PVRStreamProperty>& properties) override;
+  PVR_ERROR GetChannelStreamProperties(const kodi::addon::PVRChannel& channel,
+                                       PVR_SOURCE source,
+                                       std::vector<kodi::addon::PVRStreamProperty>& properties) override;
 
   PVR_ERROR GetEPGForChannel(int channelUid,
                              time_t start,