diff options
Diffstat (limited to 'intern/audaspace/FX/AUD_SumReader.cpp')
| -rw-r--r-- | intern/audaspace/FX/AUD_SumReader.cpp | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/intern/audaspace/FX/AUD_SumReader.cpp b/intern/audaspace/FX/AUD_SumReader.cpp index 08747790fc9..13f0e2271a6 100644 --- a/intern/audaspace/FX/AUD_SumReader.cpp +++ b/intern/audaspace/FX/AUD_SumReader.cpp @@ -24,43 +24,32 @@ */ #include "AUD_SumReader.h" -#include "AUD_Buffer.h" #include <cstring> #define CC specs.channels + channel AUD_SumReader::AUD_SumReader(AUD_IReader* reader) : - AUD_EffectReader(reader) + AUD_EffectReader(reader), + m_sums(AUD_SAMPLE_SIZE(reader->getSpecs())) { - AUD_Specs specs = reader->getSpecs(); - int samplesize = AUD_SAMPLE_SIZE(specs); - - m_buffer = new AUD_Buffer(); AUD_NEW("buffer") - - m_sums = new AUD_Buffer(samplesize); AUD_NEW("buffer") - memset(m_sums->getBuffer(), 0, samplesize); -} - -AUD_SumReader::~AUD_SumReader() -{ - delete m_buffer; AUD_DELETE("buffer") - delete m_sums; AUD_DELETE("buffer") + memset(m_sums.getBuffer(), 0, m_sums.getSize()); } void AUD_SumReader::read(int & length, sample_t* & buffer) { sample_t* buf; sample_t* sums; - sums = m_sums->getBuffer(); + sums = m_sums.getBuffer(); AUD_Specs specs = m_reader->getSpecs(); m_reader->read(length, buf); - if(m_buffer->getSize() < length * AUD_SAMPLE_SIZE(specs)) - m_buffer->resize(length * AUD_SAMPLE_SIZE(specs)); - buffer = m_buffer->getBuffer(); + if(m_buffer.getSize() < length * AUD_SAMPLE_SIZE(specs)) + m_buffer.resize(length * AUD_SAMPLE_SIZE(specs)); + + buffer = m_buffer.getBuffer(); for(int channel = 0; channel < specs.channels; channel++) for(int i = 0; i < length * specs.channels; i++) |