comparison runner/FeatureExtractionManager.cpp @ 219:d0fe861bb116

Fix grisly error in multiplexed audio reader (calling itself!)

         retrievalProgress.done();
     }
     if (!reader) {
         throw FailedToOpenFile(source);
     }
-    return reader;
-}
-
-void
-FeatureExtractionManager::extractFeaturesFor(AudioFileReader *reader,
-                                             QString audioSource)
-{
-    // Note: This also deletes reader
-
-    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;
     }
+    return reader;
+}
+
+void
+FeatureExtractionManager::extractFeaturesFor(AudioFileReader *reader,
+                                             QString audioSource)
+{
+    // Note: This also deletes reader
+
+    cerr << "Audio file \"" << audioSource.toStdString() << "\": "
+         << reader->getChannelCount() << "ch at " 
+         << reader->getNativeRate() << "Hz" << endl;
 
     // allocate audio buffers
     float **data = new float *[m_channels];
     for (int c = 0; c < m_channels; ++c) {
         data[c] = new float[m_blockSize];