Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

pvr: fix too early finish of recordings

  • Loading branch information...
commit 1410f361434bf1af9bc436cd01d977f1a372f71b 1 parent 66be6ac
@FernetMenta FernetMenta authored
View
11 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.cpp
@@ -315,9 +315,14 @@ CDVDInputStream::ENextStream CDVDInputStreamPVRManager::NextStream()
if(m_bReopened)
{
- m_bReopened = false;
- m_eof = false;
- return NEXTSTREAM_RETRY;
+ if (IsEOF())
+ return NEXTSTREAM_NONE;
+ else
+ {
+ m_bReopened = false;
+ m_eof = false;
+ return NEXTSTREAM_RETRY;
+ }
}
if (m_pOtherStream)
View
9 xbmc/cores/dvdplayer/DVDPlayer.cpp
@@ -1174,15 +1174,6 @@ void CDVDPlayer::Process()
Sleep(100);
continue;
}
- else if (m_pInputStream->IsStreamType(DVDSTREAM_TYPE_PVRMANAGER))
- {
- CDVDInputStreamPVRManager* pStream = static_cast<CDVDInputStreamPVRManager*>(m_pInputStream);
- if (pStream->IsEOF())
- break;
-
- Sleep(100);
- continue;
- }
// make sure we tell all players to finish it's data
if(m_CurrentAudio.inited)
View
2  xbmc/filesystem/PVRFile.h
@@ -44,7 +44,7 @@ class CPVRFile
virtual void Close();
virtual unsigned int Read(void* buffer, int64_t size);
virtual CStdString GetContent() { return ""; }
- virtual bool SkipNext() { return true; }
+ virtual bool SkipNext() { return !m_isPlayRecording; }
virtual bool Delete(const CURL& url);
virtual bool Rename(const CURL& url, const CURL& urlnew);

0 comments on commit 1410f36

Please sign in to comment.
Something went wrong with that request. Please try again.