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

simplify and correct. If Read (and ReadBlock) doesn't return as much data as requested, it may be because the rate is changing.

Browse Source
This commit is contained in:
Glenn Maynard
2006-12-10 05:32:03 +00:00
parent e6e37f9566
commit 04b2933af6
1 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSoundReader_Chain.cpp
+11 -20
View File
@@ -370,29 +370,20 @@ int RageSoundReader_Chain::ReadBlock( int16_t *pBuffer, int iFrames )
int RageSoundReader_Chain::Read( char *pBuffer, int iFrames )
{
int iTotalFramesRead = 0;
/* If we have no sources, and no more sounds to play, EOF. */
while( iFrames > 0 && (!m_apActiveSounds.empty() || m_iNextSound < m_aSounds.size()) )
while( m_iNextSound < m_aSounds.size() && m_iCurrentFrame == m_aSounds[m_iNextSound].GetOffsetFrame(m_iActualSampleRate) )
{
int iFramesRead = ReadBlock( (int16_t *) pBuffer, iFrames );
if( iFramesRead == -1 )
return -1;
m_iCurrentFrame += iFramesRead;
iFrames -= iFramesRead;
iTotalFramesRead += iFramesRead;
pBuffer += iFramesRead * sizeof(int16_t) * m_iChannels;
while( m_iNextSound < m_aSounds.size() && m_iCurrentFrame == m_aSounds[m_iNextSound].GetOffsetFrame(m_iActualSampleRate) )
{
Sound *pSound = &m_aSounds[m_iNextSound];
ActivateSound( pSound );
++m_iNextSound;
}
Sound *pSound = &m_aSounds[m_iNextSound];
ActivateSound( pSound );
++m_iNextSound;
}
return iTotalFramesRead;
int iFramesRead = ReadBlock( (int16_t *) pBuffer, iFrames );
if( iFramesRead == -1 )
return -1;
m_iCurrentFrame += iFramesRead;
return iFramesRead;
}
int RageSoundReader_Chain::GetLength() const