Merge pull request #594 from ksooo/drop-old-tvh-support

Drop support for Tvheadend < 4.2.0
kodi-pvr · Oct 7, 2022 · c8e933b · c8e933b
2 parents ebfb345 + 76523fd
commit c8e933b
Show file tree

Hide file tree

Showing 9 changed files with 103 additions and 330 deletions.
diff --git a/pvr.hts/addon.xml.in b/pvr.hts/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.hts"
-  version="20.5.0"
+  version="20.6.0"
   name="Tvheadend HTSP Client"
   provider-name="Adam Sutton, Sam Stenvall, Lars Op den Kamp, Kai Sommerfeld">
   <requires>@ADDON_DEPENDS@</requires>

diff --git a/pvr.hts/changelog.txt b/pvr.hts/changelog.txt
@@ -1,3 +1,6 @@
+v20.6.0
+- Drop support for Tvheadend < 4.2.0
+
 v20.5.0
 - Kodi inputstream API update to version 3.2.0
 - Kodi PVR API update to version 8.0.2

diff --git a/pvr.hts/resources/instance-settings.xml b/pvr.hts/resources/instance-settings.xml
@@ -228,8 +228,8 @@
               <option label="30385">10</option> <!-- 1 year -->
               <option label="30386">11</option> <!-- 2 years -->
               <option label="30387">12</option> <!-- 3 years -->
-              <option label="30388">13</option> <!-- Until space needed (tvh 4.1+) -->
-              <option label="30389">14</option> <!-- Forever (tvh 4.1+) -->
+              <option label="30388">13</option> <!-- Until space needed -->
+              <option label="30389">14</option> <!-- Forever -->
               <option label="30390">15</option> <!-- Use backend setting -->
             </options>
           </constraints>

diff --git a/pvr.hts/resources/language/resource.language.en_gb/strings.po b/pvr.hts/resources/language/resource.language.en_gb/strings.po
@@ -294,17 +294,7 @@ msgctxt "#30372"
 msgid "Record if unique episode according EPG/XMLTV"
 msgstr ""
 
-#. Recording lifetime representation
-#: src/Tvheadend.cpp
-msgctxt "#30373"
-msgid "Until space needed"
-msgstr ""
-
-#. Recording lifetime representation
-#: src/Tvheadend.cpp
-msgctxt "#30374"
-msgid "Forever"
-msgstr ""
+#empty strings from id 30373 to 30374
 
 #. Recording lifetime representation
 #: src/Tvheadend.cpp
@@ -384,14 +374,14 @@ msgctxt "#30387"
 msgid "3 years"
 msgstr ""
 
-#. Recording lifetime representation (for setting dialog only)
+#. Recording lifetime representation
 msgctxt "#30388"
-msgid "Until space needed (tvh 4.1+)"
+msgid "Until space needed"
 msgstr ""
 
-#. Recording lifetime representation (for setting dialog only)
+#. Recording lifetime representation
 msgctxt "#30389"
-msgid "Forever (tvh 4.1+)"
+msgid "Forever"
 msgstr ""
 
 #. Recording lifetime representation