From 4d6829e7bce25068f243d3697f0fa1ccd45a8516 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 22 Dec 2006 05:51:36 +0000 Subject: [PATCH] simplify --- stepmania/src/RageSoundReader_Chain.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/stepmania/src/RageSoundReader_Chain.cpp b/stepmania/src/RageSoundReader_Chain.cpp index 2aadbba533..9692ad01ae 100644 --- a/stepmania/src/RageSoundReader_Chain.cpp +++ b/stepmania/src/RageSoundReader_Chain.cpp @@ -352,7 +352,6 @@ int RageSoundReader_Chain::Read( char *pBuffer, int iFrames ) /* Read iFrames from each sound. */ int16_t Buffer[2048]; iFrames = min( iFrames, (int) (ARRAYLEN(Buffer) / m_iChannels) ); - int iMaxFramesRead = 0; for( unsigned i = 0; i < m_apActiveSounds.size(); ) { RageSoundReader *pSound = m_apActiveSounds[i]->pSound; @@ -365,13 +364,12 @@ int RageSoundReader_Chain::Read( char *pBuffer, int iFrames ) continue; } - iMaxFramesRead = max( iMaxFramesRead, iFramesRead ); - mix.write( Buffer, iFramesRead * pSound->GetNumChannels() ); ++i; } /* Read mixed frames into the output buffer. */ + int iMaxFramesRead = mix.size() / m_iChannels; mix.read( (int16_t *) pBuffer ); m_iCurrentFrame += iMaxFramesRead;