Mercurial > hg > svcore
diff data/fileio/AudioFileReaderFactory.cpp @ 1172:59ae7e04f7e9
Merge
| author | Chris Cannam |
|---|---|
| date | Fri, 04 Mar 2016 12:29:35 +0000 |
| parents | 5b463c7727e5 |
| children | 6877f4200912 |
line wrap: on
line diff
--- a/data/fileio/AudioFileReaderFactory.cpp Fri Mar 04 09:50:09 2016 +0000 +++ b/data/fileio/AudioFileReaderFactory.cpp Fri Mar 04 12:29:35 2016 +0000 @@ -26,6 +26,8 @@ #include <QFileInfo> #include <iostream> +//#define DEBUG_AUDIO_FILE_READER_FACTORY 1 + QString AudioFileReaderFactory::getKnownExtensions() { @@ -84,7 +86,9 @@ { QString err; - SVDEBUG << "AudioFileReaderFactory::createReader(\"" << source.getLocation() << "\"): Requested rate: " << targetRate << endl; +#ifdef DEBUG_AUDIO_FILE_READER_FACTORY + cerr << "AudioFileReaderFactory::createReader(\"" << source.getLocation() << "\"): Requested rate: " << targetRate << endl; +#endif if (!source.isOK()) { cerr << "AudioFileReaderFactory::createReader(\"" << source.getLocation() << "\": Failed to retrieve source (transmission error?): " << source.getErrorString() << endl; @@ -92,7 +96,7 @@ } if (!source.isAvailable()) { - SVDEBUG << "AudioFileReaderFactory::createReader(\"" << source.getLocation() << "\": Source not found" << endl; + cerr << "AudioFileReaderFactory::createReader(\"" << source.getLocation() << "\": Source not found" << endl; return 0; } @@ -112,8 +116,10 @@ normalised || (targetRate != 0 && fileRate != targetRate))) { - SVDEBUG << "AudioFileReaderFactory::createReader: WAV file rate: " << reader->getSampleRate() << ", normalised " << normalised << ", seekable " << reader->isQuicklySeekable() << ", creating decoding reader" << endl; - +#ifdef DEBUG_AUDIO_FILE_READER_FACTORY + cerr << "AudioFileReaderFactory::createReader: WAV file rate: " << reader->getSampleRate() << ", normalised " << normalised << ", seekable " << reader->isQuicklySeekable() << ", creating decoding reader" << endl; +#endif + delete reader; reader = new DecodingWavFileReader (source, @@ -231,7 +237,9 @@ normalised || (targetRate != 0 && fileRate != targetRate))) { - SVDEBUG << "AudioFileReaderFactory::createReader: WAV file rate: " << reader->getSampleRate() << ", normalised " << normalised << ", seekable " << reader->isQuicklySeekable() << ", creating decoding reader" << endl; +#ifdef DEBUG_AUDIO_FILE_READER_FACTORY + cerr << "AudioFileReaderFactory::createReader: WAV file rate: " << reader->getSampleRate() << ", normalised " << normalised << ", seekable " << reader->isQuicklySeekable() << ", creating decoding reader" << endl; +#endif delete reader; reader = new DecodingWavFileReader @@ -327,7 +335,9 @@ if (reader) { if (reader->isOK()) { - SVDEBUG << "AudioFileReaderFactory: Reader is OK" << endl; +#ifdef DEBUG_AUDIO_FILE_READER_FACTORY + cerr << "AudioFileReaderFactory: Reader is OK" << endl; +#endif return reader; } cerr << "AudioFileReaderFactory: Preferred reader for "