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

just some minor cleanup (texdecoder, dsoundstream)

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2394 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard
2009-02-23 19:47:58 +00:00
parent a09a3e08f1
commit 3b7875bf3f
3 changed files with 23 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Source/Plugins/Plugin_DSP_HLE/Src/PCHW/DSoundStream.cpp
View File

@ -106,7 +106,7 @@ void DSound::SoundLoop()
while (!threadData)
{
// No blocking inside the csection
soundCriticalSection->Enter();
soundCriticalSection.Enter();
dsBuffer->GetCurrentPosition((DWORD*)&currentPos, 0);
int numBytesToRender = FIX128(ModBufferSize(currentPos - lastPos));
if (numBytesToRender >= 256)
@ -120,8 +120,10 @@ void DSound::SoundLoop()
lastPos = currentPos;
}
soundCriticalSection->Leave();
soundSyncEvent->Wait();
soundCriticalSection.Leave();
if (threadData)
break;
soundSyncEvent.Wait();
}
dsBuffer->Stop();
@ -129,13 +131,10 @@ void DSound::SoundLoop()
bool DSound::Start()
{
soundSyncEvent = new Common::Event();
soundSyncEvent->Init();
soundCriticalSection = new Common::CriticalSection();
soundSyncEvent.Init();
if (FAILED(DirectSoundCreate8(0, &ds, 0)))
return false;
if(hWnd)
if (hWnd)
ds->SetCooperativeLevel((HWND)hWnd, DSSCL_NORMAL);
if (!CreateBuffer())
return false;
@ -152,24 +151,21 @@ bool DSound::Start()
void DSound::Update()
{
soundSyncEvent->Set();
soundSyncEvent.Set();
}
void DSound::Stop()
{
soundCriticalSection->Enter();
soundCriticalSection.Enter();
threadData = 1;
// kick the thread if it's waiting
soundSyncEvent->Set();
soundCriticalSection->Leave();
delete soundCriticalSection;
soundSyncEvent.Set();
soundCriticalSection.Leave();
delete thread;
dsBuffer->Release();
ds->Release();
soundSyncEvent->Shutdown();
delete soundSyncEvent;
soundSyncEvent = NULL;
soundSyncEvent.Shutdown();
thread = NULL;
}

4
Source/Plugins/Plugin_DSP_HLE/Src/PCHW/DSoundStream.h
View File

@ -36,8 +36,8 @@ class DSound : public SoundStream
{
#ifdef _WIN32
Common::Thread *thread;
Common::CriticalSection *soundCriticalSection;
Common::Event *soundSyncEvent;
Common::CriticalSection soundCriticalSection;
Common::Event soundSyncEvent;
void *hWnd;
IDirectSound8* ds;