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

Read() update

Browse Source
This commit is contained in:
Glenn Maynard
2006-12-10 07:17:58 +00:00
parent 5ad35cc6c6
commit ecbbe89f1a
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSoundReader_Chain.cpp
+7 -4
View File
@@ -332,9 +332,10 @@ int RageSoundReader_Chain::Read( char *pBuffer, int iFrames )
* directly from the source into the destination. This is to optimize * directly from the source into the destination. This is to optimize
* the common case of having one BGM track and no autoplay sounds. */ * the common case of having one BGM track and no autoplay sounds. */
iFrames = m_apActiveSounds.front()->pSound->Read( (char *) pBuffer, iFrames ); iFrames = m_apActiveSounds.front()->pSound->Read( (char *) pBuffer, iFrames );
if( iFrames == 0 ) if( iFrames < 0 )
ReleaseSound( m_apActiveSounds.front() ); ReleaseSound( m_apActiveSounds.front() );
m_iCurrentFrame += iFrames; if( iFrames > 0 )
m_iCurrentFrame += iFrames;
return iFrames; return iFrames;
} }
@@ -358,9 +359,8 @@ int RageSoundReader_Chain::Read( char *pBuffer, int iFrames )
ASSERT( pSound->GetNumChannels() == m_iChannels ); // guaranteed by ActivateSound and Finish ASSERT( pSound->GetNumChannels() == m_iChannels ); // guaranteed by ActivateSound and Finish
int iSamples = min( iFrames * pSound->GetNumChannels(), ARRAYLEN(Buffer) ); int iSamples = min( iFrames * pSound->GetNumChannels(), ARRAYLEN(Buffer) );
int iFramesRead = pSound->Read( (char *) Buffer, iSamples/pSound->GetNumChannels() ); int iFramesRead = pSound->Read( (char *) Buffer, iSamples/pSound->GetNumChannels() );
if( iFramesRead == -1 || iFramesRead == 0 ) if( iFramesRead < 0 )
{ {
/* The sound is at EOF. Release it. */
ReleaseSound( m_apActiveSounds[i] ); ReleaseSound( m_apActiveSounds[i] );
continue; continue;
} }
@@ -374,6 +374,9 @@ int RageSoundReader_Chain::Read( char *pBuffer, int iFrames )
/* Read mixed frames into the output buffer. */ /* Read mixed frames into the output buffer. */
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;
} }