actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix RageSoundReader_ChannelSplit error reporting: don't return

Browse Source 
eg. END_OF_FILE or WOULD_BLOCK if we still have buffered data
This commit is contained in:
Glenn Maynard
2007-01-06 06:58:09 +00:00
parent fcd215f61b
commit 250dd40c33
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSoundReader_ChannelSplit.cpp
+6 -2
View File
@@ -136,8 +136,6 @@ int RageSoundReader_Split::Read( char *pBuf, int iFrames )
{
m_iRequestFrames = iFrames;
int iRet = m_pImpl->ReadBuffer();
if( iRet < 0 )
return iRet;
int iBytesAvailable = m_pImpl->m_sBuffer.size();
const char *pSrc = m_pImpl->m_sBuffer.data();
@@ -151,6 +149,12 @@ int RageSoundReader_Split::Read( char *pBuf, int iFrames )
int iFramesWanted = iFrames;
int iFramesAvailable = iBytesAvailable / (sizeof(int16_t) * m_pImpl->m_pSource->GetNumChannels());
/* Report any errors from Read() if we don't have any data buffered to
* return. If we do have data, finish returning it first. */
if( iFramesAvailable == 0 && iRet < 0 )
return iRet;
iFramesAvailable = min( iFramesAvailable, iFramesWanted );
{