comparison data/fileio/AudioFileReaderFactory.cpp @ 327:1d656dcda8ef

* some tweaks to improve usability of these classes in a console application

 }
 
 AudioFileReader *
 AudioFileReaderFactory::createReader(FileSource source, size_t targetRate)
 {
+    return create(source, targetRate, false);
+}
+
+AudioFileReader *
+AudioFileReaderFactory::createThreadingReader(FileSource source, size_t targetRate)
+{
+    return create(source, targetRate, true);
+}
+
+AudioFileReader *
+AudioFileReaderFactory::create(FileSource source, size_t targetRate, bool threading)
+{
     QString err;
 
-    std::cerr << "AudioFileReaderFactory::createReader(\"" << source.getLocation().toStdString() << "\"): Requested rate: " << targetRate << std::endl;
+//    std::cerr << "AudioFileReaderFactory::createReader(\"" << source.getLocation().toStdString() << "\"): Requested rate: " << targetRate << std::endl;
 
     if (!source.isOK() || !source.isAvailable()) {
         std::cerr << "AudioFileReaderFactory::createReader(\"" << source.getLocation().toStdString() << "\": Source unavailable" << std::endl;
         return 0;
     }

             std::cerr << "AudioFileReaderFactory::createReader: WAV file rate: " << reader->getSampleRate() << ", creating resampling reader" << std::endl;
 
             delete reader;
             reader = new ResamplingWavFileReader
                 (source,
-                 ResamplingWavFileReader::ResampleThreaded,
+                 threading ?
+                 ResamplingWavFileReader::ResampleThreaded :
+                 ResamplingWavFileReader::ResampleAtOnce,
                  ResamplingWavFileReader::CacheInTemporaryFile,
                  targetRate);
         }
     }
     

 #ifdef HAVE_FISHSOUND
     if (!reader) {
         if (OggVorbisFileReader::supports(source)) {
             reader = new OggVorbisFileReader
                 (source,
-                 OggVorbisFileReader::DecodeThreaded,
+                 threading ?
+                 OggVorbisFileReader::DecodeThreaded :
+                 OggVorbisFileReader::DecodeAtOnce,
                  OggVorbisFileReader::CacheInTemporaryFile,
                  targetRate);
         }
     }
 #endif

 #ifdef HAVE_MAD
     if (!reader) {
         if (MP3FileReader::supports(source)) {
             reader = new MP3FileReader
                 (source,
-                 MP3FileReader::DecodeThreaded,
+                 threading ?
+                 MP3FileReader::DecodeThreaded :
+                 MP3FileReader::DecodeAtOnce,
                  MP3FileReader::CacheInTemporaryFile,
                  targetRate);
         }
     }
 #endif

 #ifdef HAVE_QUICKTIME
     if (!reader) {
         if (QuickTimeFileReader::supports(source)) {
             reader = new QuickTimeFileReader
                 (source,
-                 QuickTimeFileReader::DecodeThreaded,
+                 threading ?
+                 QuickTimeFileReader::DecodeThreaded : 
+                 QuickTimeFileReader::DecodeAtOnce,
                  QuickTimeFileReader::CacheInTemporaryFile,
                  targetRate);
         }
     }
 #endif
 
     if (reader) {
         if (reader->isOK()) {
-            std::cerr << "AudioFileReaderFactory: Reader is OK" << std::endl;
+//            std::cerr << "AudioFileReaderFactory: Reader is OK" << std::endl;
             return reader;
         }
         std::cerr << "AudioFileReaderFactory: Preferred reader for "
                   << "url \"" << source.getLocation().toStdString()
                   << "\" (content type \""