| @@ -81,7 +81,7 @@ void ProjectSaver::writePluginCharacteristicsFile() | |||||
| flags.set ("JucePlugin_Build_AUv3", valueToBool (project.getShouldBuildAUv3AsValue())); | flags.set ("JucePlugin_Build_AUv3", valueToBool (project.getShouldBuildAUv3AsValue())); | ||||
| flags.set ("JucePlugin_Build_RTAS", valueToBool (project.getShouldBuildRTASAsValue())); | flags.set ("JucePlugin_Build_RTAS", valueToBool (project.getShouldBuildRTASAsValue())); | ||||
| flags.set ("JucePlugin_Build_AAX", valueToBool (project.getShouldBuildAAXAsValue())); | 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_Enable_IAA", valueToBool (project.getShouldEnableIAAAsValue())); | ||||
| flags.set ("JucePlugin_Name", valueToStringLiteral (project.getPluginName())); | flags.set ("JucePlugin_Name", valueToStringLiteral (project.getPluginName())); | ||||
| flags.set ("JucePlugin_Desc", valueToStringLiteral (project.getPluginDesc())); | flags.set ("JucePlugin_Desc", valueToStringLiteral (project.getPluginDesc())); | ||||
| @@ -425,27 +425,7 @@ private: | |||||
| << String::repeatedString (" ", longestName + 5 - m->getID().length()) << " 1" << newLine; | << 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) | 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()) | if (extraAppConfigContent.isNotEmpty()) | ||||
| out << newLine << extraAppConfigContent.trimEnd() << newLine; | out << newLine << extraAppConfigContent.trimEnd() << newLine; | ||||
| } | } | ||||
| @@ -124,7 +124,7 @@ protected: | |||||
| ScopedPointer<StandaloneFilterWindow> mainWindow; | ScopedPointer<StandaloneFilterWindow> mainWindow; | ||||
| }; | }; | ||||
| #if JucePlugin_Build_STANDALONE && JUCE_IOS | |||||
| #if JucePlugin_Build_Standalone && JUCE_IOS | |||||
| bool JUCE_CALLTYPE juce_isInterAppAudioConnected() | bool JUCE_CALLTYPE juce_isInterAppAudioConnected() | ||||
| { | { | ||||
| @@ -818,7 +818,7 @@ private: | |||||
| StandalonePluginHolder* StandalonePluginHolder::getInstance() | StandalonePluginHolder* StandalonePluginHolder::getInstance() | ||||
| { | { | ||||
| #if JucePlugin_Enable_IAA || JucePlugin_Build_STANDALONE | |||||
| #if JucePlugin_Enable_IAA || JucePlugin_Build_Standalone | |||||
| if (PluginHostType::getPluginLoadedAs() == AudioProcessor::wrapperType_Standalone) | if (PluginHostType::getPluginLoadedAs() == AudioProcessor::wrapperType_Standalone) | ||||
| { | { | ||||
| auto& desktop = Desktop::getInstance(); | auto& desktop = Desktop::getInstance(); | ||||
| @@ -151,7 +151,7 @@ bool JUCE_API handleManufacturerSpecificVST2Opcode (int32 index, pointer_sized_i | |||||
| */ | */ | ||||
| extern AudioProcessor* JUCE_CALLTYPE createPluginFilter(); | 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 bool JUCE_CALLTYPE juce_isInterAppAudioConnected(); | ||||
| extern void JUCE_CALLTYPE juce_switchToHostApplication(); | extern void JUCE_CALLTYPE juce_switchToHostApplication(); | ||||
| @@ -174,7 +174,7 @@ AudioProcessor* JUCE_API JUCE_CALLTYPE createPluginFilterOfType (AudioProcessor: | |||||
| bool PluginHostType::isInterAppAudioConnected() const | 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) | if (getPluginLoadedAs() == AudioProcessor::wrapperType_Standalone) | ||||
| return juce_isInterAppAudioConnected(); | return juce_isInterAppAudioConnected(); | ||||
| #endif | #endif | ||||
| @@ -184,7 +184,7 @@ bool PluginHostType::isInterAppAudioConnected() const | |||||
| void PluginHostType::switchToHostApplication() 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) | if (getPluginLoadedAs() == AudioProcessor::wrapperType_Standalone) | ||||
| juce_switchToHostApplication(); | juce_switchToHostApplication(); | ||||
| #endif | #endif | ||||
| @@ -199,7 +199,7 @@ Image PluginHostType::getHostIcon (int size) const | |||||
| { | { | ||||
| ignoreUnused (size); | 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()) | if (isInterAppAudioConnected()) | ||||
| return juce_getIAAHostIcon (size); | return juce_getIAAHostIcon (size); | ||||
| #endif | #endif | ||||