comparison data/fileio/AudioFileReaderFactory.cpp @ 392:183ee2a55fc7

* More work to abstract out interactive components used in the data library,
  so that it does not need to depend on QtGui.

 
     return rv;
 }
 
 AudioFileReader *
-AudioFileReaderFactory::createReader(FileSource source, size_t targetRate)
+AudioFileReaderFactory::createReader(FileSource source, size_t targetRate,
+                                     ProgressReporter *reporter)
 {
-    return create(source, targetRate, false);
+    return create(source, targetRate, false, reporter);
 }
 
 AudioFileReader *
-AudioFileReaderFactory::createThreadingReader(FileSource source, size_t targetRate)
+AudioFileReaderFactory::createThreadingReader(FileSource source, size_t targetRate,
+                                              ProgressReporter *reporter)
 {
-    return create(source, targetRate, true);
+    return create(source, targetRate, true, reporter);
 }
 
 AudioFileReader *
-AudioFileReaderFactory::create(FileSource source, size_t targetRate, bool threading)
+AudioFileReaderFactory::create(FileSource source, size_t targetRate, bool threading,
+                               ProgressReporter *reporter)
 {
     QString err;
 
 //    std::cerr << "AudioFileReaderFactory::createReader(\"" << source.getLocation().toStdString() << "\"): Requested rate: " << targetRate << std::endl;
 

                 (source,
                  threading ?
                  ResamplingWavFileReader::ResampleThreaded :
                  ResamplingWavFileReader::ResampleAtOnce,
                  ResamplingWavFileReader::CacheInTemporaryFile,
-                 targetRate);
+                 targetRate,
+                 reporter);
         }
     }
     
 #ifdef HAVE_OGGZ
 #ifdef HAVE_FISHSOUND

                 (source,
                  threading ?
                  OggVorbisFileReader::DecodeThreaded :
                  OggVorbisFileReader::DecodeAtOnce,
                  OggVorbisFileReader::CacheInTemporaryFile,
-                 targetRate);
+                 targetRate,
+                 reporter);
         }
     }
 #endif
 #endif
 

                 (source,
                  threading ?
                  MP3FileReader::DecodeThreaded :
                  MP3FileReader::DecodeAtOnce,
                  MP3FileReader::CacheInTemporaryFile,
-                 targetRate);
+                 targetRate,
+                 reporter);
         }
     }
 #endif
 
 #ifdef HAVE_QUICKTIME

                 (source,
                  threading ?
                  QuickTimeFileReader::DecodeThreaded : 
                  QuickTimeFileReader::DecodeAtOnce,
                  QuickTimeFileReader::CacheInTemporaryFile,
-                 targetRate);
+                 targetRate,
+                 reporter);
         }
     }
 #endif
 
     if (reader) {