[SCM] kodi-pvr-hts/master: 3.4.10. Adpated to pvr addon api 5.2.1 (3.4.9 was just to make it compile again).

tiber-guest at users.alioth.debian.org tiber-guest at users.alioth.debian.org
Sat Jan 7 11:27:56 UTC 2017


The following commit has been merged in the master branch:
commit a8c92867a73b1945cf926fcad8e62b415552bc9a
Author: Kai Sommerfeld <kai.sommerfeld at gmx.com>
Date:   Sun Nov 27 13:52:53 2016 +0100

    3.4.10. Adpated to pvr addon api 5.2.1 (3.4.9 was just to make it compile again).

diff --git a/pvr.hts/addon.xml.in b/pvr.hts/addon.xml.in
index 9f2ec3d..5d7b84e 100644
--- a/pvr.hts/addon.xml.in
+++ b/pvr.hts/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.hts"
-  version="3.4.9"
+  version="3.4.10"
   name="Tvheadend HTSP Client"
   provider-name="Adam Sutton, Sam Stenvall, Lars Op den Kamp, Kai Sommerfeld">
   <requires>
diff --git a/pvr.hts/changelog.txt b/pvr.hts/changelog.txt
index bd69335..d62830c 100644
--- a/pvr.hts/changelog.txt
+++ b/pvr.hts/changelog.txt
@@ -1,3 +1,9 @@
+3.4.10
+- Adpations for PVR API v5.2.1
+
+3.4.9
+- Updated to PVR API v5.2.1 (just made it compile again)
+
 3.4.8
 - improve EPG loading performance
 
diff --git a/src/HTSPDemuxer.cpp b/src/HTSPDemuxer.cpp
index 7ece09c..12efa20 100644
--- a/src/HTSPDemuxer.cpp
+++ b/src/HTSPDemuxer.cpp
@@ -154,7 +154,7 @@ void CHTSPDemuxer::Abort ( void )
 }
 
 bool CHTSPDemuxer::Seek 
-  ( int time, bool _unused(backwards), double *startpts )
+  ( double time, bool _unused(backwards), double *startpts )
 {
   if (!m_subscription.IsActive())
     return false;
diff --git a/src/Tvheadend.cpp b/src/Tvheadend.cpp
index daf1541..d4ed8c2 100644
--- a/src/Tvheadend.cpp
+++ b/src/Tvheadend.cpp
@@ -2466,7 +2466,7 @@ void CTvheadend::DemuxAbort ( void )
   }
 }
 
-bool CTvheadend::DemuxSeek ( int time, bool backward, double *startpts )
+bool CTvheadend::DemuxSeek ( double time, bool backward, double *startpts )
 {
   return m_dmx_active->Seek(time, backward, startpts);
 }
diff --git a/src/Tvheadend.h b/src/Tvheadend.h
index 908d989..bbbbc29 100644
--- a/src/Tvheadend.h
+++ b/src/Tvheadend.h
@@ -277,7 +277,7 @@ private:
   void         Trim           ( void );
   void         Flush          ( void );
   void         Abort          ( void );
-  bool         Seek           ( int time, bool backwards, double *startpts );
+  bool         Seek           ( double time, bool backwards, double *startpts );
   void         Speed          ( int speed );
   void         Weight         ( tvheadend::eSubscriptionWeight weight );
   PVR_ERROR    CurrentStreams ( PVR_STREAM_PROPERTIES *streams );
@@ -538,7 +538,7 @@ public:
   DemuxPacket *DemuxRead           ( void );
   void         DemuxFlush          ( void );
   void         DemuxAbort          ( void );
-  bool         DemuxSeek           ( int time, bool backward, double *startpts );
+  bool         DemuxSeek           ( double time, bool backward, double *startpts );
   void         DemuxSpeed          ( int speed );
   PVR_ERROR    DemuxCurrentStreams ( PVR_STREAM_PROPERTIES *streams );
   PVR_ERROR    DemuxCurrentSignal  ( PVR_SIGNAL_STATUS &sig );
diff --git a/src/tvheadend/Subscription.cpp b/src/tvheadend/Subscription.cpp
index e18af1e..9f1ae0e 100644
--- a/src/tvheadend/Subscription.cpp
+++ b/src/tvheadend/Subscription.cpp
@@ -173,7 +173,7 @@ void Subscription::SendUnsubscribe(void)
   Logger::Log(LogLevel::LEVEL_DEBUG, "demux successfully unsubscribed from channel id %d, subscription id %d", GetChannelId(), GetId());
 }
 
-bool Subscription::SendSeek(int time)
+bool Subscription::SendSeek(double time)
 {
   /* Build message */
   htsmsg_t *m = htsmsg_create_map();
diff --git a/src/tvheadend/Subscription.h b/src/tvheadend/Subscription.h
index 363e5ef..01890f9 100644
--- a/src/tvheadend/Subscription.h
+++ b/src/tvheadend/Subscription.h
@@ -93,7 +93,7 @@ namespace tvheadend
      * @param time timestamp to seek to
      * @return false if the command failed, true otherwise
      */
-    bool SendSeek(int time);
+    bool SendSeek(double time);
 
     /**
      * Change the subscription speed on the backend

-- 
kodi-pvr-hts packaging



More information about the pkg-multimedia-commits mailing list