Changes for PVR API 9

Package release and update for new API
kodi-pvr · Aug 17, 2024 · 33ebcd7 · 33ebcd7
1 parent 2a3456f
commit 33ebcd7
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 4 deletions.
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.2.0"
  name="NextPVR PVR Client"
  provider-name="Graeme Blackley">
  <requires>@ADDON_DEPENDS@
- <import addon="inputstream.ffmpegdirect" minversion="22.0.0"/>
+ <import addon="inputstream.ffmpegdirect" minversion="1.15.0" optional="true"/>
  </requires>
  <extension
  point="kodi.pvrclient"

diff --git a/pvr.nextpvr/changelog.txt b/pvr.nextpvr/changelog.txt
@@ -1,3 +1,17 @@
+v22.2.0
+- port PR 266 from Omega
+- start timeshift in realtime for radio playback (266)
+- Add support for episode and episode part parsing (266)
+- Clean up duplicated S/E information sent from NextPVR in the subtitle when no subtitle is present. (266)
+- Cache channel list updates, compress with zlib
+- Upgrade tinyxml2
+
+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/Recordings.cpp b/src/Recordings.cpp
@@ -323,6 +323,7 @@ bool Recordings::UpdatePvrRecording(const tinyxml2::XMLNode* pRecordingNode, kod
 
  tag.SetSeriesNumber(PVR_RECORDING_INVALID_SERIES_EPISODE);
  tag.SetEpisodeNumber(PVR_RECORDING_INVALID_SERIES_EPISODE);
+ tag.SetEpisodePartNumber(PVR_RECORDING_INVALID_SERIES_EPISODE);
  if (ParseNextPVRSubtitle(pRecordingNode, tag))
  {
  if (m_settings->m_separateSeasons && multipleSeasons && tag.GetSeriesNumber() != PVR_RECORDING_INVALID_SERIES_EPISODE)
@@ -482,6 +483,8 @@ bool Recordings::ParseNextPVRSubtitle(const tinyxml2::XMLNode *pRecordingNode, k
  if (season != 0)
  {
  tag.SetSeriesNumber(season);
+ if (base_match[2].matched)
+ tag.SetEpisodePartNumber(std::atoi(base_match[2].str().c_str()));
  hasSeasonEpisode = true;
  }
  base_sub_match = base_match[2];

diff --git a/src/pvrclient-nextpvr.cpp b/src/pvrclient-nextpvr.cpp
@@ -564,7 +564,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;