diff runner/MultiplexedReader.cpp @ 288:fd4a6183482f kapoor_1202

Merge from branch piper-nopiper. The next release will be based on this.

--- a/runner/MultiplexedReader.cpp	Mon Nov 21 16:32:58 2016 +0000
+++ b/runner/MultiplexedReader.cpp	Fri Dec 02 10:04:44 2016 +0000
@@ -21,6 +21,11 @@
     m_channelCount = readers.size();
     m_sampleRate = readers[0]->getSampleRate();
     
+    SVDEBUG << "MultiplexedReader: channel count: " << m_channelCount
+            << " (i.e. " << m_channelCount << " reader(s) to multiplex)" << endl;
+    SVDEBUG << "MultiplexedReader: sample rate from first reader: "
+            << m_sampleRate << endl;
+    
     m_frameCount = 0;
     m_quicklySeekable = true;
     
@@ -49,18 +54,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();