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

no, this is needed (but for a different reason)

Browse Source
This commit is contained in:
Glenn Maynard
2004-05-08 23:27:36 +00:00
parent 4f369120e2
commit f87bfe8b34
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSoundManager.cpp
+17 -2
View File
@@ -90,16 +90,31 @@ void RageSoundManager::Update(float delta)
g_DeletionMutex.Lock(); g_DeletionMutex.Lock();
/* Scan the owned_sounds list for sounds that are no longer playing, and delete them. */ /* Scan the owned_sounds list for sounds that are no longer playing, and delete them. */
g_SoundManMutex.Lock(); /* lock for access to owned_sounds */ g_SoundManMutex.Lock(); /* lock for access to owned_sounds and all_sounds */
set<RageSound *>::iterator it; set<RageSound *>::iterator it;
set<RageSound *> ToDelete; set<RageSound *> ToDelete;
for( it = owned_sounds.begin(); it != owned_sounds.end(); ++it ) for( it = owned_sounds.begin(); it != owned_sounds.end(); ++it )
if( !(*it)->IsPlaying() ) if( !(*it)->IsPlaying() )
{
LOG->Trace("XXX: deleting '%s'", (*it)->GetLoadedFilePath().c_str());
ToDelete.insert( *it ); ToDelete.insert( *it );
}
/* Don't delete any sounds that are the parent of another sound. Always delete
* child sounds first. Otherwise, another sound might be allocated that has the
* same pointer as an old, deleted parent, and since we use the pointer to the
* parent to determine which sounds share the same parent, it'll confuse GetCopies(). */
for( it = all_sounds.begin(); it != all_sounds.end(); ++it )
if( (*it)->GetOriginal() != (*it) ) // child
{
set<RageSound *>::iterator parent = ToDelete.find( (*it)->GetOriginal() );
if( parent != ToDelete.end() )
ToDelete.erase( parent );
}
for( it = ToDelete.begin(); it != ToDelete.end(); ++it ) for( it = ToDelete.begin(); it != ToDelete.end(); ++it )
owned_sounds.erase( *it ); owned_sounds.erase( *it );
g_SoundManMutex.Unlock(); /* finished with owned_sounds */ g_SoundManMutex.Unlock(); /* finished with owned_sounds and all_sounds */
/* We can safely delete sounds while holding g_DeletionMutex, but not while /* We can safely delete sounds while holding g_DeletionMutex, but not while
* holding g_SoundManMutex (see the mutex ordering at the top of the file). */ * holding g_SoundManMutex (see the mutex ordering at the top of the file). */