1 files changed, 12 insertions, 26 deletions

diff --git a/intern/audaspace/FX/AUD_SuperposeReader.cpp b/intern/audaspace/FX/AUD_SuperposeReader.cpp
index e64cf79188e..c07b7a9febf 100644
--- a/intern/audaspace/FX/AUD_SuperposeReader.cpp
+++ b/intern/audaspace/FX/AUD_SuperposeReader.cpp
@@ -36,30 +36,13 @@
 static const char* specs_error = "AUD_SuperposeReader: Both readers have to "
 								 "have the same specs.";
 
-AUD_SuperposeReader::AUD_SuperposeReader(AUD_IReader* reader1, AUD_IReader* reader2) :
+AUD_SuperposeReader::AUD_SuperposeReader(AUD_Reference<AUD_IReader> reader1, AUD_Reference<AUD_IReader> reader2) :
 	m_reader1(reader1), m_reader2(reader2)
 {
-	try
-	{
-		AUD_Specs s1, s2;
-		s1 = reader1->getSpecs();
-		s2 = reader2->getSpecs();
-		if(memcmp(&s1, &s2, sizeof(AUD_Specs)))
-			AUD_THROW(AUD_ERROR_SPECS, specs_error);
-	}
-	catch(AUD_Exception&)
-	{
-		delete reader1;
-		delete reader2;
-
-		throw;
-	}
 }
 
 AUD_SuperposeReader::~AUD_SuperposeReader()
 {
-	delete m_reader1;
-	delete m_reader2;
 }
 
 bool AUD_SuperposeReader::isSeekable() const
@@ -94,28 +77,31 @@ AUD_Specs AUD_SuperposeReader::getSpecs() const
 	return m_reader1->getSpecs();
 }
 
-void AUD_SuperposeReader::read(int & length, sample_t* & buffer)
+void AUD_SuperposeReader::read(int& length, bool& eos, sample_t* buffer)
 {
 	AUD_Specs specs = m_reader1->getSpecs();
+	AUD_Specs s2 = m_reader2->getSpecs();
+	if(!AUD_COMPARE_SPECS(specs, s2))
+		AUD_THROW(AUD_ERROR_SPECS, specs_error);
+
 	int samplesize = AUD_SAMPLE_SIZE(specs);
 
-	if(m_buffer.getSize() < length * samplesize)
-		m_buffer.resize(length * samplesize);
-	buffer = m_buffer.getBuffer();
+	m_buffer.assureSize(length * samplesize);
 
 	int len1 = length;
-	sample_t* buf;
-	m_reader1->read(len1, buf);
-	memcpy(buffer, buf, len1 * samplesize);
+	m_reader1->read(len1, eos, buffer);
 
 	if(len1 < length)
 		memset(buffer + len1 * specs.channels, 0, (length - len1) * samplesize);
 
 	int len2 = length;
-	m_reader2->read(len2, buf);
+	bool eos2;
+	sample_t* buf = m_buffer.getBuffer();
+	m_reader2->read(len2, eos2, buf);
 
 	for(int i = 0; i < len2 * specs.channels; i++)
 		buffer[i] += buf[i];
 
 	length = AUD_MAX(len1, len2);
+	eos &= eos2;
 }