zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 11:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

- do not hold persistent references to sound channels in SW's ambient sound code.

Browse source 
For robustness, channels should always be looked up when needed so that the sound engine is free to do with them as it needs.
This commit is contained in:
Christoph Oelckers 2020-02-23 15:41:57 +01:00
parent 985e441d80
commit c35a2e5f11
1 changed files with 7 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
source/sw/src/sounds.cpp
View file

@ -206,7 +206,6 @@ FRolloffInfo GetRolloff(int basedist)
struct AmbientSound struct AmbientSound
{ {
SPRITEp sp; SPRITEp sp;
FSoundChan* sndChan;
int ambIndex; int ambIndex;
int vocIndex; int vocIndex;
int ChanFlags; int ChanFlags;
@ -226,12 +225,9 @@ static TArray<AmbientSound*> ambients;
void StopAmbientSound(void) void StopAmbientSound(void)
{ {
for (auto& amb : ambients) for (auto amb : ambients)
{ {
if (amb->sndChan) soundEngine->StopSound(SOURCE_Ambient, amb, -1);
{
soundEngine->StopChannel(amb->sndChan);
}
} }
ambients.Clear(); ambients.Clear();
} }
@ -271,7 +267,6 @@ void InitAmbient(int num, SPRITEp sp)
amb->sp = sp; amb->sp = sp;
amb->ambIndex = num; amb->ambIndex = num;
amb->vocIndex = vnum; amb->vocIndex = vnum;
amb->sndChan = nullptr;
amb->ChanFlags = 0; amb->ChanFlags = 0;
if (ambarray[num].ambient_flags & v3df_dontpan) amb->ChanFlags |= EChanFlags::FromInt(CHANEXF_DONTPAN); if (ambarray[num].ambient_flags & v3df_dontpan) amb->ChanFlags |= EChanFlags::FromInt(CHANEXF_DONTPAN);
if (voc[vnum].voc_flags & vf_loop) amb->ChanFlags |= CHANF_LOOP; if (voc[vnum].voc_flags & vf_loop) amb->ChanFlags |= CHANF_LOOP;
@ -354,7 +349,10 @@ static void DoTimedSound(AmbientSound* amb)
amb->curIndex += synctics; amb->curIndex += synctics;
if (amb->curIndex >= amb->maxIndex) if (amb->curIndex >= amb->maxIndex)
{ {
if (amb->sndChan == nullptr || (amb->sndChan->ChanFlags & CHANF_FORGETTABLE)) if (soundEngine->EnumerateChannels([=](FSoundChan* tchan)
{
return (tchan->Source == amb && !(tchan->ChanFlags & CHANF_FORGETTABLE));
}))
{ {
// Check for special case ambient sounds. Since the sound is stopped and doesn't occupy a real channel at this time we can just swap out the sound ID before restarting it. // Check for special case ambient sounds. Since the sound is stopped and doesn't occupy a real channel at this time we can just swap out the sound ID before restarting it.
int ambid = RandomizeAmbientSpecials(amb->vocIndex); int ambid = RandomizeAmbientSpecials(amb->vocIndex);
@ -397,11 +395,7 @@ static void UpdateAmbients()
} }
else else
{ {
if (amb->sndChan) soundEngine->StopSound(SOURCE_Ambient, amb, -1);
{
soundEngine->StopChannel(amb->sndChan);
amb->sndChan = nullptr;
}
} }
} }
@ -427,7 +421,6 @@ class SWSoundEngine : public SoundEngine
// client specific parts of the sound engine go in this class. // client specific parts of the sound engine go in this class.
void CalcPosVel(int type, const void* source, const float pt[3], int channum, int chanflags, FSoundID chanSound, FVector3* pos, FVector3* vel, FSoundChan* chan) override; void CalcPosVel(int type, const void* source, const float pt[3], int channum, int chanflags, FSoundID chanSound, FVector3* pos, FVector3* vel, FSoundChan* chan) override;
TArray<uint8_t> ReadSound(int lumpnum) override; TArray<uint8_t> ReadSound(int lumpnum) override;
void ChannelEnded(FISoundChannel* chan) override;
public: public:
SWSoundEngine() SWSoundEngine()
@ -450,19 +443,6 @@ TArray<uint8_t> SWSoundEngine::ReadSound(int lumpnum)
return wlump.Read(); return wlump.Read();
} }
void SWSoundEngine::ChannelEnded(FISoundChannel* chan)
{
// if this channel belongs to an ambient sound we have to delete the reference to it.
for (auto amb : ambients)
{
if (amb->sndChan == chan)
{
amb->sndChan = nullptr;
}
}
SoundEngine::ChannelEnded(chan);
}
//========================================================================== //==========================================================================
// //
// //