Merge remote-tracking branch 'origin/Piers' into contentrating

kodi-pvr · Aug 16, 2024 · 5109b7c · 5109b7c
2 parents f30a841 + fec5c55
commit 5109b7c
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 11 deletions.
diff --git a/.github/workflows/increment-version.yml b/.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'
 

diff --git a/.github/workflows/sync-addon-metadata-translations.yml b/.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'

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1 +1 @@
-buildPlugin(version: "Omega")
+buildPlugin(version: "Piers")
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 [![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/kodi-pvr/pvr.nextpvr/actions/workflows/build.yml/badge.svg?branch=Omega)](https://github.com/kodi-pvr/pvr.nextpvr/actions/workflows/build.yml)
-[![Build Status](https://dev.azure.com/teamkodi/kodi-pvr/_apis/build/status/kodi-pvr.pvr.nextpvr?branchName=Omega)](https://dev.azure.com/teamkodi/kodi-pvr/_build/latest?definitionId=64&branchName=Omega)
-[![Build Status](https://jenkins.kodi.tv/view/Addons/job/kodi-pvr/job/pvr.nextpvr/job/Omega/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/kodi-pvr%2Fpvr.nextpvr/branches/)
+[![Build and run tests](https://github.com/kodi-pvr/pvr.nextpvr/actions/workflows/build.yml/badge.svg?branch=Piers)](https://github.com/kodi-pvr/pvr.nextpvr/actions/workflows/build.yml)
+[![Build Status](https://dev.azure.com/teamkodi/kodi-pvr/_apis/build/status/kodi-pvr.pvr.nextpvr?branchName=Piers)](https://dev.azure.com/teamkodi/kodi-pvr/_build/latest?definitionId=64&branchName=Piers)
+[![Build Status](https://jenkins.kodi.tv/view/Addons/job/kodi-pvr/job/pvr.nextpvr/job/Piers/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/kodi-pvr%2Fpvr.nextpvr/branches/)
 
 # NextPVR PVR
 NextPVR PVR client addon for [Kodi](https://kodi.tv)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -4,7 +4,7 @@ variables:
 trigger:
   branches:
     include:
-    - Nexus
+    - Piers
     - Omega
     - releases/*
   paths:

diff --git a/pvr.nextpvr/addon.xml.in b/pvr.nextpvr/addon.xml.in
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.nextpvr"
-  version="22.0.0"
+  version="22.1.0"
   name="NextPVR PVR Client"
   provider-name="Graeme Blackley">
   <requires>@ADDON_DEPENDS@
-    <import addon="inputstream.ffmpegdirect" minversion="1.15.0" optional="true"/>
+    <import addon="inputstream.ffmpegdirect" minversion="22.0.0"/>
   </requires>
   <extension
     point="kodi.pvrclient"

diff --git a/pvr.nextpvr/changelog.txt b/pvr.nextpvr/changelog.txt
@@ -1,3 +1,9 @@
+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.4
 - Allow control of recording and timers access
 - Support all episode single channel recordings

diff --git a/src/pvrclient-nextpvr.cpp b/src/pvrclient-nextpvr.cpp
@@ -562,7 +562,7 @@ PVR_ERROR cPVRClientNextPVR::GetDriveSpace(uint64_t& total, uint64_t& used)
   return m_recordings.GetDriveSpace(total, used);
 }
 
-PVR_ERROR cPVRClientNextPVR::GetChannelStreamProperties(const kodi::addon::PVRChannel& channel, std::vector<kodi::addon::PVRStreamProperty>& properties)
+PVR_ERROR cPVRClientNextPVR::GetChannelStreamProperties(const kodi::addon::PVRChannel& channel, PVR_SOURCE source, std::vector<kodi::addon::PVRStreamProperty>& properties)
 {
   bool liveStream = m_channels.IsChannelAPlugin(channel.GetUniqueId());
   if (liveStream)

diff --git a/src/pvrclient-nextpvr.h b/src/pvrclient-nextpvr.h
@@ -109,7 +109,7 @@ class ATTR_DLL_LOCAL cPVRClientNextPVR : public kodi::addon::CInstancePVRClient
   PVR_ERROR GetChannelGroupsAmount(int& amount) override;
   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, time_t end, kodi::addon::PVREPGTagsResultSet& results) override;
   //PVR_ERROR SetEPGTimeFrame(int epgMaxDays) override;
-Original file line number
+Diff line change
@@ Expand Up / @@ -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'
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		buildPlugin(version: "Omega")
		buildPlugin(version: "Piers")