diff --git a/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp b/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp index 409e186062..af3e2620a6 100644 --- a/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp @@ -22,11 +22,7 @@ ============================================================================== */ -// Your project must contain an AppConfig.h file with your project-specific settings in it, -// and your header search path must make it accessible to the module's files. -#include "AppConfig.h" - -#include "../../juce_core/native/juce_mac_ClangBugWorkaround.h" +#include "../../juce_core/system/juce_TargetPlatform.h" #include "../utility/juce_CheckSettingMacros.h" #if JucePlugin_Build_AAX && (JUCE_INCLUDED_AAX_IN_MM || defined (_WIN32) || defined (_WIN64)) @@ -1362,8 +1358,8 @@ struct AAXClasses descriptor.AddCategory (JucePlugin_AAXCategory); #ifdef JucePlugin_AAXPageTableFile - // optional page table setting - define this macro in your AppConfig.h if you - // want to set this value - see Avid documentation for details about its format. + // optional page table setting - define this macro in your project if you want + // to set this value - see Avid documentation for details about its format. descriptor.AddResourceInfo (AAX_eResourceType_PageTable, JucePlugin_AAXPageTableFile); #endif diff --git a/modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm b/modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm index bfaef88196..eafda2047c 100644 --- a/modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm +++ b/modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm @@ -22,12 +22,8 @@ ============================================================================== */ -// Your project must contain an AppConfig.h file with your project-specific settings in it, -// and your header search path must make it accessible to the module's files. -#include "AppConfig.h" - +#include "../../juce_core/system/juce_TargetPlatform.h" #include "../utility/juce_CheckSettingMacros.h" -#include "../../juce_core/native/juce_mac_ClangBugWorkaround.h" #if JucePlugin_Build_AU diff --git a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode1.cpp b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode1.cpp index c3f952ce6a..824230ab1d 100644 --- a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode1.cpp +++ b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode1.cpp @@ -22,10 +22,7 @@ ============================================================================== */ -// Your project must contain an AppConfig.h file with your project-specific settings in it, -// and your header search path must make it accessible to the module's files. -#include "AppConfig.h" - +#include "../../juce_core/system/juce_TargetPlatform.h" #include "../utility/juce_CheckSettingMacros.h" #if JucePlugin_Build_RTAS diff --git a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode2.cpp b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode2.cpp index cbb411a62b..535ba22cfd 100644 --- a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode2.cpp +++ b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode2.cpp @@ -22,10 +22,7 @@ ============================================================================== */ -// Your project must contain an AppConfig.h file with your project-specific settings in it, -// and your header search path must make it accessible to the module's files. -#include "AppConfig.h" - +#include "../../juce_core/system/juce_TargetPlatform.h" #include "../utility/juce_CheckSettingMacros.h" #if JucePlugin_Build_RTAS diff --git a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode3.cpp b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode3.cpp index 4fe301a910..f6ad29e2ea 100644 --- a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode3.cpp +++ b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode3.cpp @@ -22,10 +22,7 @@ ============================================================================== */ -// Your project must contain an AppConfig.h file with your project-specific settings in it, -// and your header search path must make it accessible to the module's files. -#include "AppConfig.h" - +#include "../../juce_core/system/juce_TargetPlatform.h" #include "../utility/juce_CheckSettingMacros.h" #if JucePlugin_Build_RTAS diff --git a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_MacUtilities.mm b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_MacUtilities.mm index e4380004e5..1e259cf709 100644 --- a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_MacUtilities.mm +++ b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_MacUtilities.mm @@ -22,10 +22,7 @@ ============================================================================== */ -// Your project must contain an AppConfig.h file with your project-specific settings in it, -// and your header search path must make it accessible to the module's files. -#include "AppConfig.h" - +#include "../../juce_core/system/juce_TargetPlatform.h" #include "../utility/juce_CheckSettingMacros.h" #if JucePlugin_Build_RTAS diff --git a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_WinUtilities.cpp b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_WinUtilities.cpp index e76c430384..eb21aec4ff 100644 --- a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_WinUtilities.cpp +++ b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_WinUtilities.cpp @@ -22,10 +22,7 @@ ============================================================================== */ -// Your project must contain an AppConfig.h file with your project-specific settings in it, -// and your header search path must make it accessible to the module's files. -#include "AppConfig.h" - +#include "../../juce_core/system/juce_TargetPlatform.h" #include "../utility/juce_CheckSettingMacros.h" // (these functions are in their own file because of problems including windows.h diff --git a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp index a3240a431d..4c6b582c35 100644 --- a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp @@ -22,10 +22,7 @@ ============================================================================== */ -// Your project must contain an AppConfig.h file with your project-specific settings in it, -// and your header search path must make it accessible to the module's files. -#include "AppConfig.h" - +#include "../../juce_core/system/juce_TargetPlatform.h" #include "../utility/juce_CheckSettingMacros.h" #if JucePlugin_Build_RTAS diff --git a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp index 57220fee95..c8557d77d6 100644 --- a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp @@ -22,11 +22,8 @@ ============================================================================== */ -// Your project must contain an AppConfig.h file with your project-specific settings in it, -// and your header search path must make it accessible to the module's files. -#include "AppConfig.h" +#include "../../juce_core/system/juce_TargetPlatform.h" #include "../utility/juce_CheckSettingMacros.h" -#include "../../juce_core/native/juce_mac_ClangBugWorkaround.h" #if JucePlugin_Build_VST @@ -34,27 +31,13 @@ #pragma warning (disable : 4996 4100) #endif -#ifdef _WIN32 - #undef _WIN32_WINNT - #define _WIN32_WINNT 0x500 - #undef STRICT - #define STRICT 1 - #include -#elif defined (LINUX) - #include - #include - #include - #undef KeyPress -#else - #include -#endif +#include "../utility/juce_IncludeSystemHeaders.h" #ifdef PRAGMA_ALIGN_SUPPORTED #undef PRAGMA_ALIGN_SUPPORTED #define PRAGMA_ALIGN_SUPPORTED 1 #endif -//============================================================================== #ifndef _MSC_VER #define __cdecl #endif @@ -1154,26 +1137,26 @@ public: { switch (type) { - case AudioChannelSet::ChannelType::left: return kSpeakerL; - case AudioChannelSet::ChannelType::right: return kSpeakerR; - case AudioChannelSet::ChannelType::centre: return kSpeakerC; - case AudioChannelSet::ChannelType::subbass: return kSpeakerLfe; - case AudioChannelSet::ChannelType::surroundLeft: return kSpeakerLs; - case AudioChannelSet::ChannelType::surroundRight: return kSpeakerRs; - case AudioChannelSet::ChannelType::centreLeft: return kSpeakerLc; - case AudioChannelSet::ChannelType::centreRight: return kSpeakerRc; - case AudioChannelSet::ChannelType::surround: return kSpeakerS; - case AudioChannelSet::ChannelType::sideLeft: return kSpeakerSl; - case AudioChannelSet::ChannelType::sideRight: return kSpeakerSr; - case AudioChannelSet::ChannelType::topMiddle: return kSpeakerTm; - case AudioChannelSet::ChannelType::topFrontLeft: return kSpeakerTfl; - case AudioChannelSet::ChannelType::topFrontCentre: return kSpeakerTfc; - case AudioChannelSet::ChannelType::topFrontRight: return kSpeakerTfr; - case AudioChannelSet::ChannelType::topRearLeft: return kSpeakerTrl; - case AudioChannelSet::ChannelType::topRearCentre: return kSpeakerTrc; - case AudioChannelSet::ChannelType::topRearRight: return kSpeakerTrr; - case AudioChannelSet::ChannelType::subbass2: return kSpeakerLfe2; - default: break; + case AudioChannelSet::ChannelType::left: return kSpeakerL; + case AudioChannelSet::ChannelType::right: return kSpeakerR; + case AudioChannelSet::ChannelType::centre: return kSpeakerC; + case AudioChannelSet::ChannelType::subbass: return kSpeakerLfe; + case AudioChannelSet::ChannelType::surroundLeft: return kSpeakerLs; + case AudioChannelSet::ChannelType::surroundRight: return kSpeakerRs; + case AudioChannelSet::ChannelType::centreLeft: return kSpeakerLc; + case AudioChannelSet::ChannelType::centreRight: return kSpeakerRc; + case AudioChannelSet::ChannelType::surround: return kSpeakerS; + case AudioChannelSet::ChannelType::sideLeft: return kSpeakerSl; + case AudioChannelSet::ChannelType::sideRight: return kSpeakerSr; + case AudioChannelSet::ChannelType::topMiddle: return kSpeakerTm; + case AudioChannelSet::ChannelType::topFrontLeft: return kSpeakerTfl; + case AudioChannelSet::ChannelType::topFrontCentre: return kSpeakerTfc; + case AudioChannelSet::ChannelType::topFrontRight: return kSpeakerTfr; + case AudioChannelSet::ChannelType::topRearLeft: return kSpeakerTrl; + case AudioChannelSet::ChannelType::topRearCentre: return kSpeakerTrc; + case AudioChannelSet::ChannelType::topRearRight: return kSpeakerTrr; + case AudioChannelSet::ChannelType::subbass2: return kSpeakerLfe2; + default: break; } return 0; @@ -1183,26 +1166,26 @@ public: { switch (type) { - case kSpeakerL: return AudioChannelSet::ChannelType::left; - case kSpeakerR: return AudioChannelSet::ChannelType::right; - case kSpeakerC: return AudioChannelSet::ChannelType::centre; - case kSpeakerLfe: return AudioChannelSet::ChannelType::subbass; - case kSpeakerLs: return AudioChannelSet::ChannelType::surroundLeft; - case kSpeakerRs: return AudioChannelSet::ChannelType::surroundRight; - case kSpeakerLc: return AudioChannelSet::ChannelType::centreLeft; - case kSpeakerRc: return AudioChannelSet::ChannelType::centreRight; - case kSpeakerS: return AudioChannelSet::ChannelType::surround; - case kSpeakerSl: return AudioChannelSet::ChannelType::sideLeft; - case kSpeakerSr: return AudioChannelSet::ChannelType::sideRight; - case kSpeakerTm: return AudioChannelSet::ChannelType::topMiddle; - case kSpeakerTfl: return AudioChannelSet::ChannelType::topFrontLeft; - case kSpeakerTfc: return AudioChannelSet::ChannelType::topFrontCentre; - case kSpeakerTfr: return AudioChannelSet::ChannelType::topFrontRight; - case kSpeakerTrl: return AudioChannelSet::ChannelType::topRearLeft; - case kSpeakerTrc: return AudioChannelSet::ChannelType::topRearCentre; - case kSpeakerTrr: return AudioChannelSet::ChannelType::topRearRight; - case kSpeakerLfe2: return AudioChannelSet::ChannelType::subbass2; - default: break; + case kSpeakerL: return AudioChannelSet::ChannelType::left; + case kSpeakerR: return AudioChannelSet::ChannelType::right; + case kSpeakerC: return AudioChannelSet::ChannelType::centre; + case kSpeakerLfe: return AudioChannelSet::ChannelType::subbass; + case kSpeakerLs: return AudioChannelSet::ChannelType::surroundLeft; + case kSpeakerRs: return AudioChannelSet::ChannelType::surroundRight; + case kSpeakerLc: return AudioChannelSet::ChannelType::centreLeft; + case kSpeakerRc: return AudioChannelSet::ChannelType::centreRight; + case kSpeakerS: return AudioChannelSet::ChannelType::surround; + case kSpeakerSl: return AudioChannelSet::ChannelType::sideLeft; + case kSpeakerSr: return AudioChannelSet::ChannelType::sideRight; + case kSpeakerTm: return AudioChannelSet::ChannelType::topMiddle; + case kSpeakerTfl: return AudioChannelSet::ChannelType::topFrontLeft; + case kSpeakerTfc: return AudioChannelSet::ChannelType::topFrontCentre; + case kSpeakerTfr: return AudioChannelSet::ChannelType::topFrontRight; + case kSpeakerTrl: return AudioChannelSet::ChannelType::topRearLeft; + case kSpeakerTrc: return AudioChannelSet::ChannelType::topRearCentre; + case kSpeakerTrr: return AudioChannelSet::ChannelType::topRearRight; + case kSpeakerLfe2: return AudioChannelSet::ChannelType::subbass2; + default: break; } return AudioChannelSet::ChannelType::unknown; @@ -1706,17 +1689,11 @@ private: { MessageManager::getInstance()->setCurrentThreadAsMessageThread(); - class MessageThreadCallback : public CallbackMessage + struct MessageThreadCallback : public CallbackMessage { - public: MessageThreadCallback (bool& tr) : triggered (tr) {} + void messageCallback() override { triggered = true; } - void messageCallback() override - { - triggered = true; - } - - private: bool& triggered; }; diff --git a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.mm b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.mm index 439fbd0ccd..d3d53e8cde 100644 --- a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.mm +++ b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.mm @@ -22,12 +22,8 @@ ============================================================================== */ -// Your project must contain an AppConfig.h file with your project-specific settings in it, -// and your header search path must make it accessible to the module's files. -#include "AppConfig.h" - +#include "../../juce_core/system/juce_TargetPlatform.h" #include "../utility/juce_CheckSettingMacros.h" -#include "../../juce_core/native/juce_mac_ClangBugWorkaround.h" #if JucePlugin_Build_VST || JucePlugin_Build_VST3 diff --git a/modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp b/modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp index 49c3ed63da..49da746372 100644 --- a/modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp @@ -22,14 +22,11 @@ ============================================================================== */ -// Your project must contain an AppConfig.h file with your project-specific settings in it, -// and your header search path must make it accessible to the module's files. -#include "AppConfig.h" +#include "../../juce_core/system/juce_TargetPlatform.h" //============================================================================== #if JucePlugin_Build_VST3 && (__APPLE_CPP__ || __APPLE_CC__ || _WIN32 || _WIN64) -#include "../../juce_core/native/juce_mac_ClangBugWorkaround.h" #include "../../juce_audio_processors/format_types/juce_VST3Headers.h" #include "../utility/juce_CheckSettingMacros.h" #include "../utility/juce_IncludeModuleHeaders.h" diff --git a/modules/juce_audio_plugin_client/utility/juce_IncludeSystemHeaders.h b/modules/juce_audio_plugin_client/utility/juce_IncludeSystemHeaders.h index 2aaae18659..a7f91abae2 100644 --- a/modules/juce_audio_plugin_client/utility/juce_IncludeSystemHeaders.h +++ b/modules/juce_audio_plugin_client/utility/juce_IncludeSystemHeaders.h @@ -50,16 +50,23 @@ #define JUCE_SUPPORT_CARBON 1 #endif + #define Point CarbonDummyPointName + #if JUCE_SUPPORT_CARBON - #define Point CarbonDummyPointName #define Component CarbonDummyCompName - #include - #include - #undef Point - #undef Component - #else + #endif + + #ifdef __OBJC__ #include #endif + + #if JUCE_SUPPORT_CARBON + #include + #undef Component + #endif + + #undef Point + #include #include #include diff --git a/modules/juce_audio_plugin_client/utility/juce_PluginUtilities.cpp b/modules/juce_audio_plugin_client/utility/juce_PluginUtilities.cpp index 48855f7d3c..590e6c307e 100644 --- a/modules/juce_audio_plugin_client/utility/juce_PluginUtilities.cpp +++ b/modules/juce_audio_plugin_client/utility/juce_PluginUtilities.cpp @@ -26,10 +26,7 @@ #include #endif -// Your project must contain an AppConfig.h file with your project-specific settings in it, -// and your header search path must make it accessible to the module's files. -#include "AppConfig.h" - +#include "../../juce_core/system/juce_TargetPlatform.h" #include "../utility/juce_CheckSettingMacros.h" #include "juce_IncludeModuleHeaders.h"