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

Cast to uint32_t explicitely

Browse source
This commit is contained in:
Paul Ferrand 2020-01-05 00:17:08 +01:00
parent a36dc0826b
commit df8933bed1
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/sfizz/FilePool.cpp
View file

@ -140,7 +140,7 @@ bool sfz::FilePool::preloadFile(const std::string& filename, uint32_t maxOffset)
return false; return false;
// FIXME: Large offsets will require large preloading; is this OK in practice? Apparently sforzando does the same // FIXME: Large offsets will require large preloading; is this OK in practice? Apparently sforzando does the same
const uint32_t frames = sndFile.frames(); const auto frames = static_cast<uint32_t>(sndFile.frames());
const auto framesToLoad = [&]() { const auto framesToLoad = [&]() {
if (preloadSize == 0) if (preloadSize == 0)
return frames; return frames;
@ -196,7 +196,7 @@ void sfz::FilePool::setPreloadSize(uint32_t preloadSize) noexcept
// Update all the preloaded sizes // Update all the preloaded sizes
for (auto& preloadedFile : preloadedFiles) { for (auto& preloadedFile : preloadedFiles) {
const auto numFrames = preloadedFile.second.preloadedData->getNumFrames() / static_cast<int>(oversamplingFactor); const auto numFrames = preloadedFile.second.preloadedData->getNumFrames() / static_cast<int>(oversamplingFactor);
const uint32_t maxOffset = numFrames > this->preloadSize ? numFrames - this->preloadSize : 0; const auto maxOffset = numFrames > this->preloadSize ? static_cast<uint32_t>(numFrames) - this->preloadSize : 0;
fs::path file { rootDirectory / std::string(preloadedFile.first) }; fs::path file { rootDirectory / std::string(preloadedFile.first) };
SndfileHandle sndFile(file.string().c_str()); SndfileHandle sndFile(file.string().c_str());
preloadedFile.second.preloadedData = readFromFile<float>(sndFile, preloadSize + maxOffset, oversamplingFactor); preloadedFile.second.preloadedData = readFromFile<float>(sndFile, preloadSize + maxOffset, oversamplingFactor);
@ -253,7 +253,7 @@ void sfz::FilePool::loadingThread() noexcept
DBG("[sfizz] libsndfile errored for " << promise->filename << " with message " << sndFile.strError()); DBG("[sfizz] libsndfile errored for " << promise->filename << " with message " << sndFile.strError());
continue; continue;
} }
const uint32_t frames = sndFile.frames(); const auto frames = static_cast<uint32_t>(sndFile.frames());
streamFromFile<float>(sndFile, frames, oversamplingFactor, promise->fileData, &promise->availableFrames); streamFromFile<float>(sndFile, frames, oversamplingFactor, promise->fileData, &promise->availableFrames);
promise->dataReady = true; promise->dataReady = true;
threadsLoading--; threadsLoading--;
@ -326,7 +326,7 @@ void sfz::FilePool::setOversamplingFactor(sfz::Oversampling factor) noexcept
float samplerateChange { static_cast<float>(factor) / static_cast<float>(this->oversamplingFactor) }; float samplerateChange { static_cast<float>(factor) / static_cast<float>(this->oversamplingFactor) };
for (auto& preloadedFile : preloadedFiles) { for (auto& preloadedFile : preloadedFiles) {
const auto numFrames = preloadedFile.second.preloadedData->getNumFrames() / static_cast<int>(this->oversamplingFactor); const auto numFrames = preloadedFile.second.preloadedData->getNumFrames() / static_cast<int>(this->oversamplingFactor);
const uint32_t maxOffset = numFrames > this->preloadSize ? numFrames - this->preloadSize : 0; const uint32_t maxOffset = numFrames > this->preloadSize ? static_cast<uint32_t>(numFrames) - this->preloadSize : 0;
fs::path file { rootDirectory / std::string(preloadedFile.first) }; fs::path file { rootDirectory / std::string(preloadedFile.first) };
SndfileHandle sndFile(file.string().c_str()); SndfileHandle sndFile(file.string().c_str());
preloadedFile.second.preloadedData = readFromFile<float>(sndFile, preloadSize + maxOffset, factor); preloadedFile.second.preloadedData = readFromFile<float>(sndFile, preloadSize + maxOffset, factor);