piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 22:59:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

Thread safe.

Browse Source 
PS: The OpenAL is a mess.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4710 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
ayuanx
2009-12-18 19:52:04 +00:00
parent 97090337e3
commit 7b6a0f9b72
4 changed files with 48 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Core/AudioCommon/Src/DSoundStream.cpp
View File

@ -101,8 +101,8 @@ void DSound::SoundLoop()
{
currentPos = 0;
lastPos = 0;
dsBuffer->Play(0, 0, DSBPLAY_LOOPING);
HRESULT hr = dsBuffer->Play(0, 0, DSBPLAY_LOOPING);
while (!threadData)
{
// No blocking inside the csection
@ -119,19 +119,15 @@ void DSound::SoundLoop()
totalRenderedBytes += numBytesToRender;
lastPos = currentPos;
}
soundCriticalSection.Leave();
if (threadData)
break;
soundSyncEvent.Wait();
}
dsBuffer->Stop();
}
bool DSound::Start()
{
soundSyncEvent.Init();
if (FAILED(DirectSoundCreate8(0, &ds, 0)))
return false;
if (g_dspInitialize.hWnd)
@ -170,6 +166,8 @@ void DSound::Update()
void DSound::Clear(bool mute)
{
m_muted = mute;
soundCriticalSection.Enter();
if (m_muted)
{
dsBuffer->Stop();
@ -178,21 +176,23 @@ void DSound::Clear(bool mute)
{
dsBuffer->Play(0, 0, DSBPLAY_LOOPING);
}
soundCriticalSection.Leave();
}
void DSound::Stop()
{
soundCriticalSection.Enter();
threadData = 1;
// kick the thread if it's waiting
soundSyncEvent.Set();
soundCriticalSection.Leave();
delete thread;
soundCriticalSection.Enter();
delete thread;
thread = NULL;
dsBuffer->Stop();
dsBuffer->Release();
ds->Release();
soundCriticalSection.Leave();
soundSyncEvent.Shutdown();
thread = NULL;
}