mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-18 00:54:19 +00:00
Code Activity

Compile fix for PluginListComponent. Hack to allow some internal customisation of VST entry points.

Browse source
This commit is contained in:
jules 2013-01-29 17:13:57 +00:00
parent 6ce0c2e433
commit af559c47ee
2 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

25
modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp
View file

@ -72,6 +72,14 @@
static void _clearfp() {}
#endif
#ifndef JUCE_VST_WRAPPER_LOAD_CUSTOM_MAIN
#define JUCE_VST_WRAPPER_LOAD_CUSTOM_MAIN
#endif
#ifndef JUCE_VST_WRAPPER_INVOKE_MAIN
#define JUCE_VST_WRAPPER_INVOKE_MAIN effect = module->moduleMain (&audioMaster);
#endif
//==============================================================================
const int fxbVersionNum = 1;
@ -337,7 +345,7 @@ class ModuleHandle : public ReferenceCountedObject
public:
//==============================================================================
File file;
MainCall moduleMain;
MainCall moduleMain, customMain;
String pluginName;
ScopedPointer<XmlElement> vstXml;
@ -380,7 +388,8 @@ public:
//==============================================================================
ModuleHandle (const File& file_)
: file (file_),
moduleMain (0)
moduleMain (nullptr),
customMain (nullptr)
#if JUCE_MAC
#if JUCE_PPC
, fragId (0)
@ -431,6 +440,8 @@ public:
if (moduleMain == nullptr)
moduleMain = (MainCall) module.getFunction ("main");
JUCE_VST_WRAPPER_LOAD_CUSTOM_MAIN
if (moduleMain != nullptr)
{
vstXml = XmlDocument::parse (file.withFileExtension ("vstxml"));
@ -506,10 +517,12 @@ public:
{
moduleMain = (MainCall) CFBundleGetFunctionPointerForName (bundleRef, CFSTR("main_macho"));
if (moduleMain == 0)
if (moduleMain == nullptr)
moduleMain = (MainCall) CFBundleGetFunctionPointerForName (bundleRef, CFSTR("VSTPluginMain"));
if (moduleMain != 0)
JUCE_VST_WRAPPER_LOAD_CUSTOM_MAIN
if (moduleMain != nullptr)
{
if (CFTypeRef name = CFBundleGetValueForInfoDictionaryKey (bundleRef, CFSTR("CFBundleName")))
{
@ -611,7 +624,7 @@ public:
#if JUCE_PPC
if (fragId != 0)
{
if (moduleMain != 0)
if (moduleMain != nullptr)
disposeMachOFromCFM ((void*) moduleMain);
CloseConnection (&fragId);
@ -744,7 +757,7 @@ public:
#endif
#endif
{
effect = module->moduleMain (&audioMaster);
JUCE_VST_WRAPPER_INVOKE_MAIN
}
if (effect != nullptr && effect->magic == kEffectMagic)

2
modules/juce_audio_processors/scanning/juce_PluginListComponent.cpp
View file

@ -317,6 +317,8 @@ private:
double progress;
bool finished;
PluginDirectoryScanner scanner;
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Scanner)
};
void PluginListComponent::scanFor (AudioPluginFormat* format)