celisej567/mcpe
1
0
Fork 0
mirror of https://github.com/celisej567/mcpe.git synced 2026-01-05 18:10:09 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix memory leak in SoundSystemWindows (#47)

Browse Source 
* Fix memory leak in SoundSystemWindows

Add functionality to release LPDIRECTSOUND3DBUFFER8 when sound finished playing.

* Update minecraftcpp.vcxproj

same mistake again
This commit is contained in:
f
2023-08-10 09:05:13 +02:00
committed by GitHub
parent c445c255a3
commit ac4369f5b2
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
platforms/windows/SoundSystemWindows.cpp
View File

@@ -138,14 +138,18 @@ void SoundSystemWindows::playAt(const SoundDesc& sound, float x, float y, float
{ {
return; return;
} }
//Release sounds that finished playing //Release sounds that finished playing
for (size_t i = 0; i < m_buffers.size(); i++) for (size_t i = 0; i < m_buffers.size(); i++)
{ {
DWORD status; DWORD status;
m_buffers[i]->GetStatus(&status); m_buffers[i].buffer->GetStatus(&status);
if (status != DSBSTATUS_PLAYING) { if (status != DSBSTATUS_PLAYING) {
m_buffers[i]->Release(); m_buffers[i].buffer->Release();
if (m_buffers[i].object3d != NULL)
{
m_buffers[i].object3d->Release();
}
m_buffers.erase(m_buffers.begin() + i); m_buffers.erase(m_buffers.begin() + i);
i--; i--;
} }
@@ -225,7 +229,7 @@ void SoundSystemWindows::playAt(const SoundDesc& sound, float x, float y, float
//return false; //return false;
} }
// Copy the wave data into the buffer. //Move the wave data into the buffer.
memcpy(bufferPtr, sound.m_pData, length); memcpy(bufferPtr, sound.m_pData, length);
// Unlock the secondary buffer after the data has been written to it. // Unlock the secondary buffer after the data has been written to it.
@@ -259,6 +263,10 @@ void SoundSystemWindows::playAt(const SoundDesc& sound, float x, float y, float
} }
soundbuffer->SetVolume(LONG(attenuation)); soundbuffer->SetVolume(LONG(attenuation));
BufferInfo info;
info.buffer = soundbuffer;
info.object3d = NULL;
//Check if position is not 0,0,0 and for mono to play 3D sound //Check if position is not 0,0,0 and for mono to play 3D sound
if (!is2D && sound.m_pHeader->m_channels == 1) if (!is2D && sound.m_pHeader->m_channels == 1)
{ {
@@ -280,8 +288,11 @@ void SoundSystemWindows::playAt(const SoundDesc& sound, float x, float y, float
//Im not really sure what values original MCPE would use. //Im not really sure what values original MCPE would use.
object3d->SetMinDistance(2.f, DS3D_IMMEDIATE); object3d->SetMinDistance(2.f, DS3D_IMMEDIATE);
object3d->SetMaxDistance(100.f, DS3D_IMMEDIATE); object3d->SetMaxDistance(100.f, DS3D_IMMEDIATE);
info.object3d = object3d;
} }
soundbuffer->Play(0, 0, 0); soundbuffer->Play(0, 0, 0);
m_buffers.push_back(soundbuffer);
m_buffers.push_back(info);
} }

9
platforms/windows/SoundSystemWindows.hpp
View File

@@ -37,8 +37,15 @@ public:
virtual void stop(const std::string& sound); virtual void stop(const std::string& sound);
virtual void playAt(const SoundDesc& sound, float x, float y, float z, float a, float b); virtual void playAt(const SoundDesc& sound, float x, float y, float z, float a, float b);
private: private:
struct BufferInfo
{
LPDIRECTSOUNDBUFFER buffer;
LPDIRECTSOUND3DBUFFER8 object3d;
};
bool m_available; bool m_available;
IDirectSound8* m_directsound; IDirectSound8* m_directsound;
LPDIRECTSOUND3DLISTENER8 m_listener; LPDIRECTSOUND3DLISTENER8 m_listener;
std::vector<LPDIRECTSOUNDBUFFER> m_buffers; std::vector<BufferInfo> m_buffers;
}; };