diff options
author | Chris Robinson <[email protected]> | 2019-06-09 18:13:54 -0700 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2019-06-09 18:13:54 -0700 |
commit | bc8f206ee1361ec4b6e740a458bb7985bb7d1429 (patch) | |
tree | 5705d45dbedf6af324b3430654decf8388d0bd21 /Alc/alcontext.h | |
parent | 90d25e5187ca50a6e978603fabb6395035ad0db5 (diff) |
Use a FlexArray for the context's voices
Diffstat (limited to 'Alc/alcontext.h')
-rw-r--r-- | Alc/alcontext.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Alc/alcontext.h b/Alc/alcontext.h index 769847f8..63983ca3 100644 --- a/Alc/alcontext.h +++ b/Alc/alcontext.h @@ -18,6 +18,7 @@ #include "alnumeric.h" #include "alListener.h" +#include "alu.h" struct ALsource; @@ -26,7 +27,6 @@ struct ALcontextProps; struct ALlistenerProps; struct ALvoiceProps; struct ALeffectslotProps; -struct ALvoice; struct RingBuffer; enum class DistanceModel { @@ -116,9 +116,8 @@ struct ALCcontext { std::atomic<ALvoiceProps*> FreeVoiceProps{nullptr}; std::atomic<ALeffectslotProps*> FreeEffectslotProps{nullptr}; - ALvoice **Voices{nullptr}; + std::unique_ptr<al::FlexArray<ALvoice>> Voices{nullptr}; std::atomic<ALsizei> VoiceCount{0}; - ALsizei MaxVoices{0}; using ALeffectslotArray = al::FlexArray<ALeffectslot*>; std::atomic<ALeffectslotArray*> ActiveAuxSlots{nullptr}; |