Mercurial > hg > svcore
comparison data/fileio/AudioFileReaderFactory.cpp @ 689:573d45e9487b
Merge from debug-output branch
author | Chris Cannam |
---|---|
date | Tue, 14 Jun 2011 14:47:59 +0100 |
parents | 06f13a3b9e9e |
children | 1424aa29ae95 |
comparison
equal
deleted
inserted
replaced
688:be43b2fe68e8 | 689:573d45e9487b |
---|---|
71 AudioFileReaderFactory::create(FileSource source, size_t targetRate, bool threading, | 71 AudioFileReaderFactory::create(FileSource source, size_t targetRate, bool threading, |
72 ProgressReporter *reporter) | 72 ProgressReporter *reporter) |
73 { | 73 { |
74 QString err; | 74 QString err; |
75 | 75 |
76 // std::cerr << "AudioFileReaderFactory::createReader(\"" << source.getLocation().toStdString() << "\"): Requested rate: " << targetRate << std::endl; | 76 // DEBUG << "AudioFileReaderFactory::createReader(\"" << source.getLocation() << "\"): Requested rate: " << targetRate << endl; |
77 | 77 |
78 if (!source.isOK()) { | 78 if (!source.isOK()) { |
79 std::cerr << "AudioFileReaderFactory::createReader(\"" << source.getLocation().toStdString() << "\": Failed to retrieve source (transmission error?): " << source.getErrorString().toStdString() << std::endl; | 79 std::cerr << "AudioFileReaderFactory::createReader(\"" << source.getLocation() << "\": Failed to retrieve source (transmission error?): " << source.getErrorString() << std::endl; |
80 return 0; | 80 return 0; |
81 } | 81 } |
82 | 82 |
83 if (!source.isAvailable()) { | 83 if (!source.isAvailable()) { |
84 std::cerr << "AudioFileReaderFactory::createReader(\"" << source.getLocation().toStdString() << "\": Source not found" << std::endl; | 84 DEBUG << "AudioFileReaderFactory::createReader(\"" << source.getLocation() << "\": Source not found" << endl; |
85 return 0; | 85 return 0; |
86 } | 86 } |
87 | 87 |
88 AudioFileReader *reader = 0; | 88 AudioFileReader *reader = 0; |
89 | 89 |
96 | 96 |
97 if (targetRate != 0 && | 97 if (targetRate != 0 && |
98 reader->isOK() && | 98 reader->isOK() && |
99 reader->getSampleRate() != targetRate) { | 99 reader->getSampleRate() != targetRate) { |
100 | 100 |
101 std::cerr << "AudioFileReaderFactory::createReader: WAV file rate: " << reader->getSampleRate() << ", creating resampling reader" << std::endl; | 101 DEBUG << "AudioFileReaderFactory::createReader: WAV file rate: " << reader->getSampleRate() << ", creating resampling reader" << endl; |
102 | 102 |
103 delete reader; | 103 delete reader; |
104 reader = new ResamplingWavFileReader | 104 reader = new ResamplingWavFileReader |
105 (source, | 105 (source, |
106 threading ? | 106 threading ? |
187 | 187 |
188 if (targetRate != 0 && | 188 if (targetRate != 0 && |
189 reader->isOK() && | 189 reader->isOK() && |
190 reader->getSampleRate() != targetRate) { | 190 reader->getSampleRate() != targetRate) { |
191 | 191 |
192 std::cerr << "AudioFileReaderFactory::createReader: WAV file rate: " << reader->getSampleRate() << ", creating resampling reader" << std::endl; | 192 DEBUG << "AudioFileReaderFactory::createReader: WAV file rate: " << reader->getSampleRate() << ", creating resampling reader" << endl; |
193 | 193 |
194 delete reader; | 194 delete reader; |
195 reader = new ResamplingWavFileReader | 195 reader = new ResamplingWavFileReader |
196 (source, | 196 (source, |
197 threading ? | 197 threading ? |
270 return reader; | 270 return reader; |
271 } | 271 } |
272 std::cerr << "AudioFileReaderFactory: Preferred reader for " | 272 std::cerr << "AudioFileReaderFactory: Preferred reader for " |
273 << "url \"" << source.getLocation().toStdString() | 273 << "url \"" << source.getLocation().toStdString() |
274 << "\" (content type \"" | 274 << "\" (content type \"" |
275 << source.getContentType().toStdString() << "\") failed"; | 275 << source.getContentType() << "\") failed"; |
276 | 276 |
277 if (reader->getError() != "") { | 277 if (reader->getError() != "") { |
278 std::cerr << ": \"" << reader->getError().toStdString() << "\""; | 278 std::cerr << ": \"" << reader->getError() << "\""; |
279 } | 279 } |
280 std::cerr << std::endl; | 280 std::cerr << std::endl; |
281 delete reader; | 281 delete reader; |
282 reader = 0; | 282 reader = 0; |
283 } | 283 } |