Avoid naming a struct member the same as an enum type

5 files changed, 14 insertions, 14 deletions

diff --git a/OpenAL32/Include/alListener.h b/OpenAL32/Include/alListener.h
index 096a747e..e14527d9 100644
--- a/OpenAL32/Include/alListener.h
+++ b/OpenAL32/Include/alListener.h
@@ -46,7 +46,7 @@ struct ALlistener {
         ALfloat ReverbSpeedOfSound; /* in meters per sec! */
 
         ALboolean SourceDistanceModel;
-        enum DistanceModel DistanceModel;
+        DistanceModel mDistanceModel;
     } Params;
 };
 
diff --git a/OpenAL32/Include/alSource.h b/OpenAL32/Include/alSource.h
index 53313fdd..3d7d733e 100644
--- a/OpenAL32/Include/alSource.h
+++ b/OpenAL32/Include/alSource.h
@@ -43,7 +43,7 @@ typedef struct ALsource {
     ALfloat   Orientation[2][3];
     ALboolean HeadRelative;
     ALboolean Looping;
-    enum DistanceModel DistanceModel;
+    DistanceModel mDistanceModel;
     enum Resampler Resampler;
     ALboolean DirectChannels;
     enum SpatializeMode Spatialize;
diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h
index d309c2a7..d086bcc7 100644
--- a/OpenAL32/Include/alu.h
+++ b/OpenAL32/Include/alu.h
@@ -161,7 +161,7 @@ struct ALvoiceProps {
     ALfloat Direction[3];
     ALfloat Orientation[2][3];
     ALboolean HeadRelative;
-    enum DistanceModel DistanceModel;
+    DistanceModel mDistanceModel;
     enum Resampler Resampler;
     ALboolean DirectChannels;
     enum SpatializeMode SpatializeMode;
diff --git a/OpenAL32/alSource.cpp b/OpenAL32/alSource.cpp
index 72ac3391..7f54767a 100644
--- a/OpenAL32/alSource.cpp
+++ b/OpenAL32/alSource.cpp
@@ -964,7 +964,7 @@ static ALboolean SetSourceiv(ALsource *Source, ALCcontext *Context, SourceProp p
                      *values == AL_EXPONENT_DISTANCE ||
                      *values == AL_EXPONENT_DISTANCE_CLAMPED);
 
-            Source->DistanceModel = static_cast<DistanceModel>(*values);
+            Source->mDistanceModel = static_cast<DistanceModel>(*values);
             if(Context->SourceDistanceModel)
                 DO_UPDATEPROPS();
             return AL_TRUE;
@@ -1468,7 +1468,7 @@ static ALboolean GetSourceiv(ALsource *Source, ALCcontext *Context, SourceProp p
             return AL_TRUE;
 
         case AL_DISTANCE_MODEL:
-            *values = static_cast<int>(Source->DistanceModel);
+            *values = static_cast<int>(Source->mDistanceModel);
             return AL_TRUE;
 
         case AL_SOURCE_RESAMPLER_SOFT:
@@ -3082,7 +3082,7 @@ static void InitSourceParams(ALsource *Source, ALsizei num_sends)
     Source->DopplerFactor = 1.0f;
     Source->HeadRelative = AL_FALSE;
     Source->Looping = AL_FALSE;
-    Source->DistanceModel = DistanceModel::Default;
+    Source->mDistanceModel = DistanceModel::Default;
     Source->Resampler = ResamplerDefault;
     Source->DirectChannels = AL_FALSE;
     Source->Spatialize = SpatializeAuto;
@@ -3196,7 +3196,7 @@ static void UpdateSourceProps(ALsource *source, ALvoice *voice, ALsizei num_send
             props->Orientation[i][j] = source->Orientation[i][j];
     }
     props->HeadRelative = source->HeadRelative;
-    props->DistanceModel = source->DistanceModel;
+    props->mDistanceModel = source->mDistanceModel;
     props->Resampler = source->Resampler;
     props->DirectChannels = source->DirectChannels;
     props->SpatializeMode = source->Spatialize;
diff --git a/OpenAL32/alState.cpp b/OpenAL32/alState.cpp
index c550d2b5..8ff2c2c3 100644
--- a/OpenAL32/alState.cpp
+++ b/OpenAL32/alState.cpp
@@ -149,7 +149,7 @@ AL_API ALboolean AL_APIENTRY alGetBoolean(ALenum pname)
         break;
 
     case AL_DISTANCE_MODEL:
-        if(context->DistanceModel == DistanceModel::Default)
+        if(context->mDistanceModel == DistanceModel::Default)
             value = AL_TRUE;
         break;
 
@@ -202,7 +202,7 @@ AL_API ALdouble AL_APIENTRY alGetDouble(ALenum pname)
         break;
 
     case AL_DISTANCE_MODEL:
-        value = (ALdouble)context->DistanceModel;
+        value = (ALdouble)context->mDistanceModel;
         break;
 
     case AL_SPEED_OF_SOUND:
@@ -251,7 +251,7 @@ AL_API ALfloat AL_APIENTRY alGetFloat(ALenum pname)
         break;
 
     case AL_DISTANCE_MODEL:
-        value = (ALfloat)context->DistanceModel;
+        value = (ALfloat)context->mDistanceModel;
         break;
 
     case AL_SPEED_OF_SOUND:
@@ -300,7 +300,7 @@ AL_API ALint AL_APIENTRY alGetInteger(ALenum pname)
         break;
 
     case AL_DISTANCE_MODEL:
-        value = (ALint)context->DistanceModel;
+        value = (ALint)context->mDistanceModel;
         break;
 
     case AL_SPEED_OF_SOUND:
@@ -349,7 +349,7 @@ extern "C" AL_API ALint64SOFT AL_APIENTRY alGetInteger64SOFT(ALenum pname)
         break;
 
     case AL_DISTANCE_MODEL:
-        value = (ALint64SOFT)context->DistanceModel;
+        value = (ALint64SOFT)context->mDistanceModel;
         break;
 
     case AL_SPEED_OF_SOUND:
@@ -708,7 +708,7 @@ AL_API ALvoid AL_APIENTRY alDistanceModel(ALenum value)
     else
     {
         std::lock_guard<almtx_t> _{context->PropLock};
-        context->DistanceModel = static_cast<enum DistanceModel>(value);
+        context->mDistanceModel = static_cast<DistanceModel>(value);
         if(!context->SourceDistanceModel)
             DO_UPDATEPROPS();
     }
@@ -785,7 +785,7 @@ void UpdateContextProps(ALCcontext *context)
     props->SpeedOfSound = context->SpeedOfSound;
 
     props->SourceDistanceModel = context->SourceDistanceModel;
-    props->DistanceModel = context->DistanceModel;
+    props->mDistanceModel = context->mDistanceModel;
 
     /* Set the new container for updating internal parameters. */
     props = static_cast<ALcontextProps*>(ATOMIC_EXCHANGE_PTR(&context->Update, props,