diff options
| author | Chris Robinson <[email protected]> | 2023-10-11 23:06:36 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2023-10-11 23:06:36 -0700 |
| commit | dbc09095adc83b0b88b22cd094731b4907cd371b (patch) | |
| tree | 7364258942c7239c37525b46f1680a0da9388a9d /al | |
| parent | 5d48351240ed29d28517de5ab3d7985c72e4b09b (diff) | |
Remove an unnecessary deque with a custom allocator
Diffstat (limited to 'al')
| -rw-r--r-- | al/source.cpp | 6 | ||||
| -rw-r--r-- | al/source.h | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/al/source.cpp b/al/source.cpp index ce256f7a..8ad02321 100644 --- a/al/source.cpp +++ b/al/source.cpp @@ -438,7 +438,7 @@ struct VoicePos { * using the given offset type and offset. If the offset is out of range, * returns an empty optional. */ -std::optional<VoicePos> GetSampleOffset(al::deque<ALbufferQueueItem> &BufferList, +std::optional<VoicePos> GetSampleOffset(std::deque<ALbufferQueueItem> &BufferList, ALenum OffsetType, double Offset) { /* Find the first valid Buffer in the Queue */ @@ -1597,7 +1597,7 @@ NOINLINE void SetProperty(ALsource *const Source, ALCcontext *const Context, con return Context->setError(AL_INVALID_OPERATION, "Setting buffer on playing or paused source %u", Source->id); } - al::deque<ALbufferQueueItem> oldlist; + std::deque<ALbufferQueueItem> oldlist; if(values[0]) { using UT = std::make_unsigned_t<T>; @@ -1614,7 +1614,7 @@ NOINLINE void SetProperty(ALsource *const Source, ALCcontext *const Context, con "Setting already-set callback buffer %u", buffer->id); /* Add the selected buffer to a one-item queue */ - al::deque<ALbufferQueueItem> newlist; + std::deque<ALbufferQueueItem> newlist; newlist.emplace_back(); newlist.back().mCallback = buffer->mCallback; newlist.back().mUserData = buffer->mUserData; diff --git a/al/source.h b/al/source.h index 2bdeb2a3..95978ec7 100644 --- a/al/source.h +++ b/al/source.h @@ -15,7 +15,6 @@ #include "alc/alu.h" #include "alc/context.h" #include "alc/inprogext.h" -#include "aldeque.h" #include "almalloc.h" #include "alnumeric.h" #include "atomic.h" @@ -139,7 +138,7 @@ struct ALsource { ALenum state{AL_INITIAL}; /** Source Buffer Queue head. */ - al::deque<ALbufferQueueItem> mQueue; + std::deque<ALbufferQueueItem> mQueue; bool mPropsDirty{true}; |