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

Cleaned up the file pool

Browse source
This commit is contained in:
paulfd 2019-08-29 10:59:17 +02:00
parent b167625416
commit 6132fbd444
2 changed files with 19 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
sources/FilePool.cpp
View file

@ -4,10 +4,27 @@
#include <chrono> #include <chrono>
#include <fstream> #include <fstream>
#include <memory> #include <memory>
#include <sndfile.hh>
#include <sstream> #include <sstream>
#include <string> #include <string>
using namespace std::chrono_literals; using namespace std::chrono_literals;
template<class T>
void readFromFile(SndfileHandle& sndFile, int numFrames, StereoBuffer<T>& output)
{
if (sndFile.channels() == 1) {
auto tempReadBuffer = std::make_unique<Buffer<float>>(numFrames);
sndFile.readf(tempReadBuffer->data(), numFrames);
std::copy(tempReadBuffer->begin(), tempReadBuffer->end(), output.begin(Channel::left));
std::copy(tempReadBuffer->begin(), tempReadBuffer->end(), output.begin(Channel::right));
} else if (sndFile.channels() == 2) {
auto tempReadBuffer = std::make_unique<Buffer<float>>(2 * numFrames);
sndFile.readf(tempReadBuffer->data(), numFrames);
output.readInterleaved(*tempReadBuffer);
}
}
std::optional<sfz::FilePool::FileInformation> sfz::FilePool::getFileInformation(std::string_view filename) std::optional<sfz::FilePool::FileInformation> sfz::FilePool::getFileInformation(std::string_view filename)
{ {
std::filesystem::path file { rootDirectory / filename }; std::filesystem::path file { rootDirectory / filename };
@ -37,25 +54,7 @@ std::optional<sfz::FilePool::FileInformation> sfz::FilePool::getFileInformation(
}(); }();
returnedValue.preloadedData = std::make_shared<StereoBuffer<float>>(preloadedSize); returnedValue.preloadedData = std::make_shared<StereoBuffer<float>>(preloadedSize);
preloadedData[filename] = returnedValue.preloadedData; preloadedData[filename] = returnedValue.preloadedData;
// auto tempReadBuffer = std::make_unique<Buffer<float>>(2 * preloadedSize); readFromFile(sndFile, preloadedSize, *returnedValue.preloadedData);
if (sndFile.channels() == 1) {
tempReadBuffer.resize(preloadedSize);
sndFile.readf(tempReadBuffer.data(), preloadedSize);
std::copy(tempReadBuffer.begin(), tempReadBuffer.end(), returnedValue.preloadedData->begin(Channel::left));
std::copy(tempReadBuffer.begin(), tempReadBuffer.end(), returnedValue.preloadedData->begin(Channel::right));
} else if (sndFile.channels() == 2) {
tempReadBuffer.resize(preloadedSize * 2);
sndFile.readf(tempReadBuffer.data(), preloadedSize);
returnedValue.preloadedData->readInterleaved(tempReadBuffer);
}
// std::stringstream dumpName { };
// dumpName << filename << ".preloaded" << preloadedFilesWritten << ".bin";
// dumpName << filename << ".preloaded" << ".bin";
// std::ofstream ofile(dumpName.str(), std::ios::binary);
// preloadedFilesWritten++;
// for (auto& floatValue: tempReadBuffer)
// ofile.write((char*) &floatValue, sizeof(float));
// ofile.close();
// char buffer [2048] ; // char buffer [2048] ;
// sndFile.command(SFC_GET_LOG_INFO, buffer, sizeof(buffer)) ; // sndFile.command(SFC_GET_LOG_INFO, buffer, sizeof(buffer)) ;
// DBG(buffer); // DBG(buffer);
@ -90,18 +89,7 @@ void sfz::FilePool::loadingThread()
SndfileHandle sndFile(reinterpret_cast<const char*>(file.c_str())); SndfileHandle sndFile(reinterpret_cast<const char*>(file.c_str()));
auto fileLoaded = std::make_unique<StereoBuffer<float>>(fileToLoad.numFrames); auto fileLoaded = std::make_unique<StereoBuffer<float>>(fileToLoad.numFrames);
if (sndFile.channels() == 1) { readFromFile(sndFile, fileToLoad.numFrames, *fileLoaded);
tempReadBuffer.resize(fileToLoad.numFrames);
sndFile.readf(tempReadBuffer.data(), fileToLoad.numFrames);
std::copy(tempReadBuffer.begin(), tempReadBuffer.end(), fileLoaded->begin(Channel::left));
std::copy(tempReadBuffer.begin(), tempReadBuffer.end(), fileLoaded->begin(Channel::right));
} else if (sndFile.channels() == 2) {
tempReadBuffer.resize(fileToLoad.numFrames * 2);
sndFile.readf(tempReadBuffer.data(), fileToLoad.numFrames);
fileLoaded->readInterleaved(tempReadBuffer);
}
// std::unique_ptr<StereoBuffer<float>, std::function<void(StereoBuffer<float>*)>> fileLoaded(new StereoBuffer<float>(framesRead), deleteAndTrackBuffers);
// fileBuffers++;
fileToLoad.voice->setFileData(std::move(fileLoaded)); fileToLoad.voice->setFileData(std::move(fileLoaded));
} }
} }

1
sources/FilePool.h
View file

@ -60,7 +60,6 @@ private:
void loadingThread(); void loadingThread();
std::thread fileLoadingThread; std::thread fileLoadingThread;
bool quitThread { false }; bool quitThread { false };
Buffer<float> tempReadBuffer;
absl::flat_hash_map<std::string_view, std::shared_ptr<StereoBuffer<float>>> preloadedData; absl::flat_hash_map<std::string_view, std::shared_ptr<StereoBuffer<float>>> preloadedData;
LEAK_DETECTOR(FilePool); LEAK_DETECTOR(FilePool);
}; };