diff options
| author | Markus Wick <markus+github@selfnet.de> | 2015-05-30 23:40:46 +0200 |
|---|---|---|
| committer | Markus Wick <markus+github@selfnet.de> | 2015-05-30 23:40:46 +0200 |
| commit | c12f04eefa5262c00751368e40393481a4f90e62 (patch) | |
| tree | e4f1dc80b7df966933d536ef457bcb864eba97fe /Source/Core/AudioCommon/AudioCommon.cpp | |
| parent | ff29ffeb66a034937132bba196d2577b4e3e2173 (diff) | |
| parent | 9a96e3c41653417f945956e1687a7bac7216c3b4 (diff) | |
Merge pull request #2472 from degasus/master
AudioCommon: Remove lock on Pause state
Diffstat (limited to 'Source/Core/AudioCommon/AudioCommon.cpp')
| -rw-r--r-- | Source/Core/AudioCommon/AudioCommon.cpp | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/Source/Core/AudioCommon/AudioCommon.cpp b/Source/Core/AudioCommon/AudioCommon.cpp index 5152f0c8f5..f5438faca9 100644 --- a/Source/Core/AudioCommon/AudioCommon.cpp +++ b/Source/Core/AudioCommon/AudioCommon.cpp @@ -121,25 +121,6 @@ namespace AudioCommon return backends; } - void PauseAndLock(bool doLock, bool unpauseOnUnlock) - { - if (g_sound_stream) - { - // audio typically doesn't maintain its own "paused" state - // (that's already handled by the CPU and whatever else being paused) - // so it should be good enough to only lock/unlock here. - CMixer* pMixer = g_sound_stream->GetMixer(); - if (pMixer) - { - std::mutex& csMixing = pMixer->MixerCritical(); - if (doLock) - csMixing.lock(); - else - csMixing.unlock(); - } - } - } - void UpdateSoundStream() { if (g_sound_stream) |
