From 9b0cdbad02502a88901c0fd92cda706dd3aa52c3 Mon Sep 17 00:00:00 2001 From: fuzzard Date: Sat, 20 Jul 2024 12:35:24 +1000 Subject: [PATCH 1/7] [Piers] Version bump 22.0.0 --- pvr.nextpvr/addon.xml.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pvr.nextpvr/addon.xml.in b/pvr.nextpvr/addon.xml.in index e2325f69..40775ddf 100644 --- a/pvr.nextpvr/addon.xml.in +++ b/pvr.nextpvr/addon.xml.in @@ -1,11 +1,11 @@ @ADDON_DEPENDS@ - + Date: Sat, 20 Jul 2024 12:35:24 +1000 Subject: [PATCH 2/7] [Piers] CI files branch update to Piers --- Jenkinsfile | 2 +- azure-pipelines.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 81167433..b8416e67 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1 +1 @@ -buildPlugin(version: "Omega") +buildPlugin(version: "Piers") diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3dc8f648..f88e49fe 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,7 +4,7 @@ variables: trigger: branches: include: - - Nexus + - Piers - Omega - releases/* paths: From ba1fe26722c0c9dcba3fdffa6bb4fc1771b3ceee Mon Sep 17 00:00:00 2001 From: ksooo <3226626+ksooo@users.noreply.github.com> Date: Sat, 27 Jul 2024 23:10:29 +0200 Subject: [PATCH 3/7] [Piers] README.md: Update branches for build badges --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 79c2445d..0d6bc355 100644 --- 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) From 17e81bbe2af3a78eb59e159ab4f74b27cf08dfe4 Mon Sep 17 00:00:00 2001 From: ksooo <3226626+ksooo@users.noreply.github.com> Date: Sat, 27 Jul 2024 23:10:29 +0200 Subject: [PATCH 4/7] [Piers] increment-version.yml: Add Piers branch --- .github/workflows/increment-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/increment-version.yml b/.github/workflows/increment-version.yml index d1e0ef26..5f820373 100644 --- 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' From 4fce541aa1365b665b650b82905a0c1b589193c6 Mon Sep 17 00:00:00 2001 From: ksooo <3226626+ksooo@users.noreply.github.com> Date: Sat, 27 Jul 2024 23:10:29 +0200 Subject: [PATCH 5/7] [Piers] sync-addon-metadata-translations.yml: Add Piers branch --- .github/workflows/sync-addon-metadata-translations.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-addon-metadata-translations.yml b/.github/workflows/sync-addon-metadata-translations.yml index 5c4f8edd..585991be 100644 --- 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' From d67d84792cb9cc2d96531f73372d9428f912b7ef Mon Sep 17 00:00:00 2001 From: ksooo <3226626+ksooo@users.noreply.github.com> Date: Fri, 2 Aug 2024 10:34:51 +0200 Subject: [PATCH 6/7] v22.0.0: Initial release for Piers (PVR Add-on API v8.4.0) --- pvr.nextpvr/changelog.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pvr.nextpvr/changelog.txt b/pvr.nextpvr/changelog.txt index 195aec94..4223ba48 100644 --- a/pvr.nextpvr/changelog.txt +++ b/pvr.nextpvr/changelog.txt @@ -1,3 +1,6 @@ +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 From 49b6fa606a536beb1db04bb6060558f792ff0436 Mon Sep 17 00:00:00 2001 From: ksooo <3226626+ksooo@users.noreply.github.com> Date: Thu, 15 Aug 2024 16:36:13 +0200 Subject: [PATCH 7/7] v22.1.0: PVR Add-on API v9.0.0 --- pvr.nextpvr/addon.xml.in | 2 +- pvr.nextpvr/changelog.txt | 3 +++ src/pvrclient-nextpvr.cpp | 2 +- src/pvrclient-nextpvr.h | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pvr.nextpvr/addon.xml.in b/pvr.nextpvr/addon.xml.in index 40775ddf..ea6791b3 100644 --- a/pvr.nextpvr/addon.xml.in +++ b/pvr.nextpvr/addon.xml.in @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ diff --git a/pvr.nextpvr/changelog.txt b/pvr.nextpvr/changelog.txt index 4223ba48..296bb855 100644 --- a/pvr.nextpvr/changelog.txt +++ b/pvr.nextpvr/changelog.txt @@ -1,3 +1,6 @@ +v22.1.0 +- PVR Add-on API v9.0.0 + v22.0.0 - Initial release for Piers (PVR Add-on API v8.4.0) diff --git a/src/pvrclient-nextpvr.cpp b/src/pvrclient-nextpvr.cpp index 19dc4698..0830a752 100644 --- 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& properties) +PVR_ERROR cPVRClientNextPVR::GetChannelStreamProperties(const kodi::addon::PVRChannel& channel, PVR_SOURCE source, std::vector& properties) { bool liveStream = m_channels.IsChannelAPlugin(channel.GetUniqueId()); if (liveStream) diff --git a/src/pvrclient-nextpvr.h b/src/pvrclient-nextpvr.h index 97401db1..2896a9d3 100644 --- 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& properties) override; + PVR_ERROR GetChannelStreamProperties(const kodi::addon::PVRChannel& channel, PVR_SOURCE source, std::vector& properties) override; PVR_ERROR GetEPGForChannel(int channelUid, time_t start, time_t end, kodi::addon::PVREPGTagsResultSet& results) override; //PVR_ERROR SetEPGTimeFrame(int epgMaxDays) override;