3D Audio GSoC:

Changed Readers to top-down architecture instead of bottom-up.

2 files changed, 4 insertions, 7 deletions

diff --git a/intern/audaspace/SRC/AUD_SRCResampleReader.cpp b/intern/audaspace/SRC/AUD_SRCResampleReader.cpp
index e9a94418b60..42696a1caaa 100644
--- a/intern/audaspace/SRC/AUD_SRCResampleReader.cpp
+++ b/intern/audaspace/SRC/AUD_SRCResampleReader.cpp
@@ -75,11 +75,10 @@ AUD_SRCResampleReader::~AUD_SRCResampleReader()
 long AUD_SRCResampleReader::doCallback(float** data)
 {
 	int length = m_buffer.getSize() / AUD_SAMPLE_SIZE(m_tspecs);
-	sample_t* buffer;
 
-	m_reader->read(length, buffer);
+	*data = m_buffer.getBuffer();
+	m_reader->read(length, *data);
 
-	*data = buffer;
 	return length;
 }
 
@@ -105,15 +104,13 @@ AUD_Specs AUD_SRCResampleReader::getSpecs() const
 	return m_tspecs;
 }
 
-void AUD_SRCResampleReader::read(int & length, sample_t* & buffer)
+void AUD_SRCResampleReader::read(int & length, sample_t* buffer)
 {
 	int size = length * AUD_SAMPLE_SIZE(m_tspecs);
 
 	if(m_buffer.getSize() < size)
 		m_buffer.resize(size);
 
-	buffer = m_buffer.getBuffer();
-
 	length = src_callback_read(m_src, m_factor, length, buffer);
 
 	m_position += length;
diff --git a/intern/audaspace/SRC/AUD_SRCResampleReader.h b/intern/audaspace/SRC/AUD_SRCResampleReader.h
index 21193661911..2d67e636bd7 100644
--- a/intern/audaspace/SRC/AUD_SRCResampleReader.h
+++ b/intern/audaspace/SRC/AUD_SRCResampleReader.h
@@ -104,7 +104,7 @@ public:
 	virtual int getLength() const;
 	virtual int getPosition() const;
 	virtual AUD_Specs getSpecs() const;
-	virtual void read(int & length, sample_t* & buffer);
+	virtual void read(int & length, sample_t* buffer);
 };
 
 #endif //AUD_SRCRESAMPLEREADER