[SCM] kodi-pvr-hts/master: disable lifetime 'forever' for older tvheadend backends fixes #201

[tiber-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 3222729ff8333362fb8e64d304dbc4374a9db4ca
Author: Glenn-1990 <g_christiaensen at msn.com>
Date:   Tue Mar 15 00:04:00 2016 +0100

    disable lifetime 'forever' for older tvheadend backends fixes #201

diff --git a/pvr.hts/resources/language/resource.language.en_gb/strings.po b/pvr.hts/resources/language/resource.language.en_gb/strings.po
index 1891143..9800a0c 100644
--- a/pvr.hts/resources/language/resource.language.en_gb/strings.po
+++ b/pvr.hts/resources/language/resource.language.en_gb/strings.po
@@ -297,7 +297,12 @@ msgctxt "#30388"
 msgid "Until space needed (tvh 4.1+)"
 msgstr ""
 
-#empty strings from id 30389 to 30399
+#. Recording lifetime representation (for setting dialog only)
+msgctxt "#30389"
+msgid "Forever (tvh 4.1+)"
+msgstr ""
+
+#empty strings from id 30390 to 30399
 
 msgctxt "#30400"
 msgid "Predictive tuning"
diff --git a/pvr.hts/resources/settings.xml b/pvr.hts/resources/settings.xml
index 9b36243..a7d7924 100644
--- a/pvr.hts/resources/settings.xml
+++ b/pvr.hts/resources/settings.xml
@@ -27,7 +27,7 @@
     
     <setting label="30058" type="lsep"/>
     <setting id="dvr_priority" type="enum" label="30055" lvalues="30351|30352|30353|30354|30355" default="2"/>
-    <setting id="dvr_lifetime" type="enum" label="30056" lvalues="30375|30376|30377|30378|30379|30380|30381|30382|30383|30384|30385|30386|30387|30388|30374" default="8"/>
+    <setting id="dvr_lifetime" type="enum" label="30056" lvalues="30375|30376|30377|30378|30379|30380|30381|30382|30383|30384|30385|30386|30387|30388|30389" default="8"/>
     <setting id="dvr_dubdetect" type="enum" label="30057" lvalues="30356|30357|30358|30359|30360|30361" default="0"/>
   </category>
   
diff --git a/src/Tvheadend.cpp b/src/Tvheadend.cpp
index bdbb6d0..2942de4 100644
--- a/src/Tvheadend.cpp
+++ b/src/Tvheadend.cpp
@@ -691,8 +691,10 @@ PVR_ERROR CTvheadend::GetTimerTypes ( PVR_TIMER_TYPE types[], int *size )
   lifetimeValues.push_back(std::make_pair(DVR_RET_2YEARS,  XBMC->GetLocalizedString(30386)));
   lifetimeValues.push_back(std::make_pair(DVR_RET_3YEARS,  XBMC->GetLocalizedString(30387)));
   if (m_conn.GetProtocol() >= 25)
+  {
     lifetimeValues.push_back(std::make_pair(DVR_RET_SPACE,   XBMC->GetLocalizedString(30373)));
-  lifetimeValues.push_back(std::make_pair(DVR_RET_FOREVER, XBMC->GetLocalizedString(30374)));
+    lifetimeValues.push_back(std::make_pair(DVR_RET_FOREVER, XBMC->GetLocalizedString(30374)));
+  }
 
   unsigned int TIMER_ONCE_MANUAL_ATTRIBS
     = PVR_TIMER_TYPE_IS_MANUAL           |

-- 
kodi-pvr-hts packaging