[SCM] kodi-pvr-hts/master: fixed: restart subscription after reconnection

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

The following commit has been merged in the master branch:
commit 0c40c4d62cf6b999d79ba7d14d3d35a8fca3290d
Author: Glenn-1990 <g_christiaensen at msn.com>
Date:   Fri Dec 18 23:48:38 2015 +0100

    fixed: restart subscription after reconnection

diff --git a/src/HTSPDemuxer.cpp b/src/HTSPDemuxer.cpp
index ea5c98a..14a6944 100644
--- a/src/HTSPDemuxer.cpp
+++ b/src/HTSPDemuxer.cpp
@@ -47,8 +47,8 @@ void CHTSPDemuxer::Connected ( void )
   if (m_subscription.IsActive())
   {
     tvhdebug("demux re-starting stream");
-    m_subscription.SendSubscribe(true);
-    m_subscription.SendSpeed(true);
+    m_subscription.SendSubscribe(0, 0, true);
+    m_subscription.SendSpeed(0, true);
 
     /* Reset status */
     m_signalInfo.Clear();
diff --git a/src/tvheadend/Subscription.h b/src/tvheadend/Subscription.h
index 6e6e842..b03bcce 100644
--- a/src/tvheadend/Subscription.h
+++ b/src/tvheadend/Subscription.h
@@ -81,9 +81,7 @@ namespace tvheadend
      * @param weight the desired subscription weight
      * @param restart restart the current subscription (i.e. after lost connection), other parameters will be ignored
      */
-    void SendSubscribe(uint32_t channelId = 0,
-                       uint32_t weight = SUBSCRIPTION_WEIGHT_NORMAL,
-                       bool restart = false);
+    void SendSubscribe(uint32_t channelId, uint32_t weight, bool restart = false);
 
     /**
      * Unsubscribe from a channel on the backend
@@ -102,7 +100,7 @@ namespace tvheadend
      * @param speed the desired speed of the subscription
      * @param restart resent the current subscription speed (i.e. after lost connection), other parameters will be ignored
      */
-    void SendSpeed(int32_t speed = 1000, bool restart = false);
+    void SendSpeed(int32_t speed, bool restart = false);
 
     /**
      * Change the subscription weight on the backend

-- 
kodi-pvr-hts packaging