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

add a failsafe; this runs in a high-priority thread

Browse Source
This commit is contained in:
Glenn Maynard
2006-12-10 07:12:20 +00:00
parent 0b529a4960
commit 5ad35cc6c6
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSound.cpp
+14 -1
View File
@@ -288,7 +288,12 @@ int RageSound::GetData( char *pBuffer, int iFrames )
fRate = m_pSource->GetStreamToSourceRatio(); fRate = m_pSource->GetStreamToSourceRatio();
int iNewSourceFrame = m_pSource->GetNextSourceFrame(); int iNewSourceFrame = m_pSource->GetNextSourceFrame();
while( iGotFrames == 0 )
/* m_pSource->Read() may return 0, which means "try again immediately". As
* a failsafe, only try this a finite number of times. Use a high number,
* because in principle each filter in the stack may cause this. */
int iTries = 100;
while( iGotFrames == 0 && --iTries )
{ {
iGotFrames = m_pSource->Read( pBuffer, iFrames ); iGotFrames = m_pSource->Read( pBuffer, iFrames );
if( iGotFrames == RageSoundReader::ERROR ) if( iGotFrames == RageSoundReader::ERROR )
@@ -308,6 +313,14 @@ int RageSound::GetData( char *pBuffer, int iFrames )
ASSERT_M( iGotFrames >= 0, ssprintf("%i", iGotFrames) ); // unhandled error condition ASSERT_M( iGotFrames >= 0, ssprintf("%i", iGotFrames) ); // unhandled error condition
} }
if( iTries == 0 )
{
Fail( "Read() busy looping" );
/* Pretend we got EOF. */
return 0;
}
/* If we didn't get any data, don't update iSourceFrame, so we just keep /* If we didn't get any data, don't update iSourceFrame, so we just keep
* extrapolating if we're in M_CONTINUE. */ * extrapolating if we're in M_CONTINUE. */
if( iGotFrames == 0 ) if( iGotFrames == 0 )