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

stay synched through partial blocks

Browse Source
This commit is contained in:
Glenn Maynard
2006-12-22 05:58:19 +00:00
parent 3d6811191b
commit cd74aab240
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSoundReader_Chain.cpp
+21 -6
View File
@@ -356,15 +356,30 @@ int RageSoundReader_Chain::Read( char *pBuffer, int iFrames )
{ {
RageSoundReader *pSound = m_apActiveSounds[i]->pSound; RageSoundReader *pSound = m_apActiveSounds[i]->pSound;
ASSERT( pSound->GetNumChannels() == m_iChannels ); // guaranteed by ActivateSound and Finish ASSERT( pSound->GetNumChannels() == m_iChannels ); // guaranteed by ActivateSound and Finish
int iFramesRead = pSound->Read( (char *) Buffer, iFrames );
if( iFramesRead < 0 ) /* If we receive less than we were asked for, keep asking for more data. Most
* filters would simply return what they have in this situation, but we want
* to deal transparently with separate sounds returning differently-sized partial
* blocks. */
int iFramesRead = 0;
while( iFramesRead < iFrames )
{ {
ReleaseSound( m_apActiveSounds[i] ); int iGotFrames = pSound->Read( (char *) Buffer, iFrames - iFramesRead );
continue; if( iGotFrames < 0 )
{
iFramesRead = iGotFrames;
continue;
}
mix.SetWriteOffset( iFramesRead * pSound->GetNumChannels() );
mix.write( Buffer, iFramesRead * pSound->GetNumChannels() );
iFramesRead += iGotFrames;
} }
mix.write( Buffer, iFramesRead * pSound->GetNumChannels() ); if( iFramesRead < 0 )
++i; ReleaseSound( m_apActiveSounds[i] );
else
++i;
} }
/* Read mixed frames into the output buffer. */ /* Read mixed frames into the output buffer. */