diff options
author | Julian Eisel <julian@blender.org> | 2021-03-31 23:53:03 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2021-03-31 23:53:03 +0300 |
commit | c7904d2398fd4d43d15268c792aa15ea8ee538fe (patch) | |
tree | 484fd7f66ac59c82abd4aca18894f991b4935483 /extern/audaspace/src/devices/SoftwareDevice.cpp | |
parent | 91b87d8d7fb8aec62faf00e5e0c3619d2753a92e (diff) | |
parent | 1a100d2d78c75c9a6ac015606cc16698e7775682 (diff) |
Merge branch 'master' into ui-asset-view-templateui-asset-view-template
Diffstat (limited to 'extern/audaspace/src/devices/SoftwareDevice.cpp')
-rw-r--r-- | extern/audaspace/src/devices/SoftwareDevice.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extern/audaspace/src/devices/SoftwareDevice.cpp b/extern/audaspace/src/devices/SoftwareDevice.cpp index c8c1c6081c2..7a2561515f4 100644 --- a/extern/audaspace/src/devices/SoftwareDevice.cpp +++ b/extern/audaspace/src/devices/SoftwareDevice.cpp @@ -737,7 +737,7 @@ void SoftwareDevice::mix(data_t* buffer, int length) { m_buffer.assureSize(length * AUD_SAMPLE_SIZE(m_specs)); - std::lock_guard<std::recursive_mutex> lock(m_mutex); + std::lock_guard<ILockable> lock(*this); { std::shared_ptr<SoftwareDevice::SoftwareHandle> sound; @@ -880,7 +880,7 @@ std::shared_ptr<IHandle> SoftwareDevice::play(std::shared_ptr<IReader> reader, b // play sound std::shared_ptr<SoftwareDevice::SoftwareHandle> sound = std::shared_ptr<SoftwareDevice::SoftwareHandle>(new SoftwareDevice::SoftwareHandle(this, reader, pitch, resampler, mapper, keep)); - std::lock_guard<std::recursive_mutex> lock(m_mutex); + std::lock_guard<ILockable> lock(*this); m_playingSounds.push_back(sound); @@ -897,7 +897,7 @@ std::shared_ptr<IHandle> SoftwareDevice::play(std::shared_ptr<ISound> sound, boo void SoftwareDevice::stopAll() { - std::lock_guard<std::recursive_mutex> lock(m_mutex); + std::lock_guard<ILockable> lock(*this); while(!m_playingSounds.empty()) m_playingSounds.front()->stop(); |