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

simplify EOF handling

Browse Source
This commit is contained in:
Glenn Maynard
2006-12-22 06:01:49 +00:00
parent 3554fdeac0
commit 4516298901
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSoundReader_Chain.cpp
+3 -5
View File
@@ -312,6 +312,9 @@ int RageSoundReader_Chain::Read( char *pBuffer, int iFrames )
++m_iNextSound; ++m_iNextSound;
} }
if( m_iNextSound == m_aSounds.size() && m_apActiveSounds.empty() )
return END_OF_FILE;
/* Clamp iFrames to the beginning of the next sound we need to start. */ /* Clamp iFrames to the beginning of the next sound we need to start. */
if( m_iNextSound < m_aSounds.size() ) if( m_iNextSound < m_aSounds.size() )
{ {
@@ -321,9 +324,6 @@ int RageSoundReader_Chain::Read( char *pBuffer, int iFrames )
iFrames = min( iFramesToRead, iFrames ); iFrames = min( iFramesToRead, iFrames );
} }
if( iFrames == 0 )
return 0;
if( m_apActiveSounds.size() == 1 && if( m_apActiveSounds.size() == 1 &&
m_apActiveSounds.front()->pSound->GetNumChannels() == m_iChannels && m_apActiveSounds.front()->pSound->GetNumChannels() == m_iChannels &&
m_apActiveSounds.front()->pSound->GetSampleRate() == m_iActualSampleRate ) m_apActiveSounds.front()->pSound->GetSampleRate() == m_iActualSampleRate )
@@ -387,8 +387,6 @@ int RageSoundReader_Chain::Read( char *pBuffer, int iFrames )
mix.read( (int16_t *) pBuffer ); mix.read( (int16_t *) pBuffer );
m_iCurrentFrame += iMaxFramesRead; m_iCurrentFrame += iMaxFramesRead;
if( iMaxFramesRead == 0 )
return END_OF_FILE;
return iMaxFramesRead; return iMaxFramesRead;
} }