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

Trying to correct a segfault, some shenanigans with vectors of shared pointers?

Browse source
This commit is contained in:
paulfd 2019-09-18 09:14:03 +02:00
parent 234105c34c
commit 4d70ed5b73
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sfizz/FilePool.cpp
View file

@ -131,8 +131,8 @@ void sfz::FilePool::loadingThread() noexcept
SndfileHandle sndFile(reinterpret_cast<const char*>(file.c_str())); SndfileHandle sndFile(reinterpret_cast<const char*>(file.c_str()));
std::lock_guard guard { fileHandleMutex }; std::lock_guard guard { fileHandleMutex };
auto newHandle = fileHandles.emplace_back(readFromFile<float>(sndFile, fileToLoad.numFrames)); fileHandles.emplace_back(readFromFile<float>(sndFile, fileToLoad.numFrames));
fileToLoad.voice->setFileData(newHandle, fileToLoad.ticket); fileToLoad.voice->setFileData(fileHandles.back(), fileToLoad.ticket);
} }
} }
@ -141,7 +141,6 @@ void sfz::FilePool::garbageThread() noexcept
while (!quitThread) { while (!quitThread) {
for (auto handle = fileHandles.begin(); handle < fileHandles.end();) { for (auto handle = fileHandles.begin(); handle < fileHandles.end();) {
if (handle->use_count() == 1) { if (handle->use_count() == 1) {
handle->reset();
std::lock_guard guard { fileHandleMutex }; std::lock_guard guard { fileHandleMutex };
std::iter_swap(handle, fileHandles.end() - 1); std::iter_swap(handle, fileHandles.end() - 1);
fileHandles.pop_back(); fileHandles.pop_back();