# HG changeset patch
# User Chris Cannam
# Date 1448011931 0
# Node ID d0fe861bb11677f5033d2dd09fa0bb1d187494c1
# Parent  dc82579c9a260494ad478debde3495d312fe71e7
Fix grisly error in multiplexed audio reader (calling itself!)

diff -r dc82579c9a26 -r d0fe861bb116 runner/FeatureExtractionManager.cpp
--- a/runner/FeatureExtractionManager.cpp	Fri Nov 20 09:31:55 2015 +0000
+++ b/runner/FeatureExtractionManager.cpp	Fri Nov 20 09:32:11 2015 +0000
@@ -616,6 +616,12 @@
     if (!reader) {
         throw FailedToOpenFile(source);
     }
+    if (reader->getChannelCount() != m_channels ||
+        reader->getNativeRate() != m_sampleRate) {
+        cerr << "NOTE: File will be mixed or resampled for processing, to: "
+             << m_channels << "ch at " 
+             << m_sampleRate << "Hz" << endl;
+    }
     return reader;
 }
 
@@ -628,12 +634,6 @@
     cerr << "Audio file \"" << audioSource.toStdString() << "\": "
          << reader->getChannelCount() << "ch at " 
          << reader->getNativeRate() << "Hz" << endl;
-    if (reader->getChannelCount() != m_channels ||
-        reader->getNativeRate() != m_sampleRate) {
-        cerr << "NOTE: File will be mixed or resampled for processing, to: "
-             << m_channels << "ch at " 
-             << m_sampleRate << "Hz" << endl;
-    }
 
     // allocate audio buffers
     float **data = new float *[m_channels];
diff -r dc82579c9a26 -r d0fe861bb116 runner/MultiplexedReader.cpp
--- a/runner/MultiplexedReader.cpp	Fri Nov 20 09:31:55 2015 +0000
+++ b/runner/MultiplexedReader.cpp	Fri Nov 20 09:32:11 2015 +0000
@@ -60,7 +60,7 @@
     for (int out_chan = 0; out_chan < out_chans; ++out_chan) {
 
 	AudioFileReader *reader = m_readers[out_chan];
-	SampleBlock readerBlock = getInterleavedFrames(start, frameCount);
+	SampleBlock readerBlock = reader->getInterleavedFrames(start, frameCount);
 
 	int in_chans = reader->getChannelCount();