mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

SamplerPlugin: Fix bug where cancelling load could cause a segfault

Browse source
This commit is contained in:
reuk 2020-08-03 17:34:58 +01:00
parent 994ba04d7e
commit 64fa95deef
No known key found for this signature in database
GPG key ID: 9ADCD339CFC98A11
1 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

34
examples/Plugins/SamplerPluginDemo.h
View file

@ -1811,14 +1811,18 @@ private:
void sampleReaderChanged (std::shared_ptr<AudioFormatReaderFactory> value) override
{
if (value == nullptr)
thumbnail.clear();
else
if (value != nullptr)
{
auto reader = value->make (dataModel.getAudioFormatManager());
thumbnail.setReader (reader.release(), currentHashCode);
currentHashCode += 1;
if (auto reader = value->make (dataModel.getAudioFormatManager()))
{
thumbnail.setReader (reader.release(), currentHashCode);
currentHashCode += 1;
return;
}
}
thumbnail.clear();
}
void visibleRangeChanged (Range<double>) override
@ -1926,10 +1930,15 @@ public:
auto setReader = [this] (const FileChooser& fc)
{
undoManager.beginNewTransaction();
auto readerFactory = new FileAudioFormatReaderFactory (fc.getResult());
dataModel.setSampleReader (std::unique_ptr<AudioFormatReaderFactory> (readerFactory),
&undoManager);
const auto result = fc.getResult();
if (result != File())
{
undoManager.beginNewTransaction();
auto readerFactory = new FileAudioFormatReaderFactory (result);
dataModel.setSampleReader (std::unique_ptr<AudioFormatReaderFactory> (readerFactory),
&undoManager);
}
};
loadNewSampleButton.onClick = [this, setReader]
@ -2110,6 +2119,8 @@ public:
AudioFormatManager manager;
manager.registerBasicFormats();
auto reader = readerFactory->make (manager);
jassert (reader != nullptr); // Failed to load resource!
auto sound = samplerSound;
auto sample = std::unique_ptr<Sample> (new Sample (*reader, 10.0));
auto lengthInSeconds = sample->getLength() / sample->getSampleRate();
@ -2240,9 +2251,8 @@ public:
nullptr,
move (newSamplerVoices)));
}
else
else if (auto reader = fact->make (formatManager))
{
auto reader = fact->make (formatManager);
commands.push (SetSampleCommand (move (fact),
std::unique_ptr<Sample> (new Sample (*reader, 10.0)),
move (newSamplerVoices)));