From 7673e4e0ade9e2fce2ea4670d0a02c2b9d8cbff5 Mon Sep 17 00:00:00 2001 From: hogliux Date: Wed, 31 May 2017 12:46:00 +0100 Subject: [PATCH] Ensured that consistent caps is used for preprocessor macro JucePlugin_Build_Standalone --- .../Project Saving/jucer_ProjectSaver.cpp | 2 +- .../Project Saving/jucer_ProjectSaver.h | 39 +++++++++---------- .../Standalone/juce_StandaloneFilterApp.cpp | 2 +- .../Standalone/juce_StandaloneFilterWindow.h | 2 +- .../utility/juce_PluginUtilities.cpp | 8 ++-- 5 files changed, 25 insertions(+), 28 deletions(-) diff --git a/extras/Projucer/Source/Project Saving/jucer_ProjectSaver.cpp b/extras/Projucer/Source/Project Saving/jucer_ProjectSaver.cpp index fe3bef7b6b..76cc05c4d5 100644 --- a/extras/Projucer/Source/Project Saving/jucer_ProjectSaver.cpp +++ b/extras/Projucer/Source/Project Saving/jucer_ProjectSaver.cpp @@ -81,7 +81,7 @@ void ProjectSaver::writePluginCharacteristicsFile() flags.set ("JucePlugin_Build_AUv3", valueToBool (project.getShouldBuildAUv3AsValue())); flags.set ("JucePlugin_Build_RTAS", valueToBool (project.getShouldBuildRTASAsValue())); flags.set ("JucePlugin_Build_AAX", valueToBool (project.getShouldBuildAAXAsValue())); - flags.set ("JucePlugin_Build_STANDALONE", valueToBool (project.getShouldBuildStandalonePluginAsValue())); + flags.set ("JucePlugin_Build_Standalone", valueToBool (project.getShouldBuildStandalonePluginAsValue())); flags.set ("JucePlugin_Enable_IAA", valueToBool (project.getShouldEnableIAAAsValue())); flags.set ("JucePlugin_Name", valueToStringLiteral (project.getPluginName())); flags.set ("JucePlugin_Desc", valueToStringLiteral (project.getPluginDesc())); diff --git a/extras/Projucer/Source/Project Saving/jucer_ProjectSaver.h b/extras/Projucer/Source/Project Saving/jucer_ProjectSaver.h index f8513234ea..e5f5f4493f 100644 --- a/extras/Projucer/Source/Project Saving/jucer_ProjectSaver.h +++ b/extras/Projucer/Source/Project Saving/jucer_ProjectSaver.h @@ -425,27 +425,7 @@ private: << String::repeatedString (" ", longestName + 5 - m->getID().length()) << " 1" << newLine; } - out << newLine; - - { - int isStandaloneApplication = 1; - const ProjectType& type = project.getProjectType(); - - if (type.isAudioPlugin() || type.isDynamicLibrary()) - isStandaloneApplication = 0; - - // Fabian TODO - out << "//==============================================================================" << newLine - << "#ifndef JUCE_STANDALONE_APPLICATION" << newLine - << " #if defined(JucePlugin_Name) && defined(JucePlugin_Build_Standalone)" << newLine - << " #define JUCE_STANDALONE_APPLICATION JucePlugin_Build_Standalone" << newLine - << " #else" << newLine - << " #define JUCE_STANDALONE_APPLICATION " << isStandaloneApplication << newLine - << " #endif" << newLine - << "#endif" << newLine - << newLine - << "#define JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED 1" << newLine; - } + out << newLine << "#define JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED 1" << newLine; for (int j = 0; j < modules.size(); ++j) { @@ -485,6 +465,23 @@ private: } } + { + int isStandaloneApplication = 1; + const ProjectType& type = project.getProjectType(); + + if (type.isAudioPlugin() || type.isDynamicLibrary()) + isStandaloneApplication = 0; + + out << "//==============================================================================" << newLine + << "#ifndef JUCE_STANDALONE_APPLICATION" << newLine + << " #if defined(JucePlugin_Name) && defined(JucePlugin_Build_Standalone)" << newLine + << " #define JUCE_STANDALONE_APPLICATION JucePlugin_Build_Standalone" << newLine + << " #else" << newLine + << " #define JUCE_STANDALONE_APPLICATION " << isStandaloneApplication << newLine + << " #endif" << newLine + << "#endif" << newLine; + } + if (extraAppConfigContent.isNotEmpty()) out << newLine << extraAppConfigContent.trimEnd() << newLine; } diff --git a/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterApp.cpp b/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterApp.cpp index 391f905229..7b8934b4c8 100644 --- a/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterApp.cpp +++ b/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterApp.cpp @@ -124,7 +124,7 @@ protected: ScopedPointer mainWindow; }; -#if JucePlugin_Build_STANDALONE && JUCE_IOS +#if JucePlugin_Build_Standalone && JUCE_IOS bool JUCE_CALLTYPE juce_isInterAppAudioConnected() { diff --git a/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h b/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h index 42baea647e..8a76f7de8b 100644 --- a/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h +++ b/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h @@ -818,7 +818,7 @@ private: StandalonePluginHolder* StandalonePluginHolder::getInstance() { - #if JucePlugin_Enable_IAA || JucePlugin_Build_STANDALONE + #if JucePlugin_Enable_IAA || JucePlugin_Build_Standalone if (PluginHostType::getPluginLoadedAs() == AudioProcessor::wrapperType_Standalone) { auto& desktop = Desktop::getInstance(); diff --git a/modules/juce_audio_plugin_client/utility/juce_PluginUtilities.cpp b/modules/juce_audio_plugin_client/utility/juce_PluginUtilities.cpp index 11433c1dd0..4380839f4b 100644 --- a/modules/juce_audio_plugin_client/utility/juce_PluginUtilities.cpp +++ b/modules/juce_audio_plugin_client/utility/juce_PluginUtilities.cpp @@ -151,7 +151,7 @@ bool JUCE_API handleManufacturerSpecificVST2Opcode (int32 index, pointer_sized_i */ extern AudioProcessor* JUCE_CALLTYPE createPluginFilter(); -#if JucePlugin_Enable_IAA && JucePlugin_Build_STANDALONE && JUCE_IOS && (! JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP) +#if JucePlugin_Enable_IAA && JucePlugin_Build_Standalone && JUCE_IOS && (! JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP) extern bool JUCE_CALLTYPE juce_isInterAppAudioConnected(); extern void JUCE_CALLTYPE juce_switchToHostApplication(); @@ -174,7 +174,7 @@ AudioProcessor* JUCE_API JUCE_CALLTYPE createPluginFilterOfType (AudioProcessor: bool PluginHostType::isInterAppAudioConnected() const { - #if JucePlugin_Enable_IAA && JucePlugin_Build_STANDALONE && JUCE_IOS && (! JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP) + #if JucePlugin_Enable_IAA && JucePlugin_Build_Standalone && JUCE_IOS && (! JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP) if (getPluginLoadedAs() == AudioProcessor::wrapperType_Standalone) return juce_isInterAppAudioConnected(); #endif @@ -184,7 +184,7 @@ bool PluginHostType::isInterAppAudioConnected() const void PluginHostType::switchToHostApplication() const { - #if JucePlugin_Enable_IAA && JucePlugin_Build_STANDALONE && JUCE_IOS && (! JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP) + #if JucePlugin_Enable_IAA && JucePlugin_Build_Standalone && JUCE_IOS && (! JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP) if (getPluginLoadedAs() == AudioProcessor::wrapperType_Standalone) juce_switchToHostApplication(); #endif @@ -199,7 +199,7 @@ Image PluginHostType::getHostIcon (int size) const { ignoreUnused (size); - #if JucePlugin_Enable_IAA && JucePlugin_Build_STANDALONE && JUCE_IOS && (! JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP) + #if JucePlugin_Enable_IAA && JucePlugin_Build_Standalone && JUCE_IOS && (! JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP) if (isInterAppAudioConnected()) return juce_getIAAHostIcon (size); #endif