[SCM] kodi-pvr-hts/master: Merge pull request #145 from Glenn-1990/htspv25

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

update changelog
Implement proper timerec and autorec update methods.
Use removal as lifetime for htspv25+
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: da14e25d0ec59a47da93dd88bdc66e1c16d94238
X-Git-Newrev: 4dc398ff1337ec61dea38685719108f1cd20f7b0

The following commit has been merged in the master branch:
commit c4d79d8857118c2189583482f2c054b0cd7222f1
Merge: b13750d7f98d176d4420fbe93ff538edbbb6101d 6598b9dd2c19e07529c9c62a303283adeb5d964b
Author: Kai Sommerfeld <kai.sommerfeld at gmx.com>
Date:   Mon Jan 4 22:33:25 2016 +0100

    Merge pull request #145 from Glenn-1990/htspv25
    
    Support for autorec/timerec update (new htsp v25 methods)

diff --combined src/Tvheadend.h
index 5cb9089,942b67e..e0869ac
--- a/src/Tvheadend.h
+++ b/src/Tvheadend.h
@@@ -31,6 -31,7 +31,6 @@@
  #include "kodi/libXBMC_addon.h"
  #include "tvheadend/Settings.h"
  #include "HTSPTypes.h"
 -#include "AsyncState.h"
  #include "tvheadend/ChannelTuningPredictor.h"
  #include "tvheadend/Profile.h"
  #include "tvheadend/entity/Tag.h"
@@@ -41,7 -42,6 +41,7 @@@
  #include "tvheadend/status/Quality.h"
  #include "tvheadend/status/SourceInfo.h"
  #include "tvheadend/status/TimeshiftStatus.h"
 +#include "tvheadend/utilities/AsyncState.h"
  #include "tvheadend/Subscription.h"
  #include "TimeRecordings.h"
  #include "AutoRecordings.h"
@@@ -68,7 -68,7 +68,7 @@@ extern "C" 
   * Configuration defines
   */
  #define HTSP_MIN_SERVER_VERSION       (19) // Server must support at least this htsp version
- #define HTSP_CLIENT_VERSION           (24) // Client uses HTSP features up to this version. If the respective
+ #define HTSP_CLIENT_VERSION           (25) // Client uses HTSP features up to this version. If the respective
                                             // addon feature requires htsp features introduced after
                                             // HTSP_MIN_SERVER_VERSION this feature will only be available if the
                                             // actual server HTSP version matches (runtime htsp version check).
@@@ -440,7 -440,7 +440,7 @@@ private
  
    SHTSPEventList              m_events;
  
 -  AsyncState                  m_asyncState;
 +  tvheadend::utilities::AsyncState  m_asyncState;
  
    TimeRecordings              m_timeRecordings;
    AutoRecordings              m_autoRecordings;

-- 
kodi-pvr-hts packaging