sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #345 from atsushieno/fix-debug-build

Browse source 
Fix build: update debug messages and assertions to match the latest API.
This commit is contained in:
JP Cimalando 2020-08-08 14:48:29 +02:00 • committed by GitHub
commit 1d3346012f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/sfizz/FilePool.cpp
View file

@ -207,7 +207,7 @@ absl::optional<sfz::FileInformation> sfz::FilePool::getFileInformation(const Fil
const unsigned channels = reader->channels(); const unsigned channels = reader->channels();
if (channels != 1 && channels != 2) { if (channels != 1 && channels != 2) {
DBG("[sfizz] Missing logic for " << sndFile.channels() << " channels, discarding sample " << fileId); DBG("[sfizz] Missing logic for " << reader->channels() << " channels, discarding sample " << fileId);
return {}; return {};
} }
@ -398,7 +398,7 @@ void sfz::FilePool::loadingThread() noexcept
std::error_code readError; std::error_code readError;
AudioReaderPtr reader = createAudioReader(file, promise->fileId.isReverse(), &readError); AudioReaderPtr reader = createAudioReader(file, promise->fileId.isReverse(), &readError);
if (readError) { if (readError) {
DBG("[sfizz] libsndfile errored for " << promise->fileId << " with message " << readError.what()); DBG("[sfizz] libsndfile errored for " << promise->fileId << " with message " << readError.message());
promise->dataStatus = FilePromise::DataStatus::Error; promise->dataStatus = FilePromise::DataStatus::Error;
continue; continue;
} }

4
src/sfizz/Oversampler.cpp
View file

@ -139,8 +139,8 @@ void sfz::Oversampler::stream(AudioSpan<float> input, AudioSpan<float> output, s
void sfz::Oversampler::stream(AudioReader& input, AudioSpan<float> output, std::atomic<size_t>* framesReady) void sfz::Oversampler::stream(AudioReader& input, AudioSpan<float> output, std::atomic<size_t>* framesReady)
{ {
ASSERT(output.getNumFrames() >= input.getNumFrames() * static_cast<int>(factor)); ASSERT(output.getNumFrames() >= input.frames() * static_cast<int>(factor));
ASSERT(output.getNumChannels() == input.getNumChannels()); ASSERT(output.getNumChannels() == input.channels());
const auto numFrames = static_cast<size_t>(input.frames()); const auto numFrames = static_cast<size_t>(input.frames());
const auto numChannels = input.channels(); const auto numChannels = input.channels();