Browse Source

Update juce6 for nogui/embed fixes

Signed-off-by: falkTX <falktx@falktx.com>
roth-air
falkTX 2 years ago
parent
commit
2697c5df77
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
10 changed files with 41 additions and 12 deletions
  1. +3
    -1
      libs/juce6/source/modules/juce_audio_plugin_client/LV2/juce_LV2_Wrapper.cpp
  2. +3
    -3
      libs/juce6/source/modules/juce_audio_plugin_client/LV2/juce_LV2_Wrapper_Exporter.cpp
  3. +13
    -4
      libs/juce6/source/modules/juce_audio_processors/juce_audio_processors.cpp
  4. +11
    -3
      libs/juce6/source/modules/juce_audio_processors/juce_audio_processors.h
  5. +2
    -0
      libs/juce6/source/modules/juce_audio_processors/processors/juce_AudioProcessor.h
  6. +2
    -0
      libs/juce6/source/modules/juce_audio_processors/utilities/juce_AudioProcessorValueTreeState.cpp
  7. +2
    -0
      libs/juce6/source/modules/juce_audio_processors/utilities/juce_AudioProcessorValueTreeState.h
  8. +2
    -0
      libs/juce6/source/modules/juce_audio_processors/utilities/juce_PluginHostType.cpp
  9. +2
    -0
      libs/juce6/source/modules/juce_audio_processors/utilities/juce_PluginHostType.h
  10. +1
    -1
      libs/juce6/source/modules/juce_gui_basics/juce_gui_basics.h

+ 3
- 1
libs/juce6/source/modules/juce_audio_plugin_client/LV2/juce_LV2_Wrapper.cpp View File

@@ -71,7 +71,9 @@
#define JUCE_LV2_STATE_STRING_URI "urn:juce:stateString"
#define JUCE_LV2_STATE_BINARY_URI "urn:juce:stateBinary"

#define JUCE_GUI_BASICS_INCLUDE_XHEADERS 1
#if ! JUCE_AUDIOPROCESSOR_NO_GUI
#define JUCE_GUI_BASICS_INCLUDE_XHEADERS 1
#endif

#include "../utility/juce_IncludeModuleHeaders.h"



+ 3
- 3
libs/juce6/source/modules/juce_audio_plugin_client/LV2/juce_LV2_Wrapper_Exporter.cpp View File

@@ -174,7 +174,7 @@ static const String makePluginFile (AudioProcessor* const filter, const int maxN

// Plugin
text += "<" + pluginURI + ">\n";
text += " a " + getPluginType() + " ;\n";
text += " a " + getPluginType() + " , doap:Project ;\n";
text += " lv2:requiredFeature <" LV2_BUF_SIZE__boundedBlockLength "> ,\n";
#if JucePlugin_WantsLV2FixedBlockSize
text += " <" LV2_BUF_SIZE__fixedBlockLength "> ,\n";
@@ -193,8 +193,8 @@ static const String makePluginFile (AudioProcessor* const filter, const int maxN
const uint32_t version = JucePlugin_VersionCode;

const uint32_t majorVersion = (version & 0xFF0000) >> 16;
const uint32_t microVersion = (version & 0x00FF00) >> 8;
/* */ uint32_t minorVersion = (version & 0x0000FF) >> 0;
/* */ uint32_t minorVersion = (version & 0x00FF00) >> 8;
const uint32_t microVersion = (version & 0x0000FF) >> 0;

// NOTE: LV2 ignores 'major' version and says 0 for minor is pre-release/unstable.
if (majorVersion > 0)


+ 13
- 4
libs/juce6/source/modules/juce_audio_processors/juce_audio_processors.cpp View File

@@ -243,9 +243,11 @@ struct AutoResizingNSViewComponentWithParent : public AutoResizingNSViewCompone
#include "format_types/juce_VSTPluginFormat.cpp"
#include "format_types/juce_VST3PluginFormat.cpp"
#include "format_types/juce_AudioUnitPluginFormat.mm"
#include "scanning/juce_KnownPluginList.cpp"
#include "scanning/juce_PluginDirectoryScanner.cpp"
#include "scanning/juce_PluginListComponent.cpp"
#if ! JUCE_AUDIOPROCESSOR_NO_GUI
#include "scanning/juce_KnownPluginList.cpp"
#include "scanning/juce_PluginDirectoryScanner.cpp"
#include "scanning/juce_PluginListComponent.cpp"
#endif
#include "processors/juce_AudioProcessorParameterGroup.cpp"
#include "utilities/juce_AudioProcessorParameterWithID.cpp"
#include "utilities/juce_RangedAudioParameter.cpp"
@@ -253,6 +255,13 @@ struct AutoResizingNSViewComponentWithParent : public AutoResizingNSViewCompone
#include "utilities/juce_AudioParameterInt.cpp"
#include "utilities/juce_AudioParameterBool.cpp"
#include "utilities/juce_AudioParameterChoice.cpp"
#include "utilities/juce_ParameterAttachments.cpp"
#if ! JUCE_AUDIOPROCESSOR_NO_GUI
#include "utilities/juce_ParameterAttachments.cpp"
#endif
#include "utilities/juce_AudioProcessorValueTreeState.cpp"
#include "utilities/juce_PluginHostType.cpp"
#if JUCE_AUDIOPROCESSOR_NO_GUI
// commonly used classes in DSP code
namespace juce { Colour::Colour(juce::uint32) noexcept {} }
#endif

+ 11
- 3
libs/juce6/source/modules/juce_audio_processors/juce_audio_processors.h View File

@@ -115,7 +115,11 @@
#endif
//==============================================================================
#include "processors/juce_AudioProcessorEditor.h"
#if JUCE_AUDIOPROCESSOR_NO_GUI
namespace juce { class AudioProcessor; }
#else
#include "processors/juce_AudioProcessorEditor.h"
#endif
#include "processors/juce_AudioProcessorListener.h"
#include "processors/juce_AudioProcessorParameter.h"
#include "processors/juce_AudioProcessorParameterGroup.h"
@@ -123,7 +127,9 @@
#include "processors/juce_PluginDescription.h"
#include "processors/juce_AudioPluginInstance.h"
#include "processors/juce_AudioProcessorGraph.h"
#include "processors/juce_GenericAudioProcessorEditor.h"
#if ! JUCE_AUDIOPROCESSOR_NO_GUI
#include "processors/juce_GenericAudioProcessorEditor.h"
#endif
#include "format/juce_AudioPluginFormat.h"
#include "format/juce_AudioPluginFormatManager.h"
#include "scanning/juce_KnownPluginList.h"
@@ -140,6 +146,8 @@
#include "utilities/juce_AudioParameterInt.h"
#include "utilities/juce_AudioParameterBool.h"
#include "utilities/juce_AudioParameterChoice.h"
#include "utilities/juce_ParameterAttachments.h"
#if ! JUCE_AUDIOPROCESSOR_NO_GUI
#include "utilities/juce_ParameterAttachments.h"
#endif
#include "utilities/juce_AudioProcessorValueTreeState.h"
#include "utilities/juce_PluginHostType.h"

+ 2
- 0
libs/juce6/source/modules/juce_audio_processors/processors/juce_AudioProcessor.h View File

@@ -1228,7 +1228,9 @@ public:
struct TrackProperties
{
String name; // The name of the track - this will be empty if the track name is not known
#if ! JUCE_AUDIOPROCESSOR_NO_GUI
Colour colour; // The colour of the track - this will be transparentBlack if the colour is not known
#endif
// other properties may be added in the future
};


+ 2
- 0
libs/juce6/source/modules/juce_audio_processors/utilities/juce_AudioProcessorValueTreeState.cpp View File

@@ -484,6 +484,7 @@ void AudioProcessorValueTreeState::timerCallback()
}
//==============================================================================
#if ! JUCE_AUDIOPROCESSOR_NO_GUI
template <typename Attachment, typename Control>
std::unique_ptr<Attachment> makeAttachment (const AudioProcessorValueTreeState& stateToUse,
const String& parameterID,
@@ -516,6 +517,7 @@ AudioProcessorValueTreeState::ButtonAttachment::ButtonAttachment (AudioProcessor
: attachment (makeAttachment<ButtonParameterAttachment> (stateToUse, parameterID, button))
{
}
#endif
//==============================================================================
//==============================================================================


+ 2
- 0
libs/juce6/source/modules/juce_audio_processors/utilities/juce_AudioProcessorValueTreeState.h View File

@@ -429,6 +429,7 @@ public:
friend class AudioProcessorValueTreeState::ParameterAdapter;
};
#if ! JUCE_AUDIOPROCESSOR_NO_GUI
//==============================================================================
/** An object of this class maintains a connection between a Slider and a parameter
in an AudioProcessorValueTreeState.
@@ -496,6 +497,7 @@ public:
std::unique_ptr<ButtonParameterAttachment> attachment;
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ButtonAttachment)
};
#endif
private:
//==============================================================================


+ 2
- 0
libs/juce6/source/modules/juce_audio_processors/utilities/juce_PluginHostType.cpp View File

@@ -70,6 +70,7 @@ bool PluginHostType::isInAAXAudioSuite (AudioProcessor& processor)
return false;
}
#if ! JUCE_AUDIOPROCESSOR_NO_GUI
Image PluginHostType::getHostIcon (int size) const
{
ignoreUnused (size);
@@ -86,6 +87,7 @@ Image PluginHostType::getHostIcon (int size) const
return Image();
}
#endif
const char* PluginHostType::getHostDescription() const noexcept
{


+ 2
- 0
libs/juce6/source/modules/juce_audio_processors/utilities/juce_PluginHostType.h View File

@@ -202,8 +202,10 @@ public:
bool isInterAppAudioConnected() const;
/** Switches to the host application when Inter-App Audio is used on iOS. */
void switchToHostApplication() const;
#if ! JUCE_AUDIOPROCESSOR_NO_GUI
/** Gets the host app's icon when Inter-App Audio is used on iOS. */
Image getHostIcon (int size) const;
#endif
//==============================================================================
/** Returns the complete absolute path of the host application executable. */


+ 1
- 1
libs/juce6/source/modules/juce_gui_basics/juce_gui_basics.h View File

@@ -84,7 +84,7 @@
the availability of Xinerama is queried during runtime.
*/
#ifndef JUCE_USE_XINERAMA
#define JUCE_USE_XINERAMA 1
#define JUCE_USE_XINERAMA 0
#endif
/** Config: JUCE_USE_XSHM


Loading…
Cancel
Save