Mercurial > hg > sonic-annotator

diff runner/MultiplexedReader.cpp @ 195:3f7c65f26559

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes from last merge
author Chris Cannam
date Wed, 26 Aug 2015 21:46:52 +0100
parents 3287df4588dd
children d0fe861bb116
line wrap: on
line diff
--- a/runner/MultiplexedReader.cpp	Wed Aug 19 16:36:41 2015 +0100
+++ b/runner/MultiplexedReader.cpp	Wed Aug 26 21:46:52 2015 +0100
@@ -49,20 +49,18 @@
     }
 }
 
-void
-MultiplexedReader::getInterleavedFrames(int start, int frameCount,
-					SampleBlock &block) const
+SampleBlock
+MultiplexedReader::getInterleavedFrames(sv_frame_t start, sv_frame_t frameCount) const
 {
     int out_chans = m_readers.size();
 
     // Allocate and zero
-    block = SampleBlock(frameCount * out_chans, 0.f);
+    SampleBlock block(frameCount * out_chans, 0.f);
 
     for (int out_chan = 0; out_chan < out_chans; ++out_chan) {
 
 	AudioFileReader *reader = m_readers[out_chan];
-	SampleBlock readerBlock;
-	reader->getInterleavedFrames(start, frameCount, readerBlock);
+	SampleBlock readerBlock = getInterleavedFrames(start, frameCount);
 
 	int in_chans = reader->getChannelCount();
 
@@ -81,6 +79,8 @@
             }
 	}
     }
+
+    return block;
 }
 
 int