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

Another batch of conversion of methods which returned bare XmlElement* to return unique_ptrs

Browse source
This commit is contained in:
jules 2019-05-10 18:35:00 +01:00
parent fef1093f6e
commit 6463529371
23 changed files with 63 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp
View file

@ -139,12 +139,10 @@ void AudioDeviceManager::audioDeviceListChanged()
{
closeAudioDevice();
std::unique_ptr<XmlElement> e (createStateXml());
if (e == nullptr)
initialiseDefault (preferredDeviceName, &currentSetup);
else
if (auto e = createStateXml())
initialiseFromXML (*e, true, preferredDeviceName, &currentSetup);
else
initialiseDefault (preferredDeviceName, &currentSetup);
}
if (currentAudioDevice != nullptr)
@ -344,9 +342,12 @@ void AudioDeviceManager::insertDefaultDeviceNames (AudioDeviceSetup& setup) cons
}
}
XmlElement* AudioDeviceManager::createStateXml() const
std::unique_ptr<XmlElement> AudioDeviceManager::createStateXml() const
{
return createCopyIfNotNull (lastExplicitSettings.get());
if (lastExplicitSettings != nullptr)
return std::make_unique<XmlElement> (*lastExplicitSettings);
return {};
}
//==============================================================================