aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--al/source.cpp4
-rw-r--r--alc/alc.cpp2
-rw-r--r--alc/backends/base.h2
3 files changed, 3 insertions, 5 deletions
diff --git a/al/source.cpp b/al/source.cpp
index 9d6fd8be..63212bee 100644
--- a/al/source.cpp
+++ b/al/source.cpp
@@ -988,7 +988,7 @@ bool SetSourcefv(ALsource *Source, ALCcontext *Context, SourceProp prop, const a
if(IsPlayingOrPaused(Source))
{
ALCdevice *device{Context->mDevice.get()};
- BackendLockGuard _{*device->Backend};
+ std::lock_guard<BackendBase> _{*device->Backend};
/* Double-check that the source is still playing while we have the
* lock.
*/
@@ -1215,7 +1215,7 @@ bool SetSourceiv(ALsource *Source, ALCcontext *Context, SourceProp prop, const a
if(IsPlayingOrPaused(Source))
{
- BackendLockGuard _{*device->Backend};
+ std::lock_guard<BackendBase> _{*device->Backend};
if(ALvoice *voice{GetSourceVoice(Source, Context)})
{
auto vpos = GetSampleOffset(Source);
diff --git a/alc/alc.cpp b/alc/alc.cpp
index bc411a75..85d6ae30 100644
--- a/alc/alc.cpp
+++ b/alc/alc.cpp
@@ -4240,7 +4240,7 @@ START_API_FUNC
alcSetError(dev.get(), ALC_INVALID_VALUE);
else
{
- BackendLockGuard _{*dev->Backend};
+ std::lock_guard<BackendBase> _{*dev->Backend};
aluMixData(dev.get(), buffer, static_cast<ALuint>(samples), dev->channelsFromFmt());
}
}
diff --git a/alc/backends/base.h b/alc/backends/base.h
index d4856818..3942a673 100644
--- a/alc/backends/base.h
+++ b/alc/backends/base.h
@@ -54,8 +54,6 @@ struct BackendBase {
virtual ~BackendBase();
};
using BackendPtr = std::unique_ptr<BackendBase>;
-using BackendUniqueLock = std::unique_lock<BackendBase>;
-using BackendLockGuard = std::lock_guard<BackendBase>;
enum class BackendType {
Playback,