| @@ -328,7 +328,7 @@ void LibraryModule::addSettingsForModuleToExporter (ProjectExporter& exporter, P | |||||
| XCodeProjectExporter& xcodeExporter = dynamic_cast<XCodeProjectExporter&> (exporter); | XCodeProjectExporter& xcodeExporter = dynamic_cast<XCodeProjectExporter&> (exporter); | ||||
| if (project.isAUPluginHost()) | if (project.isAUPluginHost()) | ||||
| xcodeExporter.xcodeFrameworks.addTokens ("AudioUnit CoreAudioKit", false); | |||||
| xcodeExporter.xcodeFrameworks.addTokens (xcodeExporter.isOSX() ? "AudioUnit CoreAudioKit" : "CoreAudioKit", false); | |||||
| const String frameworks (moduleInfo.moduleInfo [xcodeExporter.isOSX() ? "OSXFrameworks" : "iOSFrameworks"].toString()); | const String frameworks (moduleInfo.moduleInfo [xcodeExporter.isOSX() ? "OSXFrameworks" : "iOSFrameworks"].toString()); | ||||
| xcodeExporter.xcodeFrameworks.addTokens (frameworks, ", ", StringRef()); | xcodeExporter.xcodeFrameworks.addTokens (frameworks, ", ", StringRef()); | ||||
| @@ -65,11 +65,11 @@ void AudioPluginFormatManager::addDefaultFormats() | |||||
| // you should only call this method once! | // you should only call this method once! | ||||
| for (int i = formats.size(); --i >= 0;) | for (int i = formats.size(); --i >= 0;) | ||||
| { | { | ||||
| #if JUCE_PLUGINHOST_VST | |||||
| #if JUCE_PLUGINHOST_VST && (JUCE_MAC || JUCE_WIN || JUCE_LINUX) | |||||
| jassert (dynamic_cast<VSTPluginFormat*> (formats[i]) == nullptr); | jassert (dynamic_cast<VSTPluginFormat*> (formats[i]) == nullptr); | ||||
| #endif | #endif | ||||
| #if JUCE_PLUGINHOST_VST3 | |||||
| #if JUCE_PLUGINHOST_VST3 && (JUCE_MAC || JUCE_WIN) | |||||
| jassert (dynamic_cast<VST3PluginFormat*> (formats[i]) == nullptr); | jassert (dynamic_cast<VST3PluginFormat*> (formats[i]) == nullptr); | ||||
| #endif | #endif | ||||
| @@ -87,11 +87,11 @@ void AudioPluginFormatManager::addDefaultFormats() | |||||
| formats.add (new AudioUnitPluginFormat()); | formats.add (new AudioUnitPluginFormat()); | ||||
| #endif | #endif | ||||
| #if JUCE_PLUGINHOST_VST | |||||
| #if JUCE_PLUGINHOST_VST && (JUCE_MAC || JUCE_WIN || JUCE_LINUX) | |||||
| formats.add (new VSTPluginFormat()); | formats.add (new VSTPluginFormat()); | ||||
| #endif | #endif | ||||
| #if JUCE_PLUGINHOST_VST3 | |||||
| #if JUCE_PLUGINHOST_VST3 && (JUCE_MAC || JUCE_WIN) | |||||
| formats.add (new VST3PluginFormat()); | formats.add (new VST3PluginFormat()); | ||||
| #endif | #endif | ||||
| @@ -39,6 +39,18 @@ | |||||
| #include <AudioUnit/AudioUnitCarbonView.h> | #include <AudioUnit/AudioUnitCarbonView.h> | ||||
| #endif | #endif | ||||
| #ifndef JUCE_SUPPORTS_AUv3 | |||||
| #if JUCE_COMPILER_SUPPORTS_VARIADIC_TEMPLATES && defined (MAC_OS_X_VERSION_MIN_REQUIRED) && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_8) && __OBJC2__ | |||||
| #define JUCE_SUPPORTS_AUv3 1 | |||||
| #else | |||||
| #define JUCE_SUPPORTS_AUv3 0 | |||||
| #endif | |||||
| #endif | |||||
| #if JUCE_SUPPORTS_AUv3 | |||||
| #include <CoreAudioKit/AUViewController.h> | |||||
| #endif | |||||
| namespace juce | namespace juce | ||||
| { | { | ||||
| @@ -61,14 +73,6 @@ namespace juce | |||||
| #define JUCE_AU_LOG(a) | #define JUCE_AU_LOG(a) | ||||
| #endif | #endif | ||||
| #ifndef JUCE_SUPPORTS_AUv3 | |||||
| #if JUCE_COMPILER_SUPPORTS_VARIADIC_TEMPLATES | |||||
| #define JUCE_SUPPORTS_AUv3 1 | |||||
| #else | |||||
| #define JUCE_SUPPORTS_AUv3 0 | |||||
| #endif | |||||
| #endif | |||||
| namespace AudioUnitFormatHelpers | namespace AudioUnitFormatHelpers | ||||
| { | { | ||||
| #if JUCE_DEBUG | #if JUCE_DEBUG | ||||
| @@ -1516,7 +1520,7 @@ private: | |||||
| AutoResizingNSViewComponent wrapper; | AutoResizingNSViewComponent wrapper; | ||||
| #if JUCE_SUPPORTS_AUv3 | #if JUCE_SUPPORTS_AUv3 | ||||
| typedef void (^ViewControllerCallbackBlock)(NSViewController *); | |||||
| typedef void (^ViewControllerCallbackBlock)(AUViewControllerBase *); | |||||
| ObjCBlock<ViewControllerCallbackBlock> viewControllerCallback; | ObjCBlock<ViewControllerCallbackBlock> viewControllerCallback; | ||||
| #endif | #endif | ||||
| @@ -1617,7 +1621,7 @@ private: | |||||
| } | } | ||||
| #if JUCE_SUPPORTS_AUv3 | #if JUCE_SUPPORTS_AUv3 | ||||
| void requestViewControllerCallback (NSViewController* controller) | |||||
| void requestViewControllerCallback (AUViewControllerBase* controller) | |||||
| { | { | ||||
| auto nsSize = [controller preferredContentSize]; | auto nsSize = [controller preferredContentSize]; | ||||
| auto viewSize = CGSizeMake (nsSize.width, nsSize.height); | auto viewSize = CGSizeMake (nsSize.width, nsSize.height); | ||||
| @@ -22,7 +22,7 @@ | |||||
| ============================================================================== | ============================================================================== | ||||
| */ | */ | ||||
| #if JUCE_PLUGINHOST_VST3 | |||||
| #if JUCE_PLUGINHOST_VST3 && (JUCE_MAC || JUCE_WIN) | |||||
| } // namespace juce | } // namespace juce | ||||
| @@ -25,7 +25,7 @@ | |||||
| #ifndef JUCE_VST3PLUGINFORMAT_H_INCLUDED | #ifndef JUCE_VST3PLUGINFORMAT_H_INCLUDED | ||||
| #define JUCE_VST3PLUGINFORMAT_H_INCLUDED | #define JUCE_VST3PLUGINFORMAT_H_INCLUDED | ||||
| #if JUCE_PLUGINHOST_VST3 | |||||
| #if (JUCE_PLUGINHOST_VST3 && (JUCE_MAC || JUCE_WIN)) || DOXYGEN | |||||
| /** | /** | ||||
| Implements a plugin format for VST3s. | Implements a plugin format for VST3s. | ||||
| @@ -22,7 +22,7 @@ | |||||
| ============================================================================== | ============================================================================== | ||||
| */ | */ | ||||
| #if JUCE_PLUGINHOST_VST | |||||
| #if JUCE_PLUGINHOST_VST && (JUCE_MAC || JUCE_WIN || JUCE_LINUX) | |||||
| //============================================================================== | //============================================================================== | ||||
| #if JUCE_MAC && JUCE_SUPPORT_CARBON | #if JUCE_MAC && JUCE_SUPPORT_CARBON | ||||
| @@ -22,7 +22,7 @@ | |||||
| ============================================================================== | ============================================================================== | ||||
| */ | */ | ||||
| #if JUCE_PLUGINHOST_VST || DOXYGEN | |||||
| #if (JUCE_PLUGINHOST_VST && (JUCE_MAC || JUCE_WIN || JUCE_LINUX)) || DOXYGEN | |||||
| //============================================================================== | //============================================================================== | ||||
| /** | /** | ||||