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

Improved sndfile Loader 

When streaming and mixing to mono, the samples buffer is kept between
the calls
Made SoundBuffer loader exception-safe
Fixed sf_close not being called


Former-commit-id: cef1d114809dc1fde9a84d2d96dd7afc7550c32e
This commit is contained in:
Lynix 2014-04-20 13:12:02 +02:00
parent d8507b5d10
commit e16e3658f1
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Nazara/Audio/Loaders/sndfile/Loader.cpp
View File

@ -9,6 +9,7 @@
#include <Nazara/Audio/Music.hpp> #include <Nazara/Audio/Music.hpp>
#include <Nazara/Audio/SoundBuffer.hpp> #include <Nazara/Audio/SoundBuffer.hpp>
#include <Nazara/Audio/SoundStream.hpp> #include <Nazara/Audio/SoundStream.hpp>
#include <Nazara/Core/CallOnExit.hpp>
#include <Nazara/Core/Endianness.hpp> #include <Nazara/Core/Endianness.hpp>
#include <Nazara/Core/Error.hpp> #include <Nazara/Core/Error.hpp>
#include <Nazara/Core/File.hpp> #include <Nazara/Core/File.hpp>
@ -16,6 +17,7 @@
#include <Nazara/Core/MemoryStream.hpp> #include <Nazara/Core/MemoryStream.hpp>
#include <memory> #include <memory>
#include <set> #include <set>
#include <vector>
#include <sndfile/sndfile.h> #include <sndfile/sndfile.h>
#include <Nazara/Audio/Debug.hpp> #include <Nazara/Audio/Debug.hpp>
@ -166,14 +168,14 @@ namespace
{ {
if (m_mixToMono) if (m_mixToMono)
{ {
std::unique_ptr<nzInt16[]> samples(new nzInt16[m_format*sampleCount]); m_mixBuffer.resize(m_format*sampleCount);
unsigned int readSampleCount = sf_read_short(m_handle, samples.get(), m_format*sampleCount); unsigned int readSampleCount = sf_read_short(m_handle, m_mixBuffer.data(), m_format*sampleCount);
NzMixToMono(samples.get(), reinterpret_cast<nzInt16*>(buffer), m_format, sampleCount); NzMixToMono(m_mixBuffer.data(), static_cast<nzInt16*>(buffer), m_format, sampleCount);
return readSampleCount / m_format; return readSampleCount / m_format;
} }
else else
return sf_read_short(m_handle, reinterpret_cast<nzInt16*>(buffer), sampleCount); return sf_read_short(m_handle, static_cast<nzInt16*>(buffer), sampleCount);
} }
void Seek(nzUInt32 offset) void Seek(nzUInt32 offset)
@ -182,6 +184,7 @@ namespace
} }
private: private:
std::vector<nzInt16> m_mixBuffer;
nzAudioFormat m_format; nzAudioFormat m_format;
NzFile* m_file; NzFile* m_file;
SNDFILE* m_handle; SNDFILE* m_handle;
@ -293,12 +296,12 @@ namespace
return false; return false;
} }
NzCallOnExit onExit([file] { sf_close(file); });
nzAudioFormat format = NzAudio::GetAudioFormat(info.channels); nzAudioFormat format = NzAudio::GetAudioFormat(info.channels);
if (format == nzAudioFormat_Unknown) if (format == nzAudioFormat_Unknown)
{ {
NazaraError("Channel count not handled"); NazaraError("Channel count not handled");
sf_close(file);
return false; return false;
} }
@ -313,8 +316,6 @@ namespace
if (sf_read_short(file, samples.get(), sampleCount) != sampleCount) if (sf_read_short(file, samples.get(), sampleCount) != sampleCount)
{ {
sf_close(file);
NazaraError("Failed to read samples"); NazaraError("Failed to read samples");
return false; return false;
} }
@ -331,8 +332,6 @@ namespace
if (!soundBuffer->Create(format, static_cast<unsigned int>(sampleCount), info.samplerate, samples.get())) if (!soundBuffer->Create(format, static_cast<unsigned int>(sampleCount), info.samplerate, samples.get()))
{ {
sf_close(file);
NazaraError("Failed to create sound buffer"); NazaraError("Failed to create sound buffer");
return false; return false;
} }