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

reuse preloaded sounds

Browse Source
This commit is contained in:
Glenn Maynard
2005-07-18 19:09:31 +00:00
parent 2493236cea
commit 9ef48d4a48
1 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSound.cpp
+24 -6
View File
@@ -173,14 +173,26 @@ bool RageSound::Load( CString sSoundFilePath, bool bPrecache )
{ {
LOG->Trace( "RageSound::LoadSound( '%s', %d )", sSoundFilePath.c_str(), bPrecache ); LOG->Trace( "RageSound::LoadSound( '%s', %d )", sSoundFilePath.c_str(), bPrecache );
CString error; /* If this sound is already preloaded and held by SOUNDMAN, just make a
SoundReader *pSound = SoundReader_FileReader::OpenFile( sSoundFilePath, error ); * copy of that. Since RageSoundReader_Preload is reference counted, this
* is cheap. */
SoundReader *pSound = SOUNDMAN->GetLoadedSound( sSoundFilePath );
if( pSound == NULL ) if( pSound == NULL )
{ {
LOG->Warn( "RageSound::Load: error opening sound \"%s\": %s", CString error;
sSoundFilePath.c_str(), error.c_str() ); pSound = SoundReader_FileReader::OpenFile( sSoundFilePath, error );
if( pSound == NULL )
{
LOG->Warn( "RageSound::Load: error opening sound \"%s\": %s",
sSoundFilePath.c_str(), error.c_str() );
pSound = new RageSoundReader_Silence; pSound = new RageSoundReader_Silence;
}
}
else
{
/* The sound we were given from SOUNDMAN is already preloaded. */
bPrecache = false;
} }
LoadSoundReader( pSound ); LoadSoundReader( pSound );
@@ -188,7 +200,13 @@ bool RageSound::Load( CString sSoundFilePath, bool bPrecache )
/* Try to precache. Do this after calling LoadSoundReader() to put the /* Try to precache. Do this after calling LoadSoundReader() to put the
* sound in this->m_pSource, so we preload after resampling. */ * sound in this->m_pSource, so we preload after resampling. */
if( bPrecache ) if( bPrecache )
RageSoundReader_Preload::PreloadSound( m_pSource ); {
if( RageSoundReader_Preload::PreloadSound(m_pSource) )
{
/* We've preloaded the sound. Pass it to SOUNDMAN, for reuse. */
SOUNDMAN->AddLoadedSound( sSoundFilePath, (RageSoundReader_Preload *) m_pSource );
}
}
m_sFilePath = sSoundFilePath; m_sFilePath = sSoundFilePath;