Make specific functions to lock/unlock UIntMap access

2 files changed, 12 insertions, 4 deletions

diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index fd645218..9a7c1cc4 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -322,6 +322,14 @@ ALenum InsertUIntMapEntry(UIntMap *map, ALuint key, ALvoid *value);
 void RemoveUIntMapKey(UIntMap *map, ALuint key);
 ALvoid *LookupUIntMapKey(UIntMap *map, ALuint key);
 
+static __inline void LockUIntMapRead(UIntMap *map)
+{ ReadLock(&map->lock); }
+static __inline void UnlockUIntMapRead(UIntMap *map)
+{ ReadUnlock(&map->lock); }
+static __inline void LockUIntMapWrite(UIntMap *map)
+{ WriteLock(&map->lock); }
+static __inline void UnlockUIntMapWrite(UIntMap *map)
+{ WriteUnlock(&map->lock); }
 
 #include "alListener.h"
 #include "alu.h"
diff --git a/OpenAL32/alState.c b/OpenAL32/alState.c
index 424a73f6..76628038 100644
--- a/OpenAL32/alState.c
+++ b/OpenAL32/alState.c
@@ -610,14 +610,14 @@ AL_API ALvoid AL_APIENTRY alDeferUpdatesSOFT(void)
             src++;
         }
 
-        ReadLock(&Context->EffectSlotMap.lock);
+        LockUIntMapRead(&Context->EffectSlotMap);
         for(e = 0;e < Context->EffectSlotMap.size;e++)
         {
             ALEffectSlot = Context->EffectSlotMap.array[e].value;
             if(Exchange_ALenum(&ALEffectSlot->NeedsUpdate, AL_FALSE))
                 ALEffect_Update(ALEffectSlot->EffectState, Context, ALEffectSlot);
         }
-        ReadUnlock(&Context->EffectSlotMap.lock);
+        UnlockUIntMapRead(&Context->EffectSlotMap);
         UnlockContext(Context);
     }
 
@@ -636,7 +636,7 @@ AL_API ALvoid AL_APIENTRY alProcessUpdatesSOFT(void)
         ALsizei pos;
 
         LockContext(Context);
-        ReadLock(&Context->SourceMap.lock);
+        LockUIntMapRead(&Context->SourceMap);
         for(pos = 0;pos < Context->SourceMap.size;pos++)
         {
             ALsource *Source = Context->SourceMap.array[pos].value;
@@ -649,7 +649,7 @@ AL_API ALvoid AL_APIENTRY alProcessUpdatesSOFT(void)
             if(new_state)
                 SetSourceState(Source, Context, new_state);
         }
-        ReadUnlock(&Context->SourceMap.lock);
+        UnlockUIntMapRead(&Context->SourceMap);
         UnlockContext(Context);
     }