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

fix race condition

Browse Source
This commit is contained in:
Glenn Maynard
2004-04-11 01:03:18 +00:00
parent fd839eb946
commit 67eb0be6b0
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSoundManager.cpp
+8 -4
View File
@@ -221,19 +221,23 @@ void RageSoundManager::GetCopies(RageSound &snd, vector<RageSound *> &snds)
snds.push_back(*i); snds.push_back(*i);
} }
/* Don't hold the lock when we don't have to. We call this function from other
* threads, to avoid stalling the gameplay thread. */
void RageSoundManager::PlayOnce( CString sPath ) void RageSoundManager::PlayOnce( CString sPath )
{ {
/* We want this to start quickly, so don't try to prebuffer it. */ /* We want this to start quickly, so don't try to prebuffer it. */
RageSound *snd = new RageSound; RageSound *snd = new RageSound;
snd->Load(sPath, false); snd->Load(sPath, false);
/* We're responsible for freeing it. */ snd->Play();
/* We're responsible for freeing it. Add it to owned_sounds *after* we start
* playing, so RageSoundManager::Update doesn't free it before we actually start
* it. */
LockMut(lock);
lock.Lock(); lock.Lock();
owned_sounds.insert(snd); owned_sounds.insert(snd);
lock.Unlock(); lock.Unlock();
snd->Play();
} }
void RageSoundManager::SetPrefs(float MixVol) void RageSoundManager::SetPrefs(float MixVol)