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

This could alleviate the suffering of dual core synchronization a bit.

Browse Source 
But I doubt you would notice it in most cases.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4830 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
ayuanx
2010-01-14 10:52:14 +00:00
parent b186f0821e
commit 571a47ef9a
11 changed files with 108 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,7 +106,6 @@ void DSound::SoundLoop()
while (!threadData)
{
// No blocking inside the csection
soundCriticalSection.Enter();
dsBuffer->GetCurrentPosition((DWORD*)&currentPos, 0);
int numBytesToRender = FIX128(ModBufferSize(currentPos - lastPos));
if (numBytesToRender >= 256)
@ -117,7 +116,6 @@ void DSound::SoundLoop()
WriteDataToBuffer(lastPos, (char*)realtimeBuffer, numBytesToRender);
lastPos = ModBufferSize(lastPos + numBytesToRender);
}
soundCriticalSection.Leave();
soundSyncEvent.Wait();
}
}
@ -149,10 +147,8 @@ void DSound::SetVolume(int volume)
// This is in "dBA attenuation" from 0 to -10000, logarithmic
m_volume = (int)floor(log10((float)volume) * 5000.0f) - 10000;
soundCriticalSection.Enter();
if (dsBuffer != NULL)
dsBuffer->SetVolume(m_volume);
soundCriticalSection.Leave();
}
void DSound::Update()
@ -164,7 +160,6 @@ void DSound::Clear(bool mute)
{
m_muted = mute;
soundCriticalSection.Enter();
if (m_muted)
{
dsBuffer->Stop();
@ -173,7 +168,6 @@ void DSound::Clear(bool mute)
{
dsBuffer->Play(0, 0, DSBPLAY_LOOPING);
}
soundCriticalSection.Leave();
}
void DSound::Stop()
@ -182,13 +176,11 @@ void DSound::Stop()
// kick the thread if it's waiting
soundSyncEvent.Set();
soundCriticalSection.Enter();
delete thread;
thread = NULL;
dsBuffer->Stop();
dsBuffer->Release();
ds->Release();
soundCriticalSection.Leave();
soundSyncEvent.Shutdown();
}

3
Source/Core/AudioCommon/Src/DSoundStream.h
View File

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

3
Source/Core/AudioCommon/Src/OpenALStream.h
View File

@ -64,8 +64,7 @@ public:
private:
Common::Thread *thread;
Common::CriticalSection soundCriticalSection;
Common::Event soundSyncEvent;
Common::EventEx soundSyncEvent;
short realtimeBuffer[OAL_MAX_SAMPLES * 2];
ALuint uiBuffers[OAL_NUM_BUFFERS];