diff runner/MultiplexedReader.cpp @ 258:857ce6ecb163 piper-nopiper

Align Sonic Annotator with the new Piper-ified subrepos (bearing in mind we want neither Piper nor the plugin load checker in Sonic Annotator itself)

--- a/runner/MultiplexedReader.cpp	Fri Nov 04 14:13:11 2016 +0000
+++ b/runner/MultiplexedReader.cpp	Fri Nov 04 14:16:01 2016 +0000
@@ -49,18 +49,18 @@
     }
 }
 
-SampleBlock
+std::vector<float>
 MultiplexedReader::getInterleavedFrames(sv_frame_t start, sv_frame_t frameCount) const
 {
     int out_chans = m_readers.size();
 
     // Allocate and zero
-    SampleBlock block(frameCount * out_chans, 0.f);
+    std::vector<float> 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);
+	auto readerBlock = reader->getInterleavedFrames(start, frameCount);
 
 	int in_chans = reader->getChannelCount();