edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Protect various variables for the sound class

Browse source
This commit is contained in:
Jupeyy 2021-10-28 13:46:53 +02:00
parent 86319303e8
commit 141ce9e088
1 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/engine/client/sound.cpp
View file

@ -8,6 +8,7 @@
#include <engine/storage.h> #include <engine/storage.h>
#include <engine/shared/config.h> #include <engine/shared/config.h>
#include <mutex>
#include "SDL.h" #include "SDL.h"
@ -69,15 +70,15 @@ static CSample m_aSamples[NUM_SAMPLES] = {{0}};
static CVoice m_aVoices[NUM_VOICES] = {{0}}; static CVoice m_aVoices[NUM_VOICES] = {{0}};
static CChannel m_aChannels[NUM_CHANNELS] = {{255, 0}}; static CChannel m_aChannels[NUM_CHANNELS] = {{255, 0}};
static LOCK m_SoundLock = 0; static std::mutex m_SoundLock;
static int m_CenterX = 0; static std::atomic<int> m_CenterX{0};
static int m_CenterY = 0; static std::atomic<int> m_CenterY{0};
static int m_MixingRate = 48000; static int m_MixingRate = 48000;
static std::atomic<int> m_SoundVolume{100}; static std::atomic<int> m_SoundVolume{100};
static int m_NextVoice GUARDED_BY(m_SoundLock) = 0; static int m_NextVoice = 0;
static int *m_pMixBuffer = 0; // buffer only used by the thread callback function static int *m_pMixBuffer = 0; // buffer only used by the thread callback function
static unsigned m_MaxFrames = 0; static unsigned m_MaxFrames = 0;
@ -112,7 +113,7 @@ static void Mix(short *pFinalOut, unsigned Frames)
Frames = minimum(Frames, m_MaxFrames); Frames = minimum(Frames, m_MaxFrames);
// acquire lock while we are mixing // acquire lock while we are mixing
lock_wait(m_SoundLock); m_SoundLock.lock();
MasterVol = m_SoundVolume; MasterVol = m_SoundVolume;
@ -144,8 +145,8 @@ static void Mix(short *pFinalOut, unsigned Frames)
if(Voice.m_Flags & ISound::FLAG_POS && Voice.m_pChannel->m_Pan) if(Voice.m_Flags & ISound::FLAG_POS && Voice.m_pChannel->m_Pan)
{ {
// TODO: we should respect the channel panning value // TODO: we should respect the channel panning value
int dx = Voice.m_X - m_CenterX; int dx = Voice.m_X - m_CenterX.load(std::memory_order_relaxed);
int dy = Voice.m_Y - m_CenterY; int dy = Voice.m_Y - m_CenterY.load(std::memory_order_relaxed);
// //
int p = IntAbs(dx); int p = IntAbs(dx);
float FalloffX = 0.0f; float FalloffX = 0.0f;
@ -255,7 +256,7 @@ static void Mix(short *pFinalOut, unsigned Frames)
} }
// release the lock // release the lock
lock_unlock(m_SoundLock); m_SoundLock.unlock();
{ {
// clamp accumulated values // clamp accumulated values
@ -299,8 +300,6 @@ int CSound::Init()
SDL_AudioSpec Format, FormatOut; SDL_AudioSpec Format, FormatOut;
m_SoundLock = lock_create();
if(!g_Config.m_SndEnable) if(!g_Config.m_SndEnable)
return 0; return 0;
@ -351,9 +350,8 @@ int CSound::Update()
if(WantedVolume != m_SoundVolume) if(WantedVolume != m_SoundVolume)
{ {
lock_wait(m_SoundLock); std::unique_lock<std::mutex> Lock(m_SoundLock);
m_SoundVolume = WantedVolume; m_SoundVolume = WantedVolume;
lock_unlock(m_SoundLock);
} }
//#if defined(CONF_VIDEORECORDER) //#if defined(CONF_VIDEORECORDER)
// if(IVideo::Current() && g_Config.m_ClVideoSndEnable) // if(IVideo::Current() && g_Config.m_ClVideoSndEnable)
@ -371,7 +369,6 @@ int CSound::Shutdown()
SDL_CloseAudioDevice(m_Device); SDL_CloseAudioDevice(m_Device);
SDL_QuitSubSystem(SDL_INIT_AUDIO); SDL_QuitSubSystem(SDL_INIT_AUDIO);
lock_destroy(m_SoundLock);
free(m_pMixBuffer); free(m_pMixBuffer);
m_pMixBuffer = 0; m_pMixBuffer = 0;
return 0; return 0;
@ -761,8 +758,8 @@ float CSound::GetSampleDuration(int SampleID)
void CSound::SetListenerPos(float x, float y) void CSound::SetListenerPos(float x, float y)
{ {
m_CenterX = (int)x; m_CenterX.store((int)x, std::memory_order_relaxed);
m_CenterY = (int)y; m_CenterY.store((int)y, std::memory_order_relaxed);
} }
void CSound::SetVoiceVolume(CVoiceHandle Voice, float Volume) void CSound::SetVoiceVolume(CVoiceHandle Voice, float Volume)
@ -772,6 +769,7 @@ void CSound::SetVoiceVolume(CVoiceHandle Voice, float Volume)
int VoiceID = Voice.Id(); int VoiceID = Voice.Id();
std::unique_lock<std::mutex> Lock(m_SoundLock);
if(m_aVoices[VoiceID].m_Age != Voice.Age()) if(m_aVoices[VoiceID].m_Age != Voice.Age())
return; return;
@ -786,6 +784,7 @@ void CSound::SetVoiceFalloff(CVoiceHandle Voice, float Falloff)
int VoiceID = Voice.Id(); int VoiceID = Voice.Id();
std::unique_lock<std::mutex> Lock(m_SoundLock);
if(m_aVoices[VoiceID].m_Age != Voice.Age()) if(m_aVoices[VoiceID].m_Age != Voice.Age())
return; return;
@ -800,6 +799,7 @@ void CSound::SetVoiceLocation(CVoiceHandle Voice, float x, float y)
int VoiceID = Voice.Id(); int VoiceID = Voice.Id();
std::unique_lock<std::mutex> Lock(m_SoundLock);
if(m_aVoices[VoiceID].m_Age != Voice.Age()) if(m_aVoices[VoiceID].m_Age != Voice.Age())
return; return;
@ -814,10 +814,10 @@ void CSound::SetVoiceTimeOffset(CVoiceHandle Voice, float offset)
int VoiceID = Voice.Id(); int VoiceID = Voice.Id();
std::unique_lock<std::mutex> Lock(m_SoundLock);
if(m_aVoices[VoiceID].m_Age != Voice.Age()) if(m_aVoices[VoiceID].m_Age != Voice.Age())
return; return;
lock_wait(m_SoundLock);
{ {
if(m_aVoices[VoiceID].m_pSample) if(m_aVoices[VoiceID].m_pSample)
{ {
@ -841,7 +841,6 @@ void CSound::SetVoiceTimeOffset(CVoiceHandle Voice, float offset)
} }
} }
} }
lock_unlock(m_SoundLock);
} }
void CSound::SetVoiceCircle(CVoiceHandle Voice, float Radius) void CSound::SetVoiceCircle(CVoiceHandle Voice, float Radius)
@ -851,6 +850,7 @@ void CSound::SetVoiceCircle(CVoiceHandle Voice, float Radius)
int VoiceID = Voice.Id(); int VoiceID = Voice.Id();
std::unique_lock<std::mutex> Lock(m_SoundLock);
if(m_aVoices[VoiceID].m_Age != Voice.Age()) if(m_aVoices[VoiceID].m_Age != Voice.Age())
return; return;
@ -865,6 +865,7 @@ void CSound::SetVoiceRectangle(CVoiceHandle Voice, float Width, float Height)
int VoiceID = Voice.Id(); int VoiceID = Voice.Id();
std::unique_lock<std::mutex> Lock(m_SoundLock);
if(m_aVoices[VoiceID].m_Age != Voice.Age()) if(m_aVoices[VoiceID].m_Age != Voice.Age())
return; return;
@ -885,7 +886,7 @@ ISound::CVoiceHandle CSound::Play(int ChannelID, int SampleID, int Flags, float
int Age = -1; int Age = -1;
int i; int i;
lock_wait(m_SoundLock); m_SoundLock.lock();
// search for voice // search for voice
for(i = 0; i < NUM_VOICES; i++) for(i = 0; i < NUM_VOICES; i++)
@ -918,7 +919,7 @@ ISound::CVoiceHandle CSound::Play(int ChannelID, int SampleID, int Flags, float
Age = m_aVoices[VoiceID].m_Age; Age = m_aVoices[VoiceID].m_Age;
} }
lock_unlock(m_SoundLock); m_SoundLock.unlock();
return CreateVoiceHandle(VoiceID, Age); return CreateVoiceHandle(VoiceID, Age);
} }
@ -935,7 +936,7 @@ ISound::CVoiceHandle CSound::Play(int ChannelID, int SampleID, int Flags)
void CSound::Stop(int SampleID) void CSound::Stop(int SampleID)
{ {
// TODO: a nice fade out // TODO: a nice fade out
lock_wait(m_SoundLock); std::unique_lock<std::mutex> Lock(m_SoundLock);
CSample *pSample = &m_aSamples[SampleID]; CSample *pSample = &m_aSamples[SampleID];
for(auto &Voice : m_aVoices) for(auto &Voice : m_aVoices)
{ {
@ -948,13 +949,12 @@ void CSound::Stop(int SampleID)
Voice.m_pSample = 0; Voice.m_pSample = 0;
} }
} }
lock_unlock(m_SoundLock);
} }
void CSound::StopAll() void CSound::StopAll()
{ {
// TODO: a nice fade out // TODO: a nice fade out
lock_wait(m_SoundLock); std::unique_lock<std::mutex> Lock(m_SoundLock);
for(auto &Voice : m_aVoices) for(auto &Voice : m_aVoices)
{ {
if(Voice.m_pSample) if(Voice.m_pSample)
@ -966,7 +966,6 @@ void CSound::StopAll()
} }
Voice.m_pSample = 0; Voice.m_pSample = 0;
} }
lock_unlock(m_SoundLock);
} }
void CSound::StopVoice(CVoiceHandle Voice) void CSound::StopVoice(CVoiceHandle Voice)
@ -976,15 +975,14 @@ void CSound::StopVoice(CVoiceHandle Voice)
int VoiceID = Voice.Id(); int VoiceID = Voice.Id();
std::unique_lock<std::mutex> Lock(m_SoundLock);
if(m_aVoices[VoiceID].m_Age != Voice.Age()) if(m_aVoices[VoiceID].m_Age != Voice.Age())
return; return;
lock_wait(m_SoundLock);
{ {
m_aVoices[VoiceID].m_pSample = 0; m_aVoices[VoiceID].m_pSample = 0;
m_aVoices[VoiceID].m_Age++; m_aVoices[VoiceID].m_Age++;
} }
lock_unlock(m_SoundLock);
} }
IEngineSound *CreateEngineSound() { return new CSound; } IEngineSound *CreateEngineSound() { return new CSound; }