Merge pull request #147 from AlwinEsch/gui-change

[Matrix] increase version to 8.0.0 (API related)
kodi-pvr · Oct 30, 2020 · bdb6164 · bdb6164
2 parents 24f97bb + c1638b8
commit bdb6164
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/pvr.nextpvr/addon.xml.in b/pvr.nextpvr/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.nextpvr"
-  version="7.1.1"
+  version="8.0.0"
   name="NextPVR PVR Client"
   provider-name="Graeme Blackley">
   <requires>@ADDON_DEPENDS@

diff --git a/pvr.nextpvr/changelog.txt b/pvr.nextpvr/changelog.txt
@@ -1,3 +1,6 @@
+v8.0.0
+- Update PVR API 7.0.2
+
 v7.1.1
 - Add drive space options in v5
 

diff --git a/src/buffers/RecordingBuffer.cpp b/src/buffers/RecordingBuffer.cpp
@@ -16,7 +16,7 @@ PVR_ERROR RecordingBuffer::GetStreamTimes(kodi::addon::PVRStreamTimes& stimes)
   stimes.SetStartTime(0);
   stimes.SetPTSStart(0);
   stimes.SetPTSBegin(0);
-  stimes.SetPTSEnd(static_cast<int64_t>(Duration()) * DVD_TIME_BASE);
+  stimes.SetPTSEnd(static_cast<int64_t>(Duration()) * STREAM_TIME_BASE);
   return PVR_ERROR_NO_ERROR;
 }
 

diff --git a/src/buffers/RollingFile.cpp b/src/buffers/RollingFile.cpp
@@ -280,8 +280,8 @@ PVR_ERROR RollingFile::GetStreamTimes(kodi::addon::PVRStreamTimes& stimes)
     return RecordingBuffer::GetStreamTimes(stimes);
   stimes.SetStartTime(m_streamStart);
   stimes.SetPTSStart(0);
-  stimes.SetPTSBegin((m_rollingStartSeconds - m_streamStart) * DVD_TIME_BASE);
-  stimes.SetPTSEnd((time(nullptr) - m_streamStart) * DVD_TIME_BASE);
+  stimes.SetPTSBegin((m_rollingStartSeconds - m_streamStart) * STREAM_TIME_BASE);
+  stimes.SetPTSEnd((time(nullptr) - m_streamStart) * STREAM_TIME_BASE);
   return PVR_ERROR_NO_ERROR;
 }
 

diff --git a/src/buffers/TimeshiftBuffer.cpp b/src/buffers/TimeshiftBuffer.cpp
@@ -505,8 +505,8 @@ bool TimeshiftBuffer::WriteData(const byte *buf, unsigned int size, uint64_t blo
      m_sd.tsbStart.store(tsbStart);
      m_sd.lastKnownLength.store(lastKnownLength);
      m_sd.iBytesPerSecond = iBytesPerSecond;
-     m_sd.ptsBegin.store((tsbStartTime - sessionStartTime) * DVD_TIME_BASE);
-     m_sd.ptsEnd.store((now - sessionStartTime) * DVD_TIME_BASE);
+     m_sd.ptsBegin.store((tsbStartTime - sessionStartTime) * STREAM_TIME_BASE);
+     m_sd.ptsEnd.store((now - sessionStartTime) * STREAM_TIME_BASE);
      m_sd.lastPauseAdjust = lastPauseAdjust;