hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Use array specialization for unique_ptr when managing DrumSynth data

Browse Source 
Also made it so that we don't create result
before checking if we failed to decode the file,
potentially saving us an allocation.
This commit is contained in:
sakertooth
2023-09-26 22:07:13 -04:00
parent 0600ced75a
commit 99e628a5ab
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/SampleBuffer.cpp
View File

@@ -122,20 +122,21 @@ void SampleBuffer::decodeSampleSF(const QString& audioFile)
void SampleBuffer::decodeSampleDS(const QString& audioFile)
{
auto data = std::unique_ptr<int_sample_t>{};
// Populated by DrumSynth::GetDSFileSamples
int_sample_t* dataPtr = nullptr;
auto ds = DrumSynth{};
const auto engineRate = Engine::audioEngine()->processingSampleRate();
const auto frames = ds.GetDSFileSamples(audioFile, dataPtr, DEFAULT_CHANNELS, engineRate);
data.reset(dataPtr);
const auto data = std::unique_ptr<int_sample_t[]>{dataPtr}; // NOLINT, we have to use a C-style array here
if (frames <= 0 || !data)
{
throw std::runtime_error{"Decoding failure: failed to decode DrumSynth file."};
}
auto result = std::vector<sampleFrame>(frames);
if (frames > 0 && data != nullptr)
{
src_short_to_float_array(data.get(), &result[0][0], frames * DEFAULT_CHANNELS);
}
else { throw std::runtime_error{"Decoding failure: failed to decode DrumSynth file."}; }
src_short_to_float_array(data.get(), &result[0][0], frames * DEFAULT_CHANNELS);
m_data = std::move(result);
m_audioFile = audioFile;