You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

146 lines
6.9KB

  1. diff --git a/modules/juce_audio_processors/juce_audio_processors.cpp b/modules/juce_audio_processors/juce_audio_processors.cpp
  2. index ac194a19d..f494ec3a2 100644
  3. --- a/modules/juce_audio_processors/juce_audio_processors.cpp
  4. +++ b/modules/juce_audio_processors/juce_audio_processors.cpp
  5. @@ -47,7 +47,7 @@
  6. #endif
  7. #endif
  8. -#if (JUCE_PLUGINHOST_VST || JUCE_PLUGINHOST_VST3) && JUCE_LINUX
  9. +#if (JUCE_PLUGINHOST_VST || JUCE_PLUGINHOST_VST3) && JUCE_LINUX && ! JUCE_AUDIOPROCESSOR_NO_GUI
  10. #include <X11/Xlib.h>
  11. #include <X11/Xutil.h>
  12. #include <sys/utsname.h>
  13. @@ -141,9 +141,11 @@ JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wdeprecated-declarations", "-Wcast-align"
  14. #include "format_types/juce_LegacyAudioParameter.cpp"
  15. #include "processors/juce_AudioProcessor.cpp"
  16. #include "processors/juce_AudioPluginInstance.cpp"
  17. -#include "processors/juce_AudioProcessorEditor.cpp"
  18. #include "processors/juce_AudioProcessorGraph.cpp"
  19. -#include "processors/juce_GenericAudioProcessorEditor.cpp"
  20. +#if ! JUCE_AUDIOPROCESSOR_NO_GUI
  21. + #include "processors/juce_AudioProcessorEditor.cpp"
  22. + #include "processors/juce_GenericAudioProcessorEditor.cpp"
  23. +#endif
  24. #include "processors/juce_PluginDescription.cpp"
  25. #include "format_types/juce_LADSPAPluginFormat.cpp"
  26. #include "format_types/juce_VSTPluginFormat.cpp"
  27. diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessor.cpp b/modules/juce_audio_processors/processors/juce_AudioProcessor.cpp
  28. index caa55b618..41c547b0c 100644
  29. --- a/modules/juce_audio_processors/processors/juce_AudioProcessor.cpp
  30. +++ b/modules/juce_audio_processors/processors/juce_AudioProcessor.cpp
  31. @@ -51,12 +51,14 @@ AudioProcessor::AudioProcessor (const BusesProperties& ioConfig)
  32. AudioProcessor::~AudioProcessor()
  33. {
  34. + #if ! JUCE_AUDIOPROCESSOR_NO_GUI
  35. {
  36. const ScopedLock sl (activeEditorLock);
  37. // ooh, nasty - the editor should have been deleted before its AudioProcessor.
  38. jassert (activeEditor == nullptr);
  39. }
  40. + #endif
  41. #if JUCE_DEBUG && ! JUCE_DISABLE_AUDIOPROCESSOR_BEGIN_END_GESTURE_CHECKING
  42. // This will fail if you've called beginParameterChangeGesture() for one
  43. @@ -804,6 +806,7 @@ void AudioProcessor::audioIOChanged (bool busNumberChanged, bool channelNumChang
  44. processorLayoutsChanged();
  45. }
  46. +#if ! JUCE_AUDIOPROCESSOR_NO_GUI
  47. //==============================================================================
  48. void AudioProcessor::editorBeingDeleted (AudioProcessorEditor* const editor) noexcept
  49. {
  50. @@ -840,6 +843,7 @@ AudioProcessorEditor* AudioProcessor::createEditorIfNeeded()
  51. return ed;
  52. }
  53. +#endif
  54. //==============================================================================
  55. void AudioProcessor::getCurrentProgramStateInformation (juce::MemoryBlock& destData)
  56. diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessor.h b/modules/juce_audio_processors/processors/juce_AudioProcessor.h
  57. index dbad562ef..ab9e8a7d6 100644
  58. --- a/modules/juce_audio_processors/processors/juce_AudioProcessor.h
  59. +++ b/modules/juce_audio_processors/processors/juce_AudioProcessor.h
  60. @@ -926,6 +926,7 @@ public:
  61. */
  62. virtual void setNonRealtime (bool isNonRealtime) noexcept;
  63. + #if ! JUCE_AUDIOPROCESSOR_NO_GUI
  64. //==============================================================================
  65. /** Creates the processor's GUI.
  66. @@ -975,6 +976,7 @@ public:
  67. This may call createEditor() internally to create the component.
  68. */
  69. AudioProcessorEditor* createEditorIfNeeded();
  70. + #endif
  71. //==============================================================================
  72. /** Returns the default number of steps for a parameter.
  73. @@ -1191,9 +1193,11 @@ public:
  74. virtual CurveData getResponseCurve (CurveData::Type /*curveType*/) const { return CurveData(); }
  75. + #if ! JUCE_AUDIOPROCESSOR_NO_GUI
  76. //==============================================================================
  77. /** Not for public use - this is called before deleting an editor component. */
  78. void editorBeingDeleted (AudioProcessorEditor*) noexcept;
  79. + #endif
  80. /** Flags to indicate the type of plugin context in which a processor is being used. */
  81. enum WrapperType
  82. @@ -1468,7 +1472,9 @@ private:
  83. //==============================================================================
  84. Array<AudioProcessorListener*> listeners;
  85. + #if ! JUCE_AUDIOPROCESSOR_NO_GUI
  86. Component::SafePointer<AudioProcessorEditor> activeEditor;
  87. + #endif
  88. double currentSampleRate = 0;
  89. int blockSize = 0, latencySamples = 0;
  90. bool suspended = false;
  91. diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.cpp b/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.cpp
  92. index fd8c35879..070f82554 100644
  93. --- a/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.cpp
  94. +++ b/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.cpp
  95. @@ -1496,8 +1496,10 @@ bool AudioProcessorGraph::AudioGraphIOProcessor::producesMidi() const
  96. bool AudioProcessorGraph::AudioGraphIOProcessor::isInput() const noexcept { return type == audioInputNode || type == midiInputNode; }
  97. bool AudioProcessorGraph::AudioGraphIOProcessor::isOutput() const noexcept { return type == audioOutputNode || type == midiOutputNode; }
  98. +#if ! JUCE_AUDIOPROCESSOR_NO_GUI
  99. bool AudioProcessorGraph::AudioGraphIOProcessor::hasEditor() const { return false; }
  100. AudioProcessorEditor* AudioProcessorGraph::AudioGraphIOProcessor::createEditor() { return nullptr; }
  101. +#endif
  102. int AudioProcessorGraph::AudioGraphIOProcessor::getNumPrograms() { return 0; }
  103. int AudioProcessorGraph::AudioGraphIOProcessor::getCurrentProgram() { return 0; }
  104. diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.h b/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.h
  105. index a16e35df0..8d2221f1e 100644
  106. --- a/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.h
  107. +++ b/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.h
  108. @@ -355,8 +355,10 @@ public:
  109. bool acceptsMidi() const override;
  110. bool producesMidi() const override;
  111. + #if ! JUCE_AUDIOPROCESSOR_NO_GUI
  112. bool hasEditor() const override;
  113. AudioProcessorEditor* createEditor() override;
  114. + #endif
  115. int getNumPrograms() override;
  116. int getCurrentProgram() override;
  117. @@ -392,8 +394,10 @@ public:
  118. bool acceptsMidi() const override;
  119. bool producesMidi() const override;
  120. + #if ! JUCE_AUDIOPROCESSOR_NO_GUI
  121. bool hasEditor() const override { return false; }
  122. AudioProcessorEditor* createEditor() override { return nullptr; }
  123. + #endif
  124. int getNumPrograms() override { return 0; }
  125. int getCurrentProgram() override { return 0; }
  126. void setCurrentProgram (int) override { }