diff 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.

--- a/data/fileio/AudioFileReaderFactory.cpp	Thu Mar 13 14:06:03 2008 +0000
+++ b/data/fileio/AudioFileReaderFactory.cpp	Fri Mar 14 17:14:21 2008 +0000
@@ -54,19 +54,22 @@
 }
 
 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;
 
@@ -99,7 +102,8 @@
                  ResamplingWavFileReader::ResampleThreaded :
                  ResamplingWavFileReader::ResampleAtOnce,
                  ResamplingWavFileReader::CacheInTemporaryFile,
-                 targetRate);
+                 targetRate,
+                 reporter);
         }
     }
     
@@ -113,7 +117,8 @@
                  OggVorbisFileReader::DecodeThreaded :
                  OggVorbisFileReader::DecodeAtOnce,
                  OggVorbisFileReader::CacheInTemporaryFile,
-                 targetRate);
+                 targetRate,
+                 reporter);
         }
     }
 #endif
@@ -128,7 +133,8 @@
                  MP3FileReader::DecodeThreaded :
                  MP3FileReader::DecodeAtOnce,
                  MP3FileReader::CacheInTemporaryFile,
-                 targetRate);
+                 targetRate,
+                 reporter);
         }
     }
 #endif
@@ -142,7 +148,8 @@
                  QuickTimeFileReader::DecodeThreaded : 
                  QuickTimeFileReader::DecodeAtOnce,
                  QuickTimeFileReader::CacheInTemporaryFile,
-                 targetRate);
+                 targetRate,
+                 reporter);
         }
     }
 #endif