comparison runner/FeatureExtractionManager.cpp @ 11:21a31c779384

* progress tweaks

 
 void FeatureExtractionManager::extractFeatures(QString audioSource)
 {
     if (m_plugins.empty()) return;
 
-    ProgressPrinter printer("Retrieving audio data...");
-
-    FileSource source(audioSource, &printer);
+    ProgressPrinter retrievalProgress("Retrieving audio data...");
+
+    FileSource source(audioSource, &retrievalProgress);
     if (!source.isAvailable()) {
         cerr << "ERROR: File or URL \"" << audioSource.toStdString()
              << "\" could not be located" << endl;
         exit(1);
     }

         cerr << "ERROR: Internal error in FeatureExtractionManager::extractFeatures: Plugin list is non-empty, but no sample rate set" << endl;
         exit(1);
     }
 
     AudioFileReader *reader =
-        AudioFileReaderFactory::createReader(source, m_sampleRate, &printer);
+        AudioFileReaderFactory::createReader(source, m_sampleRate, &retrievalProgress);
     
     if (!reader) {
         cerr << "ERROR: File or URL \"" << audioSource.toStdString()
              << "\" could not be opened" << endl;
         exit(1);
     }
 
     size_t channels = reader->getChannelCount();
-    
+
+    retrievalProgress.done();
+
     cerr << "Opened " << channels << "-channel file or URL \"" << audioSource.toStdString() << "\"" << endl;
 
     // reject file if it has too few channels, plugin will handle if it has too many
     if ((int)channels < m_channels) {
         //!!! should not be terminating here!