epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix OpenAlSound.Complete being incorrect when OpenAl source is reused.

Browse Source
This commit is contained in:
tovl
2021-09-10 23:10:35 +02:00
committed by reaperrr
parent 289c4ef2b7
commit 2bc03b4d84
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OpenRA.Platforms.Default/OpenAlSoundEngine.cs
View File

@@ -171,6 +171,15 @@ namespace OpenRA.Platforms.Default
freeSources.Add(freeSource); freeSources.Add(freeSource);
AL10.alSourceRewind(freeSource); AL10.alSourceRewind(freeSource);
AL10.alSourcei(freeSource, AL10.AL_BUFFER, 0); AL10.alSourcei(freeSource, AL10.AL_BUFFER, 0);
// Make sure we can accurately determine the end of the original sound,
// even if the source is immediately reused.
sound.Done = true;
var slot = kv.Value;
slot.SoundSource = null;
slot.Sound = null;
slot.IsActive = false;
} }
} }
@@ -180,14 +189,6 @@ namespace OpenRA.Platforms.Default
return false; return false;
} }
foreach (var freeSource in freeSources)
{
var slot = sourcePool[freeSource];
slot.SoundSource = null;
slot.Sound = null;
slot.IsActive = false;
}
source = freeSources[0]; source = freeSources[0];
sourcePool[source].IsActive = true; sourcePool[source].IsActive = true;
return true; return true;
@@ -416,6 +417,8 @@ namespace OpenRA.Platforms.Default
public readonly uint Source; public readonly uint Source;
protected readonly float SampleRate; protected readonly float SampleRate;
public bool Done;
public OpenAlSound(uint source, bool looping, bool relative, WPos pos, float volume, int sampleRate, uint buffer) public OpenAlSound(uint source, bool looping, bool relative, WPos pos, float volume, int sampleRate, uint buffer)
: this(source, looping, relative, pos, volume, sampleRate) : this(source, looping, relative, pos, volume, sampleRate)
{ {
@@ -458,6 +461,9 @@ namespace OpenRA.Platforms.Default
{ {
get get
{ {
if (Done)
return true;
AL10.alGetSourcei(Source, AL10.AL_SOURCE_STATE, out var state); AL10.alGetSourcei(Source, AL10.AL_SOURCE_STATE, out var state);
return state == AL10.AL_STOPPED; return state == AL10.AL_STOPPED;
} }