[SCM] kodi-pvr-hts/master: class Subscription: Fix member init order.

tiber-guest at users.alioth.debian.org tiber-guest at users.alioth.debian.org
Wed Mar 2 23:01:49 UTC 2016


The following commit has been merged in the master branch:
commit 017702aac3c6c28619895b02b5d09eb8505daa70
Author: Kai Sommerfeld <kai.sommerfeld at gmx.com>
Date:   Tue Nov 3 14:23:52 2015 +0100

    class Subscription: Fix member init order.

diff --git a/src/tvheadend/Subscription.cpp b/src/tvheadend/Subscription.cpp
index f08d4a8..89b1127 100644
--- a/src/tvheadend/Subscription.cpp
+++ b/src/tvheadend/Subscription.cpp
@@ -26,10 +26,10 @@ using namespace PLATFORM;
 using namespace tvheadend;
 
 Subscription::Subscription(CHTSPConnection &conn) :
+  m_id(0),
   m_channelId(0),
-  m_speed(1000),
   m_weight(SUBSCRIPTION_WEIGHT_NORMAL),
-  m_id(0),
+  m_speed(1000),
   m_state(SUBSCRIPTION_STOPPED),
   m_conn(conn)
 {
diff --git a/src/tvheadend/Subscription.h b/src/tvheadend/Subscription.h
index fff1b57..6e6e842 100644
--- a/src/tvheadend/Subscription.h
+++ b/src/tvheadend/Subscription.h
@@ -37,7 +37,8 @@ namespace tvheadend
   /* lowest configurable streaming weight in tvh is 50          */
   /* predictive tuning should be lower to avoid conflicts       */
   /* weight 0 means that tvh will use the weight of it's config */
-  enum eSubscriptionWeight {
+  enum eSubscriptionWeight
+  {
     SUBSCRIPTION_WEIGHT_NORMAL     = 100,
     SUBSCRIPTION_WEIGHT_PRETUNING  = 40,
     SUBSCRIPTION_WEIGHT_POSTTUNING = 30,

-- 
kodi-pvr-hts packaging



More information about the pkg-multimedia-commits mailing list