comparison runner/FeatureExtractionManager.cpp @ 113:297f9e415e39 multiplex

Fix channel counting

 
         retrievalProgress.done();
 
         cerr << "File or URL \"" << audioSource.toStdString() << "\" opened successfully" << endl;
 
-        if (willMultiplex) {
-            ++m_channels; // channel count is simply number of sources
-        } else {
+        if (!willMultiplex) {
             if (m_channels == 0) {
                 m_channels = reader->getChannelCount();
                 cerr << "Taking default channel count of "
                      << reader->getChannelCount() << " from file" << endl;
             }

                  << reader->getNativeRate() << "Hz from file" << endl;
             cerr << "(Note: Default may be overridden by transforms)" << endl;
         }
 
         m_readyReaders[audioSource] = reader;
+    }
+
+    if (willMultiplex) {
+        ++m_channels; // channel count is simply number of sources
+        cerr << "Multiplexing, incremented target channel count to " 
+             << m_channels << endl;
     }
 }
 
 void FeatureExtractionManager::extractFeatures(QString audioSource)
 {

     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: "
+        cerr << "NOTE: File will be mixed or resampled for processing, to: "
              << m_channels << "ch at " 
              << m_sampleRate << "Hz" << endl;
     }
 
     // allocate audio buffers