Browse Source

Quick tidy-up in AudioPluginFormatManager

tags/2021-05-28
jules 7 years ago
parent
commit
8c30808ef9
1 changed files with 24 additions and 25 deletions
  1. +24
    -25
      modules/juce_audio_processors/format/juce_AudioPluginFormatManager.cpp

+ 24
- 25
modules/juce_audio_processors/format/juce_AudioPluginFormatManager.cpp View File

@@ -32,8 +32,8 @@ namespace PluginFormatManagerHelpers
struct ErrorCallbackOnMessageThread : public CallbackMessage
{
ErrorCallbackOnMessageThread (const String& inError,
AudioPluginFormat::InstantiationCompletionCallback* inCallback)
: error (inError), callback (inCallback)
AudioPluginFormat::InstantiationCompletionCallback* c)
: error (inError), callback (c)
{
}
@@ -66,22 +66,24 @@ void AudioPluginFormatManager::addDefaultFormats()
{
#if JUCE_DEBUG
// you should only call this method once!
for (int i = formats.size(); --i >= 0;)
for (auto* format : formats)
{
ignoreUnused (format);
#if JUCE_PLUGINHOST_VST && (JUCE_MAC || JUCE_WINDOWS || JUCE_LINUX || JUCE_IOS)
jassert (dynamic_cast<VSTPluginFormat*> (formats[i]) == nullptr);
jassert (dynamic_cast<VSTPluginFormat*> (format) == nullptr);
#endif
#if JUCE_PLUGINHOST_VST3 && (JUCE_MAC || JUCE_WINDOWS)
jassert (dynamic_cast<VST3PluginFormat*> (formats[i]) == nullptr);
jassert (dynamic_cast<VST3PluginFormat*> (format) == nullptr);
#endif
#if JUCE_PLUGINHOST_AU && (JUCE_MAC || JUCE_IOS)
jassert (dynamic_cast<AudioUnitPluginFormat*> (formats[i]) == nullptr);
jassert (dynamic_cast<AudioUnitPluginFormat*> (format) == nullptr);
#endif
#if JUCE_PLUGINHOST_LADSPA && JUCE_LINUX
jassert (dynamic_cast<LADSPAPluginFormat*> (formats[i]) == nullptr);
jassert (dynamic_cast<LADSPAPluginFormat*> (format) == nullptr);
#endif
}
#endif
@@ -108,12 +110,12 @@ int AudioPluginFormatManager::getNumFormats()
return formats.size();
}
AudioPluginFormat* AudioPluginFormatManager::getFormat (const int index)
AudioPluginFormat* AudioPluginFormatManager::getFormat (int index)
{
return formats [index];
return formats[index];
}
void AudioPluginFormatManager::addFormat (AudioPluginFormat* const format)
void AudioPluginFormatManager::addFormat (AudioPluginFormat* format)
{
formats.add (format);
}
@@ -121,7 +123,7 @@ void AudioPluginFormatManager::addFormat (AudioPluginFormat* const format)
AudioPluginInstance* AudioPluginFormatManager::createPluginInstance (const PluginDescription& description, double rate,
int blockSize, String& errorMessage) const
{
if (AudioPluginFormat* format = findFormatForDescription (description, errorMessage))
if (auto* format = findFormatForDescription (description, errorMessage))
return format->createInstanceFromDescription (description, rate, blockSize, errorMessage);
return nullptr;
@@ -134,7 +136,7 @@ void AudioPluginFormatManager::createPluginInstanceAsync (const PluginDescriptio
{
String error;
if (AudioPluginFormat* format = findFormatForDescription (description, error))
if (auto* format = findFormatForDescription (description, error))
return format->createPluginInstanceAsync (description, initialSampleRate, initialBufferSize, callback);
(new PluginFormatManagerHelpers::ErrorCallbackOnMessageThread (error, callback))->post();
@@ -147,24 +149,21 @@ void AudioPluginFormatManager::createPluginInstanceAsync (const PluginDescriptio
{
String error;
if (AudioPluginFormat* format = findFormatForDescription (description, error))
if (auto* format = findFormatForDescription (description, error))
return format->createPluginInstanceAsync (description, initialSampleRate, initialBufferSize, f);
(new PluginFormatManagerHelpers::ErrorLambdaOnMessageThread (error, f))->post();
}
AudioPluginFormat* AudioPluginFormatManager::findFormatForDescription (const PluginDescription& description, String& errorMessage) const
AudioPluginFormat* AudioPluginFormatManager::findFormatForDescription (const PluginDescription& description,
String& errorMessage) const
{
errorMessage = String();
for (int i = 0; i < formats.size(); ++i)
{
AudioPluginFormat* format;
errorMessage = {};
if ((format = formats.getUnchecked (i))->getName() == description.pluginFormatName
&& format->fileMightContainThisPluginType (description.fileOrIdentifier))
for (auto* format : formats)
if (format->getName() == description.pluginFormatName
&& format->fileMightContainThisPluginType (description.fileOrIdentifier))
return format;
}
errorMessage = NEEDS_TRANS ("No compatible plug-in format exists for this plug-in");
@@ -173,9 +172,9 @@ AudioPluginFormat* AudioPluginFormatManager::findFormatForDescription (const Plu
bool AudioPluginFormatManager::doesPluginStillExist (const PluginDescription& description) const
{
for (int i = 0; i < formats.size(); ++i)
if (formats.getUnchecked(i)->getName() == description.pluginFormatName)
return formats.getUnchecked(i)->doesPluginStillExist (description);
for (auto* format : formats)
if (format->getName() == description.pluginFormatName)
return format->doesPluginStillExist (description);
return false;
}


Loading…
Cancel
Save