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

Fix Sound memory leak (OutOfMemoryException), remove Music caching to free memory

Browse Source
This commit is contained in:
rob-v
2017-06-05 19:36:48 +02:00
committed by atlimit8
parent 2def72a078
commit 8276b17570
3 changed files with 70 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -311,6 +311,26 @@ namespace OpenRA.Platforms.Default
AL10.alListenerf(EFX.AL_METERS_PER_UNIT, .01f);
}
public void ReleaseSourcePool()
{
foreach (var slot in sourcePool)
if (slot.Value.Sound != null)
ReleaseSound(slot.Key);
}
public void ReleaseSound(ISound sound)
{
var openAlSound = sound as OpenAlSound;
if (openAlSound != null)
ReleaseSound(openAlSound.Source);
}
void ReleaseSound(uint source)
{
AL10.alSourceStop(source);
AL10.alSourcei(source, AL10.AL_BUFFER, 0);
}
~OpenAlSoundEngine()
{
Dispose(false);
@@ -341,7 +361,10 @@ namespace OpenRA.Platforms.Default
class OpenAlSoundSource : ISoundSource
{
public readonly uint Buffer;
uint buffer;
bool disposed;
public uint Buffer { get { return buffer; } }
static int MakeALFormat(int channels, int bits)
{
@@ -353,8 +376,28 @@ namespace OpenRA.Platforms.Default
public OpenAlSoundSource(byte[] data, int channels, int sampleBits, int sampleRate)
{
AL10.alGenBuffers(new IntPtr(1), out Buffer);
AL10.alBufferData(Buffer, MakeALFormat(channels, sampleBits), data, new IntPtr(data.Length), new IntPtr(sampleRate));
AL10.alGenBuffers(new IntPtr(1), out buffer);
AL10.alBufferData(buffer, MakeALFormat(channels, sampleBits), data, new IntPtr(data.Length), new IntPtr(sampleRate));
}
protected virtual void Dispose(bool disposing)
{
if (!disposed)
{
AL10.alDeleteBuffers(new IntPtr(1), ref buffer);
disposed = true;
}
}
~OpenAlSoundSource()
{
Dispose(false);
}
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
}