Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

pvr: align NexStream and SkipNext with logic in dvdplayer

  • Loading branch information...
commit cbad7f0e8feca4cb96a21bb6c84d98272edb000f 1 parent 1410f36
Rainer Hochecker FernetMenta authored
24 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.cpp
View
@@ -45,7 +45,6 @@ CDVDInputStreamPVRManager::CDVDInputStreamPVRManager(IDVDPlayer* pPlayer) : CDVD
m_pLiveTV = NULL;
m_pOtherStream = NULL;
m_eof = true;
- m_bReopened = false;
m_iScanTimeout = 0;
}
@@ -311,28 +310,20 @@ bool CDVDInputStreamPVRManager::UpdateItem(CFileItem& item)
CDVDInputStream::ENextStream CDVDInputStreamPVRManager::NextStream()
{
- if(!m_pFile) return NEXTSTREAM_NONE;
+ if(!m_pFile)
+ return NEXTSTREAM_NONE;
- if(m_bReopened)
- {
- if (IsEOF())
- return NEXTSTREAM_NONE;
- else
- {
- m_bReopened = false;
- m_eof = false;
- return NEXTSTREAM_RETRY;
- }
- }
+ m_eof = IsEOF();
if (m_pOtherStream)
return m_pOtherStream->NextStream();
else if(m_pFile->SkipNext())
{
- m_eof = false;
- return NEXTSTREAM_OPEN;
+ if (m_eof)
+ return NEXTSTREAM_OPEN;
+ else
+ return NEXTSTREAM_RETRY;
}
-
return NEXTSTREAM_NONE;
}
@@ -385,7 +376,6 @@ bool CDVDInputStreamPVRManager::CloseAndOpen(const char* strFile)
if (Open(strFile, m_content))
{
- m_bReopened = true;
return true;
}
1  xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.h
View
@@ -98,7 +98,6 @@ class CDVDInputStreamPVRManager
XFILE::IRecordable* m_pRecordable;
bool m_eof;
std::string m_strContent;
- bool m_bReopened;
unsigned int m_iScanTimeout;
};
Please sign in to comment.
Something went wrong with that request. Please try again.