diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2012-03-22 15:21:52 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2012-03-22 15:21:52 +0100 |
| commit | 0ffc12bbfd6ac44b3030ec30f400a58e951087b7 (patch) | |
| tree | 53a6fac9ec79bcd71fe2046d8fb579478da12fd2 /Source/Core/AudioCommon/Src/DSoundStream.cpp | |
| parent | 006923e871e496a7c6c0fe9ba76da4ee939ce14e (diff) | |
| parent | d95e31af3f779bfa3141047e8b6275e1fd2e4bbb (diff) | |
Merge branch 'master' into zcomploc-support
Conflicts:
Source/Core/VideoCommon/Src/PixelShaderGen.cpp
Diffstat (limited to 'Source/Core/AudioCommon/Src/DSoundStream.cpp')
| -rw-r--r-- | Source/Core/AudioCommon/Src/DSoundStream.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/Core/AudioCommon/Src/DSoundStream.cpp b/Source/Core/AudioCommon/Src/DSoundStream.cpp index 38fbc2a851..b252dc90c5 100644 --- a/Source/Core/AudioCommon/Src/DSoundStream.cpp +++ b/Source/Core/AudioCommon/Src/DSoundStream.cpp @@ -96,6 +96,8 @@ bool DSound::WriteDataToBuffer(DWORD dwOffset, // Our own write // The audio thread. void DSound::SoundLoop() { + Common::SetCurrentThreadName("Audio thread - dsound"); + currentPos = 0; lastPos = 0; dsBuffer->Play(0, 0, DSBPLAY_LOOPING); @@ -130,7 +132,7 @@ bool DSound::Start() DWORD num1; short* p1; - dsBuffer->Lock(0, bufferSize, (void* *)&p1, &num1, 0, 0, 0); + dsBuffer->Lock(0, bufferSize, (void* *)&p1, &num1, 0, 0, DSBLOCK_ENTIREBUFFER); memset(p1, 0, num1); dsBuffer->Unlock(p1, num1, 0, 0); thread = std::thread(std::mem_fun(&DSound::SoundLoop), this); |