diff options
author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2010-09-04 22:49:07 +0400 |
---|---|---|
committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2010-09-04 22:49:07 +0400 |
commit | 90b464d3728d9ed8ec26fdf59058d236b99dbcd9 (patch) | |
tree | e88cab4fb1358e962b19f658064ca8c9f8d29f5b /intern/audaspace/intern/AUD_ConverterReader.cpp | |
parent | 08d02dd04d836976b25793bb1d4c6a86b3f924c7 (diff) | |
parent | b0b787ef38f9947b3176642556f5282eb3518f69 (diff) |
COLLADA branch: merge from trunk -r 28015:31610.soc-2009-chingachgook
Diffstat (limited to 'intern/audaspace/intern/AUD_ConverterReader.cpp')
-rw-r--r-- | intern/audaspace/intern/AUD_ConverterReader.cpp | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/intern/audaspace/intern/AUD_ConverterReader.cpp b/intern/audaspace/intern/AUD_ConverterReader.cpp index 808144085bb..379a7c85851 100644 --- a/intern/audaspace/intern/AUD_ConverterReader.cpp +++ b/intern/audaspace/intern/AUD_ConverterReader.cpp @@ -24,7 +24,6 @@ */ #include "AUD_ConverterReader.h" -#include "AUD_Buffer.h" AUD_ConverterReader::AUD_ConverterReader(AUD_IReader* reader, AUD_DeviceSpecs specs) : @@ -63,16 +62,9 @@ AUD_ConverterReader::AUD_ConverterReader(AUD_IReader* reader, } m_specs.format = specs.format; - - m_buffer = new AUD_Buffer(); AUD_NEW("buffer") -} - -AUD_ConverterReader::~AUD_ConverterReader() -{ - delete m_buffer; AUD_DELETE("buffer") } -AUD_Specs AUD_ConverterReader::getSpecs() +AUD_Specs AUD_ConverterReader::getSpecs() const { return m_specs.specs; } @@ -83,11 +75,11 @@ void AUD_ConverterReader::read(int & length, sample_t* & buffer) int samplesize = AUD_SAMPLE_SIZE(m_specs); - if(m_buffer->getSize() < length*samplesize) - m_buffer->resize(length*samplesize); + if(m_buffer.getSize() < length * samplesize) + m_buffer.resize(length * samplesize); - m_convert((data_t*)m_buffer->getBuffer(), (data_t*)buffer, + m_convert((data_t*)m_buffer.getBuffer(), (data_t*)buffer, length * m_specs.channels); - buffer = m_buffer->getBuffer(); + buffer = m_buffer.getBuffer(); } |