sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made Sound class safier 

Former-commit-id: 4d75f94086b2bddcd84bed5b17204f99a3d78ef4
This commit is contained in:
Lynix 2013-12-20 19:33:27 +01:00
parent 56438f6ecd
commit bd98490d9f
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/Nazara/Audio/Sound.cpp
View File

@ -7,6 +7,7 @@
#include <Nazara/Audio/Config.hpp> #include <Nazara/Audio/Config.hpp>
#include <Nazara/Core/Error.hpp> #include <Nazara/Core/Error.hpp>
#include <cstring> #include <cstring>
#include <memory>
#include <stdexcept> #include <stdexcept>
#include <AL/al.h> #include <AL/al.h>
#include <Nazara/Audio/Debug.hpp> #include <Nazara/Audio/Debug.hpp>
@ -42,7 +43,7 @@ nzUInt32 NzSound::GetDuration() const
#if NAZARA_AUDIO_SAFE #if NAZARA_AUDIO_SAFE
if (!m_buffer) if (!m_buffer)
{ {
NazaraError("No sound buffer"); NazaraError("Invalid sound buffer");
return 0; return 0;
} }
#endif #endif
@ -73,54 +74,51 @@ bool NzSound::IsLooping() const
bool NzSound::LoadFromFile(const NzString& filePath, const NzSoundBufferParams& params) bool NzSound::LoadFromFile(const NzString& filePath, const NzSoundBufferParams& params)
{ {
NzSoundBuffer* buffer = new NzSoundBuffer; std::unique_ptr<NzSoundBuffer> buffer(new NzSoundBuffer);
buffer->SetPersistent(false);
if (!buffer->LoadFromFile(filePath, params)) if (!buffer->LoadFromFile(filePath, params))
{ {
NazaraError("Failed to load buffer from file (" + filePath + ')'); NazaraError("Failed to load buffer from file (" + filePath + ')');
delete buffer;
return false; return false;
} }
SetBuffer(buffer); SetBuffer(buffer.get());
buffer.release();
buffer->SetPersistent(false);
return true; return true;
} }
bool NzSound::LoadFromMemory(const void* data, std::size_t size, const NzSoundBufferParams& params) bool NzSound::LoadFromMemory(const void* data, std::size_t size, const NzSoundBufferParams& params)
{ {
NzSoundBuffer* buffer = new NzSoundBuffer; std::unique_ptr<NzSoundBuffer> buffer(new NzSoundBuffer);
buffer->SetPersistent(false);
if (!buffer->LoadFromMemory(data, size, params)) if (!buffer->LoadFromMemory(data, size, params))
{ {
NazaraError("Failed to load buffer from memory (" + NzString::Pointer(data) + ')'); NazaraError("Failed to load buffer from memory (" + NzString::Pointer(data) + ')');
delete buffer;
return false; return false;
} }
SetBuffer(buffer); SetBuffer(buffer.get());
buffer.release();
buffer->SetPersistent(false);
return true; return true;
} }
bool NzSound::LoadFromStream(NzInputStream& stream, const NzSoundBufferParams& params) bool NzSound::LoadFromStream(NzInputStream& stream, const NzSoundBufferParams& params)
{ {
NzSoundBuffer* buffer = new NzSoundBuffer; std::unique_ptr<NzSoundBuffer> buffer(new NzSoundBuffer);
buffer->SetPersistent(false);
if (!buffer->LoadFromStream(stream, params)) if (!buffer->LoadFromStream(stream, params))
{ {
NazaraError("Failed to load buffer from stream"); NazaraError("Failed to load buffer from stream");
delete buffer;
return false; return false;
} }
SetBuffer(buffer); SetBuffer(buffer.get());
buffer.release();
buffer->SetPersistent(false);
return true; return true;
} }
@ -135,7 +133,7 @@ bool NzSound::Play()
#if NAZARA_AUDIO_SAFE #if NAZARA_AUDIO_SAFE
if (!m_buffer) if (!m_buffer)
{ {
NazaraError("No sound buffer to play"); NazaraError("Invalid sound buffer");
return false; return false;
} }
#endif #endif
@ -147,6 +145,14 @@ bool NzSound::Play()
void NzSound::SetBuffer(const NzSoundBuffer* buffer) void NzSound::SetBuffer(const NzSoundBuffer* buffer)
{ {
#if NAZARA_AUDIO_SAFE
if (buffer && !buffer->IsValid())
{
NazaraError("Invalid sound buffer");
return;
}
#endif
if (m_buffer == buffer) if (m_buffer == buffer)
return; return;