From ea76e003e7f2063687ed662282d388078ecf385b Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Tue, 30 Jul 2019 09:05:54 -0700 Subject: Properly prefix ALCcontext members --- alc/alcontext.h | 76 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) (limited to 'alc/alcontext.h') diff --git a/alc/alcontext.h b/alc/alcontext.h index a2da77b0..8156c345 100644 --- a/alc/alcontext.h +++ b/alc/alcontext.h @@ -73,70 +73,70 @@ struct EffectSlotSubList { }; struct ALCcontext { - RefCount ref{1u}; + RefCount mRef{1u}; - al::vector SourceList; - ALuint NumSources{0}; - std::mutex SourceLock; + al::vector mSourceList; + ALuint mNumSources{0}; + std::mutex mSourceLock; - al::vector EffectSlotList; - ALuint NumEffectSlots{0u}; - std::mutex EffectSlotLock; + al::vector mEffectSlotList; + ALuint mNumEffectSlots{0u}; + std::mutex mEffectSlotLock; - std::atomic LastError{AL_NO_ERROR}; + std::atomic mLastError{AL_NO_ERROR}; DistanceModel mDistanceModel{DistanceModel::Default}; - ALboolean SourceDistanceModel{AL_FALSE}; + ALboolean mSourceDistanceModel{AL_FALSE}; - ALfloat DopplerFactor{1.0f}; - ALfloat DopplerVelocity{1.0f}; - ALfloat SpeedOfSound{}; - ALfloat MetersPerUnit{1.0f}; + ALfloat mDopplerFactor{1.0f}; + ALfloat mDopplerVelocity{1.0f}; + ALfloat mSpeedOfSound{}; + ALfloat mMetersPerUnit{1.0f}; - std::atomic_flag PropsClean; - std::atomic DeferUpdates{false}; + std::atomic_flag mPropsClean; + std::atomic mDeferUpdates{false}; - std::mutex PropLock; + std::mutex mPropLock; /* Counter for the pre-mixing updates, in 31.1 fixed point (lowest bit * indicates if updates are currently happening). */ - RefCount UpdateCount{0u}; - std::atomic HoldUpdates{false}; + RefCount mUpdateCount{0u}; + std::atomic mHoldUpdates{false}; - ALfloat GainBoost{1.0f}; + ALfloat mGainBoost{1.0f}; - std::atomic Update{nullptr}; + std::atomic mUpdate{nullptr}; /* Linked lists of unused property containers, free to use for future * updates. */ - std::atomic FreeContextProps{nullptr}; - std::atomic FreeListenerProps{nullptr}; - std::atomic FreeVoiceProps{nullptr}; - std::atomic FreeEffectslotProps{nullptr}; + std::atomic mFreeContextProps{nullptr}; + std::atomic mFreeListenerProps{nullptr}; + std::atomic mFreeVoiceProps{nullptr}; + std::atomic mFreeEffectslotProps{nullptr}; - std::unique_ptr> Voices{nullptr}; - std::atomic VoiceCount{0u}; + std::unique_ptr> mVoices{nullptr}; + std::atomic mVoiceCount{0u}; using ALeffectslotArray = al::FlexArray; - std::atomic ActiveAuxSlots{nullptr}; + std::atomic mActiveAuxSlots{nullptr}; - std::thread EventThread; - al::semaphore EventSem; - std::unique_ptr AsyncEvents; - std::atomic EnabledEvts{0u}; - std::mutex EventCbLock; - ALEVENTPROCSOFT EventCb{}; - void *EventParam{nullptr}; + std::thread mEventThread; + al::semaphore mEventSem; + std::unique_ptr mAsyncEvents; + std::atomic mEnabledEvts{0u}; + std::mutex mEventCbLock; + ALEVENTPROCSOFT mEventCb{}; + void *mEventParam{nullptr}; /* Default effect slot */ - std::unique_ptr DefaultSlot; + std::unique_ptr mDefaultSlot; - ALCdevice *const Device; - const ALCchar *ExtensionList{nullptr}; + ALCdevice *const mDevice; + const ALCchar *mExtensionList{nullptr}; - ALlistener Listener{}; + ALlistener mListener{}; ALCcontext(ALCdevice *device); -- cgit v1.2.3