diff --git a/stepmania/src/RageSoundReader_Extend.cpp b/stepmania/src/RageSoundReader_Extend.cpp index db1590dcbf..9640132857 100644 --- a/stepmania/src/RageSoundReader_Extend.cpp +++ b/stepmania/src/RageSoundReader_Extend.cpp @@ -113,9 +113,6 @@ int RageSoundReader_Extend::Read( char *pBuffer, int iFrames ) return STREAM_LOOPED; } - if( iFramesRead == RageSoundReader::ERROR ) - this->SetError( m_pSource->GetError() ); - return iFramesRead; } diff --git a/stepmania/src/RageSoundReader_Pan.cpp b/stepmania/src/RageSoundReader_Pan.cpp index fbc2887ca9..f29c07c51b 100644 --- a/stepmania/src/RageSoundReader_Pan.cpp +++ b/stepmania/src/RageSoundReader_Pan.cpp @@ -13,10 +13,7 @@ int RageSoundReader_Pan::Read( char *pBuf, int iFrames ) { iFrames = m_pSource->Read( pBuf, iFrames ); if( iFrames < 0 ) - { - this->SetError( m_pSource->GetError() ); return iFrames; - } int iSamples = iFrames * m_pSource->GetNumChannels(); diff --git a/stepmania/src/RageSoundReader_Resample_Good.cpp b/stepmania/src/RageSoundReader_Resample_Good.cpp index bd22561509..ac32fad6af 100644 --- a/stepmania/src/RageSoundReader_Resample_Good.cpp +++ b/stepmania/src/RageSoundReader_Resample_Good.cpp @@ -713,12 +713,8 @@ int RageSoundReader_Resample_Good::Read( char *pBuf_, int iFrames ) int16_t *pTmpBuf = (int16_t *) alloca( iFramesNeeded * sizeof(int16_t) * iChannels ); ASSERT( pTmpBuf ); int iFramesIn = m_pSource->Read( (char *) pTmpBuf, iFramesNeeded ); - if( iFramesIn < 0 ) - { - SetError( m_pSource->GetError() ); return iFramesIn; - } const int iSamplesIn = iFramesIn * iChannels; diff --git a/stepmania/src/RageSoundReader_ThreadedBuffer.cpp b/stepmania/src/RageSoundReader_ThreadedBuffer.cpp index c934a58530..a51de9dc5e 100644 --- a/stepmania/src/RageSoundReader_ThreadedBuffer.cpp +++ b/stepmania/src/RageSoundReader_ThreadedBuffer.cpp @@ -296,9 +296,6 @@ int RageSoundReader_ThreadedBuffer::FillBlock() m_bEOF = (iGotFrames == END_OF_FILE); - if( iGotFrames < 0 && iGotFrames != END_OF_FILE ) - SetError( m_pSource->GetError() ); - return iGotFrames; }