Merge pull request #244 from ksooo/piers-initial-release

v22.0.0: Initial release for Piers (PVR Add-on API v8.4.0)
janbar · Aug 2, 2024 · 17f59bd · 17f59bd
2 parents e6e4796 + b688f4e
commit 17f59bd
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 14 deletions.
diff --git a/pvr.mythtv/addon.xml.in b/pvr.mythtv/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.mythtv"
-  version="21.1.9"
+  version="22.0.0"
   name="MythTV PVR Client"
   provider-name="Christian Fetzer, Jean-Luc Barrière">
   <requires>@ADDON_DEPENDS@</requires>

diff --git a/pvr.mythtv/changelog.txt b/pvr.mythtv/changelog.txt
@@ -1,3 +1,6 @@
+v22.0.0
+- Initial release for Piers (PVR Add-on API v8.4.0)
+
 v21.1.9
 - Update settings to new format
 - Add build script for mac

diff --git a/src/cppmyth/MythScheduleHelper75.cpp b/src/cppmyth/MythScheduleHelper75.cpp
@@ -1385,7 +1385,7 @@ const MythTimerType::AttributeList& MythScheduleHelper75::GetRuleRecordingGroupL
 {
   if (!m_recGroupListInit && GetControl())
   {
-    int count = 0, index = RECGROUP_DFLT_ID;
+    int index = RECGROUP_DFLT_ID;
     m_recGroupListInit = true;
     Myth::StringListPtr strl = GetControl()->GetRecGroupList();
     // First add default group
@@ -1394,21 +1394,14 @@ const MythTimerType::AttributeList& MythScheduleHelper75::GetRuleRecordingGroupL
       if (*it == RECGROUP_DFLT_NAME)
       {
         m_recGroupList.emplace_back(index++, RECGROUP_DFLT_NAME);
-        ++count;
       }
     }
     // Then others
     for (Myth::StringList::const_iterator it = strl->begin(); it != strl->end(); ++it)
     {
       if (*it != RECGROUP_DFLT_NAME)
       {
-        if (count == PVR_ADDON_TIMERTYPE_VALUES_ARRAY_SIZE)
-        {
-          kodi::Log(ADDON_LOG_INFO, "75::%s: List overflow (%d): %u remaining value(s) are not loaded", __FUNCTION__, count, (unsigned)(strl->size() - count));
-          break;
-        }
         m_recGroupList.emplace_back(index++, *it);
-        ++count;
       }
     }
   }

diff --git a/src/pvrclient-mythtv.cpp b/src/pvrclient-mythtv.cpp
@@ -1552,13 +1552,10 @@ PVR_ERROR PVRClientMythTV::GetRecordingEdl(const kodi::addon::PVRRecording& reco
   }
 
   // Processing marks
-  int index = 0;
   Myth::MarkList::const_iterator it;
   Myth::MarkPtr startPtr;
   for (it = skpList.begin(); it != skpList.end(); ++it)
   {
-    if (index >= PVR_ADDON_EDL_LENGTH)
-      break;
     switch ((*it)->markType)
     {
       case Myth::MARK_COMM_START:
@@ -1587,7 +1584,6 @@ PVR_ERROR PVRClientMythTV::GetRecordingEdl(const kodi::addon::PVRRecording& reco
             kodi::Log(ADDON_LOG_DEBUG, "%s: COMBREAK %9.3f - %9.3f", __FUNCTION__, s, e);
           }
           edl.emplace_back(entry);
-          index++;
         }
         startPtr.reset();
         break;
@@ -1601,7 +1597,6 @@ PVR_ERROR PVRClientMythTV::GetRecordingEdl(const kodi::addon::PVRRecording& reco
           entry.SetEnd((int64_t)(e * 1000.0));
           entry.SetType(PVR_EDL_TYPE_CUT);
           edl.emplace_back(entry);
-          index++;
           if (CMythSettings::GetExtraDebug())
             kodi::Log(ADDON_LOG_DEBUG, "%s: CUT %9.3f - %9.3f", __FUNCTION__, s, e);
         }