Permalink
Browse files

pvr: fix CDVDInputStream::NextStream() override after the merge

  • Loading branch information...
1 parent 7d2db75 commit 8d007da6cae1e998f762377c85ab749abc6f1e96 Lars Op den Kamp committed Apr 11, 2012
@@ -248,9 +248,9 @@ bool CDVDInputStreamPVRManager::UpdateItem(CFileItem& item)
return false;
}
-bool CDVDInputStreamPVRManager::NextStream()
+CDVDInputStream::ENextStream CDVDInputStreamPVRManager::NextStream()
{
- if(!m_pFile) return false;
+ if(!m_pFile) return NEXTSTREAM_NONE;
if (m_pOtherStream)
return m_pOtherStream->NextStream();
@@ -259,10 +259,10 @@ bool CDVDInputStreamPVRManager::NextStream()
if(m_pFile->SkipNext())
{
m_eof = false;
- return true;
+ return NEXTSTREAM_OPEN;
}
}
- return false;
+ return NEXTSTREAM_NONE;
}
bool CDVDInputStreamPVRManager::CanRecord()
@@ -51,7 +51,7 @@ class CDVDInputStreamPVRManager
virtual bool IsEOF();
virtual __int64 GetLength();
- virtual bool NextStream();
+ virtual ENextStream NextStream();
bool SelectChannelByNumber(unsigned int iChannel);
bool SelectChannel(const PVR::CPVRChannel &channel);

0 comments on commit 8d007da

Please sign in to comment.