Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

4.4.14 Fix HTSPDemuxer::IsRealTimeStream to always return true if subscription is active. #403

Merged
merged 1 commit into from Feb 17, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion pvr.hts/addon.xml.in
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="pvr.hts"
version="4.4.13"
version="4.4.14"
name="Tvheadend HTSP Client"
provider-name="Adam Sutton, Sam Stenvall, Lars Op den Kamp, Kai Sommerfeld">
<requires>@ADDON_DEPENDS@</requires>
Expand Down
3 changes: 3 additions & 0 deletions pvr.hts/changelog.txt
@@ -1,3 +1,6 @@
4.4.14
- Fix HTSPDemuxer::IsRealTimeStream to always return true if subscription is active.

4.4.13
- Fixed missing description in EPG and DVR tags.

Expand Down
7 changes: 1 addition & 6 deletions src/tvheadend/HTSPDemuxer.cpp
Expand Up @@ -297,12 +297,7 @@ bool HTSPDemuxer::IsTimeShifting() const

bool HTSPDemuxer::IsRealTimeStream() const
{
if (!m_subscription.IsActive())
return false;

/* Handle as real time when reading close to the EOF (10 secs) */
CLockObject lock(m_mutex);
return (m_timeshiftStatus.shift < 10000000);
return m_subscription.IsActive();
}

PVR_ERROR HTSPDemuxer::GetStreamTimes(PVR_STREAM_TIMES *times) const
Expand Down