[SCM] kodi-pvr-hts/master: [settings] fix approximate time setting

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

The following commit has been merged in the master branch:
commit b1949c617827aa14743c658c4a5fb7e37a9b54d2
Author: Glenn-1990 <g_christiaensen at msn.com>
Date:   Sat Dec 12 15:36:53 2015 +0100

    [settings] fix approximate time setting

diff --git a/src/tvheadend/Settings.cpp b/src/tvheadend/Settings.cpp
index b7a60c6..2539a97 100644
--- a/src/tvheadend/Settings.cpp
+++ b/src/tvheadend/Settings.cpp
@@ -37,7 +37,7 @@ const bool        Settings::DEFAULT_ASYNC_EPG           = false;
 const int         Settings::DEFAULT_TOTAL_TUNERS        = 1;  // total tuners > 1 => predictive tuning active
 const int         Settings::DEFAULT_PRETUNER_CLOSEDELAY = 10; // secs
 const int         Settings::DEFAULT_AUTOREC_MAXDIFF     = 15; // mins. Maximum difference between real and approximate start time for auto recordings
-const int         Settings::DEFAULT_APPROX_TIME         = 0;  // mins
+const int         Settings::DEFAULT_APPROX_TIME         = 0;  // don't use an approximate start time, use a fixed time instead for auto recordings
 const std::string Settings::DEFAULT_STREAMING_PROFILE   = "";
 
 void Settings::ReadSettings()
diff --git a/src/tvheadend/Settings.h b/src/tvheadend/Settings.h
index 26a62de..1301bc0 100644
--- a/src/tvheadend/Settings.h
+++ b/src/tvheadend/Settings.h
@@ -46,7 +46,7 @@ namespace tvheadend {
     static const int         DEFAULT_TOTAL_TUNERS;
     static const int         DEFAULT_PRETUNER_CLOSEDELAY; // secs
     static const int         DEFAULT_AUTOREC_MAXDIFF; // mins. Maximum difference between real and approximate start time for auto recordings
-    static const int         DEFAULT_APPROX_TIME;     // mins
+    static const int         DEFAULT_APPROX_TIME;     // 0..1 (0 = use a fixed start time, 1 = use an approximate start time for auto recordings)
     static const std::string DEFAULT_STREAMING_PROFILE;
 
     /**
@@ -84,7 +84,7 @@ namespace tvheadend {
     int         GetTotalTuners() const { return m_iTotalTuners; }
     int         GetPreTunerCloseDelay() const { return m_iPreTunerCloseDelay; }
     bool        GetAutorecApproxTime() const { return m_bAutorecApproxTime; }
-    int         GetAutorecMaxDiff() const { return m_iPreTunerCloseDelay; }
+    int         GetAutorecMaxDiff() const { return m_iAutorecMaxDiff; }
     std::string GetStreamingProfile() const { return m_strStreamingProfile; }
 
   private:

-- 
kodi-pvr-hts packaging