comparison data/fileio/AudioFileReaderFactory.cpp @ 1599:ce185d4dd408 bqaudiostream

Merge from default branch
author Chris Cannam
date Wed, 23 Jan 2019 14:43:43 +0000
parents f8e3dcbafb4d 70e172e6cc59
children dbd13eb7dad1
comparison
equal deleted inserted replaced
1598:d2555df635ec 1599:ce185d4dd408
77 SVDEBUG << "AudioFileReaderFactory: url \"" << source.getLocation() << "\": requested rate: " << params.targetRate << (params.targetRate == 0 ? " (use source rate)" : "") << endl; 77 SVDEBUG << "AudioFileReaderFactory: url \"" << source.getLocation() << "\": requested rate: " << params.targetRate << (params.targetRate == 0 ? " (use source rate)" : "") << endl;
78 SVDEBUG << "AudioFileReaderFactory: local filename \"" << source.getLocalFilename() << "\", content type \"" << source.getContentType() << "\"" << endl; 78 SVDEBUG << "AudioFileReaderFactory: local filename \"" << source.getLocalFilename() << "\", content type \"" << source.getContentType() << "\"" << endl;
79 79
80 if (!source.isOK()) { 80 if (!source.isOK()) {
81 SVCERR << "AudioFileReaderFactory::createReader(\"" << source.getLocation() << "\": Failed to retrieve source (transmission error?): " << source.getErrorString() << endl; 81 SVCERR << "AudioFileReaderFactory::createReader(\"" << source.getLocation() << "\": Failed to retrieve source (transmission error?): " << source.getErrorString() << endl;
82 return 0; 82 return nullptr;
83 } 83 }
84 84
85 if (!source.isAvailable()) { 85 if (!source.isAvailable()) {
86 SVCERR << "AudioFileReaderFactory::createReader(\"" << source.getLocation() << "\": Source not found" << endl; 86 SVCERR << "AudioFileReaderFactory::createReader(\"" << source.getLocation() << "\": Source not found" << endl;
87 return 0; 87 return nullptr;
88 } 88 }
89 89
90 AudioFileReader *reader = 0; 90 AudioFileReader *reader = nullptr;
91 91
92 sv_samplerate_t targetRate = params.targetRate; 92 sv_samplerate_t targetRate = params.targetRate;
93 bool normalised = (params.normalisation == Normalisation::Peak); 93 bool normalised = (params.normalisation == Normalisation::Peak);
94 94
95 sv_frame_t estimatedSamples = 95 sv_frame_t estimatedSamples =