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

Ensured that consistent caps is used for preprocessor macro JucePlugin_Build_Standalone

Browse source
This commit is contained in:
hogliux 2017-05-31 12:46:00 +01:00
parent 313571118e
commit 7673e4e0ad
5 changed files with 25 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
extras/Projucer/Source/Project Saving/jucer_ProjectSaver.cpp
View file

@ -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()));

39
extras/Projucer/Source/Project Saving/jucer_ProjectSaver.h
View file

@ -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;
}

2
modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterApp.cpp
View file

@ -124,7 +124,7 @@ protected:
ScopedPointer<StandaloneFilterWindow> mainWindow;
};
#if JucePlugin_Build_STANDALONE && JUCE_IOS
#if JucePlugin_Build_Standalone && JUCE_IOS
bool JUCE_CALLTYPE juce_isInterAppAudioConnected()
{

2
modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h
View file

@ -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();

8
modules/juce_audio_plugin_client/utility/juce_PluginUtilities.cpp
View file

@ -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