DISTRHO
/
DISTRHO-Ports
mirror of https://github.com/DISTRHO/DISTRHO-Ports
1
0
Fork 0
Code Releases 5 Activity
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.
604 Commits
6 Branches
885MB
Tree: 6c5203be57
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '6c5203be57'
${ noResults }
DISTRHO-Ports/libs/juce-current/patches/04_vst2-interface.patch

2840 lines
153KB
Raw Blame History 

  1. diff --git a/extras/Build/CMake/JUCEUtils.cmake b/extras/Build/CMake/JUCEUtils.cmake

  2. index a2de746b1..b78171e9e 100644

  3. --- a/extras/Build/CMake/JUCEUtils.cmake

  4. +++ b/extras/Build/CMake/JUCEUtils.cmake

  5. @@ -1162,9 +1162,7 @@ function(_juce_configure_plugin_targets target)

  6.          endif()

  7.      endforeach()

  8.  

  9. -    if((VST IN_LIST active_formats) AND (NOT TARGET juce_vst2_sdk))

  10. -        message(FATAL_ERROR "Use juce_set_vst2_sdk_path to set up the VST sdk before adding VST targets")

  11. -    elseif((AAX IN_LIST active_formats) AND (NOT TARGET juce_aax_sdk))

  12. +    if((AAX IN_LIST active_formats) AND (NOT TARGET juce_aax_sdk))

  13.          message(FATAL_ERROR "Use juce_set_aax_sdk_path to set up the AAX sdk before adding AAX targets")

  14.      endif()

  15.  

  16. diff --git a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp

  17. index 61433739f..652665434 100644

  18. --- a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp

  19. +++ b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp

  20. @@ -72,14 +72,7 @@ JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4458)

  21.  

  22.  namespace Vst2

  23.  {

  24. -// If the following files cannot be found then you are probably trying to build

  25. -// a VST2 plug-in or a VST2-compatible VST3 plug-in. To do this you must have a

  26. -// VST2 SDK in your header search paths or use the "VST (Legacy) SDK Folder"

  27. -// field in the Projucer. The VST2 SDK can be obtained from the

  28. -// vstsdk3610_11_06_2018_build_37 (or older) VST3 SDK or JUCE version 5.3.2. You

  29. -// also need a VST2 license from Steinberg to distribute VST2 plug-ins.

  30. -#include "pluginterfaces/vst2.x/aeffect.h"

  31. -#include "pluginterfaces/vst2.x/aeffectx.h"

  32. +#include "../../juce_audio_processors/format_types/juce_VSTInterface.h"

  33.  }

  34.  

  35.  JUCE_END_IGNORE_WARNINGS_MSVC

  36. @@ -90,7 +83,6 @@ JUCE_END_IGNORE_WARNINGS_GCC_LIKE

  37.   #pragma pack (push, 8)

  38.  #endif

  39.  

  40. -#define JUCE_VSTINTERFACE_H_INCLUDED 1

  41.  #define JUCE_GUI_BASICS_INCLUDE_XHEADERS 1

  42.  

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

  44. @@ -240,7 +232,7 @@ private:

  45.  

  46.  public:

  47.      //==============================================================================

  48. -    JuceVSTWrapper (Vst2::audioMasterCallback cb, std::unique_ptr<AudioProcessor> af)

  49. +    JuceVSTWrapper (Vst2::VstHostCallback cb, std::unique_ptr<AudioProcessor> af)

  50.         : hostCallback (cb),

  51.           processor (std::move (af))

  52.      {

  53. @@ -271,41 +263,41 @@ public:

  54.          juceParameters.update (*processor, false);

  55.  

  56.          memset (&vstEffect, 0, sizeof (vstEffect));

  57. -        vstEffect.magic = 0x56737450 /* 'VstP' */;

  58. -        vstEffect.dispatcher = (Vst2::AEffectDispatcherProc) dispatcherCB;

  59. -        vstEffect.process = nullptr;

  60. -        vstEffect.setParameter = (Vst2::AEffectSetParameterProc) setParameterCB;

  61. -        vstEffect.getParameter = (Vst2::AEffectGetParameterProc) getParameterCB;

  62. +        vstEffect.interfaceIdentifier = Vst2::juceVstInterfaceIdentifier;

  63. +        vstEffect.dispatchFunction = dispatcherCB;

  64. +        vstEffect.processAudioFunction = nullptr;

  65. +        vstEffect.setParameterValueFunction = setParameterCB;

  66. +        vstEffect.getParameterValueFunction = getParameterCB;

  67.          vstEffect.numPrograms = jmax (1, processor->getNumPrograms());

  68. -        vstEffect.numParams = juceParameters.getNumParameters();

  69. -        vstEffect.numInputs = maxNumInChannels;

  70. -        vstEffect.numOutputs = maxNumOutChannels;

  71. -        vstEffect.initialDelay = processor->getLatencySamples();

  72. -        vstEffect.object = this;

  73. -        vstEffect.uniqueID = JucePlugin_VSTUniqueID;

  74. +        vstEffect.numParameters = juceParameters.getNumParameters();

  75. +        vstEffect.numInputChannels = maxNumInChannels;

  76. +        vstEffect.numOutputChannels = maxNumOutChannels;

  77. +        vstEffect.latency = processor->getLatencySamples();

  78. +        vstEffect.effectPointer = this;

  79. +        vstEffect.plugInIdentifier = JucePlugin_VSTUniqueID;

  80.  

  81.         #ifdef JucePlugin_VSTChunkStructureVersion

  82. -        vstEffect.version = JucePlugin_VSTChunkStructureVersion;

  83. +        vstEffect.plugInVersion = JucePlugin_VSTChunkStructureVersion;

  84.         #else

  85. -        vstEffect.version = JucePlugin_VersionCode;

  86. +        vstEffect.plugInVersion = JucePlugin_VersionCode;

  87.         #endif

  88.  

  89. -        vstEffect.processReplacing = (Vst2::AEffectProcessProc) processReplacingCB;

  90. -        vstEffect.processDoubleReplacing = (Vst2::AEffectProcessDoubleProc) processDoubleReplacingCB;

  91. +        vstEffect.processAudioInplaceFunction = processReplacingCB;

  92. +        vstEffect.processDoubleAudioInplaceFunction = processDoubleReplacingCB;

  93.  

  94. -        vstEffect.flags |= Vst2::effFlagsHasEditor;

  95. +        vstEffect.flags |= Vst2::vstEffectFlagHasEditor;

  96.  

  97. -        vstEffect.flags |= Vst2::effFlagsCanReplacing;

  98. +        vstEffect.flags |= Vst2::vstEffectFlagInplaceAudio;

  99.          if (processor->supportsDoublePrecisionProcessing())

  100. -            vstEffect.flags |= Vst2::effFlagsCanDoubleReplacing;

  101. +            vstEffect.flags |= Vst2::vstEffectFlagInplaceDoubleAudio;

  102.  

  103. -        vstEffect.flags |= Vst2::effFlagsProgramChunks;

  104. +        vstEffect.flags |= Vst2::vstEffectFlagDataInChunks;

  105.  

  106.         #if JucePlugin_IsSynth

  107. -        vstEffect.flags |= Vst2::effFlagsIsSynth;

  108. +        vstEffect.flags |= Vst2::vstEffectFlagIsSynth;

  109.         #else

  110.          if (processor->getTailLengthSeconds() == 0.0)

  111. -            vstEffect.flags |= Vst2::effFlagsNoSoundInStop;

  112. +            vstEffect.flags |= 512;

  113.         #endif

  114.  

  115.         #if JUCE_WINDOWS

  116. @@ -339,7 +331,7 @@ public:

  117.          }

  118.      }

  119.  

  120. -    Vst2::AEffect* getAEffect() noexcept    { return &vstEffect; }

  121. +    Vst2::VstEffectInterface* getAEffect() noexcept    { return &vstEffect; }

  122.  

  123.      template <typename FloatType>

  124.      void internalProcessReplacing (FloatType** inputs, FloatType** outputs,

  125. @@ -482,7 +474,7 @@ public:

  126.  

  127.              // Send VST events to the host.

  128.              if (hostCallback != nullptr)

  129. -                hostCallback (&vstEffect, Vst2::audioMasterProcessEvents, 0, 0, outgoingEvents.events, 0);

  130. +                hostCallback (&vstEffect, Vst2::hostOpcodePreAudioProcessingEvents, 0, 0, outgoingEvents.events, 0);

  131.             #elif JUCE_DEBUG

  132.              /*  This assertion is caused when you've added some events to the

  133.                  midiMessages array in your processBlock() method, which usually means

  134. @@ -511,7 +503,7 @@ public:

  135.          internalProcessReplacing (inputs, outputs, sampleFrames, floatTempBuffers);

  136.      }

  137.  

  138. -    static void processReplacingCB (Vst2::AEffect* vstInterface, float** inputs, float** outputs, int32 sampleFrames)

  139. +    static void processReplacingCB (Vst2::VstEffectInterface* vstInterface, float** inputs, float** outputs, int32 sampleFrames)

  140.      {

  141.          getWrapper (vstInterface)->processReplacing (inputs, outputs, sampleFrames);

  142.      }

  143. @@ -522,7 +514,7 @@ public:

  144.          internalProcessReplacing (inputs, outputs, sampleFrames, doubleTempBuffers);

  145.      }

  146.  

  147. -    static void processDoubleReplacingCB (Vst2::AEffect* vstInterface, double** inputs, double** outputs, int32 sampleFrames)

  148. +    static void processDoubleReplacingCB (Vst2::VstEffectInterface* vstInterface, double** inputs, double** outputs, int32 sampleFrames)

  149.      {

  150.          getWrapper (vstInterface)->processDoubleReplacing (inputs, outputs, sampleFrames);

  151.      }

  152. @@ -534,7 +526,7 @@ public:

  153.          {

  154.              isProcessing = true;

  155.  

  156. -            auto numInAndOutChannels = static_cast<size_t> (vstEffect.numInputs + vstEffect.numOutputs);

  157. +            auto numInAndOutChannels = static_cast<size_t> (vstEffect.numInputChannels + vstEffect.numOutputChannels);

  158.              floatTempBuffers .channels.calloc (numInAndOutChannels);

  159.              doubleTempBuffers.channels.calloc (numInAndOutChannels);

  160.  

  161. @@ -553,16 +545,16 @@ public:

  162.              midiEvents.ensureSize (2048);

  163.              midiEvents.clear();

  164.  

  165. -            vstEffect.initialDelay = processor->getLatencySamples();

  166. +            vstEffect.latency = processor->getLatencySamples();

  167.  

  168.              /** If this plug-in is a synth or it can receive midi events we need to tell the

  169.                  host that we want midi. In the SDK this method is marked as deprecated, but

  170.                  some hosts rely on this behaviour.

  171.              */

  172. -            if (vstEffect.flags & Vst2::effFlagsIsSynth || JucePlugin_WantsMidiInput || JucePlugin_IsMidiEffect)

  173. +            if (vstEffect.flags & Vst2::vstEffectFlagIsSynth || JucePlugin_WantsMidiInput || JucePlugin_IsMidiEffect)

  174.              {

  175.                  if (hostCallback != nullptr)

  176. -                    hostCallback (&vstEffect, Vst2::audioMasterWantMidi, 0, 1, nullptr, 0);

  177. +                    hostCallback (&vstEffect, Vst2::hostOpcodePlugInWantsMidi, 0, 1, nullptr, 0);

  178.              }

  179.  

  180.              if (getHostType().isAbletonLive()

  181. @@ -576,7 +568,7 @@ public:

  182.                  hostCmd.commandSize = sizeof (int);

  183.                  hostCmd.flags = AbletonLiveHostSpecific::KCantBeSuspended;

  184.  

  185. -                hostCallback (&vstEffect, Vst2::audioMasterVendorSpecific, 0, 0, &hostCmd, 0.0f);

  186. +                hostCallback (&vstEffect, Vst2::hostOpcodeManufacturerSpecific, 0, 0, &hostCmd, 0.0f);

  187.              }

  188.  

  189.             #if JucePlugin_ProducesMidiOutput || JucePlugin_IsMidiEffect

  190. @@ -602,17 +594,17 @@ public:

  191.  

  192.      void updateCallbackContextInfo()

  193.      {

  194. -        const Vst2::VstTimeInfo* ti = nullptr;

  195. +        const Vst2::VstTimingInformation* ti = nullptr;

  196.  

  197.          if (hostCallback != nullptr)

  198.          {

  199. -            int32 flags = Vst2::kVstPpqPosValid  | Vst2::kVstTempoValid

  200. -                          | Vst2::kVstBarsValid    | Vst2::kVstCyclePosValid

  201. -                          | Vst2::kVstTimeSigValid | Vst2::kVstSmpteValid

  202. -                          | Vst2::kVstClockValid   | Vst2::kVstNanosValid;

  203. +            int32 flags = Vst2::vstTimingInfoFlagMusicalPositionValid    | Vst2::vstTimingInfoFlagTempoValid

  204. +                          | Vst2::vstTimingInfoFlagLastBarPositionValid  | Vst2::vstTimingInfoFlagLoopPositionValid

  205. +                          | Vst2::vstTimingInfoFlagTimeSignatureValid    | Vst2::vstTimingInfoFlagSmpteValid

  206. +                          | Vst2::vstTimingInfoFlagNearestClockValid     | Vst2::vstTimingInfoFlagNanosecondsValid;

  207.  

  208. -            auto result = hostCallback (&vstEffect, Vst2::audioMasterGetTime, 0, flags, nullptr, 0);

  209. -            ti = reinterpret_cast<Vst2::VstTimeInfo*> (result);

  210. +            auto result = hostCallback (&vstEffect, Vst2::hostOpcodeGetTimingInfo, 0, flags, nullptr, 0);

  211. +            ti = reinterpret_cast<Vst2::VstTimingInformation*> (result);

  212.          }

  213.  

  214.          if (ti == nullptr || ti->sampleRate <= 0)

  215. @@ -622,12 +614,12 @@ public:

  216.          }

  217.  

  218.          auto& info = currentPosition.emplace();

  219. -        info.bpm = (ti->flags & Vst2::kVstTempoValid) != 0 ? ti->tempo : 0.0;

  220. +        info.bpm = (ti->flags & Vst2::vstTimingInfoFlagTempoValid) != 0 ? ti->tempoBPM : 0.0;

  221.  

  222. -        if ((ti->flags & Vst2::kVstTimeSigValid) != 0)

  223. +        if ((ti->flags & Vst2::vstTimingInfoFlagTimeSignatureValid) != 0)

  224.          {

  225. -            info.timeSigNumerator   = ti->timeSigNumerator;

  226. -            info.timeSigDenominator = ti->timeSigDenominator;

  227. +            info.timeSigNumerator   = ti->timeSignatureNumerator;

  228. +            info.timeSigDenominator = ti->timeSignatureDenominator;

  229.          }

  230.          else

  231.          {

  232. @@ -635,36 +627,36 @@ public:

  233.              info.timeSigDenominator = 4;

  234.          }

  235.  

  236. -        info.timeInSamples = (int64) (ti->samplePos + 0.5);

  237. -        info.timeInSeconds = ti->samplePos / ti->sampleRate;

  238. -        info.ppqPosition = (ti->flags & Vst2::kVstPpqPosValid) != 0 ? ti->ppqPos : 0.0;

  239. -        info.ppqPositionOfLastBarStart = (ti->flags & Vst2::kVstBarsValid) != 0 ? ti->barStartPos : 0.0;

  240. +        info.timeInSamples = (int64) (ti->samplePosition + 0.5);

  241. +        info.timeInSeconds = ti->samplePosition / ti->sampleRate;

  242. +        info.ppqPosition = (ti->flags & Vst2::vstTimingInfoFlagMusicalPositionValid) != 0 ? ti->musicalPosition : 0.0;

  243. +        info.ppqPositionOfLastBarStart = (ti->flags & Vst2::vstTimingInfoFlagLastBarPositionValid) != 0 ? ti->lastBarPosition : 0.0;

  244.  

  245.          std::tie (info.frameRate, info.editOriginTime) = [ti]

  246.          {

  247. -            if ((ti->flags & Vst2::kVstSmpteValid) == 0)

  248. +            if ((ti->flags & Vst2::vstTimingInfoFlagSmpteValid) == 0)

  249.                  return std::make_tuple (FrameRate(), 0.0);

  250.  

  251.              const auto rate = [&]

  252.              {

  253. -                switch (ti->smpteFrameRate)

  254. +                switch (ti->smpteRate)

  255.                  {

  256. -                    case Vst2::kVstSmpte24fps:          return FrameRate().withBaseRate (24);

  257. -                    case Vst2::kVstSmpte239fps:         return FrameRate().withBaseRate (24).withPullDown();

  258. +                    case Vst2::vstSmpteRateFps24:          return FrameRate().withBaseRate (24);

  259. +                    case Vst2::vstSmpteRateFps239:         return FrameRate().withBaseRate (24).withPullDown();

  260.  

  261. -                    case Vst2::kVstSmpte25fps:          return FrameRate().withBaseRate (25);

  262. -                    case Vst2::kVstSmpte249fps:         return FrameRate().withBaseRate (25).withPullDown();

  263. +                    case Vst2::vstSmpteRateFps25:          return FrameRate().withBaseRate (25);

  264. +                    case Vst2::vstSmpteRateFps249:         return FrameRate().withBaseRate (25).withPullDown();

  265.  

  266. -                    case Vst2::kVstSmpte30fps:          return FrameRate().withBaseRate (30);

  267. -                    case Vst2::kVstSmpte30dfps:         return FrameRate().withBaseRate (30).withDrop();

  268. -                    case Vst2::kVstSmpte2997fps:        return FrameRate().withBaseRate (30).withPullDown();

  269. -                    case Vst2::kVstSmpte2997dfps:       return FrameRate().withBaseRate (30).withPullDown().withDrop();

  270. +                    case Vst2::vstSmpteRateFps30:          return FrameRate().withBaseRate (30);

  271. +                    case Vst2::vstSmpteRateFps30drop:      return FrameRate().withBaseRate (30).withDrop();

  272. +                    case Vst2::vstSmpteRateFps2997:        return FrameRate().withBaseRate (30).withPullDown();

  273. +                    case Vst2::vstSmpteRateFps2997drop:    return FrameRate().withBaseRate (30).withPullDown().withDrop();

  274.  

  275. -                    case Vst2::kVstSmpte60fps:          return FrameRate().withBaseRate (60);

  276. -                    case Vst2::kVstSmpte599fps:         return FrameRate().withBaseRate (60).withPullDown();

  277. +                    case Vst2::vstSmpteRateFps60:          return FrameRate().withBaseRate (60);

  278. +                    case Vst2::vstSmpteRateFps599:         return FrameRate().withBaseRate (60).withPullDown();

  279.  

  280. -                    case Vst2::kVstSmpteFilm16mm:

  281. -                    case Vst2::kVstSmpteFilm35mm:       return FrameRate().withBaseRate (24);

  282. +                    case Vst2::vstSmpteRate16mmFilm:

  283. +                    case Vst2::vstSmpteRate35mmFilm:       return FrameRate().withBaseRate (24);

  284.                  }

  285.  

  286.                  return FrameRate();

  287. @@ -674,14 +666,14 @@ public:

  288.              return std::make_tuple (rate, effectiveRate != 0.0 ? ti->smpteOffset / (80.0 * effectiveRate) : 0.0);

  289.          }();

  290.  

  291. -        info.isRecording = (ti->flags & Vst2::kVstTransportRecording) != 0;

  292. -        info.isPlaying   = (ti->flags & (Vst2::kVstTransportRecording | Vst2::kVstTransportPlaying)) != 0;

  293. -        info.isLooping   = (ti->flags & Vst2::kVstTransportCycleActive) != 0;

  294. +        info.isRecording = (ti->flags & Vst2::vstTimingInfoFlagCurrentlyRecording) != 0;

  295. +        info.isPlaying   = (ti->flags & (Vst2::vstTimingInfoFlagCurrentlyRecording | Vst2::vstTimingInfoFlagCurrentlyPlaying)) != 0;

  296. +        info.isLooping   = (ti->flags & Vst2::vstTimingInfoFlagLoopActive) != 0;

  297.  

  298. -        if ((ti->flags & Vst2::kVstCyclePosValid) != 0)

  299. +        if ((ti->flags & Vst2::vstTimingInfoFlagLoopPositionValid) != 0)

  300.          {

  301. -            info.ppqLoopStart = ti->cycleStartPos;

  302. -            info.ppqLoopEnd   = ti->cycleEndPos;

  303. +            info.ppqLoopStart = ti->loopStartPosition;

  304. +            info.ppqLoopEnd   = ti->loopEndPosition;

  305.          }

  306.          else

  307.          {

  308. @@ -689,9 +681,9 @@ public:

  309.              info.ppqLoopEnd = 0;

  310.          }

  311.  

  312. -        if ((ti->flags & Vst2::kVstNanosValid) != 0)

  313. +        if ((ti->flags & Vst2::vstTimingInfoFlagNanosecondsValid) != 0)

  314.          {

  315. -            const auto nanos = (uint64_t) ti->nanoSeconds;

  316. +            const auto nanos = (uint64_t) ti->systemTimeNanoseconds;

  317.              processor->setHostTimeNanos (&nanos);

  318.          }

  319.      }

  320. @@ -715,7 +707,7 @@ public:

  321.          return 0.0f;

  322.      }

  323.  

  324. -    static float getParameterCB (Vst2::AEffect* vstInterface, int32 index)

  325. +    static float getParameterCB (Vst2::VstEffectInterface* vstInterface, int32 index)

  326.      {

  327.          return getWrapper (vstInterface)->getParameter (index);

  328.      }

  329. @@ -726,7 +718,7 @@ public:

  330.              setValueAndNotifyIfChanged (*param, value);

  331.      }

  332.  

  333. -    static void setParameterCB (Vst2::AEffect* vstInterface, int32 index, float value)

  334. +    static void setParameterCB (Vst2::VstEffectInterface* vstInterface, int32 index, float value)

  335.      {

  336.          getWrapper (vstInterface)->setParameter (index, value);

  337.      }

  338. @@ -740,19 +732,19 @@ public:

  339.          }

  340.  

  341.          if (hostCallback != nullptr)

  342. -            hostCallback (&vstEffect, Vst2::audioMasterAutomate, index, 0, nullptr, newValue);

  343. +            hostCallback (&vstEffect, Vst2::hostOpcodeParameterChanged, index, 0, nullptr, newValue);

  344.      }

  345.  

  346.      void audioProcessorParameterChangeGestureBegin (AudioProcessor*, int index) override

  347.      {

  348.          if (hostCallback != nullptr)

  349. -            hostCallback (&vstEffect, Vst2::audioMasterBeginEdit, index, 0, nullptr, 0);

  350. +            hostCallback (&vstEffect, Vst2::hostOpcodeParameterChangeGestureBegin, index, 0, nullptr, 0);

  351.      }

  352.  

  353.      void audioProcessorParameterChangeGestureEnd (AudioProcessor*, int index) override

  354.      {

  355.          if (hostCallback != nullptr)

  356. -            hostCallback (&vstEffect, Vst2::audioMasterEndEdit, index, 0, nullptr, 0);

  357. +            hostCallback (&vstEffect, Vst2::hostOpcodeParameterChangeGestureEnd, index, 0, nullptr, 0);

  358.      }

  359.  

  360.      void parameterValueChanged (int, float newValue) override

  361. @@ -768,7 +760,7 @@ public:

  362.          hostChangeUpdater.update (details);

  363.      }

  364.  

  365. -    bool getPinProperties (Vst2::VstPinProperties& properties, bool direction, int index) const

  366. +    bool getPinProperties (Vst2::VstPinInfo& properties, bool direction, int index) const

  367.      {

  368.          if (processor->isMidiEffect())

  369.              return false;

  370. @@ -777,9 +769,9 @@ public:

  371.  

  372.          // fill with default

  373.          properties.flags = 0;

  374. -        properties.label[0] = 0;

  375. -        properties.shortLabel[0] = 0;

  376. -        properties.arrangementType = Vst2::kSpeakerArrEmpty;

  377. +        properties.text[0] = 0;

  378. +        properties.shortText[0] = 0;

  379. +        properties.configurationType = Vst2::vstSpeakerConfigTypeEmpty;

  380.  

  381.          if ((channelIdx = processor->getOffsetInBusBufferForAbsoluteChannelIndex (direction, index, busIdx)) >= 0)

  382.          {

  383. @@ -787,8 +779,8 @@ public:

  384.              auto& channelSet = bus.getCurrentLayout();

  385.              auto channelType = channelSet.getTypeOfChannel (channelIdx);

  386.  

  387. -            properties.flags = Vst2::kVstPinIsActive | Vst2::kVstPinUseSpeaker;

  388. -            properties.arrangementType = SpeakerMappings::channelSetToVstArrangementType (channelSet);

  389. +            properties.flags = Vst2::vstPinInfoFlagIsActive | Vst2::vstPinInfoFlagValid;

  390. +            properties.configurationType = SpeakerMappings::channelSetToVstArrangementType (channelSet);

  391.              String label = bus.getName();

  392.  

  393.             #ifdef JucePlugin_PreferredChannelConfigurations

  394. @@ -798,8 +790,8 @@ public:

  395.                  label += " " + AudioChannelSet::getAbbreviatedChannelTypeName (channelType);

  396.             #endif

  397.  

  398. -            label.copyToUTF8 (properties.label, (size_t) (Vst2::kVstMaxLabelLen + 1));

  399. -            label.copyToUTF8 (properties.shortLabel, (size_t) (Vst2::kVstMaxShortLabelLen + 1));

  400. +            label.copyToUTF8 (properties.text, (size_t) (Vst2::vstMaxParameterOrPinLabelLength + 1));

  401. +            label.copyToUTF8 (properties.shortText, (size_t) (Vst2::vstMaxParameterOrPinShortLabelLength + 1));

  402.  

  403.              if (channelType == AudioChannelSet::left

  404.                  || channelType == AudioChannelSet::leftSurround

  405. @@ -809,7 +801,7 @@ public:

  406.                  || channelType == AudioChannelSet::topRearLeft

  407.                  || channelType == AudioChannelSet::leftSurroundRear

  408.                  || channelType == AudioChannelSet::wideLeft)

  409. -                properties.flags |= Vst2::kVstPinIsStereo;

  410. +                properties.flags |= Vst2::vstPinInfoFlagIsStereo;

  411.  

  412.              return true;

  413.          }

  414. @@ -844,15 +836,15 @@ public:

  415.  

  416.      void setHasEditorFlag (bool shouldSetHasEditor)

  417.      {

  418. -        auto hasEditor = (vstEffect.flags & Vst2::effFlagsHasEditor) != 0;

  419. +        auto hasEditor = (vstEffect.flags & Vst2::vstEffectFlagHasEditor) != 0;

  420.  

  421.          if (shouldSetHasEditor == hasEditor)

  422.              return;

  423.  

  424.          if (shouldSetHasEditor)

  425. -            vstEffect.flags |= Vst2::effFlagsHasEditor;

  426. +            vstEffect.flags |= Vst2::vstEffectFlagHasEditor;

  427.          else

  428. -            vstEffect.flags &= ~Vst2::effFlagsHasEditor;

  429. +            vstEffect.flags &= ~Vst2::vstEffectFlagHasEditor;

  430.      }

  431.  

  432.      void createEditorComp()

  433. @@ -919,60 +911,60 @@ public:

  434.  

  435.          switch (opCode)

  436.          {

  437. -            case Vst2::effOpen:                     return handleOpen (args);

  438. -            case Vst2::effClose:                    return handleClose (args);

  439. -            case Vst2::effSetProgram:               return handleSetCurrentProgram (args);

  440. -            case Vst2::effGetProgram:               return handleGetCurrentProgram (args);

  441. -            case Vst2::effSetProgramName:           return handleSetCurrentProgramName (args);

  442. -            case Vst2::effGetProgramName:           return handleGetCurrentProgramName (args);

  443. -            case Vst2::effGetParamLabel:            return handleGetParameterLabel (args);

  444. -            case Vst2::effGetParamDisplay:          return handleGetParameterText (args);

  445. -            case Vst2::effGetParamName:             return handleGetParameterName (args);

  446. -            case Vst2::effSetSampleRate:            return handleSetSampleRate (args);

  447. -            case Vst2::effSetBlockSize:             return handleSetBlockSize (args);

  448. -            case Vst2::effMainsChanged:             return handleResumeSuspend (args);

  449. -            case Vst2::effEditGetRect:              return handleGetEditorBounds (args);

  450. -            case Vst2::effEditOpen:                 return handleOpenEditor (args);

  451. -            case Vst2::effEditClose:                return handleCloseEditor (args);

  452. -            case Vst2::effIdentify:                 return (pointer_sized_int) ByteOrder::bigEndianInt ("NvEf");

  453. -            case Vst2::effGetChunk:                 return handleGetData (args);

  454. -            case Vst2::effSetChunk:                 return handleSetData (args);

  455. -            case Vst2::effProcessEvents:            return handlePreAudioProcessingEvents (args);

  456. -            case Vst2::effCanBeAutomated:           return handleIsParameterAutomatable (args);

  457. -            case Vst2::effString2Parameter:         return handleParameterValueForText (args);

  458. -            case Vst2::effGetProgramNameIndexed:    return handleGetProgramName (args);

  459. -            case Vst2::effGetInputProperties:       return handleGetInputPinProperties (args);

  460. -            case Vst2::effGetOutputProperties:      return handleGetOutputPinProperties (args);

  461. -            case Vst2::effGetPlugCategory:          return handleGetPlugInCategory (args);

  462. -            case Vst2::effSetSpeakerArrangement:    return handleSetSpeakerConfiguration (args);

  463. -            case Vst2::effSetBypass:                return handleSetBypass (args);

  464. -            case Vst2::effGetEffectName:            return handleGetPlugInName (args);

  465. -            case Vst2::effGetProductString:         return handleGetPlugInName (args);

  466. -            case Vst2::effGetVendorString:          return handleGetManufacturerName (args);

  467. -            case Vst2::effGetVendorVersion:         return handleGetManufacturerVersion (args);

  468. -            case Vst2::effVendorSpecific:           return handleManufacturerSpecific (args);

  469. -            case Vst2::effCanDo:                    return handleCanPlugInDo (args);

  470. -            case Vst2::effGetTailSize:              return handleGetTailSize (args);

  471. -            case Vst2::effKeysRequired:             return handleKeyboardFocusRequired (args);

  472. -            case Vst2::effGetVstVersion:            return handleGetVstInterfaceVersion (args);

  473. -            case Vst2::effGetCurrentMidiProgram:    return handleGetCurrentMidiProgram (args);

  474. -            case Vst2::effGetSpeakerArrangement:    return handleGetSpeakerConfiguration (args);

  475. -            case Vst2::effSetTotalSampleToProcess:  return handleSetNumberOfSamplesToProcess (args);

  476. -            case Vst2::effSetProcessPrecision:      return handleSetSampleFloatType (args);

  477. -            case Vst2::effGetNumMidiInputChannels:  return handleGetNumMidiInputChannels();

  478. -            case Vst2::effGetNumMidiOutputChannels: return handleGetNumMidiOutputChannels();

  479. -            case Vst2::effEditIdle:                 return handleEditIdle();

  480. -            default:                                return 0;

  481. -        }

  482. -    }

  483. -

  484. -    static pointer_sized_int dispatcherCB (Vst2::AEffect* vstInterface, int32 opCode, int32 index,

  485. +            case Vst2::plugInOpcodeOpen:                        return handleOpen (args);

  486. +            case Vst2::plugInOpcodeClose:                       return handleClose (args);

  487. +            case Vst2::plugInOpcodeSetCurrentProgram:           return handleSetCurrentProgram (args);

  488. +            case Vst2::plugInOpcodeGetCurrentProgram:           return handleGetCurrentProgram (args);

  489. +            case Vst2::plugInOpcodeSetCurrentProgramName:       return handleSetCurrentProgramName (args);

  490. +            case Vst2::plugInOpcodeGetCurrentProgramName:       return handleGetCurrentProgramName (args);

  491. +            case Vst2::plugInOpcodeGetParameterLabel:           return handleGetParameterLabel (args);

  492. +            case Vst2::plugInOpcodeGetParameterText:            return handleGetParameterText (args);

  493. +            case Vst2::plugInOpcodeGetParameterName:            return handleGetParameterName (args);

  494. +            case Vst2::plugInOpcodeSetSampleRate:               return handleSetSampleRate (args);

  495. +            case Vst2::plugInOpcodeSetBlockSize:                return handleSetBlockSize (args);

  496. +            case Vst2::plugInOpcodeResumeSuspend:               return handleResumeSuspend (args);

  497. +            case Vst2::plugInOpcodeGetEditorBounds:             return handleGetEditorBounds (args);

  498. +            case Vst2::plugInOpcodeOpenEditor:                  return handleOpenEditor (args);

  499. +            case Vst2::plugInOpcodeCloseEditor:                 return handleCloseEditor (args);

  500. +            case Vst2::plugInOpcodeIdentify:                    return (pointer_sized_int) ByteOrder::bigEndianInt ("NvEf");

  501. +            case Vst2::plugInOpcodeGetData:                     return handleGetData (args);

  502. +            case Vst2::plugInOpcodeSetData:                     return handleSetData (args);

  503. +            case Vst2::plugInOpcodePreAudioProcessingEvents:    return handlePreAudioProcessingEvents (args);

  504. +            case Vst2::plugInOpcodeIsParameterAutomatable:      return handleIsParameterAutomatable (args);

  505. +            case Vst2::plugInOpcodeParameterValueForText:       return handleParameterValueForText (args);

  506. +            case Vst2::plugInOpcodeGetProgramName:              return handleGetProgramName (args);

  507. +            case Vst2::plugInOpcodeGetInputPinProperties:       return handleGetInputPinProperties (args);

  508. +            case Vst2::plugInOpcodeGetOutputPinProperties:      return handleGetOutputPinProperties (args);

  509. +            case Vst2::plugInOpcodeGetPlugInCategory:           return handleGetPlugInCategory (args);

  510. +            case Vst2::plugInOpcodeSetSpeakerConfiguration:     return handleSetSpeakerConfiguration (args);

  511. +            case Vst2::plugInOpcodeSetBypass:                   return handleSetBypass (args);

  512. +            case Vst2::plugInOpcodeGetPlugInName:               return handleGetPlugInName (args);

  513. +            case Vst2::plugInOpcodeGetManufacturerProductName:  return handleGetPlugInName (args);

  514. +            case Vst2::plugInOpcodeGetManufacturerName:         return handleGetManufacturerName (args);

  515. +            case Vst2::plugInOpcodeGetManufacturerVersion:      return handleGetManufacturerVersion (args);

  516. +            case Vst2::plugInOpcodeManufacturerSpecific:        return handleManufacturerSpecific (args);

  517. +            case Vst2::plugInOpcodeCanPlugInDo:                 return handleCanPlugInDo (args);

  518. +            case Vst2::plugInOpcodeGetTailSize:                 return handleGetTailSize (args);

  519. +            case Vst2::plugInOpcodeKeyboardFocusRequired:       return handleKeyboardFocusRequired (args);

  520. +            case Vst2::plugInOpcodeGetVstInterfaceVersion:      return handleGetVstInterfaceVersion (args);

  521. +            case Vst2::plugInOpcodeGetCurrentMidiProgram:       return handleGetCurrentMidiProgram (args);

  522. +            case Vst2::plugInOpcodeGetSpeakerArrangement:       return handleGetSpeakerConfiguration (args);

  523. +            case Vst2::plugInOpcodeSetNumberOfSamplesToProcess: return handleSetNumberOfSamplesToProcess (args);

  524. +            case Vst2::plugInOpcodeSetSampleFloatType:          return handleSetSampleFloatType (args);

  525. +            case Vst2::pluginOpcodeGetNumMidiInputChannels:     return handleGetNumMidiInputChannels();

  526. +            case Vst2::pluginOpcodeGetNumMidiOutputChannels:    return handleGetNumMidiOutputChannels();

  527. +            case Vst2::plugInOpcodeEditorIdle:                  return handleEditIdle();

  528. +            default:                                            return 0;

  529. +        }

  530. +    }

  531. +

  532. +    static pointer_sized_int dispatcherCB (Vst2::VstEffectInterface* vstInterface, int32 opCode, int32 index,

  533.                                             pointer_sized_int value, void* ptr, float opt)

  534.      {

  535.          auto* wrapper = getWrapper (vstInterface);

  536.          VstOpCodeArguments args = { index, value, ptr, opt };

  537.  

  538. -        if (opCode == Vst2::effClose)

  539. +        if (opCode == Vst2::plugInOpcodeClose)

  540.          {

  541.              wrapper->dispatcher (opCode, args);

  542.              delete wrapper;

  543. @@ -1023,7 +1015,7 @@ public:

  544.              g.fillAll (Colours::black);

  545.          }

  546.  

  547. -        void getEditorBounds (Vst2::ERect& bounds)

  548. +        void getEditorBounds (Vst2::VstEditorBounds& bounds)

  549.          {

  550.              auto editorBounds = getSizeToContainChild();

  551.              bounds = convertToHostBounds ({ 0, 0, (int16) editorBounds.getHeight(), (int16) editorBounds.getWidth() });

  552. @@ -1136,20 +1128,20 @@ public:

  553.          void resizeHostWindow (juce::Rectangle<int> bounds)

  554.          {

  555.              auto rect = convertToHostBounds ({ 0, 0, (int16) bounds.getHeight(), (int16) bounds.getWidth() });

  556. -            const auto newWidth = rect.right - rect.left;

  557. -            const auto newHeight = rect.bottom - rect.top;

  558. +            const auto newWidth = rect.rightmost - rect.leftmost;

  559. +            const auto newHeight = rect.lower - rect.upper;

  560.  

  561.              bool sizeWasSuccessful = false;

  562.  

  563.              if (auto host = wrapper.hostCallback)

  564.              {

  565. -                auto status = host (wrapper.getAEffect(), Vst2::audioMasterCanDo, 0, 0, const_cast<char*> ("sizeWindow"), 0);

  566. +                auto status = host (wrapper.getAEffect(), Vst2::hostOpcodeCanHostDo, 0, 0, const_cast<char*> ("sizeWindow"), 0);

  567.  

  568.                  if (status == (pointer_sized_int) 1 || getHostType().isAbletonLive())

  569.                  {

  570.                      const ScopedValueSetter<bool> resizingParentSetter (resizingParent, true);

  571.  

  572. -                    sizeWasSuccessful = (host (wrapper.getAEffect(), Vst2::audioMasterSizeWindow,

  573. +                    sizeWasSuccessful = (host (wrapper.getAEffect(), Vst2::hostOpcodeWindowSize,

  574.                                                 newWidth, newHeight, nullptr, 0) != 0);

  575.                  }

  576.              }

  577. @@ -1212,8 +1204,8 @@ public:

  578.  

  579.             #if JUCE_LINUX || JUCE_BSD

  580.              X11Symbols::getInstance()->xResizeWindow (display, (Window) getWindowHandle(),

  581. -                                                      static_cast<unsigned int> (rect.right - rect.left),

  582. -                                                      static_cast<unsigned int> (rect.bottom - rect.top));

  583. +                                                      static_cast<unsigned int> (rect.rightmost - rect.leftmost),

  584. +                                                      static_cast<unsigned int> (rect.lower - rect.upper));

  585.             #endif

  586.          }

  587.  

  588. @@ -1305,17 +1297,17 @@ public:

  589.          }

  590.  

  591.          //==============================================================================

  592. -        static Vst2::ERect convertToHostBounds (const Vst2::ERect& rect)

  593. +        static Vst2::VstEditorBounds convertToHostBounds (const Vst2::VstEditorBounds& rect)

  594.          {

  595.              auto desktopScale = Desktop::getInstance().getGlobalScaleFactor();

  596.  

  597.              if (approximatelyEqual (desktopScale, 1.0f))

  598.                  return rect;

  599.  

  600. -            return { (int16) roundToInt (rect.top    * desktopScale),

  601. -                     (int16) roundToInt (rect.left   * desktopScale),

  602. -                     (int16) roundToInt (rect.bottom * desktopScale),

  603. -                     (int16) roundToInt (rect.right  * desktopScale) };

  604. +            return { (int16) roundToInt (rect.upper      * desktopScale),

  605. +                     (int16) roundToInt (rect.leftmost   * desktopScale),

  606. +                     (int16) roundToInt (rect.lower      * desktopScale),

  607. +                     (int16) roundToInt (rect.rightmost  * desktopScale)};

  608.          }

  609.  

  610.          //==============================================================================

  611. @@ -1355,7 +1347,7 @@ private:

  612.          {

  613.              if (details.latencyChanged)

  614.              {

  615. -                owner.vstEffect.initialDelay = owner.processor->getLatencySamples();

  616. +                owner.vstEffect.latency = owner.processor->getLatencySamples();

  617.                  callbackBits |= audioMasterIOChangedBit;

  618.              }

  619.  

  620. @@ -1374,12 +1366,12 @@ private:

  621.              {

  622.                  struct FlagPair

  623.                  {

  624. -                    Vst2::AudioMasterOpcodesX opcode;

  625. +                    int32 opcode;

  626.                      int bit;

  627.                  };

  628.  

  629. -                constexpr FlagPair pairs[] { { Vst2::audioMasterUpdateDisplay, audioMasterUpdateDisplayBit },

  630. -                                             { Vst2::audioMasterIOChanged,     audioMasterIOChangedBit } };

  631. +                constexpr FlagPair pairs[] { { Vst2::hostOpcodeUpdateView, audioMasterUpdateDisplayBit },

  632. +                                             { Vst2::hostOpcodeIOModified, audioMasterIOChangedBit } };

  633.  

  634.                  for (const auto& pair : pairs)

  635.                      if ((callbacksToFire & pair.bit) != 0)

  636. @@ -1394,12 +1386,12 @@ private:

  637.          std::atomic<int> callbackBits { 0 };

  638.      };

  639.  

  640. -    static JuceVSTWrapper* getWrapper (Vst2::AEffect* v) noexcept  { return static_cast<JuceVSTWrapper*> (v->object); }

  641. +    static JuceVSTWrapper* getWrapper (Vst2::VstEffectInterface* v) noexcept  { return static_cast<JuceVSTWrapper*> (v->effectPointer); }

  642.  

  643.      bool isProcessLevelOffline()

  644.      {

  645.          return hostCallback != nullptr

  646. -                && (int32) hostCallback (&vstEffect, Vst2::audioMasterGetCurrentProcessLevel, 0, 0, nullptr, 0) == 4;

  647. +                && (int32) hostCallback (&vstEffect, Vst2::hostOpcodeGetCurrentAudioProcessingLevel, 0, 0, nullptr, 0) == 4;

  648.      }

  649.  

  650.      static int32 convertHexVersionToDecimal (const unsigned int hexVersion)

  651. @@ -1476,8 +1468,8 @@ private:

  652.          tmpBuffers.release();

  653.  

  654.          if (processor != nullptr)

  655. -            tmpBuffers.tempChannels.insertMultiple (0, nullptr, vstEffect.numInputs

  656. -                                                                 + vstEffect.numOutputs);

  657. +            tmpBuffers.tempChannels.insertMultiple (0, nullptr, vstEffect.numInputChannels

  658. +                                                                 + vstEffect.numOutputChannels);

  659.      }

  660.  

  661.      void deleteTempChannels()

  662. @@ -1641,7 +1633,7 @@ private:

  663.          if (editorComp != nullptr)

  664.          {

  665.              editorComp->getEditorBounds (editorRect);

  666. -            *((Vst2::ERect**) args.ptr) = &editorRect;

  667. +            *((Vst2::VstEditorBounds**) args.ptr) = &editorRect;

  668.              return (pointer_sized_int) &editorRect;

  669.          }

  670.  

  671. @@ -1745,7 +1737,7 @@ private:

  672.      pointer_sized_int handlePreAudioProcessingEvents (VstOpCodeArguments args)

  673.      {

  674.         #if JucePlugin_WantsMidiInput || JucePlugin_IsMidiEffect

  675. -        VSTMidiEventList::addEventsToMidiBuffer ((Vst2::VstEvents*) args.ptr, midiEvents);

  676. +        VSTMidiEventList::addEventsToMidiBuffer ((Vst2::VstEventBlock*) args.ptr, midiEvents);

  677.          return 1;

  678.         #else

  679.          ignoreUnused (args);

  680. @@ -1791,12 +1783,12 @@ private:

  681.  

  682.      pointer_sized_int handleGetInputPinProperties (VstOpCodeArguments args)

  683.      {

  684. -        return (processor != nullptr && getPinProperties (*(Vst2::VstPinProperties*) args.ptr, true, args.index)) ? 1 : 0;

  685. +        return (processor != nullptr && getPinProperties (*(Vst2::VstPinInfo*) args.ptr, true, args.index)) ? 1 : 0;

  686.      }

  687.  

  688.      pointer_sized_int handleGetOutputPinProperties (VstOpCodeArguments args)

  689.      {

  690. -        return (processor != nullptr && getPinProperties (*(Vst2::VstPinProperties*) args.ptr, false, args.index)) ? 1 : 0;

  691. +        return (processor != nullptr && getPinProperties (*(Vst2::VstPinInfo*) args.ptr, false, args.index)) ? 1 : 0;

  692.      }

  693.  

  694.      pointer_sized_int handleGetPlugInCategory (VstOpCodeArguments)

  695. @@ -1806,8 +1798,8 @@ private:

  696.  

  697.      pointer_sized_int handleSetSpeakerConfiguration (VstOpCodeArguments args)

  698.      {

  699. -        auto* pluginInput  = reinterpret_cast<Vst2::VstSpeakerArrangement*> (args.value);

  700. -        auto* pluginOutput = reinterpret_cast<Vst2::VstSpeakerArrangement*> (args.ptr);

  701. +        auto* pluginInput  = reinterpret_cast<Vst2::VstSpeakerConfiguration*> (args.value);

  702. +        auto* pluginOutput = reinterpret_cast<Vst2::VstSpeakerConfiguration*> (args.ptr);

  703.  

  704.          if (processor->isMidiEffect())

  705.              return 0;

  706. @@ -1818,29 +1810,29 @@ private:

  707.          if (pluginInput != nullptr && pluginInput->type >= 0)

  708.          {

  709.              // inconsistent request?

  710. -            if (SpeakerMappings::vstArrangementTypeToChannelSet (*pluginInput).size() != pluginInput->numChannels)

  711. +            if (SpeakerMappings::vstArrangementTypeToChannelSet (*pluginInput).size() != pluginInput->numberOfChannels)

  712.                  return 0;

  713.          }

  714.  

  715.          if (pluginOutput != nullptr && pluginOutput->type >= 0)

  716.          {

  717.              // inconsistent request?

  718. -            if (SpeakerMappings::vstArrangementTypeToChannelSet (*pluginOutput).size() != pluginOutput->numChannels)

  719. +            if (SpeakerMappings::vstArrangementTypeToChannelSet (*pluginOutput).size() != pluginOutput->numberOfChannels)

  720.                  return 0;

  721.          }

  722.  

  723. -        if (pluginInput != nullptr  && pluginInput->numChannels  > 0 && numIns  == 0)

  724. +        if (pluginInput != nullptr  && pluginInput->numberOfChannels  > 0 && numIns  == 0)

  725.              return 0;

  726.  

  727. -        if (pluginOutput != nullptr && pluginOutput->numChannels > 0 && numOuts == 0)

  728. +        if (pluginOutput != nullptr && pluginOutput->numberOfChannels > 0 && numOuts == 0)

  729.              return 0;

  730.  

  731.          auto layouts = processor->getBusesLayout();

  732.  

  733. -        if (pluginInput != nullptr && pluginInput-> numChannels >= 0 && numIns  > 0)

  734. +        if (pluginInput != nullptr && pluginInput-> numberOfChannels >= 0 && numIns  > 0)

  735.              layouts.getChannelSet (true,  0) = SpeakerMappings::vstArrangementTypeToChannelSet (*pluginInput);

  736.  

  737. -        if (pluginOutput != nullptr && pluginOutput->numChannels >= 0 && numOuts > 0)

  738. +        if (pluginOutput != nullptr && pluginOutput->numberOfChannels >= 0 && numOuts > 0)

  739.              layouts.getChannelSet (false, 0) = SpeakerMappings::vstArrangementTypeToChannelSet (*pluginOutput);

  740.  

  741.         #ifdef JucePlugin_PreferredChannelConfigurations

  742. @@ -1888,7 +1880,7 @@ private:

  743.               && args.value == (int32) ByteOrder::bigEndianInt ("AeCs"))

  744.              return handleSetContentScaleFactor (args.opt);

  745.  

  746. -        if (args.index == Vst2::effGetParamDisplay)

  747. +        if (args.index == Vst2::plugInOpcodeGetParameterText)

  748.              return handleCockosGetParameterText (args.value, args.ptr, args.opt);

  749.  

  750.          if (auto callbackHandler = dynamic_cast<VSTCallbackHandler*> (processor.get()))

  751. @@ -1985,7 +1977,7 @@ private:

  752.  

  753.      pointer_sized_int handleGetVstInterfaceVersion (VstOpCodeArguments)

  754.      {

  755. -        return kVstVersion;

  756. +        return Vst2::juceVstInterfaceVersion;

  757.      }

  758.  

  759.      pointer_sized_int handleGetCurrentMidiProgram (VstOpCodeArguments)

  760. @@ -1995,8 +1987,8 @@ private:

  761.  

  762.      pointer_sized_int handleGetSpeakerConfiguration (VstOpCodeArguments args)

  763.      {

  764. -        auto** pluginInput  = reinterpret_cast<Vst2::VstSpeakerArrangement**> (args.value);

  765. -        auto** pluginOutput = reinterpret_cast<Vst2::VstSpeakerArrangement**> (args.ptr);

  766. +        auto** pluginInput  = reinterpret_cast<Vst2::VstSpeakerConfiguration**> (args.value);

  767. +        auto** pluginOutput = reinterpret_cast<Vst2::VstSpeakerConfiguration**> (args.ptr);

  768.  

  769.          if (pluginHasSidechainsOrAuxs() || processor->isMidiEffect())

  770.              return false;

  771. @@ -2004,10 +1996,10 @@ private:

  772.          auto inputLayout  = processor->getChannelLayoutOfBus (true,  0);

  773.          auto outputLayout = processor->getChannelLayoutOfBus (false,  0);

  774.  

  775. -        auto speakerBaseSize = sizeof (Vst2::VstSpeakerArrangement) - (sizeof (Vst2::VstSpeakerProperties) * 8);

  776. +        auto speakerBaseSize = sizeof (Vst2::VstSpeakerConfiguration) - (sizeof (Vst2::VstIndividualSpeakerInfo) * 8);

  777.  

  778. -        cachedInArrangement .malloc (speakerBaseSize + (static_cast<std::size_t> (inputLayout. size()) * sizeof (Vst2::VstSpeakerArrangement)), 1);

  779. -        cachedOutArrangement.malloc (speakerBaseSize + (static_cast<std::size_t> (outputLayout.size()) * sizeof (Vst2::VstSpeakerArrangement)), 1);

  780. +        cachedInArrangement .malloc (speakerBaseSize + (static_cast<std::size_t> (inputLayout. size()) * sizeof (Vst2::VstSpeakerConfiguration)), 1);

  781. +        cachedOutArrangement.malloc (speakerBaseSize + (static_cast<std::size_t> (outputLayout.size()) * sizeof (Vst2::VstSpeakerConfiguration)), 1);

  782.  

  783.          *pluginInput  = cachedInArrangement. getData();

  784.          *pluginOutput = cachedOutArrangement.getData();

  785. @@ -2029,7 +2021,7 @@ private:

  786.          {

  787.              if (processor != nullptr)

  788.              {

  789. -                processor->setProcessingPrecision ((args.value == Vst2::kVstProcessPrecision64

  790. +                processor->setProcessingPrecision ((args.value == Vst2::vstProcessingSampleTypeDouble

  791.                                                       && processor->supportsDoublePrecisionProcessing())

  792.                                                           ? AudioProcessor::doublePrecision

  793.                                                           : AudioProcessor::singlePrecision);

  794. @@ -2130,17 +2122,17 @@ private:

  795.      SharedResourcePointer<MessageThread> messageThread;

  796.     #endif

  797.  

  798. -    Vst2::audioMasterCallback hostCallback;

  799. +    Vst2::VstHostCallback hostCallback;

  800.      std::unique_ptr<AudioProcessor> processor;

  801.      double sampleRate = 44100.0;

  802.      int32 blockSize = 1024;

  803. -    Vst2::AEffect vstEffect;

  804. +    Vst2::VstEffectInterface vstEffect;

  805.      CriticalSection stateInformationLock;

  806.      juce::MemoryBlock chunkMemory;

  807.      uint32 chunkMemoryTime = 0;

  808.      float editorScaleFactor = 1.0f;

  809.      std::unique_ptr<EditorCompWrapper> editorComp;

  810. -    Vst2::ERect editorRect;

  811. +    Vst2::VstEditorBounds editorRect;

  812.      MidiBuffer midiEvents;

  813.      VSTMidiEventList outgoingEvents;

  814.      Optional<CurrentPositionInfo> currentPosition;

  815. @@ -2162,7 +2154,7 @@ private:

  816.      VstTempBuffers<double> doubleTempBuffers;

  817.      int maxNumInChannels = 0, maxNumOutChannels = 0;

  818.  

  819. -    HeapBlock<Vst2::VstSpeakerArrangement> cachedInArrangement, cachedOutArrangement;

  820. +    HeapBlock<Vst2::VstSpeakerConfiguration> cachedInArrangement, cachedOutArrangement;

  821.  

  822.      ThreadLocalValue<bool> inParameterChangedCallback;

  823.  

  824. @@ -2176,7 +2168,7 @@ private:

  825.  //==============================================================================

  826.  namespace

  827.  {

  828. -    Vst2::AEffect* pluginEntryPoint (Vst2::audioMasterCallback audioMaster)

  829. +    Vst2::VstEffectInterface* pluginEntryPoint (Vst2::VstHostCallback audioMaster)

  830.      {

  831.          JUCE_AUTORELEASEPOOL

  832.          {

  833. @@ -2188,7 +2180,7 @@ namespace

  834.  

  835.              try

  836.              {

  837. -                if (audioMaster (nullptr, Vst2::audioMasterVersion, 0, 0, nullptr, 0) != 0)

  838. +                if (audioMaster (nullptr, Vst2::hostOpcodeVstVersion, 0, 0, nullptr, 0) != 0)

  839.                  {

  840.                      std::unique_ptr<AudioProcessor> processor { createPluginFilterOfType (AudioProcessor::wrapperType_VST) };

  841.                      auto* processorPtr = processor.get();

  842. @@ -2224,8 +2216,8 @@ JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wmissing-prototypes")

  843.  // Mac startup code..

  844.  #if JUCE_MAC

  845.  

  846. -    JUCE_EXPORTED_FUNCTION Vst2::AEffect* VSTPluginMain (Vst2::audioMasterCallback audioMaster);

  847. -    JUCE_EXPORTED_FUNCTION Vst2::AEffect* VSTPluginMain (Vst2::audioMasterCallback audioMaster)

  848. +    JUCE_EXPORTED_FUNCTION Vst2::VstEffectInterface* VSTPluginMain (Vst2::VstHostCallback audioMaster);

  849. +    JUCE_EXPORTED_FUNCTION Vst2::VstEffectInterface* VSTPluginMain (Vst2::VstHostCallback audioMaster)

  850.      {

  851.          PluginHostType::jucePlugInClientCurrentWrapperType = AudioProcessor::wrapperType_VST;

  852.  

  853. @@ -2233,8 +2225,8 @@ JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wmissing-prototypes")

  854.          return pluginEntryPoint (audioMaster);

  855.      }

  856.  

  857. -    JUCE_EXPORTED_FUNCTION Vst2::AEffect* main_macho (Vst2::audioMasterCallback audioMaster);

  858. -    JUCE_EXPORTED_FUNCTION Vst2::AEffect* main_macho (Vst2::audioMasterCallback audioMaster)

  859. +    JUCE_EXPORTED_FUNCTION Vst2::VstEffectInterface* main_macho (Vst2::VstHostCallback audioMaster);

  860. +    JUCE_EXPORTED_FUNCTION Vst2::VstEffectInterface* main_macho (Vst2::VstHostCallback audioMaster)

  861.      {

  862.          PluginHostType::jucePlugInClientCurrentWrapperType = AudioProcessor::wrapperType_VST;

  863.  

  864. @@ -2246,16 +2238,16 @@ JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wmissing-prototypes")

  865.  // Linux startup code..

  866.  #elif JUCE_LINUX || JUCE_BSD

  867.  

  868. -    JUCE_EXPORTED_FUNCTION Vst2::AEffect* VSTPluginMain (Vst2::audioMasterCallback audioMaster);

  869. -    JUCE_EXPORTED_FUNCTION Vst2::AEffect* VSTPluginMain (Vst2::audioMasterCallback audioMaster)

  870. +    JUCE_EXPORTED_FUNCTION Vst2::VstEffectInterface* VSTPluginMain (Vst2::VstHostCallback audioMaster);

  871. +    JUCE_EXPORTED_FUNCTION Vst2::VstEffectInterface* VSTPluginMain (Vst2::VstHostCallback audioMaster)

  872.      {

  873.          PluginHostType::jucePlugInClientCurrentWrapperType = AudioProcessor::wrapperType_VST;

  874.  

  875.          return pluginEntryPoint (audioMaster);

  876.      }

  877.  

  878. -    JUCE_EXPORTED_FUNCTION Vst2::AEffect* main_plugin (Vst2::audioMasterCallback audioMaster) asm ("main");

  879. -    JUCE_EXPORTED_FUNCTION Vst2::AEffect* main_plugin (Vst2::audioMasterCallback audioMaster)

  880. +    JUCE_EXPORTED_FUNCTION Vst2::VstEffectInterface* main_plugin (Vst2::VstHostCallback audioMaster) asm ("main");

  881. +    JUCE_EXPORTED_FUNCTION Vst2::VstEffectInterface* main_plugin (Vst2::VstHostCallback audioMaster)

  882.      {

  883.          PluginHostType::jucePlugInClientCurrentWrapperType = AudioProcessor::wrapperType_VST;

  884.  

  885. @@ -2270,7 +2262,7 @@ JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wmissing-prototypes")

  886.  // Win32 startup code..

  887.  #else

  888.  

  889. -    extern "C" __declspec (dllexport) Vst2::AEffect* VSTPluginMain (Vst2::audioMasterCallback audioMaster)

  890. +    extern "C" __declspec (dllexport) Vst2::VstEffectInterface* VSTPluginMain (Vst2::VstHostCallback audioMaster)

  891.      {

  892.          PluginHostType::jucePlugInClientCurrentWrapperType = AudioProcessor::wrapperType_VST;

  893.  

  894. @@ -2278,7 +2270,7 @@ JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wmissing-prototypes")

  895.      }

  896.  

  897.     #if ! defined (JUCE_64BIT) && JUCE_MSVC // (can't compile this on win64, but it's not needed anyway with VST2.4)

  898. -    extern "C" __declspec (dllexport) int main (Vst2::audioMasterCallback audioMaster)

  899. +    extern "C" __declspec (dllexport) int main (Vst2::VstHostCallback audioMaster)

  900.      {

  901.          PluginHostType::jucePlugInClientCurrentWrapperType = AudioProcessor::wrapperType_VST;

  902.  

  903. diff --git a/modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp b/modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp

  904. index d6528c217..e463e10ec 100644

  905. --- a/modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp

  906. +++ b/modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp

  907. @@ -58,8 +58,7 @@ JUCE_BEGIN_NO_SANITIZE ("vptr")

  908.  

  909.   namespace Vst2

  910.   {

  911. - struct AEffect;

  912. - #include "pluginterfaces/vst2.x/vstfxstore.h"

  913. + #include "../../juce_audio_processors/format_types/juce_VSTInterface.h"

  914.   }

  915.  

  916.  #endif

  917. @@ -2516,16 +2515,16 @@ public:

  918.  

  919.      bool loadVST2CcnKBlock (const char* data, int size)

  920.      {

  921. -        auto* bank = reinterpret_cast<const Vst2::fxBank*> (data);

  922. +        auto* bank = reinterpret_cast<const Vst2::vst2FxBank*> (data);

  923.  

  924. -        jassert (ByteOrder::bigEndianInt ("CcnK") == htonl ((uint32) bank->chunkMagic));

  925. -        jassert (ByteOrder::bigEndianInt ("FBCh") == htonl ((uint32) bank->fxMagic));

  926. -        jassert (htonl ((uint32) bank->version) == 1 || htonl ((uint32) bank->version) == 2);

  927. +        jassert (ByteOrder::bigEndianInt ("CcnK") == htonl ((uint32) bank->magic1));

  928. +        jassert (ByteOrder::bigEndianInt ("FBCh") == htonl ((uint32) bank->magic2));

  929. +        jassert (htonl ((uint32) bank->version1) == 1 || htonl ((uint32) bank->version1) == 2);

  930.          jassert (JucePlugin_VSTUniqueID == htonl ((uint32) bank->fxID));

  931.  

  932. -        setStateInformation (bank->content.data.chunk,

  933. -                             jmin ((int) (size - (bank->content.data.chunk - data)),

  934. -                                   (int) htonl ((uint32) bank->content.data.size)));

  935. +        setStateInformation (bank->chunk,

  936. +                             jmin ((int) (size - (bank->chunk - data)),

  937. +                                   (int) htonl ((uint32) bank->chunkSize)));

  938.          return true;

  939.      }

  940.  

  941. @@ -2725,16 +2724,16 @@ public:

  942.              return status;

  943.  

  944.          const int bankBlockSize = 160;

  945. -        Vst2::fxBank bank;

  946. +        Vst2::vst2FxBank bank;

  947.  

  948.          zerostruct (bank);

  949. -        bank.chunkMagic         = (int32) htonl (ByteOrder::bigEndianInt ("CcnK"));

  950. -        bank.byteSize           = (int32) htonl (bankBlockSize - 8 + (unsigned int) mem.getSize());

  951. -        bank.fxMagic            = (int32) htonl (ByteOrder::bigEndianInt ("FBCh"));

  952. -        bank.version            = (int32) htonl (2);

  953. -        bank.fxID               = (int32) htonl (JucePlugin_VSTUniqueID);

  954. -        bank.fxVersion          = (int32) htonl (JucePlugin_VersionCode);

  955. -        bank.content.data.size  = (int32) htonl ((unsigned int) mem.getSize());

  956. +        bank.magic1     = (int32) htonl (ByteOrder::bigEndianInt ("CcnK"));

  957. +        bank.size       = (int32) htonl (bankBlockSize - 8 + (unsigned int) mem.getSize());

  958. +        bank.magic2     = (int32) htonl (ByteOrder::bigEndianInt ("FBCh"));

  959. +        bank.version1   = (int32) htonl (2);

  960. +        bank.fxID       = (int32) htonl (JucePlugin_VSTUniqueID);

  961. +        bank.version2   = (int32) htonl (JucePlugin_VersionCode);

  962. +        bank.chunkSize  = (int32) htonl ((unsigned int) mem.getSize());

  963.  

  964.          status = state->write (&bank, bankBlockSize);

  965.  

  966. diff --git a/modules/juce_audio_processors/format_types/juce_VSTCommon.h b/modules/juce_audio_processors/format_types/juce_VSTCommon.h

  967. index ffa1352f1..fe7935023 100644

  968. --- a/modules/juce_audio_processors/format_types/juce_VSTCommon.h

  969. +++ b/modules/juce_audio_processors/format_types/juce_VSTCommon.h

  970. @@ -51,25 +51,25 @@ struct SpeakerMappings  : private AudioChannelSet // (inheritance only to give e

  971.  

  972.      static AudioChannelSet vstArrangementTypeToChannelSet (int32 arr, int fallbackNumChannels)

  973.      {

  974. -        if      (arr == Vst2::kSpeakerArrEmpty)        return AudioChannelSet::disabled();

  975. -        else if (arr == Vst2::kSpeakerArrMono)         return AudioChannelSet::mono();

  976. -        else if (arr == Vst2::kSpeakerArrStereo)       return AudioChannelSet::stereo();

  977. -        else if (arr == Vst2::kSpeakerArr30Cine)       return AudioChannelSet::createLCR();

  978. -        else if (arr == Vst2::kSpeakerArr30Music)      return AudioChannelSet::createLRS();

  979. -        else if (arr == Vst2::kSpeakerArr40Cine)       return AudioChannelSet::createLCRS();

  980. -        else if (arr == Vst2::kSpeakerArr50)           return AudioChannelSet::create5point0();

  981. -        else if (arr == Vst2::kSpeakerArr51)           return AudioChannelSet::create5point1();

  982. -        else if (arr == Vst2::kSpeakerArr60Cine)       return AudioChannelSet::create6point0();

  983. -        else if (arr == Vst2::kSpeakerArr61Cine)       return AudioChannelSet::create6point1();

  984. -        else if (arr == Vst2::kSpeakerArr60Music)      return AudioChannelSet::create6point0Music();

  985. -        else if (arr == Vst2::kSpeakerArr61Music)      return AudioChannelSet::create6point1Music();

  986. -        else if (arr == Vst2::kSpeakerArr70Music)      return AudioChannelSet::create7point0();

  987. -        else if (arr == Vst2::kSpeakerArr70Cine)       return AudioChannelSet::create7point0SDDS();

  988. -        else if (arr == Vst2::kSpeakerArr71Music)      return AudioChannelSet::create7point1();

  989. -        else if (arr == Vst2::kSpeakerArr71Cine)       return AudioChannelSet::create7point1SDDS();

  990. -        else if (arr == Vst2::kSpeakerArr40Music)      return AudioChannelSet::quadraphonic();

  991. -

  992. -        for (const Mapping* m = getMappings(); m->vst2 != Vst2::kSpeakerArrEmpty; ++m)

  993. +        if      (arr == Vst2::vstSpeakerConfigTypeEmpty)          return AudioChannelSet::disabled();

  994. +        else if (arr == Vst2::vstSpeakerConfigTypeMono)           return AudioChannelSet::mono();

  995. +        else if (arr == Vst2::vstSpeakerConfigTypeLR)             return AudioChannelSet::stereo();

  996. +        else if (arr == Vst2::vstSpeakerConfigTypeLRC)            return AudioChannelSet::createLCR();

  997. +        else if (arr == Vst2::vstSpeakerConfigTypeLRS)            return AudioChannelSet::createLRS();

  998. +        else if (arr == Vst2::vstSpeakerConfigTypeLRCS)           return AudioChannelSet::createLCRS();

  999. +        else if (arr == Vst2::vstSpeakerConfigTypeLRCLsRs)        return AudioChannelSet::create5point0();

  1000. +        else if (arr == Vst2::vstSpeakerConfigTypeLRCLfeLsRs)     return AudioChannelSet::create5point1();

  1001. +        else if (arr == Vst2::vstSpeakerConfigTypeLRCLsRsCs)      return AudioChannelSet::create6point0();

  1002. +        else if (arr == Vst2::vstSpeakerConfigTypeLRCLfeLsRsCs)   return AudioChannelSet::create6point1();

  1003. +        else if (arr == Vst2::vstSpeakerConfigTypeLRLsRsSlSr)     return AudioChannelSet::create6point0Music();

  1004. +        else if (arr == Vst2::vstSpeakerConfigTypeLRLfeLsRsSlSr)  return AudioChannelSet::create6point1Music();

  1005. +        else if (arr == Vst2::vstSpeakerConfigTypeLRCLsRsSlSr)    return AudioChannelSet::create7point0();

  1006. +        else if (arr == Vst2::vstSpeakerConfigTypeLRCLsRsLcRc)    return AudioChannelSet::create7point0SDDS();

  1007. +        else if (arr == Vst2::vstSpeakerConfigTypeLRCLfeLsRsSlSr) return AudioChannelSet::create7point1();

  1008. +        else if (arr == Vst2::vstSpeakerConfigTypeLRCLfeLsRsLcRc) return AudioChannelSet::create7point1SDDS();

  1009. +        else if (arr == Vst2::vstSpeakerConfigTypeLRLsRs)         return AudioChannelSet::quadraphonic();

  1010. +

  1011. +        for (const Mapping* m = getMappings(); m->vst2 != Vst2::vstSpeakerConfigTypeEmpty; ++m)

  1012.          {

  1013.              if (m->vst2 == arr)

  1014.              {

  1015. @@ -85,53 +85,53 @@ struct SpeakerMappings  : private AudioChannelSet // (inheritance only to give e

  1016.          return AudioChannelSet::discreteChannels (fallbackNumChannels);

  1017.      }

  1018.  

  1019. -    static AudioChannelSet vstArrangementTypeToChannelSet (const Vst2::VstSpeakerArrangement& arr)

  1020. +    static AudioChannelSet vstArrangementTypeToChannelSet (const Vst2::VstSpeakerConfiguration& arr)

  1021.      {

  1022. -        return vstArrangementTypeToChannelSet (arr.type, arr.numChannels);

  1023. +        return vstArrangementTypeToChannelSet (arr.type, arr.numberOfChannels);

  1024.      }

  1025.  

  1026.      static int32 channelSetToVstArrangementType (AudioChannelSet channels)

  1027.      {

  1028. -        if      (channels == AudioChannelSet::disabled())           return Vst2::kSpeakerArrEmpty;

  1029. -        else if (channels == AudioChannelSet::mono())               return Vst2::kSpeakerArrMono;

  1030. -        else if (channels == AudioChannelSet::stereo())             return Vst2::kSpeakerArrStereo;

  1031. -        else if (channels == AudioChannelSet::createLCR())          return Vst2::kSpeakerArr30Cine;

  1032. -        else if (channels == AudioChannelSet::createLRS())          return Vst2::kSpeakerArr30Music;

  1033. -        else if (channels == AudioChannelSet::createLCRS())         return Vst2::kSpeakerArr40Cine;

  1034. -        else if (channels == AudioChannelSet::create5point0())      return Vst2::kSpeakerArr50;

  1035. -        else if (channels == AudioChannelSet::create5point1())      return Vst2::kSpeakerArr51;

  1036. -        else if (channels == AudioChannelSet::create6point0())      return Vst2::kSpeakerArr60Cine;

  1037. -        else if (channels == AudioChannelSet::create6point1())      return Vst2::kSpeakerArr61Cine;

  1038. -        else if (channels == AudioChannelSet::create6point0Music()) return Vst2::kSpeakerArr60Music;

  1039. -        else if (channels == AudioChannelSet::create6point1Music()) return Vst2::kSpeakerArr61Music;

  1040. -        else if (channels == AudioChannelSet::create7point0())      return Vst2::kSpeakerArr70Music;

  1041. -        else if (channels == AudioChannelSet::create7point0SDDS())  return Vst2::kSpeakerArr70Cine;

  1042. -        else if (channels == AudioChannelSet::create7point1())      return Vst2::kSpeakerArr71Music;

  1043. -        else if (channels == AudioChannelSet::create7point1SDDS())  return Vst2::kSpeakerArr71Cine;

  1044. -        else if (channels == AudioChannelSet::quadraphonic())       return Vst2::kSpeakerArr40Music;

  1045. +        if      (channels == AudioChannelSet::disabled())           return Vst2::vstSpeakerConfigTypeEmpty;

  1046. +        else if (channels == AudioChannelSet::mono())               return Vst2::vstSpeakerConfigTypeMono;

  1047. +        else if (channels == AudioChannelSet::stereo())             return Vst2::vstSpeakerConfigTypeLR;

  1048. +        else if (channels == AudioChannelSet::createLCR())          return Vst2::vstSpeakerConfigTypeLRC;

  1049. +        else if (channels == AudioChannelSet::createLRS())          return Vst2::vstSpeakerConfigTypeLRS;

  1050. +        else if (channels == AudioChannelSet::createLCRS())         return Vst2::vstSpeakerConfigTypeLRCS;

  1051. +        else if (channels == AudioChannelSet::create5point0())      return Vst2::vstSpeakerConfigTypeLRCLsRs;

  1052. +        else if (channels == AudioChannelSet::create5point1())      return Vst2::vstSpeakerConfigTypeLRCLfeLsRs;

  1053. +        else if (channels == AudioChannelSet::create6point0())      return Vst2::vstSpeakerConfigTypeLRCLsRsCs;

  1054. +        else if (channels == AudioChannelSet::create6point1())      return Vst2::vstSpeakerConfigTypeLRCLfeLsRsCs;

  1055. +        else if (channels == AudioChannelSet::create6point0Music()) return Vst2::vstSpeakerConfigTypeLRLsRsSlSr;

  1056. +        else if (channels == AudioChannelSet::create6point1Music()) return Vst2::vstSpeakerConfigTypeLRLfeLsRsSlSr;

  1057. +        else if (channels == AudioChannelSet::create7point0())      return Vst2::vstSpeakerConfigTypeLRCLsRsSlSr;

  1058. +        else if (channels == AudioChannelSet::create7point0SDDS())  return Vst2::vstSpeakerConfigTypeLRCLsRsLcRc;

  1059. +        else if (channels == AudioChannelSet::create7point1())      return Vst2::vstSpeakerConfigTypeLRCLfeLsRsSlSr;

  1060. +        else if (channels == AudioChannelSet::create7point1SDDS())  return Vst2::vstSpeakerConfigTypeLRCLfeLsRsLcRc;

  1061. +        else if (channels == AudioChannelSet::quadraphonic())       return Vst2::vstSpeakerConfigTypeLRLsRs;

  1062.  

  1063.          if (channels == AudioChannelSet::disabled())

  1064. -            return Vst2::kSpeakerArrEmpty;

  1065. +            return Vst2::vstSpeakerConfigTypeEmpty;

  1066.  

  1067.          auto chans = channels.getChannelTypes();

  1068.  

  1069. -        for (auto* m = getMappings(); m->vst2 != Vst2::kSpeakerArrEmpty; ++m)

  1070. +        for (auto* m = getMappings(); m->vst2 != Vst2::vstSpeakerConfigTypeEmpty; ++m)

  1071.              if (m->matches (chans))

  1072.                  return m->vst2;

  1073.  

  1074. -        return Vst2::kSpeakerArrUserDefined;

  1075. +        return Vst2::vstSpeakerConfigTypeUser;

  1076.      }

  1077.  

  1078. -    static void channelSetToVstArrangement (const AudioChannelSet& channels, Vst2::VstSpeakerArrangement& result)

  1079. +    static void channelSetToVstArrangement (const AudioChannelSet& channels, Vst2::VstSpeakerConfiguration& result)

  1080.      {

  1081.          result.type = channelSetToVstArrangementType (channels);

  1082. -        result.numChannels = channels.size();

  1083. +        result.numberOfChannels = channels.size();

  1084.  

  1085. -        for (int i = 0; i < result.numChannels; ++i)

  1086. +        for (int i = 0; i < result.numberOfChannels; ++i)

  1087.          {

  1088.              auto& speaker = result.speakers[i];

  1089.  

  1090. -            zeromem (&speaker, sizeof (Vst2::VstSpeakerProperties));

  1091. +            zeromem (&speaker, sizeof (Vst2::VstIndividualSpeakerInfo));

  1092.              speaker.type = getSpeakerType (channels.getTypeOfChannel (i));

  1093.          }

  1094.      }

  1095. @@ -145,7 +145,7 @@ struct SpeakerMappings  : private AudioChannelSet // (inheritance only to give e

  1096.              clear();

  1097.          }

  1098.  

  1099. -        VstSpeakerConfigurationHolder (const Vst2::VstSpeakerArrangement& vstConfig)

  1100. +        VstSpeakerConfigurationHolder (const Vst2::VstSpeakerConfiguration& vstConfig)

  1101.          {

  1102.              operator= (vstConfig);

  1103.          }

  1104. @@ -164,29 +164,29 @@ struct SpeakerMappings  : private AudioChannelSet // (inheritance only to give e

  1105.          VstSpeakerConfigurationHolder (const AudioChannelSet& channels)

  1106.          {

  1107.              auto numberOfChannels = channels.size();

  1108. -            Vst2::VstSpeakerArrangement& dst = *allocate (numberOfChannels);

  1109. +            Vst2::VstSpeakerConfiguration& dst = *allocate (numberOfChannels);

  1110.  

  1111.              dst.type = channelSetToVstArrangementType (channels);

  1112. -            dst.numChannels = numberOfChannels;

  1113. +            dst.numberOfChannels = numberOfChannels;

  1114.  

  1115. -            for (int i = 0; i < dst.numChannels; ++i)

  1116. +            for (int i = 0; i < dst.numberOfChannels; ++i)

  1117.              {

  1118. -                Vst2::VstSpeakerProperties& speaker = dst.speakers[i];

  1119. +                Vst2::VstIndividualSpeakerInfo& speaker = dst.speakers[i];

  1120.  

  1121. -                zeromem (&speaker, sizeof (Vst2::VstSpeakerProperties));

  1122. +                zeromem (&speaker, sizeof (Vst2::VstIndividualSpeakerInfo));

  1123.                  speaker.type = getSpeakerType (channels.getTypeOfChannel (i));

  1124.              }

  1125.          }

  1126.  

  1127.          VstSpeakerConfigurationHolder& operator= (const VstSpeakerConfigurationHolder& vstConfig) { return operator=(vstConfig.get()); }

  1128. -        VstSpeakerConfigurationHolder& operator= (const Vst2::VstSpeakerArrangement& vstConfig)

  1129. +        VstSpeakerConfigurationHolder& operator= (const Vst2::VstSpeakerConfiguration& vstConfig)

  1130.          {

  1131. -            Vst2::VstSpeakerArrangement& dst = *allocate (vstConfig.numChannels);

  1132. +            Vst2::VstSpeakerConfiguration& dst = *allocate (vstConfig.numberOfChannels);

  1133.  

  1134.              dst.type             = vstConfig.type;

  1135. -            dst.numChannels      = vstConfig.numChannels;

  1136. +            dst.numberOfChannels = vstConfig.numberOfChannels;

  1137.  

  1138. -            for (int i = 0; i < dst.numChannels; ++i)

  1139. +            for (int i = 0; i < dst.numberOfChannels; ++i)

  1140.                  dst.speakers[i] = vstConfig.speakers[i];

  1141.  

  1142.              return *this;

  1143. @@ -200,17 +200,17 @@ struct SpeakerMappings  : private AudioChannelSet // (inheritance only to give e

  1144.              return *this;

  1145.          }

  1146.  

  1147. -        const Vst2::VstSpeakerArrangement& get() const { return *storage.get(); }

  1148. +        const Vst2::VstSpeakerConfiguration& get() const { return *storage.get(); }

  1149.  

  1150.      private:

  1151.          JUCE_LEAK_DETECTOR (VstSpeakerConfigurationHolder)

  1152.  

  1153. -        HeapBlock<Vst2::VstSpeakerArrangement> storage;

  1154. +        HeapBlock<Vst2::VstSpeakerConfiguration> storage;

  1155.  

  1156. -        Vst2::VstSpeakerArrangement* allocate (int numChannels)

  1157. +        Vst2::VstSpeakerConfiguration* allocate (int numChannels)

  1158.          {

  1159. -            auto arrangementSize = (size_t) (jmax (8, numChannels) - 8) * sizeof (Vst2::VstSpeakerProperties)

  1160. -                                    + sizeof (Vst2::VstSpeakerArrangement);

  1161. +            auto arrangementSize = (size_t) (jmax (8, numChannels) - 8) * sizeof (Vst2::VstIndividualSpeakerInfo)

  1162. +                                    + sizeof (Vst2::VstSpeakerConfiguration);

  1163.  

  1164.              storage.malloc (1, arrangementSize);

  1165.              return storage.get();

  1166. @@ -218,10 +218,10 @@ struct SpeakerMappings  : private AudioChannelSet // (inheritance only to give e

  1167.  

  1168.          void clear()

  1169.          {

  1170. -            Vst2::VstSpeakerArrangement& dst = *allocate (0);

  1171. +            Vst2::VstSpeakerConfiguration& dst = *allocate (0);

  1172.  

  1173. -            dst.type = Vst2::kSpeakerArrEmpty;

  1174. -            dst.numChannels = 0;

  1175. +            dst.type = Vst2::vstSpeakerConfigTypeEmpty;

  1176. +            dst.numberOfChannels = 0;

  1177.          }

  1178.      };

  1179.  

  1180. @@ -229,36 +229,36 @@ struct SpeakerMappings  : private AudioChannelSet // (inheritance only to give e

  1181.      {

  1182.          static const Mapping mappings[] =

  1183.          {

  1184. -            { Vst2::kSpeakerArrMono,           { centre, unknown } },

  1185. -            { Vst2::kSpeakerArrStereo,         { left, right, unknown } },

  1186. -            { Vst2::kSpeakerArrStereoSurround, { leftSurround, rightSurround, unknown } },

  1187. -            { Vst2::kSpeakerArrStereoCenter,   { leftCentre, rightCentre, unknown } },

  1188. -            { Vst2::kSpeakerArrStereoSide,     { leftSurroundRear, rightSurroundRear, unknown } },

  1189. -            { Vst2::kSpeakerArrStereoCLfe,     { centre, LFE, unknown } },

  1190. -            { Vst2::kSpeakerArr30Cine,         { left, right, centre, unknown } },

  1191. -            { Vst2::kSpeakerArr30Music,        { left, right, surround, unknown } },

  1192. -            { Vst2::kSpeakerArr31Cine,         { left, right, centre, LFE, unknown } },

  1193. -            { Vst2::kSpeakerArr31Music,        { left, right, LFE, surround, unknown } },

  1194. -            { Vst2::kSpeakerArr40Cine,         { left, right, centre, surround, unknown } },

  1195. -            { Vst2::kSpeakerArr40Music,        { left, right, leftSurround, rightSurround, unknown } },

  1196. -            { Vst2::kSpeakerArr41Cine,         { left, right, centre, LFE, surround, unknown } },

  1197. -            { Vst2::kSpeakerArr41Music,        { left, right, LFE, leftSurround, rightSurround, unknown } },

  1198. -            { Vst2::kSpeakerArr50,             { left, right, centre, leftSurround, rightSurround, unknown } },

  1199. -            { Vst2::kSpeakerArr51,             { left, right, centre, LFE, leftSurround, rightSurround, unknown } },

  1200. -            { Vst2::kSpeakerArr60Cine,         { left, right, centre, leftSurround, rightSurround, surround, unknown } },

  1201. -            { Vst2::kSpeakerArr60Music,        { left, right, leftSurround, rightSurround, leftSurroundRear, rightSurroundRear, unknown } },

  1202. -            { Vst2::kSpeakerArr61Cine,         { left, right, centre, LFE, leftSurround, rightSurround, surround, unknown } },

  1203. -            { Vst2::kSpeakerArr61Music,        { left, right, LFE, leftSurround, rightSurround, leftSurroundRear, rightSurroundRear, unknown } },

  1204. -            { Vst2::kSpeakerArr70Cine,         { left, right, centre, leftSurround, rightSurround, topFrontLeft, topFrontRight, unknown } },

  1205. -            { Vst2::kSpeakerArr70Music,        { left, right, centre, leftSurround, rightSurround, leftSurroundRear, rightSurroundRear, unknown } },

  1206. -            { Vst2::kSpeakerArr71Cine,         { left, right, centre, LFE, leftSurround, rightSurround, topFrontLeft, topFrontRight, unknown } },

  1207. -            { Vst2::kSpeakerArr71Music,        { left, right, centre, LFE, leftSurround, rightSurround, leftSurroundRear, rightSurroundRear, unknown } },

  1208. -            { Vst2::kSpeakerArr80Cine,         { left, right, centre, leftSurround, rightSurround, topFrontLeft, topFrontRight, surround, unknown } },

  1209. -            { Vst2::kSpeakerArr80Music,        { left, right, centre, leftSurround, rightSurround, surround, leftSurroundRear, rightSurroundRear, unknown } },

  1210. -            { Vst2::kSpeakerArr81Cine,         { left, right, centre, LFE, leftSurround, rightSurround, topFrontLeft, topFrontRight, surround, unknown } },

  1211. -            { Vst2::kSpeakerArr81Music,        { left, right, centre, LFE, leftSurround, rightSurround, surround, leftSurroundRear, rightSurroundRear, unknown } },

  1212. -            { Vst2::kSpeakerArr102,            { left, right, centre, LFE, leftSurround, rightSurround, topFrontLeft, topFrontCentre, topFrontRight, topRearLeft, topRearRight, LFE2, unknown } },

  1213. -            { Vst2::kSpeakerArrEmpty,          { unknown } }

  1214. +            { Vst2::vstSpeakerConfigTypeMono,                          { centre, unknown } },

  1215. +            { Vst2::vstSpeakerConfigTypeLR,                            { left, right, unknown } },

  1216. +            { Vst2::vstSpeakerConfigTypeLsRs,                          { leftSurround, rightSurround, unknown } },

  1217. +            { Vst2::vstSpeakerConfigTypeLcRc,                          { leftCentre, rightCentre, unknown } },

  1218. +            { Vst2::vstSpeakerConfigTypeSlSr,                          { leftSurroundRear, rightSurroundRear, unknown } },

  1219. +            { Vst2::vstSpeakerConfigTypeCLfe,                          { centre, LFE, unknown } },

  1220. +            { Vst2::vstSpeakerConfigTypeLRC,                           { left, right, centre, unknown } },

  1221. +            { Vst2::vstSpeakerConfigTypeLRS,                           { left, right, surround, unknown } },

  1222. +            { Vst2::vstSpeakerConfigTypeLRCLfe,                        { left, right, centre, LFE, unknown } },

  1223. +            { Vst2::vstSpeakerConfigTypeLRLfeS,                        { left, right, LFE, surround, unknown } },

  1224. +            { Vst2::vstSpeakerConfigTypeLRCS,                          { left, right, centre, surround, unknown } },

  1225. +            { Vst2::vstSpeakerConfigTypeLRLsRs,                        { left, right, leftSurround, rightSurround, unknown } },

  1226. +            { Vst2::vstSpeakerConfigTypeLRCLfeS,                       { left, right, centre, LFE, surround, unknown } },

  1227. +            { Vst2::vstSpeakerConfigTypeLRLfeLsRs,                     { left, right, LFE, leftSurround, rightSurround, unknown } },

  1228. +            { Vst2::vstSpeakerConfigTypeLRCLsRs,                       { left, right, centre, leftSurround, rightSurround, unknown } },

  1229. +            { Vst2::vstSpeakerConfigTypeLRCLfeLsRs,                    { left, right, centre, LFE, leftSurround, rightSurround, unknown } },

  1230. +            { Vst2::vstSpeakerConfigTypeLRCLsRsCs,                     { left, right, centre, leftSurround, rightSurround, surround, unknown } },

  1231. +            { Vst2::vstSpeakerConfigTypeLRLsRsSlSr,                    { left, right, leftSurround, rightSurround, leftSurroundRear, rightSurroundRear, unknown } },

  1232. +            { Vst2::vstSpeakerConfigTypeLRCLfeLsRsCs,                  { left, right, centre, LFE, leftSurround, rightSurround, surround, unknown } },

  1233. +            { Vst2::vstSpeakerConfigTypeLRLfeLsRsSlSr,                 { left, right, LFE, leftSurround, rightSurround, leftSurroundRear, rightSurroundRear, unknown } },

  1234. +            { Vst2::vstSpeakerConfigTypeLRCLsRsLcRc,                   { left, right, centre, leftSurround, rightSurround, topFrontLeft, topFrontRight, unknown } },

  1235. +            { Vst2::vstSpeakerConfigTypeLRCLsRsSlSr,                   { left, right, centre, leftSurround, rightSurround, leftSurroundRear, rightSurroundRear, unknown } },

  1236. +            { Vst2::vstSpeakerConfigTypeLRCLfeLsRsLcRc,                { left, right, centre, LFE, leftSurround, rightSurround, topFrontLeft, topFrontRight, unknown } },

  1237. +            { Vst2::vstSpeakerConfigTypeLRCLfeLsRsSlSr,                { left, right, centre, LFE, leftSurround, rightSurround, leftSurroundRear, rightSurroundRear, unknown } },

  1238. +            { Vst2::vstSpeakerConfigTypeLRCLsRsLcRcCs,                 { left, right, centre, leftSurround, rightSurround, topFrontLeft, topFrontRight, surround, unknown } },

  1239. +            { Vst2::vstSpeakerConfigTypeLRCLsRsCsSlSr,                 { left, right, centre, leftSurround, rightSurround, surround, leftSurroundRear, rightSurroundRear, unknown } },

  1240. +            { Vst2::vstSpeakerConfigTypeLRCLfeLsRsLcRcCs,              { left, right, centre, LFE, leftSurround, rightSurround, topFrontLeft, topFrontRight, surround, unknown } },

  1241. +            { Vst2::vstSpeakerConfigTypeLRCLfeLsRsCsSlSr,              { left, right, centre, LFE, leftSurround, rightSurround, surround, leftSurroundRear, rightSurroundRear, unknown } },

  1242. +            { Vst2::vstSpeakerConfigTypeLRCLfeLsRsTflTfcTfrTrlTrrLfe2, { left, right, centre, LFE, leftSurround, rightSurround, topFrontLeft, topFrontCentre, topFrontRight, topRearLeft, topRearRight, LFE2, unknown } },

  1243. +            { Vst2::vstSpeakerConfigTypeEmpty,                         { unknown } }

  1244.          };

  1245.  

  1246.          return mappings;

  1247. @@ -268,25 +268,25 @@ struct SpeakerMappings  : private AudioChannelSet // (inheritance only to give e

  1248.      {

  1249.          static const std::map<AudioChannelSet::ChannelType, int32> speakerTypeMap =

  1250.          {

  1251. -            { AudioChannelSet::left,              Vst2::kSpeakerL },

  1252. -            { AudioChannelSet::right,             Vst2::kSpeakerR },

  1253. -            { AudioChannelSet::centre,            Vst2::kSpeakerC },

  1254. -            { AudioChannelSet::LFE,               Vst2::kSpeakerLfe },

  1255. -            { AudioChannelSet::leftSurround,      Vst2::kSpeakerLs },

  1256. -            { AudioChannelSet::rightSurround,     Vst2::kSpeakerRs },

  1257. -            { AudioChannelSet::leftCentre,        Vst2::kSpeakerLc },

  1258. -            { AudioChannelSet::rightCentre,       Vst2::kSpeakerRc },

  1259. -            { AudioChannelSet::surround,          Vst2::kSpeakerS },

  1260. -            { AudioChannelSet::leftSurroundRear,  Vst2::kSpeakerSl },

  1261. -            { AudioChannelSet::rightSurroundRear, Vst2::kSpeakerSr },

  1262. -            { AudioChannelSet::topMiddle,         Vst2::kSpeakerTm },

  1263. -            { AudioChannelSet::topFrontLeft,      Vst2::kSpeakerTfl },

  1264. -            { AudioChannelSet::topFrontCentre,    Vst2::kSpeakerTfc },

  1265. -            { AudioChannelSet::topFrontRight,     Vst2::kSpeakerTfr },

  1266. -            { AudioChannelSet::topRearLeft,       Vst2::kSpeakerTrl },

  1267. -            { AudioChannelSet::topRearCentre,     Vst2::kSpeakerTrc },

  1268. -            { AudioChannelSet::topRearRight,      Vst2::kSpeakerTrr },

  1269. -            { AudioChannelSet::LFE2,              Vst2::kSpeakerLfe2 }

  1270. +            { AudioChannelSet::left,              Vst2::vstIndividualSpeakerTypeLeft },

  1271. +            { AudioChannelSet::right,             Vst2::vstIndividualSpeakerTypeRight },

  1272. +            { AudioChannelSet::centre,            Vst2::vstIndividualSpeakerTypeCentre },

  1273. +            { AudioChannelSet::LFE,               Vst2::vstIndividualSpeakerTypeLFE },

  1274. +            { AudioChannelSet::leftSurround,      Vst2::vstIndividualSpeakerTypeLeftSurround },

  1275. +            { AudioChannelSet::rightSurround,     Vst2::vstIndividualSpeakerTypeRightSurround },

  1276. +            { AudioChannelSet::leftCentre,        Vst2::vstIndividualSpeakerTypeLeftCentre },

  1277. +            { AudioChannelSet::rightCentre,       Vst2::vstIndividualSpeakerTypeRightCentre },

  1278. +            { AudioChannelSet::surround,          Vst2::vstIndividualSpeakerTypeSurround },

  1279. +            { AudioChannelSet::leftSurroundRear,  Vst2::vstIndividualSpeakerTypeLeftRearSurround },

  1280. +            { AudioChannelSet::rightSurroundRear, Vst2::vstIndividualSpeakerTypeRightRearSurround },

  1281. +            { AudioChannelSet::topMiddle,         Vst2::vstIndividualSpeakerTypeTopMiddle },

  1282. +            { AudioChannelSet::topFrontLeft,      Vst2::vstIndividualSpeakerTypeTopFrontLeft },

  1283. +            { AudioChannelSet::topFrontCentre,    Vst2::vstIndividualSpeakerTypeTopFrontCentre },

  1284. +            { AudioChannelSet::topFrontRight,     Vst2::vstIndividualSpeakerTypeTopFrontRight },

  1285. +            { AudioChannelSet::topRearLeft,       Vst2::vstIndividualSpeakerTypeTopRearLeft },

  1286. +            { AudioChannelSet::topRearCentre,     Vst2::vstIndividualSpeakerTypeTopRearCentre },

  1287. +            { AudioChannelSet::topRearRight,      Vst2::vstIndividualSpeakerTypeTopRearRight },

  1288. +            { AudioChannelSet::LFE2,              Vst2::vstIndividualSpeakerTypeLFE2 }

  1289.          };

  1290.  

  1291.          if (speakerTypeMap.find (type) == speakerTypeMap.end())

  1292. diff --git a/modules/juce_audio_processors/format_types/juce_VSTMidiEventList.h b/modules/juce_audio_processors/format_types/juce_VSTMidiEventList.h

  1293. index ee54a4606..ec593f35c 100644

  1294. --- a/modules/juce_audio_processors/format_types/juce_VSTMidiEventList.h

  1295. +++ b/modules/juce_audio_processors/format_types/juce_VSTMidiEventList.h

  1296. @@ -16,8 +16,12 @@

  1297.    ==============================================================================

  1298.  */

  1299.  

  1300. -// NB: this must come first, *before* the header-guard.

  1301. -#ifdef JUCE_VSTINTERFACE_H_INCLUDED

  1302. +#pragma once

  1303. +

  1304. +namespace Vst2

  1305. +{

  1306. +#include "juce_VSTInterface.h"

  1307. +}

  1308.  

  1309.  namespace juce

  1310.  {

  1311. @@ -32,7 +36,7 @@ namespace juce

  1312.  */

  1313.  class VSTMidiEventList

  1314.  {

  1315. -    // "events" is expected to be a const- or non-const-ref to Vst2::VstEvents.

  1316. +    // "events" is expected to be a const- or non-const-ref to Vst2::VstEventBlock.

  1317.      template <typename Events>

  1318.      static auto& getEvent (Events& events, int index)

  1319.      {

  1320. @@ -66,7 +70,7 @@ public:

  1321.          numEventsUsed = 0;

  1322.  

  1323.          if (events != nullptr)

  1324. -            events->numEvents = 0;

  1325. +            events->numberOfEvents = 0;

  1326.      }

  1327.  

  1328.      void addEvent (const void* const midiData, int numBytes, int frameOffset)

  1329. @@ -74,52 +78,52 @@ public:

  1330.          ensureSize (numEventsUsed + 1);

  1331.  

  1332.          void* const ptr = getEvent (numEventsUsed);

  1333. -        events->numEvents = ++numEventsUsed;

  1334. +        events->numberOfEvents = ++numEventsUsed;

  1335.  

  1336.          if (numBytes <= 4)

  1337.          {

  1338.              auto* const e = static_cast<Vst2::VstMidiEvent*> (ptr);

  1339.  

  1340. -            if (e->type == Vst2::kVstSysExType)

  1341. +            if (e->type == Vst2::vstSysExEventType)

  1342.              {

  1343. -                delete[] reinterpret_cast<Vst2::VstMidiSysexEvent*> (e)->sysexDump;

  1344. -                e->type = Vst2::kVstMidiType;

  1345. -                e->byteSize = sizeof (Vst2::VstMidiEvent);

  1346. -                e->noteLength = 0;

  1347. -                e->noteOffset = 0;

  1348. -                e->detune = 0;

  1349. -                e->noteOffVelocity = 0;

  1350. +                delete[] reinterpret_cast<Vst2::VstSysExEvent*> (e)->sysExDump;

  1351. +                e->type = Vst2::vstMidiEventType;

  1352. +                e->size = sizeof (Vst2::VstMidiEvent);

  1353. +                e->noteSampleLength = 0;

  1354. +                e->noteSampleOffset = 0;

  1355. +                e->tuning = 0;

  1356. +                e->noteVelocityOff = 0;

  1357.              }

  1358.  

  1359. -            e->deltaFrames = frameOffset;

  1360. +            e->sampleOffset = frameOffset;

  1361.              memcpy (e->midiData, midiData, (size_t) numBytes);

  1362.          }

  1363.          else

  1364.          {

  1365. -            auto* const se = static_cast<Vst2::VstMidiSysexEvent*> (ptr);

  1366. +            auto* const se = static_cast<Vst2::VstSysExEvent*> (ptr);

  1367.  

  1368. -            if (se->type == Vst2::kVstSysExType)

  1369. -                delete[] se->sysexDump;

  1370. +            if (se->type == Vst2::vstSysExEventType)

  1371. +                delete[] se->sysExDump;

  1372.  

  1373. -            se->sysexDump = new char [(size_t) numBytes];

  1374. -            memcpy (se->sysexDump, midiData, (size_t) numBytes);

  1375. +            se->sysExDump = new char [(size_t) numBytes];

  1376. +            memcpy (se->sysExDump, midiData, (size_t) numBytes);

  1377.  

  1378. -            se->type = Vst2::kVstSysExType;

  1379. -            se->byteSize = sizeof (Vst2::VstMidiSysexEvent);

  1380. -            se->deltaFrames = frameOffset;

  1381. +            se->type = Vst2::vstSysExEventType;

  1382. +            se->size = sizeof (Vst2::VstSysExEvent);

  1383. +            se->offsetSamples = frameOffset;

  1384.              se->flags = 0;

  1385. -            se->dumpBytes = numBytes;

  1386. -            se->resvd1 = 0;

  1387. -            se->resvd2 = 0;

  1388. +            se->sysExDumpSize = numBytes;

  1389. +            se->future1 = 0;

  1390. +            se->future2 = 0;

  1391.          }

  1392.      }

  1393.  

  1394.      //==============================================================================

  1395.      // Handy method to pull the events out of an event buffer supplied by the host

  1396.      // or plugin.

  1397. -    static void addEventsToMidiBuffer (const Vst2::VstEvents* events, MidiBuffer& dest)

  1398. +    static void addEventsToMidiBuffer (const Vst2::VstEventBlock* events, MidiBuffer& dest)

  1399.      {

  1400. -        for (int i = 0; i < events->numEvents; ++i)

  1401. +        for (int i = 0; i < events->numberOfEvents; ++i)

  1402.          {

  1403.              const auto* const e = getEvent (*events, i);

  1404.  

  1405. @@ -127,17 +131,17 @@ public:

  1406.              {

  1407.                  const void* const ptr = e;

  1408.  

  1409. -                if (e->type == Vst2::kVstMidiType)

  1410. +                if (e->type == Vst2::vstMidiEventType)

  1411.                  {

  1412.                      dest.addEvent ((const juce::uint8*) static_cast<const Vst2::VstMidiEvent*> (ptr)->midiData,

  1413. -                                   4, e->deltaFrames);

  1414. +                                   4, e->sampleOffset);

  1415.                  }

  1416. -                else if (e->type == Vst2::kVstSysExType)

  1417. +                else if (e->type == Vst2::vstSysExEventType)

  1418.                  {

  1419. -                    const auto* se = static_cast<const Vst2::VstMidiSysexEvent*> (ptr);

  1420. -                    dest.addEvent ((const juce::uint8*) se->sysexDump,

  1421. -                                   (int) se->dumpBytes,

  1422. -                                   e->deltaFrames);

  1423. +                    const auto* se = static_cast<const Vst2::VstSysExEvent*> (ptr);

  1424. +                    dest.addEvent ((const juce::uint8*) se->sysExDump,

  1425. +                                   (int) se->sysExDumpSize,

  1426. +                                   e->sampleOffset);

  1427.                  }

  1428.              }

  1429.          }

  1430. @@ -178,19 +182,19 @@ public:

  1431.      }

  1432.  

  1433.      //==============================================================================

  1434. -    HeapBlock<Vst2::VstEvents> events;

  1435. +    HeapBlock<Vst2::VstEventBlock> events;

  1436.  

  1437.  private:

  1438.      int numEventsUsed, numEventsAllocated;

  1439.  

  1440.      static Vst2::VstEvent* allocateVSTEvent()

  1441.      {

  1442. -        constexpr auto size = jmax (sizeof (Vst2::VstMidiEvent), sizeof (Vst2::VstMidiSysexEvent));

  1443. +        constexpr auto size = jmax (sizeof (Vst2::VstMidiEvent), sizeof (Vst2::VstSysExEvent));

  1444.  

  1445.          if (auto* e = static_cast<Vst2::VstEvent*> (std::calloc (1, size)))

  1446.          {

  1447. -            e->type = Vst2::kVstMidiType;

  1448. -            e->byteSize = sizeof (Vst2::VstMidiEvent);

  1449. +            e->type = Vst2::vstMidiEventType;

  1450. +            e->size = sizeof (Vst2::VstMidiEvent);

  1451.              return e;

  1452.          }

  1453.  

  1454. @@ -199,9 +203,9 @@ private:

  1455.  

  1456.      static void freeVSTEvent (Vst2::VstEvent* e)

  1457.      {

  1458. -        if (e->type == Vst2::kVstSysExType)

  1459. +        if (e->type == Vst2::vstSysExEventType)

  1460.          {

  1461. -            delete[] (reinterpret_cast<Vst2::VstMidiSysexEvent*> (e)->sysexDump);

  1462. +            delete[] (reinterpret_cast<Vst2::VstSysExEvent*> (e)->sysExDump);

  1463.          }

  1464.  

  1465.          std::free (e);

  1466. @@ -209,5 +213,3 @@ private:

  1467.  };

  1468.  

  1469.  } // namespace juce

  1470. -

  1471. -#endif // JUCE_VSTINTERFACE_H_INCLUDED

  1472. diff --git a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp

  1473. index 5e8f6a592..06b5d5a95 100644

  1474. --- a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp

  1475. +++ b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp

  1476. @@ -30,19 +30,10 @@ JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wzero-as-null-pointer-constant")

  1477.  JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4996)

  1478.  

  1479.  #define VST_FORCE_DEPRECATED 0

  1480. -#define JUCE_VSTINTERFACE_H_INCLUDED 1

  1481.  

  1482.  namespace Vst2

  1483.  {

  1484. -struct AEffect;

  1485. -

  1486. -// If the following files cannot be found then you are probably trying to host

  1487. -// VST2 plug-ins. To do this you must have a VST2 SDK in your header search

  1488. -// paths or use the "VST (Legacy) SDK Folder" field in the Projucer. The VST2

  1489. -// SDK can be obtained from the vstsdk3610_11_06_2018_build_37 (or older) VST3

  1490. -// SDK or JUCE version 5.3.2.

  1491. -#include <pluginterfaces/vst2.x/aeffect.h>

  1492. -#include <pluginterfaces/vst2.x/aeffectx.h>

  1493. +#include "juce_VSTInterface.h"

  1494.  }

  1495.  

  1496.  #include "juce_VSTCommon.h"

  1497. @@ -72,7 +63,7 @@ JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4355)

  1498.  #endif

  1499.  

  1500.  #ifndef JUCE_VST_WRAPPER_INVOKE_MAIN

  1501. -#define JUCE_VST_WRAPPER_INVOKE_MAIN  effect = module->moduleMain ((Vst2::audioMasterCallback) &audioMaster);

  1502. + #define JUCE_VST_WRAPPER_INVOKE_MAIN  effect = module->moduleMain (&audioMaster);

  1503.  #endif

  1504.  

  1505.  #ifndef JUCE_VST_FALLBACK_HOST_NAME

  1506. @@ -213,8 +204,8 @@ namespace

  1507.  }

  1508.  

  1509.  //==============================================================================

  1510. -typedef Vst2::AEffect* (VSTCALLBACK *MainCall) (Vst2::audioMasterCallback);

  1511. -static pointer_sized_int VSTCALLBACK audioMaster (Vst2::AEffect*, int32, int32, pointer_sized_int, void*, float);

  1512. +typedef Vst2::VstEffectInterface* (VSTINTERFACECALL *MainCall) (Vst2::VstHostCallback);

  1513. +static pointer_sized_int VSTINTERFACECALL audioMaster (Vst2::VstEffectInterface*, int32, int32, pointer_sized_int, void*, float);

  1514.  

  1515.  //==============================================================================

  1516.  // Change this to disable logging of various VST activities

  1517. @@ -682,9 +673,9 @@ struct ModuleHandle    : public ReferenceCountedObject

  1518.          module.close();

  1519.      }

  1520.  

  1521. -    void closeEffect (Vst2::AEffect* eff)

  1522. +    void closeEffect (Vst2::VstEffectInterface* eff)

  1523.      {

  1524. -        eff->dispatcher (eff, Vst2::effClose, 0, 0, nullptr, 0);

  1525. +        eff->dispatchFunction (eff, Vst2::plugInOpcodeClose, 0, 0, nullptr, 0);

  1526.      }

  1527.  

  1528.     #if JUCE_WINDOWS

  1529. @@ -806,9 +797,9 @@ struct ModuleHandle    : public ReferenceCountedObject

  1530.          }

  1531.      }

  1532.  

  1533. -    void closeEffect (Vst2::AEffect* eff)

  1534. +    void closeEffect (Vst2::VstEffectInterface* eff)

  1535.      {

  1536. -        eff->dispatcher (eff, Vst2::effClose, 0, 0, nullptr, 0);

  1537. +        eff->dispatchFunction (eff, Vst2::plugInOpcodeClose, 0, 0, nullptr, 0);

  1538.      }

  1539.  

  1540.    #endif

  1541. @@ -860,7 +851,7 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1542.              {

  1543.                  const ScopedLock sl (pluginInstance.lock);

  1544.  

  1545. -                return effect->getParameter (effect, getParameterIndex());

  1546. +                return effect->getParameterValueFunction (effect, getParameterIndex());

  1547.              }

  1548.  

  1549.              return 0.0f;

  1550. @@ -872,8 +863,8 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1551.              {

  1552.                  const ScopedLock sl (pluginInstance.lock);

  1553.  

  1554. -                if (effect->getParameter (effect, getParameterIndex()) != newValue)

  1555. -                    effect->setParameter (effect, getParameterIndex(), newValue);

  1556. +                if (effect->getParameterValueFunction (effect, getParameterIndex()) != newValue)

  1557. +                    effect->setParameterValueFunction (effect, getParameterIndex(), newValue);

  1558.              }

  1559.          }

  1560.  

  1561. @@ -906,7 +897,7 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1562.              if (valueType != nullptr || ! vstValueStrings.isEmpty())

  1563.                  return getText (getValue(), 1024);

  1564.  

  1565. -            return pluginInstance.getTextForOpcode (getParameterIndex(), Vst2::effGetParamDisplay);

  1566. +            return pluginInstance.getTextForOpcode (getParameterIndex(), Vst2::plugInOpcodeGetParameterText);

  1567.          }

  1568.  

  1569.          float getDefaultValue() const override

  1570. @@ -918,7 +909,7 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1571.          {

  1572.              if (name.isEmpty())

  1573.                  return pluginInstance.getTextForOpcode (getParameterIndex(),

  1574. -                                                        Vst2::effGetParamName);

  1575. +                                                        Vst2::plugInOpcodeGetParameterName);

  1576.  

  1577.              if (name.length() <= maximumStringLength)

  1578.                  return name;

  1579. @@ -938,7 +929,7 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1580.          String getLabel() const override

  1581.          {

  1582.              return label.isEmpty() ? pluginInstance.getTextForOpcode (getParameterIndex(),

  1583. -                                                                      Vst2::effGetParamLabel)

  1584. +                                                                      Vst2::plugInOpcodeGetParameterLabel)

  1585.                                     : label;

  1586.          }

  1587.  

  1588. @@ -985,7 +976,7 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1589.          const VSTXMLInfo::ValueType* const valueType;

  1590.      };

  1591.  

  1592. -    VSTPluginInstance (const ModuleHandle::Ptr& mh, const BusesProperties& ioConfig, Vst2::AEffect* effect,

  1593. +    VSTPluginInstance (const ModuleHandle::Ptr& mh, const BusesProperties& ioConfig, Vst2::VstEffectInterface* effect,

  1594.                         double sampleRateToUse, int blockSizeToUse)

  1595.          : AudioPluginInstance (ioConfig),

  1596.            vstEffect (effect),

  1597. @@ -1008,13 +999,13 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1598.      {

  1599.          AudioProcessorParameterGroup newParameterTree;

  1600.  

  1601. -        for (int i = 0; i < vstEffect->numParams; ++i)

  1602. +        for (int i = 0; i < vstEffect->numParameters; ++i)

  1603.          {

  1604.              String paramName;

  1605.              Array<String> shortParamNames;

  1606.              float defaultValue = 0;

  1607.              String label;

  1608. -            bool isAutomatable = dispatch (Vst2::effCanBeAutomated, i, 0, nullptr, 0) != 0;

  1609. +            bool isAutomatable = dispatch (Vst2::plugInOpcodeIsParameterAutomatable, i, 0, nullptr, 0) != 0;

  1610.              bool isDiscrete = false;

  1611.              int numSteps = AudioProcessor::getDefaultNumParameterSteps();

  1612.              bool isBoolSwitch = false;

  1613. @@ -1082,13 +1073,13 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1614.  

  1615.      ~VSTPluginInstance() override

  1616.      {

  1617. -        if (vstEffect != nullptr && vstEffect->magic == 0x56737450 /* 'VstP' */)

  1618. +        if (vstEffect != nullptr && vstEffect->interfaceIdentifier == Vst2::juceVstInterfaceIdentifier)

  1619.              callOnMessageThread ([this] { cleanup(); });

  1620.      }

  1621.  

  1622.      void cleanup()

  1623.      {

  1624. -        if (vstEffect != nullptr && vstEffect->magic == 0x56737450 /* 'VstP' */)

  1625. +        if (vstEffect != nullptr && vstEffect->interfaceIdentifier == Vst2::juceVstInterfaceIdentifier)

  1626.          {

  1627.             #if JUCE_MAC

  1628.              if (vstModule->resFileId != 0)

  1629. @@ -1113,16 +1104,16 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1630.      {

  1631.          if (auto* newEffect = constructEffect (newModule))

  1632.          {

  1633. -            newEffect->resvd2 = 0;

  1634. +            newEffect->hostSpace2 = 0;

  1635.  

  1636. -            newEffect->dispatcher (newEffect, Vst2::effIdentify, 0, 0, nullptr, 0);

  1637. +            newEffect->dispatchFunction (newEffect, Vst2::plugInOpcodeIdentify, 0, 0, nullptr, 0);

  1638.  

  1639.              auto blockSize = jmax (32, initialBlockSize);

  1640.  

  1641. -            newEffect->dispatcher (newEffect, Vst2::effSetSampleRate, 0, 0, nullptr, static_cast<float> (initialSampleRate));

  1642. -            newEffect->dispatcher (newEffect, Vst2::effSetBlockSize,  0, blockSize, nullptr, 0);

  1643. +            newEffect->dispatchFunction (newEffect, Vst2::plugInOpcodeSetSampleRate, 0, 0, nullptr, static_cast<float> (initialSampleRate));

  1644. +            newEffect->dispatchFunction (newEffect, Vst2::plugInOpcodeSetBlockSize,  0, blockSize, nullptr, 0);

  1645.  

  1646. -            newEffect->dispatcher (newEffect, Vst2::effOpen, 0, 0, nullptr, 0);

  1647. +            newEffect->dispatchFunction (newEffect, Vst2::plugInOpcodeOpen, 0, 0, nullptr, 0);

  1648.              BusesProperties ioConfig = queryBusIO (newEffect);

  1649.  

  1650.              return new VSTPluginInstance (newModule, ioConfig, newEffect, initialSampleRate, blockSize);

  1651. @@ -1138,7 +1129,7 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1652.  

  1653.          {

  1654.              char buffer[512] = { 0 };

  1655. -            dispatch (Vst2::effGetEffectName, 0, 0, buffer, 0);

  1656. +            dispatch (Vst2::plugInOpcodeGetPlugInName, 0, 0, buffer, 0);

  1657.  

  1658.              desc.descriptiveName = String::createStringFromData (buffer, (int) sizeof (buffer)).trim();

  1659.  

  1660. @@ -1155,7 +1146,7 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1661.  

  1662.          {

  1663.              char buffer[512] = { 0 };

  1664. -            dispatch (Vst2::effGetVendorString, 0, 0, buffer, 0);

  1665. +            dispatch (Vst2::plugInOpcodeGetManufacturerName, 0, 0, buffer, 0);

  1666.              desc.manufacturerName = String::createStringFromData (buffer, (int) sizeof (buffer)).trim();

  1667.          }

  1668.  

  1669. @@ -1169,7 +1160,7 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1670.      {

  1671.          if (vstEffect != nullptr)

  1672.          {

  1673. -            vstEffect->resvd2 = (pointer_sized_int) (pointer_sized_int) this;

  1674. +            vstEffect->hostSpace2 = (pointer_sized_int) (pointer_sized_int) this;

  1675.              initialise (initialSampleRate, initialBlockSize);

  1676.              return true;

  1677.          }

  1678. @@ -1195,25 +1186,25 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1679.  

  1680.          setRateAndBufferSizeDetails (initialSampleRate, initialBlockSize);

  1681.  

  1682. -        dispatch (Vst2::effIdentify, 0, 0, nullptr, 0);

  1683. +        dispatch (Vst2::plugInOpcodeIdentify, 0, 0, nullptr, 0);

  1684.  

  1685.          if (getSampleRate() > 0)

  1686. -            dispatch (Vst2::effSetSampleRate, 0, 0, nullptr, (float) getSampleRate());

  1687. +            dispatch (Vst2::plugInOpcodeSetSampleRate, 0, 0, nullptr, (float) getSampleRate());

  1688.  

  1689.          if (getBlockSize() > 0)

  1690. -            dispatch (Vst2::effSetBlockSize, 0, jmax (32, getBlockSize()), nullptr, 0);

  1691. +            dispatch (Vst2::plugInOpcodeSetBlockSize, 0, jmax (32, getBlockSize()), nullptr, 0);

  1692.  

  1693. -        dispatch (Vst2::effOpen, 0, 0, nullptr, 0);

  1694. +        dispatch (Vst2::plugInOpcodeOpen, 0, 0, nullptr, 0);

  1695.  

  1696.          setRateAndBufferSizeDetails (getSampleRate(), getBlockSize());

  1697.  

  1698.          if (getNumPrograms() > 1)

  1699.              setCurrentProgram (0);

  1700.          else

  1701. -            dispatch (Vst2::effSetProgram, 0, 0, nullptr, 0);

  1702. +            dispatch (Vst2::plugInOpcodeSetCurrentProgram, 0, 0, nullptr, 0);

  1703.  

  1704. -        for (int i = vstEffect->numInputs;  --i >= 0;)  dispatch (Vst2::effConnectInput,  i, 1, nullptr, 0);

  1705. -        for (int i = vstEffect->numOutputs; --i >= 0;)  dispatch (Vst2::effConnectOutput, i, 1, nullptr, 0);

  1706. +        for (int i = vstEffect->numInputChannels;  --i >= 0;)  dispatch (Vst2::plugInOpcodeConnectInput,  i, 1, nullptr, 0);

  1707. +        for (int i = vstEffect->numOutputChannels; --i >= 0;)  dispatch (Vst2::plugInOpcodeConnectOutput, i, 1, nullptr, 0);

  1708.  

  1709.          if (getVstCategory() != Vst2::kPlugCategShell) // (workaround for Waves 5 plugins which crash during this call)

  1710.              updateStoredProgramNames();

  1711. @@ -1224,7 +1215,7 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1712.          usesCocoaNSView = ((unsigned int) pluginCanDo ("hasCockosViewAsConfig") & 0xffff0000ul) == 0xbeef0000ul;

  1713.         #endif

  1714.  

  1715. -        setLatencySamples (vstEffect->initialDelay);

  1716. +        setLatencySamples (vstEffect->latency);

  1717.      }

  1718.  

  1719.      void getExtensions (ExtensionsVisitor& visitor) const override

  1720. @@ -1249,7 +1240,7 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1721.          {

  1722.              char buffer[512] = { 0 };

  1723.  

  1724. -            if (dispatch (Vst2::effGetProductString, 0, 0, buffer, 0) != 0)

  1725. +            if (dispatch (Vst2::plugInOpcodeGetManufacturerProductName, 0, 0, buffer, 0) != 0)

  1726.              {

  1727.                  String productName = String::createStringFromData (buffer, (int) sizeof (buffer));

  1728.  

  1729. @@ -1263,7 +1254,7 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1730.  

  1731.      int getUID() const

  1732.      {

  1733. -        int uid = vstEffect != nullptr ? vstEffect->uniqueID : 0;

  1734. +        int uid = vstEffect != nullptr ? vstEffect->plugInIdentifier : 0;

  1735.  

  1736.          if (uid == 0)

  1737.              uid = vstModule->file.hashCode();

  1738. @@ -1276,10 +1267,10 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1739.          if (vstEffect == nullptr)

  1740.              return 0.0;

  1741.  

  1742. -        if ((vstEffect->flags & Vst2::effFlagsNoSoundInStop) != 0)

  1743. +        if ((vstEffect->flags & 512) != 0)

  1744.              return 0.0;

  1745.  

  1746. -        auto tailSize = dispatch (Vst2::effGetTailSize, 0, 0, nullptr, 0);

  1747. +        auto tailSize = dispatch (Vst2::plugInOpcodeGetTailSize, 0, 0, nullptr, 0);

  1748.          auto sampleRate = getSampleRate();

  1749.  

  1750.          // remain backward compatible with old JUCE plug-ins: anything larger

  1751. @@ -1299,11 +1290,11 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1752.      bool producesMidi() const override   { return pluginCanDo ("sendVstMidiEvent") > 0; }

  1753.      bool supportsMPE() const override    { return pluginCanDo ("MPE") > 0; }

  1754.  

  1755. -    Vst2::VstPlugCategory getVstCategory() const noexcept     { return (Vst2::VstPlugCategory) dispatch (Vst2::effGetPlugCategory, 0, 0, nullptr, 0); }

  1756. +    Vst2::VstPlugInCategory getVstCategory() const noexcept     { return (Vst2::VstPlugInCategory) dispatch (Vst2::plugInOpcodeGetPlugInCategory, 0, 0, nullptr, 0); }

  1757.  

  1758. -    bool isSynthPlugin() const  { return (vstEffect != nullptr && (vstEffect->flags & Vst2::effFlagsIsSynth) != 0); }

  1759. +    bool isSynthPlugin() const  { return (vstEffect != nullptr && (vstEffect->flags & Vst2::vstEffectFlagIsSynth) != 0); }

  1760.  

  1761. -    int pluginCanDo (const char* text) const  { return (int) dispatch (Vst2::effCanDo, 0, 0, (void*) text,  0); }

  1762. +    int pluginCanDo (const char* text) const  { return (int) dispatch (Vst2::plugInOpcodeCanPlugInDo, 0, 0, (void*) text,  0); }

  1763.  

  1764.      //==============================================================================

  1765.      void prepareToPlay (double rate, int samplesPerBlockExpected) override

  1766. @@ -1318,17 +1309,17 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1767.              SpeakerMappings::VstSpeakerConfigurationHolder inArr  (getChannelLayoutOfBus (true,  0));

  1768.              SpeakerMappings::VstSpeakerConfigurationHolder outArr (getChannelLayoutOfBus (false, 0));

  1769.  

  1770. -            dispatch (Vst2::effSetSpeakerArrangement, 0, (pointer_sized_int) &inArr.get(), (void*) &outArr.get(), 0.0f);

  1771. +            dispatch (Vst2::plugInOpcodeSetSpeakerConfiguration, 0, (pointer_sized_int) &inArr.get(), (void*) &outArr.get(), 0.0f);

  1772.          }

  1773.  

  1774. -        vstHostTime.tempo = 120.0;

  1775. -        vstHostTime.timeSigNumerator = 4;

  1776. -        vstHostTime.timeSigDenominator = 4;

  1777. +        vstHostTime.tempoBPM = 120.0;

  1778. +        vstHostTime.timeSignatureNumerator = 4;

  1779. +        vstHostTime.timeSignatureDenominator = 4;

  1780.          vstHostTime.sampleRate = rate;

  1781. -        vstHostTime.samplePos = 0;

  1782. -        vstHostTime.flags = Vst2::kVstNanosValid

  1783. -                              | Vst2::kVstAutomationWriting

  1784. -                              | Vst2::kVstAutomationReading;

  1785. +        vstHostTime.samplePosition = 0;

  1786. +        vstHostTime.flags = Vst2::vstTimingInfoFlagNanosecondsValid

  1787. +                              | Vst2::vstTimingInfoFlagAutomationWriteModeActive

  1788. +                              | Vst2::vstTimingInfoFlagAutomationReadModeActive;

  1789.  

  1790.          initialise (rate, samplesPerBlockExpected);

  1791.  

  1792. @@ -1343,18 +1334,18 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1793.  

  1794.              incomingMidi.clear();

  1795.  

  1796. -            dispatch (Vst2::effSetSampleRate, 0, 0, nullptr, (float) rate);

  1797. -            dispatch (Vst2::effSetBlockSize, 0, jmax (16, samplesPerBlockExpected), nullptr, 0);

  1798. +            dispatch (Vst2::plugInOpcodeSetSampleRate, 0, 0, nullptr, (float) rate);

  1799. +            dispatch (Vst2::plugInOpcodeSetBlockSize, 0, jmax (16, samplesPerBlockExpected), nullptr, 0);

  1800.  

  1801.              if (supportsDoublePrecisionProcessing())

  1802.              {

  1803. -                int32 vstPrecision = isUsingDoublePrecision() ? Vst2::kVstProcessPrecision64

  1804. -                                                              : Vst2::kVstProcessPrecision32;

  1805. +                int32 vstPrecision = isUsingDoublePrecision() ? Vst2::vstProcessingSampleTypeDouble

  1806. +                                                              : Vst2::vstProcessingSampleTypeFloat;

  1807.  

  1808. -                dispatch (Vst2::effSetProcessPrecision, 0, (pointer_sized_int) vstPrecision, nullptr, 0);

  1809. +                dispatch (Vst2::plugInOpcodeSetSampleFloatType, 0, (pointer_sized_int) vstPrecision, nullptr, 0);

  1810.              }

  1811.  

  1812. -            auto maxChannels = jmax (1, jmax (vstEffect->numInputs, vstEffect->numOutputs));

  1813. +            auto maxChannels = jmax (1, jmax (vstEffect->numInputChannels, vstEffect->numOutputChannels));

  1814.  

  1815.              tmpBufferFloat .setSize (maxChannels, samplesPerBlockExpected);

  1816.              tmpBufferDouble.setSize (maxChannels, samplesPerBlockExpected);

  1817. @@ -1362,7 +1353,7 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1818.              channelBufferFloat .calloc (static_cast<size_t> (maxChannels));

  1819.              channelBufferDouble.calloc (static_cast<size_t> (maxChannels));

  1820.  

  1821. -            outOfPlaceBuffer.setSize (jmax (1, vstEffect->numOutputs), samplesPerBlockExpected);

  1822. +            outOfPlaceBuffer.setSize (jmax (1, vstEffect->numOutputChannels), samplesPerBlockExpected);

  1823.  

  1824.              if (! isPowerOn)

  1825.                  setPower (true);

  1826. @@ -1378,9 +1369,9 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1827.                  }

  1828.              }

  1829.  

  1830. -            dispatch (Vst2::effStartProcess, 0, 0, nullptr, 0);

  1831. +            dispatch (Vst2::plugInOpcodeStartProcess, 0, 0, nullptr, 0);

  1832.  

  1833. -            setLatencySamples (vstEffect->initialDelay);

  1834. +            setLatencySamples (vstEffect->latency);

  1835.          }

  1836.      }

  1837.  

  1838. @@ -1388,7 +1379,7 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1839.      {

  1840.          if (initialised)

  1841.          {

  1842. -            dispatch (Vst2::effStopProcess, 0, 0, nullptr, 0);

  1843. +            dispatch (Vst2::plugInOpcodeStopProcess, 0, 0, nullptr, 0);

  1844.              setPower (false);

  1845.          }

  1846.  

  1847. @@ -1441,8 +1432,8 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1848.      //==============================================================================

  1849.      bool supportsDoublePrecisionProcessing() const override

  1850.      {

  1851. -        return ((vstEffect->flags & Vst2::effFlagsCanReplacing) != 0

  1852. -             && (vstEffect->flags & Vst2::effFlagsCanDoubleReplacing) != 0);

  1853. +        return ((vstEffect->flags & Vst2::vstEffectFlagInplaceAudio) != 0

  1854. +             && (vstEffect->flags & Vst2::vstEffectFlagInplaceDoubleAudio) != 0);

  1855.      }

  1856.  

  1857.      AudioProcessorParameter* getBypassParameter() const override               { return vstSupportsBypass ? bypassParam.get() : nullptr; }

  1858. @@ -1460,15 +1451,15 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1859.          if (numInputBuses > 1 || numOutputBuses > 1)

  1860.              return (layouts == getBusesLayout());

  1861.  

  1862. -        return (layouts.getNumChannels (true,  0) <= vstEffect->numInputs

  1863. -             && layouts.getNumChannels (false, 0) <= vstEffect->numOutputs);

  1864. +        return (layouts.getNumChannels (true,  0) <= vstEffect->numInputChannels

  1865. +             && layouts.getNumChannels (false, 0) <= vstEffect->numOutputChannels);

  1866.      }

  1867.  

  1868.      //==============================================================================

  1869.     #if JUCE_IOS || JUCE_ANDROID

  1870.      bool hasEditor() const override                  { return false; }

  1871.     #else

  1872. -    bool hasEditor() const override                  { return vstEffect != nullptr && (vstEffect->flags & Vst2::effFlagsHasEditor) != 0; }

  1873. +    bool hasEditor() const override                  { return vstEffect != nullptr && (vstEffect->flags & Vst2::vstEffectFlagHasEditor) != 0; }

  1874.     #endif

  1875.  

  1876.      AudioProcessorEditor* createEditor() override;

  1877. @@ -1478,9 +1469,9 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1878.      {

  1879.          if (isValidChannel (index, true))

  1880.          {

  1881. -            Vst2::VstPinProperties pinProps;

  1882. -            if (dispatch (Vst2::effGetInputProperties, index, 0, &pinProps, 0.0f) != 0)

  1883. -                return String (pinProps.label, sizeof (pinProps.label));

  1884. +            Vst2::VstPinInfo pinProps;

  1885. +            if (dispatch (Vst2::plugInOpcodeGetInputPinProperties, index, 0, &pinProps, 0.0f) != 0)

  1886. +                return String (pinProps.text, sizeof (pinProps.text));

  1887.          }

  1888.  

  1889.          return {};

  1890. @@ -1491,9 +1482,9 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1891.          if (! isValidChannel (index, true))

  1892.              return false;

  1893.  

  1894. -        Vst2::VstPinProperties pinProps;

  1895. -        if (dispatch (Vst2::effGetInputProperties, index, 0, &pinProps, 0.0f) != 0)

  1896. -            return (pinProps.flags & Vst2::kVstPinIsStereo) != 0;

  1897. +        Vst2::VstPinInfo pinProps;

  1898. +        if (dispatch (Vst2::plugInOpcodeGetInputPinProperties, index, 0, &pinProps, 0.0f) != 0)

  1899. +            return (pinProps.flags & Vst2::vstPinInfoFlagIsStereo) != 0;

  1900.  

  1901.          return true;

  1902.      }

  1903. @@ -1502,9 +1493,9 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1904.      {

  1905.          if (isValidChannel (index, false))

  1906.          {

  1907. -            Vst2::VstPinProperties pinProps;

  1908. -            if (dispatch (Vst2::effGetOutputProperties, index, 0, &pinProps, 0.0f) != 0)

  1909. -                return String (pinProps.label, sizeof (pinProps.label));

  1910. +            Vst2::VstPinInfo pinProps;

  1911. +            if (dispatch (Vst2::plugInOpcodeGetOutputPinProperties, index, 0, &pinProps, 0.0f) != 0)

  1912. +                return String (pinProps.text, sizeof (pinProps.text));

  1913.          }

  1914.  

  1915.          return {};

  1916. @@ -1515,9 +1506,9 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1917.          if (! isValidChannel (index, false))

  1918.              return false;

  1919.  

  1920. -        Vst2::VstPinProperties pinProps;

  1921. -        if (dispatch (Vst2::effGetOutputProperties, index, 0, &pinProps, 0.0f) != 0)

  1922. -            return (pinProps.flags & Vst2::kVstPinIsStereo) != 0;

  1923. +        Vst2::VstPinInfo pinProps;

  1924. +        if (dispatch (Vst2::plugInOpcodeGetOutputPinProperties, index, 0, &pinProps, 0.0f) != 0)

  1925. +            return (pinProps.flags & Vst2::vstPinInfoFlagIsStereo) != 0;

  1926.  

  1927.          return true;

  1928.      }

  1929. @@ -1532,12 +1523,12 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1930.      int getNumPrograms() override          { return vstEffect != nullptr ? jmax (0, vstEffect->numPrograms) : 0; }

  1931.  

  1932.      // NB: some plugs return negative numbers from this function.

  1933. -    int getCurrentProgram() override       { return (int) dispatch (Vst2::effGetProgram, 0, 0, nullptr, 0); }

  1934. +    int getCurrentProgram() override       { return (int) dispatch (Vst2::plugInOpcodeGetCurrentProgram, 0, 0, nullptr, 0); }

  1935.  

  1936.      void setCurrentProgram (int newIndex) override

  1937.      {

  1938.          if (getNumPrograms() > 0 && newIndex != getCurrentProgram())

  1939. -            dispatch (Vst2::effSetProgram, 0, jlimit (0, getNumPrograms() - 1, newIndex), nullptr, 0);

  1940. +            dispatch (Vst2::plugInOpcodeSetCurrentProgram, 0, jlimit (0, getNumPrograms() - 1, newIndex), nullptr, 0);

  1941.      }

  1942.  

  1943.      const String getProgramName (int index) override

  1944. @@ -1551,7 +1542,7 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1945.              {

  1946.                  char nm[264] = { 0 };

  1947.  

  1948. -                if (dispatch (Vst2::effGetProgramNameIndexed, jlimit (0, getNumPrograms() - 1, index), -1, nm, 0) != 0)

  1949. +                if (dispatch (Vst2::plugInOpcodeGetProgramName, jlimit (0, getNumPrograms() - 1, index), -1, nm, 0) != 0)

  1950.                      return String::fromUTF8 (nm).trim();

  1951.              }

  1952.          }

  1953. @@ -1564,7 +1555,7 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1954.          if (index >= 0 && index == getCurrentProgram())

  1955.          {

  1956.              if (getNumPrograms() > 0 && newName != getCurrentProgramName())

  1957. -                dispatch (Vst2::effSetProgramName, 0, 0, (void*) newName.substring (0, 24).toRawUTF8(), 0.0f);

  1958. +                dispatch (Vst2::plugInOpcodeSetCurrentProgramName, 0, 0, (void*) newName.substring (0, 24).toRawUTF8(), 0.0f);

  1959.          }

  1960.          else

  1961.          {

  1962. @@ -1582,7 +1573,7 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1963.      //==============================================================================

  1964.      void timerCallback() override

  1965.      {

  1966. -        if (dispatch (Vst2::effIdle, 0, 0, nullptr, 0) == 0)

  1967. +        if (dispatch (Vst2::plugInOpcodeIdle, 0, 0, nullptr, 0) == 0)

  1968.              stopTimer();

  1969.      }

  1970.  

  1971. @@ -1596,7 +1587,7 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1972.      {

  1973.          switch (opcode)

  1974.          {

  1975. -            case Vst2::audioMasterAutomate:

  1976. +            case Vst2::hostOpcodeParameterChanged:

  1977.                  if (auto* param = getParameters()[index])

  1978.                      param->sendValueChangedMessageToListeners (opt);

  1979.                  else

  1980. @@ -1604,23 +1595,23 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  1981.  

  1982.                  break;

  1983.  

  1984. -            case Vst2::audioMasterProcessEvents:            handleMidiFromPlugin ((const Vst2::VstEvents*) ptr); break;

  1985. -            case Vst2::audioMasterGetTime:                  return getVSTTime();

  1986. -            case Vst2::audioMasterIdle:                     handleIdle(); break;

  1987. -            case Vst2::audioMasterSizeWindow:               setWindowSize (index, (int) value); return 1;

  1988. -            case Vst2::audioMasterUpdateDisplay:            triggerAsyncUpdate(); break;

  1989. -            case Vst2::audioMasterIOChanged:                setLatencySamples (vstEffect->initialDelay); break;

  1990. -            case Vst2::audioMasterNeedIdle:                 startTimer (50); break;

  1991. +            case Vst2::hostOpcodePreAudioProcessingEvents:    handleMidiFromPlugin ((const Vst2::VstEventBlock*) ptr); break;

  1992. +            case Vst2::hostOpcodeGetTimingInfo:               return getVSTTime();

  1993. +            case Vst2::hostOpcodeIdle:                        handleIdle(); break;

  1994. +            case Vst2::hostOpcodeWindowSize:                  setWindowSize (index, (int) value); return 1;

  1995. +            case Vst2::hostOpcodeUpdateView:                  triggerAsyncUpdate(); break;

  1996. +            case Vst2::hostOpcodeIOModified:                  setLatencySamples (vstEffect->latency); break;

  1997. +            case Vst2::hostOpcodeNeedsIdle:                   startTimer (50); break;

  1998.  

  1999. -            case Vst2::audioMasterGetSampleRate:            return (pointer_sized_int) (getSampleRate() > 0 ? getSampleRate() : defaultVSTSampleRateValue);

  2000. -            case Vst2::audioMasterGetBlockSize:             return (pointer_sized_int) (getBlockSize() > 0  ? getBlockSize()  : defaultVSTBlockSizeValue);

  2001. -            case Vst2::audioMasterWantMidi:                 wantsMidiMessages = true; break;

  2002. -            case Vst2::audioMasterGetDirectory:             return getVstDirectory();

  2003. +            case Vst2::hostOpcodeGetSampleRate:               return (pointer_sized_int) (getSampleRate() > 0 ? getSampleRate() : defaultVSTSampleRateValue);

  2004. +            case Vst2::hostOpcodeGetBlockSize:                return (pointer_sized_int) (getBlockSize() > 0  ? getBlockSize()  : defaultVSTBlockSizeValue);

  2005. +            case Vst2::hostOpcodePlugInWantsMidi:             wantsMidiMessages = true; break;

  2006. +            case Vst2::hostOpcodeGetDirectory:                return getVstDirectory();

  2007.  

  2008. -            case Vst2::audioMasterTempoAt:                  return (pointer_sized_int) (extraFunctions != nullptr ? extraFunctions->getTempoAt ((int64) value) : 0);

  2009. -            case Vst2::audioMasterGetAutomationState:       return (pointer_sized_int) (extraFunctions != nullptr ? extraFunctions->getAutomationState() : 0);

  2010. +            case Vst2::hostOpcodeTempoAt:                     return (pointer_sized_int) (extraFunctions != nullptr ? extraFunctions->getTempoAt ((int64) value) : 0);

  2011. +            case Vst2::hostOpcodeGetAutomationState:          return (pointer_sized_int) (extraFunctions != nullptr ? extraFunctions->getAutomationState() : 0);

  2012.  

  2013. -            case Vst2::audioMasterBeginEdit:

  2014. +            case Vst2::hostOpcodeParameterChangeGestureBegin:

  2015.                  if (auto* param = getParameters()[index])

  2016.                      param->beginChangeGesture();

  2017.                  else

  2018. @@ -1628,7 +1619,7 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  2019.  

  2020.                  break;

  2021.  

  2022. -            case Vst2::audioMasterEndEdit:

  2023. +            case Vst2::hostOpcodeParameterChangeGestureEnd:

  2024.                  if (auto* param = getParameters()[index])

  2025.                      param->endChangeGesture();

  2026.                  else

  2027. @@ -1636,28 +1627,28 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  2028.  

  2029.                  break;

  2030.  

  2031. -            case Vst2::audioMasterPinConnected:             return isValidChannel (index, value == 0) ? 0 : 1; // (yes, 0 = true)

  2032. -            case Vst2::audioMasterGetCurrentProcessLevel:   return isNonRealtime() ? 4 : 0;

  2033. +            case Vst2::hostOpcodePinConnected:                   return isValidChannel (index, value == 0) ? 0 : 1; // (yes, 0 = true)

  2034. +            case Vst2::hostOpcodeGetCurrentAudioProcessingLevel: return isNonRealtime() ? 4 : 0;

  2035.  

  2036.              // none of these are handled (yet)...

  2037. -            case Vst2::audioMasterSetTime:

  2038. -            case Vst2::audioMasterGetParameterQuantization:

  2039. -            case Vst2::audioMasterGetInputLatency:

  2040. -            case Vst2::audioMasterGetOutputLatency:

  2041. -            case Vst2::audioMasterGetPreviousPlug:

  2042. -            case Vst2::audioMasterGetNextPlug:

  2043. -            case Vst2::audioMasterWillReplaceOrAccumulate:

  2044. -            case Vst2::audioMasterOfflineStart:

  2045. -            case Vst2::audioMasterOfflineRead:

  2046. -            case Vst2::audioMasterOfflineWrite:

  2047. -            case Vst2::audioMasterOfflineGetCurrentPass:

  2048. -            case Vst2::audioMasterOfflineGetCurrentMetaPass:

  2049. -            case Vst2::audioMasterGetOutputSpeakerArrangement:

  2050. -            case Vst2::audioMasterVendorSpecific:

  2051. -            case Vst2::audioMasterSetIcon:

  2052. -            case Vst2::audioMasterGetLanguage:

  2053. -            case Vst2::audioMasterOpenWindow:

  2054. -            case Vst2::audioMasterCloseWindow:

  2055. +            case Vst2::hostOpcodeSetTime:

  2056. +            case Vst2::hostOpcodeGetParameterInterval:

  2057. +            case Vst2::hostOpcodeGetInputLatency:

  2058. +            case Vst2::hostOpcodeGetOutputLatency:

  2059. +            case Vst2::hostOpcodeGetPreviousPlugIn:

  2060. +            case Vst2::hostOpcodeGetNextPlugIn:

  2061. +            case Vst2::hostOpcodeWillReplace:

  2062. +            case Vst2::hostOpcodeOfflineStart:

  2063. +            case Vst2::hostOpcodeOfflineReadSource:

  2064. +            case Vst2::hostOpcodeOfflineWrite:

  2065. +            case Vst2::hostOpcodeOfflineGetCurrentPass:

  2066. +            case Vst2::hostOpcodeOfflineGetCurrentMetaPass:

  2067. +            case Vst2::hostOpcodeGetOutputSpeakerConfiguration:

  2068. +            case Vst2::hostOpcodeManufacturerSpecific:

  2069. +            case Vst2::hostOpcodeSetIcon:

  2070. +            case Vst2::hostOpcodeGetLanguage:

  2071. +            case Vst2::hostOpcodeOpenEditorWindow:

  2072. +            case Vst2::hostOpcodeCloseEditorWindow:

  2073.                  break;

  2074.  

  2075.              default:

  2076. @@ -1672,19 +1663,19 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  2077.      {

  2078.          switch (opcode)

  2079.          {

  2080. -            case Vst2::audioMasterCanDo:                        return handleCanDo ((const char*) ptr);

  2081. -            case Vst2::audioMasterVersion:                      return 2400;

  2082. -            case Vst2::audioMasterCurrentId:                    return shellUIDToCreate;

  2083. -            case Vst2::audioMasterGetNumAutomatableParameters:  return 0;

  2084. -            case Vst2::audioMasterGetAutomationState:           return 1;

  2085. -            case Vst2::audioMasterGetVendorVersion:             return 0x0101;

  2086. +            case Vst2::hostOpcodeCanHostDo:                         return handleCanDo ((const char*) ptr);

  2087. +            case Vst2::hostOpcodeVstVersion:                        return 2400;

  2088. +            case Vst2::hostOpcodeCurrentId:                         return shellUIDToCreate;

  2089. +            case Vst2::hostOpcodeGetNumberOfAutomatableParameters:  return 0;

  2090. +            case Vst2::hostOpcodeGetAutomationState:                return 1;

  2091. +            case Vst2::hostOpcodeGetManufacturerVersion:            return 0x0101;

  2092.  

  2093. -            case Vst2::audioMasterGetVendorString:

  2094. -            case Vst2::audioMasterGetProductString:             return getHostName ((char*) ptr);

  2095. +            case Vst2::hostOpcodeGetManufacturerName:

  2096. +            case Vst2::hostOpcodeGetProductName:                    return getHostName ((char*) ptr);

  2097.  

  2098. -            case Vst2::audioMasterGetSampleRate:                return (pointer_sized_int) defaultVSTSampleRateValue;

  2099. -            case Vst2::audioMasterGetBlockSize:                 return (pointer_sized_int) defaultVSTBlockSizeValue;

  2100. -            case Vst2::audioMasterSetOutputSampleRate:          return 0;

  2101. +            case Vst2::hostOpcodeGetSampleRate:                     return (pointer_sized_int) defaultVSTSampleRateValue;

  2102. +            case Vst2::hostOpcodeGetBlockSize:                      return (pointer_sized_int) defaultVSTBlockSizeValue;

  2103. +            case Vst2::hostOpcodeSetOutputSampleRate:               return 0;

  2104.  

  2105.              default:

  2106.                  DBG ("*** Unhandled VST Callback: " + String ((int) opcode));

  2107. @@ -1713,7 +1704,7 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  2108.                      UseResFile (vstModule->resFileId);

  2109.                 #endif

  2110.  

  2111. -                result = vstEffect->dispatcher (vstEffect, opcode, index, value, ptr, opt);

  2112. +                result = vstEffect->dispatchFunction (vstEffect, opcode, index, value, ptr, opt);

  2113.  

  2114.                 #if JUCE_MAC

  2115.                  auto newResFile = CurResFile();

  2116. @@ -1919,14 +1910,14 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  2117.          return true;

  2118.      }

  2119.  

  2120. -    bool usesChunks() const noexcept        { return vstEffect != nullptr && (vstEffect->flags & Vst2::effFlagsProgramChunks) != 0; }

  2121. +    bool usesChunks() const noexcept        { return vstEffect != nullptr && (vstEffect->flags & Vst2::vstEffectFlagDataInChunks) != 0; }

  2122.  

  2123.      bool getChunkData (MemoryBlock& mb, bool isPreset, int maxSizeMB) const

  2124.      {

  2125.          if (usesChunks())

  2126.          {

  2127.              void* data = nullptr;

  2128. -            auto bytes = (size_t) dispatch (Vst2::effGetChunk, isPreset ? 1 : 0, 0, &data, 0.0f);

  2129. +            auto bytes = (size_t) dispatch (Vst2::plugInOpcodeGetData, isPreset ? 1 : 0, 0, &data, 0.0f);

  2130.  

  2131.              if (data != nullptr && bytes <= (size_t) maxSizeMB * 1024 * 1024)

  2132.              {

  2133. @@ -1944,7 +1935,7 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  2134.      {

  2135.          if (size > 0 && usesChunks())

  2136.          {

  2137. -            dispatch (Vst2::effSetChunk, isPreset ? 1 : 0, size, (void*) data, 0.0f);

  2138. +            dispatch (Vst2::plugInOpcodeSetData, isPreset ? 1 : 0, size, (void*) data, 0.0f);

  2139.  

  2140.              if (! isPreset)

  2141.                  updateStoredProgramNames();

  2142. @@ -1957,7 +1948,7 @@ struct VSTPluginInstance final   : public AudioPluginInstance,

  2143.  

  2144.      bool updateSizeFromEditor (int w, int h);

  2145.  

  2146. -    Vst2::AEffect* vstEffect;

  2147. +    Vst2::VstEffectInterface* vstEffect;

  2148.      ModuleHandle::Ptr vstModule;

  2149.  

  2150.      std::unique_ptr<VSTPluginFormat::ExtraFunctions> extraFunctions;

  2151. @@ -1980,7 +1971,7 @@ private:

  2152.              currentValue = (newValue != 0.0f);

  2153.  

  2154.              if (parent.vstSupportsBypass)

  2155. -                parent.dispatch (Vst2::effSetBypass, 0, currentValue ? 1 : 0, nullptr, 0.0f);

  2156. +                parent.dispatch (Vst2::plugInOpcodeSetBypass, 0, currentValue ? 1 : 0, nullptr, 0.0f);

  2157.          }

  2158.  

  2159.          float getValueForText (const String& text) const override

  2160. @@ -2028,7 +2019,7 @@ private:

  2161.      CriticalSection midiInLock;

  2162.      MidiBuffer incomingMidi;

  2163.      VSTMidiEventList midiEventsToSend;

  2164. -    Vst2::VstTimeInfo vstHostTime;

  2165. +    Vst2::VstTimingInformation vstHostTime;

  2166.  

  2167.      AudioBuffer<float> tmpBufferFloat;

  2168.      HeapBlock<float*> channelBufferFloat;

  2169. @@ -2065,7 +2056,7 @@ private:

  2170.          if (auto* app = JUCEApplicationBase::getInstance())

  2171.              hostName = app->getApplicationName();

  2172.  

  2173. -        hostName.copyToUTF8 (name, (size_t) jmin (Vst2::kVstMaxVendorStrLen, Vst2::kVstMaxProductStrLen) - 1);

  2174. +        hostName.copyToUTF8 (name, (size_t) jmin (Vst2::vstMaxManufacturerStringLength, Vst2::vstMaxPlugInNameStringLength) - 1);

  2175.          return 1;

  2176.      }

  2177.  

  2178. @@ -2086,7 +2077,7 @@ private:

  2179.  

  2180.             #if JUCE_MAC

  2181.              if (getActiveEditor() != nullptr)

  2182. -                dispatch (Vst2::effEditIdle, 0, 0, nullptr, 0);

  2183. +                dispatch (Vst2::plugInOpcodeEditorIdle, 0, 0, nullptr, 0);

  2184.             #endif

  2185.  

  2186.              Timer::callPendingTimersSynchronously();

  2187. @@ -2108,9 +2099,9 @@ private:

  2188.      }

  2189.  

  2190.      //==============================================================================

  2191. -    static Vst2::AEffect* constructEffect (const ModuleHandle::Ptr& module)

  2192. +    static Vst2::VstEffectInterface* constructEffect (const ModuleHandle::Ptr& module)

  2193.      {

  2194. -        Vst2::AEffect* effect = nullptr;

  2195. +        Vst2::VstEffectInterface* effect = nullptr;

  2196.          try

  2197.          {

  2198.              const IdleCallRecursionPreventer icrp;

  2199. @@ -2127,10 +2118,10 @@ private:

  2200.                  JUCE_VST_WRAPPER_INVOKE_MAIN

  2201.              }

  2202.  

  2203. -            if (effect != nullptr && effect->magic == 0x56737450 /* 'VstP' */)

  2204. +            if (effect != nullptr && effect->interfaceIdentifier == Vst2::juceVstInterfaceIdentifier)

  2205.              {

  2206. -                jassert (effect->resvd2 == 0);

  2207. -                jassert (effect->object != nullptr);

  2208. +                jassert (effect->hostSpace2 == 0);

  2209. +                jassert (effect->effectPointer != 0);

  2210.  

  2211.                  _fpreset(); // some dodgy plugs mess around with this

  2212.              }

  2213. @@ -2145,11 +2136,11 @@ private:

  2214.          return effect;

  2215.      }

  2216.  

  2217. -    static BusesProperties queryBusIO (Vst2::AEffect* effect)

  2218. +    static BusesProperties queryBusIO (Vst2::VstEffectInterface* effect)

  2219.      {

  2220.          BusesProperties returnValue;

  2221.  

  2222. -        if (effect->numInputs == 0 && effect->numOutputs == 0)

  2223. +        if (effect->numInputChannels == 0 && effect->numOutputChannels == 0)

  2224.              return returnValue;

  2225.  

  2226.          // Workaround for old broken JUCE plug-ins which would return an invalid

  2227. @@ -2160,10 +2151,10 @@ private:

  2228.          // plug-in is reporting.

  2229.          if (! pluginHasDefaultChannelLayouts (effect))

  2230.          {

  2231. -            SpeakerMappings::VstSpeakerConfigurationHolder canonicalIn  (AudioChannelSet::canonicalChannelSet (effect->numInputs));

  2232. -            SpeakerMappings::VstSpeakerConfigurationHolder canonicalOut (AudioChannelSet::canonicalChannelSet (effect->numOutputs));

  2233. +            SpeakerMappings::VstSpeakerConfigurationHolder canonicalIn  (AudioChannelSet::canonicalChannelSet (effect->numInputChannels));

  2234. +            SpeakerMappings::VstSpeakerConfigurationHolder canonicalOut (AudioChannelSet::canonicalChannelSet (effect->numOutputChannels));

  2235.  

  2236. -            effect->dispatcher (effect, Vst2::effSetSpeakerArrangement, 0,

  2237. +            effect->dispatchFunction (effect, Vst2::plugInOpcodeSetSpeakerConfiguration, 0,

  2238.                                        (pointer_sized_int) &canonicalIn.get(), (void*) &canonicalOut.get(), 0.0f);

  2239.          }

  2240.  

  2241. @@ -2172,35 +2163,35 @@ private:

  2242.          for (int dir = 0; dir < 2; ++dir)

  2243.          {

  2244.              const bool isInput = (dir == 0);

  2245. -            const int opcode = (isInput ? Vst2::effGetInputProperties : Vst2::effGetOutputProperties);

  2246. -            const int maxChannels = (isInput ? effect->numInputs : effect->numOutputs);

  2247. +            const int opcode = (isInput ? Vst2::plugInOpcodeGetInputPinProperties : Vst2::plugInOpcodeGetOutputPinProperties);

  2248. +            const int maxChannels = (isInput ? effect->numInputChannels : effect->numOutputChannels);

  2249.              const auto* arr = (isInput ? arrangement.in : arrangement.out);

  2250.              bool busAdded = false;

  2251.  

  2252. -            Vst2::VstPinProperties pinProps;

  2253. +            Vst2::VstPinInfo pinProps;

  2254.              AudioChannelSet layout;

  2255.  

  2256.              for (int ch = 0; ch < maxChannels; ch += layout.size())

  2257.              {

  2258. -                if (effect->dispatcher (effect, opcode, ch, 0, &pinProps, 0.0f) == 0)

  2259. +                if (effect->dispatchFunction (effect, opcode, ch, 0, &pinProps, 0.0f) == 0)

  2260.                      break;

  2261.  

  2262. -                if ((pinProps.flags & Vst2::kVstPinUseSpeaker) != 0)

  2263. +                if ((pinProps.flags & Vst2::vstPinInfoFlagValid) != 0)

  2264.                  {

  2265. -                    layout = SpeakerMappings::vstArrangementTypeToChannelSet (pinProps.arrangementType, 0);

  2266. +                    layout = SpeakerMappings::vstArrangementTypeToChannelSet (pinProps.configurationType, 0);

  2267.  

  2268.                      if (layout.isDisabled())

  2269.                          break;

  2270.                  }

  2271.                  else if (arr == nullptr)

  2272.                  {

  2273. -                    layout = ((pinProps.flags & Vst2::kVstPinIsStereo) != 0 ? AudioChannelSet::stereo() : AudioChannelSet::mono());

  2274. +                    layout = ((pinProps.flags & Vst2::vstPinInfoFlagIsStereo) != 0 ? AudioChannelSet::stereo() : AudioChannelSet::mono());

  2275.                  }

  2276.                  else

  2277.                      break;

  2278.  

  2279.                  busAdded = true;

  2280. -                returnValue.addBus (isInput, pinProps.label, layout, true);

  2281. +                returnValue.addBus (isInput, pinProps.text, layout, true);

  2282.              }

  2283.  

  2284.              // no buses?

  2285. @@ -2208,8 +2199,8 @@ private:

  2286.              {

  2287.                  String busName = (isInput ? "Input" : "Output");

  2288.  

  2289. -                if (effect->dispatcher (effect, opcode, 0, 0, &pinProps, 0.0f) != 0)

  2290. -                    busName = pinProps.label;

  2291. +                if (effect->dispatchFunction (effect, opcode, 0, 0, &pinProps, 0.0f) != 0)

  2292. +                    busName = pinProps.text;

  2293.  

  2294.                  if (arr != nullptr)

  2295.                      layout = SpeakerMappings::vstArrangementTypeToChannelSet (*arr);

  2296. @@ -2223,7 +2214,7 @@ private:

  2297.          return returnValue;

  2298.      }

  2299.  

  2300. -    static bool pluginHasDefaultChannelLayouts (Vst2::AEffect* effect)

  2301. +    static bool pluginHasDefaultChannelLayouts (Vst2::VstEffectInterface* effect)

  2302.      {

  2303.          if (getSpeakerArrangementWrapper (effect).isValid())

  2304.              return true;

  2305. @@ -2231,22 +2222,22 @@ private:

  2306.          for (int dir = 0; dir < 2; ++dir)

  2307.          {

  2308.              const bool isInput = (dir == 0);

  2309. -            const int opcode = (isInput ? Vst2::effGetInputProperties : Vst2::effGetOutputProperties);

  2310. -            const int maxChannels = (isInput ? effect->numInputs : effect->numOutputs);

  2311. +            const int opcode = (isInput ? Vst2::plugInOpcodeGetInputPinProperties : Vst2::plugInOpcodeGetOutputPinProperties);

  2312. +            const int maxChannels = (isInput ? effect->numInputChannels : effect->numOutputChannels);

  2313.  

  2314.              int channels = 1;

  2315.  

  2316.              for (int ch = 0; ch < maxChannels; ch += channels)

  2317.              {

  2318. -                Vst2::VstPinProperties pinProps;

  2319. +                Vst2::VstPinInfo pinProps;

  2320.  

  2321. -                if (effect->dispatcher (effect, opcode, ch, 0, &pinProps, 0.0f) == 0)

  2322. +                if (effect->dispatchFunction (effect, opcode, ch, 0, &pinProps, 0.0f) == 0)

  2323.                      return false;

  2324.  

  2325. -                if ((pinProps.flags & Vst2::kVstPinUseSpeaker) != 0)

  2326. +                if ((pinProps.flags & Vst2::vstPinInfoFlagValid) != 0)

  2327.                      return true;

  2328.  

  2329. -                channels = (pinProps.flags & Vst2::kVstPinIsStereo) != 0 ? 2 : 1;

  2330. +                channels = (pinProps.flags & Vst2::vstPinInfoFlagIsStereo) != 0 ? 2 : 1;

  2331.              }

  2332.          }

  2333.  

  2334. @@ -2255,28 +2246,28 @@ private:

  2335.  

  2336.      struct SpeakerArrangements

  2337.      {

  2338. -        const Vst2::VstSpeakerArrangement* in;

  2339. -        const Vst2::VstSpeakerArrangement* out;

  2340. +        const Vst2::VstSpeakerConfiguration* in;

  2341. +        const Vst2::VstSpeakerConfiguration* out;

  2342.  

  2343.          bool isValid() const noexcept { return in != nullptr && out != nullptr; }

  2344.      };

  2345.  

  2346. -    static SpeakerArrangements getSpeakerArrangementWrapper (Vst2::AEffect* effect)

  2347. +    static SpeakerArrangements getSpeakerArrangementWrapper (Vst2::VstEffectInterface* effect)

  2348.      {

  2349.          // Workaround: unfortunately old JUCE VST-2 plug-ins had a bug and would crash if

  2350.          // you try to get the speaker arrangement when there are no input channels present.

  2351.          // Hopefully, one day (when there are no more old JUCE plug-ins around), we can

  2352.          // comment out the next two lines.

  2353. -        if (effect->numInputs == 0)

  2354. +        if (effect->numInputChannels == 0)

  2355.              return { nullptr, nullptr };

  2356.  

  2357.          SpeakerArrangements result { nullptr, nullptr };

  2358. -        const auto dispatchResult = effect->dispatcher (effect,

  2359. -                                                        Vst2::effGetSpeakerArrangement,

  2360. -                                                        0,

  2361. -                                                        reinterpret_cast<pointer_sized_int> (&result.in),

  2362. -                                                        &result.out,

  2363. -                                                        0.0f);

  2364. +        const auto dispatchResult = effect->dispatchFunction (effect,

  2365. +                                                              Vst2::plugInOpcodeGetSpeakerArrangement,

  2366. +                                                              0,

  2367. +                                                              reinterpret_cast<pointer_sized_int> (&result.in),

  2368. +                                                              &result.out,

  2369. +                                                              0.0f);

  2370.  

  2371.          if (dispatchResult != 0)

  2372.              return result;

  2373. @@ -2313,69 +2304,69 @@ private:

  2374.  

  2375.                  if (currentPlayHead->getCurrentPosition (position))

  2376.                  {

  2377. -                    vstHostTime.samplePos          = (double) position.timeInSamples;

  2378. -                    vstHostTime.tempo              = position.bpm;

  2379. -                    vstHostTime.timeSigNumerator   = position.timeSigNumerator;

  2380. -                    vstHostTime.timeSigDenominator = position.timeSigDenominator;

  2381. -                    vstHostTime.ppqPos             = position.ppqPosition;

  2382. -                    vstHostTime.barStartPos        = position.ppqPositionOfLastBarStart;

  2383. -                    vstHostTime.flags |= Vst2::kVstTempoValid

  2384. -                                       | Vst2::kVstTimeSigValid

  2385. -                                       | Vst2::kVstPpqPosValid

  2386. -                                       | Vst2::kVstBarsValid;

  2387. +                    vstHostTime.samplePosition           = (double) position.timeInSamples;

  2388. +                    vstHostTime.tempoBPM                 = position.bpm;

  2389. +                    vstHostTime.timeSignatureNumerator   = position.timeSigNumerator;

  2390. +                    vstHostTime.timeSignatureDenominator = position.timeSigDenominator;

  2391. +                    vstHostTime.musicalPosition          = position.ppqPosition;

  2392. +                    vstHostTime.lastBarPosition          = position.ppqPositionOfLastBarStart;

  2393. +                    vstHostTime.flags |= Vst2::vstTimingInfoFlagTempoValid

  2394. +                                       | Vst2::vstTimingInfoFlagTimeSignatureValid

  2395. +                                       | Vst2::vstTimingInfoFlagMusicalPositionValid

  2396. +                                       | Vst2::vstTimingInfoFlagLastBarPositionValid;

  2397.  

  2398.                      if (const auto* hostTimeNs = getHostTimeNs())

  2399.                      {

  2400. -                        vstHostTime.nanoSeconds = (double) *hostTimeNs;

  2401. -                        vstHostTime.flags |= Vst2::kVstNanosValid;

  2402. +                        vstHostTime.systemTimeNanoseconds = (double) *hostTimeNs;

  2403. +                        vstHostTime.flags |= Vst2::vstTimingInfoFlagNanosecondsValid;

  2404.                      }

  2405.                      else

  2406.                      {

  2407. -                        vstHostTime.flags &= ~Vst2::kVstNanosValid;

  2408. +                        vstHostTime.flags &= ~Vst2::vstTimingInfoFlagNanosecondsValid;

  2409.                      }

  2410.  

  2411.                      int32 newTransportFlags = 0;

  2412. -                    if (position.isPlaying)     newTransportFlags |= Vst2::kVstTransportPlaying;

  2413. -                    if (position.isRecording)   newTransportFlags |= Vst2::kVstTransportRecording;

  2414. +                    if (position.isPlaying)     newTransportFlags |= Vst2::vstTimingInfoFlagCurrentlyPlaying;

  2415. +                    if (position.isRecording)   newTransportFlags |= Vst2::vstTimingInfoFlagCurrentlyRecording;

  2416.  

  2417. -                    if (newTransportFlags != (vstHostTime.flags & (Vst2::kVstTransportPlaying

  2418. -                                                                   | Vst2::kVstTransportRecording)))

  2419. -                        vstHostTime.flags = (vstHostTime.flags & ~(Vst2::kVstTransportPlaying | Vst2::kVstTransportRecording)) | newTransportFlags | Vst2::kVstTransportChanged;

  2420. +                    if (newTransportFlags != (vstHostTime.flags & (Vst2::vstTimingInfoFlagCurrentlyPlaying

  2421. +                                                                   | Vst2::vstTimingInfoFlagCurrentlyRecording)))

  2422. +                        vstHostTime.flags = (vstHostTime.flags & ~(Vst2::vstTimingInfoFlagCurrentlyPlaying | Vst2::vstTimingInfoFlagCurrentlyRecording)) | newTransportFlags | Vst2::vstTimingInfoFlagTransportChanged;

  2423.                      else

  2424. -                        vstHostTime.flags &= ~Vst2::kVstTransportChanged;

  2425. +                        vstHostTime.flags &= ~Vst2::vstTimingInfoFlagTransportChanged;

  2426.  

  2427. -                    const auto optionalFrameRate = [&fr = position.frameRate]() -> Optional<Vst2::VstInt32>

  2428. +                    const auto optionalFrameRate = [&fr = position.frameRate]() -> Optional<int32>

  2429.                      {

  2430.                          switch (fr.getBaseRate())

  2431.                          {

  2432. -                            case 24:        return fr.isPullDown() ? Vst2::kVstSmpte239fps : Vst2::kVstSmpte24fps;

  2433. -                            case 25:        return fr.isPullDown() ? Vst2::kVstSmpte249fps : Vst2::kVstSmpte25fps;

  2434. -                            case 30:        return fr.isPullDown() ? (fr.isDrop() ? Vst2::kVstSmpte2997dfps : Vst2::kVstSmpte2997fps)

  2435. -                                                                   : (fr.isDrop() ? Vst2::kVstSmpte30dfps   : Vst2::kVstSmpte30fps);

  2436. -                            case 60:        return fr.isPullDown() ? Vst2::kVstSmpte599fps : Vst2::kVstSmpte60fps;

  2437. +                            case 24:        return fr.isPullDown() ? Vst2::vstSmpteRateFps239 : Vst2::vstSmpteRateFps24;

  2438. +                            case 25:        return fr.isPullDown() ? Vst2::vstSmpteRateFps249 : Vst2::vstSmpteRateFps25;

  2439. +                            case 30:        return fr.isPullDown() ? (fr.isDrop() ? Vst2::vstSmpteRateFps2997drop : Vst2::vstSmpteRateFps2997)

  2440. +                                                                   : (fr.isDrop() ? Vst2::vstSmpteRateFps30drop   : Vst2::vstSmpteRateFps30);

  2441. +                            case 60:        return fr.isPullDown() ? Vst2::vstSmpteRateFps599 : Vst2::vstSmpteRateFps60;

  2442.                          }

  2443.  

  2444.                          return {};

  2445.                      }();

  2446.  

  2447. -                    vstHostTime.flags |= optionalFrameRate ? Vst2::kVstSmpteValid : 0;

  2448. -                    vstHostTime.smpteFrameRate = optionalFrameRate.orFallback (Vst2::VstSmpteFrameRate{});

  2449. +                    vstHostTime.flags |= optionalFrameRate ? Vst2::vstTimingInfoFlagSmpteValid : 0;

  2450. +                    vstHostTime.smpteRate = optionalFrameRate.orFallback (0);

  2451.                      vstHostTime.smpteOffset = (int32) (position.timeInSeconds * 80.0 * position.frameRate.getEffectiveRate() + 0.5);

  2452.  

  2453.                      if (position.isLooping)

  2454.                      {

  2455. -                        vstHostTime.cycleStartPos = position.ppqLoopStart;

  2456. -                        vstHostTime.cycleEndPos   = position.ppqLoopEnd;

  2457. -                        vstHostTime.flags |= (Vst2::kVstCyclePosValid | Vst2::kVstTransportCycleActive);

  2458. +                        vstHostTime.loopStartPosition = position.ppqLoopStart;

  2459. +                        vstHostTime.loopEndPosition   = position.ppqLoopEnd;

  2460. +                        vstHostTime.flags |= (Vst2::vstTimingInfoFlagLoopPositionValid | Vst2::vstTimingInfoFlagLoopActive);

  2461.                      }

  2462.                      else

  2463.                      {

  2464. -                        vstHostTime.flags &= ~(Vst2::kVstCyclePosValid | Vst2::kVstTransportCycleActive);

  2465. +                        vstHostTime.flags &= ~(Vst2::vstTimingInfoFlagLoopPositionValid | Vst2::vstTimingInfoFlagLoopActive);

  2466.                      }

  2467.                  }

  2468.              }

  2469.  

  2470. -            vstHostTime.nanoSeconds = getVSTHostTimeNanoseconds();

  2471. +            vstHostTime.systemTimeNanoseconds = getVSTHostTimeNanoseconds();

  2472.  

  2473.              if (wantsMidiMessages)

  2474.              {

  2475. @@ -2386,13 +2377,13 @@ private:

  2476.                      midiEventsToSend.addEvent (metadata.data, metadata.numBytes,

  2477.                                                 jlimit (0, numSamples - 1, metadata.samplePosition));

  2478.  

  2479. -                vstEffect->dispatcher (vstEffect, Vst2::effProcessEvents, 0, 0, midiEventsToSend.events, 0);

  2480. +                vstEffect->dispatchFunction (vstEffect, Vst2::plugInOpcodePreAudioProcessingEvents, 0, 0, midiEventsToSend.events, 0);

  2481.              }

  2482.  

  2483.              _clearfp();

  2484.  

  2485.              // always ensure that the buffer is at least as large as the maximum number of channels

  2486. -            auto maxChannels = jmax (vstEffect->numInputs, vstEffect->numOutputs);

  2487. +            auto maxChannels = jmax (vstEffect->numInputChannels, vstEffect->numOutputChannels);

  2488.              auto channels = channelBuffer.get();

  2489.  

  2490.              if (numChannels < maxChannels)

  2491. @@ -2431,28 +2422,28 @@ private:

  2492.      //==============================================================================

  2493.      inline void invokeProcessFunction (AudioBuffer<float>& buffer, int32 sampleFrames)

  2494.      {

  2495. -        if ((vstEffect->flags & Vst2::effFlagsCanReplacing) != 0)

  2496. +        if ((vstEffect->flags & Vst2::vstEffectFlagInplaceAudio) != 0)

  2497.          {

  2498. -            vstEffect->processReplacing (vstEffect, buffer.getArrayOfWritePointers(),

  2499. -                                                    buffer.getArrayOfWritePointers(), sampleFrames);

  2500. +            vstEffect->processAudioInplaceFunction (vstEffect, buffer.getArrayOfWritePointers(),

  2501. +                                                               buffer.getArrayOfWritePointers(), sampleFrames);

  2502.          }

  2503.          else

  2504.          {

  2505. -            outOfPlaceBuffer.setSize (vstEffect->numOutputs, sampleFrames);

  2506. +            outOfPlaceBuffer.setSize (vstEffect->numOutputChannels, sampleFrames);

  2507.              outOfPlaceBuffer.clear();

  2508.  

  2509. -            vstEffect->process (vstEffect, buffer.getArrayOfWritePointers(),

  2510. -                                           outOfPlaceBuffer.getArrayOfWritePointers(), sampleFrames);

  2511. +            vstEffect->processAudioFunction (vstEffect, buffer.getArrayOfWritePointers(),

  2512. +                                                        outOfPlaceBuffer.getArrayOfWritePointers(), sampleFrames);

  2513.  

  2514. -            for (int i = vstEffect->numOutputs; --i >= 0;)

  2515. +            for (int i = vstEffect->numOutputChannels; --i >= 0;)

  2516.                  buffer.copyFrom (i, 0, outOfPlaceBuffer.getReadPointer (i), sampleFrames);

  2517.          }

  2518.      }

  2519.  

  2520.      inline void invokeProcessFunction (AudioBuffer<double>& buffer, int32 sampleFrames)

  2521.      {

  2522. -        vstEffect->processDoubleReplacing (vstEffect, buffer.getArrayOfWritePointers(),

  2523. -                                                      buffer.getArrayOfWritePointers(), sampleFrames);

  2524. +        vstEffect->processDoubleAudioInplaceFunction (vstEffect, buffer.getArrayOfWritePointers(),

  2525. +                                                                 buffer.getArrayOfWritePointers(), sampleFrames);

  2526.      }

  2527.  

  2528.      //==============================================================================

  2529. @@ -2478,7 +2469,7 @@ private:

  2530.          if (vstEffect == nullptr)

  2531.              return {};

  2532.  

  2533. -        jassert (index >= 0 && index < vstEffect->numParams);

  2534. +        jassert (index >= 0 && index < vstEffect->numParameters);

  2535.          char nm[256] = { 0 };

  2536.          dispatch (opcode, index, 0, nm, 0);

  2537.          return String::createStringFromData (nm, (int) sizeof (nm)).trim();

  2538. @@ -2492,7 +2483,7 @@ private:

  2539.          {

  2540.              {

  2541.                  char nm[256] = { 0 };

  2542. -                dispatch (Vst2::effGetProgramName, 0, 0, nm, 0);

  2543. +                dispatch (Vst2::plugInOpcodeGetCurrentProgramName, 0, 0, nm, 0);

  2544.                  progName = String::createStringFromData (nm, (int) sizeof (nm)).trim();

  2545.              }

  2546.  

  2547. @@ -2536,7 +2527,7 @@ private:

  2548.              char nm[256] = { 0 };

  2549.  

  2550.              // only do this if the plugin can't use indexed names.

  2551. -            if (dispatch (Vst2::effGetProgramNameIndexed, 0, -1, nm, 0) == 0)

  2552. +            if (dispatch (Vst2::plugInOpcodeGetProgramName, 0, -1, nm, 0) == 0)

  2553.              {

  2554.                  auto oldProgram = getCurrentProgram();

  2555.                  MemoryBlock oldSettings;

  2556. @@ -2554,7 +2545,7 @@ private:

  2557.          }

  2558.      }

  2559.  

  2560. -    void handleMidiFromPlugin (const Vst2::VstEvents* events)

  2561. +    void handleMidiFromPlugin (const Vst2::VstEventBlock* events)

  2562.      {

  2563.          if (events != nullptr)

  2564.          {

  2565. @@ -2601,11 +2592,11 @@ private:

  2566.      }

  2567.  

  2568.      //==============================================================================

  2569. -    int getVersionNumber() const noexcept   { return vstEffect != nullptr ? vstEffect->version : 0; }

  2570. +    int getVersionNumber() const noexcept   { return vstEffect != nullptr ? vstEffect->plugInVersion : 0; }

  2571.  

  2572.      String getVersion() const

  2573.      {

  2574. -        auto v = (unsigned int) dispatch (Vst2::effGetVendorVersion, 0, 0, nullptr, 0);

  2575. +        auto v = (unsigned int) dispatch (Vst2::plugInOpcodeGetManufacturerVersion, 0, 0, nullptr, 0);

  2576.  

  2577.          String s;

  2578.  

  2579. @@ -2673,7 +2664,6 @@ private:

  2580.              case Vst2::kPlugCategOfflineProcess:  return "Offline Process";

  2581.              case Vst2::kPlugCategShell:           return "Shell";

  2582.              case Vst2::kPlugCategUnknown:         return "Unknown";

  2583. -            case Vst2::kPlugCategMaxCount:

  2584.              default:                              break;

  2585.          }

  2586.  

  2587. @@ -2682,7 +2672,7 @@ private:

  2588.  

  2589.      void setPower (const bool on)

  2590.      {

  2591. -        dispatch (Vst2::effMainsChanged, 0, on ? 1 : 0, nullptr, 0);

  2592. +        dispatch (Vst2::plugInOpcodeResumeSuspend, 0, on ? 1 : 0, nullptr, 0);

  2593.          isPowerOn = on;

  2594.      }

  2595.  

  2596. @@ -2748,11 +2738,11 @@ public:

  2597.  

  2598.          activeVSTWindows.add (this);

  2599.  

  2600. -        Vst2::ERect* rect = nullptr;

  2601. -        dispatch (Vst2::effEditGetRect, 0, 0, &rect, 0);

  2602. +        Vst2::VstEditorBounds* rect = nullptr;

  2603. +        dispatch (Vst2::plugInOpcodeGetEditorBounds, 0, 0, &rect, 0);

  2604.  

  2605.          if (rect != nullptr)

  2606. -            updateSizeFromEditor (rect->right - rect->left, rect->bottom - rect->top);

  2607. +            updateSizeFromEditor (rect->rightmost - rect->leftmost, rect->lower - rect->upper);

  2608.          else

  2609.              updateSizeFromEditor (1, 1);

  2610.  

  2611. @@ -2937,7 +2927,7 @@ public:

  2612.      void setContentScaleFactor()

  2613.      {

  2614.          if (pluginRespondsToDPIChanges)

  2615. -            dispatch (Vst2::effVendorSpecific,

  2616. +            dispatch (Vst2::plugInOpcodeManufacturerSpecific,

  2617.                        (int) ByteOrder::bigEndianInt ("PreS"),

  2618.                        (int) ByteOrder::bigEndianInt ("AeCs"),

  2619.                        nullptr, getEffectiveScale());

  2620. @@ -2985,7 +2975,7 @@ public:

  2621.                  // DPI awareness is set correctly inside this call.

  2622.                  ScopedThreadDPIAwarenessSetter scope (getPluginHWND());

  2623.                 #endif

  2624. -                plugin.dispatch (Vst2::effEditIdle, 0, 0, nullptr, 0);

  2625. +                plugin.dispatch (Vst2::plugInOpcodeEditorIdle, 0, 0, nullptr, 0);

  2626.  

  2627.                  reentrantGuard = false;

  2628.              }

  2629. @@ -3018,7 +3008,7 @@ public:

  2630.          activeVSTWindows.add (this);

  2631.  

  2632.         #if JUCE_MAC

  2633. -        dispatch (Vst2::effEditTop, 0, 0, nullptr, 0);

  2634. +        dispatch (Vst2::plugInOpcodeeffEditorTop, 0, 0, nullptr, 0);

  2635.         #endif

  2636.      }

  2637.  

  2638. @@ -3048,24 +3038,24 @@ private:

  2639.  

  2640.          isOpen = true;

  2641.  

  2642. -        Vst2::ERect* rect = nullptr;

  2643. -        dispatch (Vst2::effEditGetRect, 0, 0, &rect, 0);

  2644. -        dispatch (Vst2::effEditOpen, 0, 0, parentWindow, 0);

  2645. +        Vst2::VstEditorBounds* rect = nullptr;

  2646. +        dispatch (Vst2::plugInOpcodeGetEditorBounds, 0, 0, &rect, 0);

  2647. +        dispatch (Vst2::plugInOpcodeOpenEditor, 0, 0, parentWindow, 0);

  2648.  

  2649.          // do this before and after like in the steinberg example

  2650. -        dispatch (Vst2::effEditGetRect, 0, 0, &rect, 0);

  2651. -        dispatch (Vst2::effGetProgram, 0, 0, nullptr, 0); // also in steinberg code

  2652. +        dispatch (Vst2::plugInOpcodeGetEditorBounds, 0, 0, &rect, 0);

  2653. +        dispatch (Vst2::plugInOpcodeGetCurrentProgram, 0, 0, nullptr, 0); // also in steinberg code

  2654.  

  2655.          // Install keyboard hooks

  2656. -        pluginWantsKeys = (dispatch (Vst2::effKeysRequired, 0, 0, nullptr, 0) == 0);

  2657. +        pluginWantsKeys = (dispatch (Vst2::plugInOpcodeKeyboardFocusRequired, 0, 0, nullptr, 0) == 0);

  2658.  

  2659.          // double-check it's not too tiny

  2660.          int w = 250, h = 150;

  2661.  

  2662.          if (rect != nullptr)

  2663.          {

  2664. -            w = rect->right - rect->left;

  2665. -            h = rect->bottom - rect->top;

  2666. +            w = rect->rightmost - rect->leftmost;

  2667. +            h = rect->lower - rect->upper;

  2668.  

  2669.              if (w == 0 || h == 0)

  2670.              {

  2671. @@ -3095,20 +3085,20 @@ private:

  2672.  

  2673.          setContentScaleFactor();

  2674.  

  2675. -        Vst2::ERect* rect = nullptr;

  2676. +        Vst2::VstEditorBounds* rect = nullptr;

  2677.  

  2678. -        dispatch (Vst2::effEditGetRect, 0, 0, &rect, 0);

  2679. +        dispatch (Vst2::plugInOpcodeGetEditorBounds, 0, 0, &rect, 0);

  2680.  

  2681.         #if JUCE_WINDOWS

  2682.          auto* handle = embeddedComponent.getHWND();

  2683.         #else

  2684.          auto* handle = getWindowHandle();

  2685.         #endif

  2686. -        dispatch (Vst2::effEditOpen, 0, 0, handle, 0);

  2687. -        dispatch (Vst2::effEditGetRect, 0, 0, &rect, 0);  // do this before and after like in the steinberg example

  2688. -        dispatch (Vst2::effGetProgram, 0, 0, nullptr, 0); // also in steinberg code

  2689. +        dispatch (Vst2::plugInOpcodeOpenEditor, 0, 0, handle, 0);

  2690. +        dispatch (Vst2::plugInOpcodeGetEditorBounds, 0, 0, &rect, 0);  // do this before and after like in the steinberg example

  2691. +        dispatch (Vst2::plugInOpcodeGetCurrentProgram, 0, 0, nullptr, 0); // also in steinberg code

  2692.  

  2693. -        pluginWantsKeys = (dispatch (Vst2::effKeysRequired, 0, 0, nullptr, 0) == 0);

  2694. +        pluginWantsKeys = (dispatch (Vst2::plugInOpcodeKeyboardFocusRequired, 0, 0, nullptr, 0) == 0);

  2695.  

  2696.         #if JUCE_WINDOWS

  2697.          originalWndProc = 0;

  2698. @@ -3143,8 +3133,8 @@ private:

  2699.  

  2700.          if (rect != nullptr)

  2701.          {

  2702. -            auto rw = rect->right - rect->left;

  2703. -            auto rh = rect->bottom - rect->top;

  2704. +            auto rw = rect->rightmost - rect->leftmost;

  2705. +            auto rh = rect->lower - rect->upper;

  2706.  

  2707.              if ((rw > 50 && rh > 50 && rw < 2000 && rh < 2000 && (! isWithin (w, rw, 2) || ! isWithin (h, rh, 2)))

  2708.                  || ((w == 0 && rw > 0) || (h == 0 && rh > 0)))

  2709. @@ -3177,8 +3167,8 @@ private:

  2710.  

  2711.          if (rect != nullptr)

  2712.          {

  2713. -            w = rect->right - rect->left;

  2714. -            h = rect->bottom - rect->top;

  2715. +            w = rect->rightmost - rect->leftmost;

  2716. +            h = rect->lower - rect->upper;

  2717.  

  2718.              if (w == 0 || h == 0)

  2719.              {

  2720. @@ -3217,7 +3207,7 @@ private:

  2721.  

  2722.              JUCE_VST_LOG ("Closing VST UI: " + plugin.getName());

  2723.              isOpen = false;

  2724. -            dispatch (Vst2::effEditClose, 0, 0, nullptr, 0);

  2725. +            dispatch (Vst2::plugInOpcodeCloseEditor, 0, 0, nullptr, 0);

  2726.              stopTimer();

  2727.  

  2728.             #if JUCE_WINDOWS

  2729. @@ -3254,11 +3244,11 @@ private:

  2730.  

  2731.      void resizeToFit()

  2732.      {

  2733. -        Vst2::ERect* rect = nullptr;

  2734. -        dispatch (Vst2::effEditGetRect, 0, 0, &rect, 0);

  2735. +        Vst2::VstEditorBounds* rect = nullptr;

  2736. +        dispatch (Vst2::plugInOpcodeGetEditorBounds, 0, 0, &rect, 0);

  2737.  

  2738. -        auto w = rect->right - rect->left;

  2739. -        auto h = rect->bottom - rect->top;

  2740. +        auto w = rect->rightmost - rect->leftmost;

  2741. +        auto h = rect->lower - rect->upper;

  2742.  

  2743.          if (! isWindowSizeCorrectForPlugin (w, h))

  2744.          {

  2745. @@ -3342,17 +3332,17 @@ private:

  2746.                if (owner.isOpen)

  2747.                {

  2748.                    owner.isOpen = false;

  2749. -                  owner.dispatch (Vst2::effEditClose, 0, 0, 0, 0);

  2750. -                  owner.dispatch (Vst2::effEditSleep, 0, 0, 0, 0);

  2751. +                  owner.dispatch (Vst2::plugInOpcodeCloseEditor, 0, 0, 0, 0);

  2752. +                  owner.dispatch (Vst2::plugInOpcodeSleepEditor, 0, 0, 0, 0);

  2753.                }

  2754.            }

  2755.  

  2756.            bool getEmbeddedViewSize (int& w, int& h) override

  2757.            {

  2758. -              Vst2::ERect* rect = nullptr;

  2759. -              owner.dispatch (Vst2::effEditGetRect, 0, 0, &rect, 0);

  2760. -              w = rect->right - rect->left;

  2761. -              h = rect->bottom - rect->top;

  2762. +              Vst2::VstEditorBounds* rect = nullptr;

  2763. +              owner.dispatch (Vst2::plugInOpcodeGetEditorBounds, 0, 0, &rect, 0);

  2764. +              w = rect->rightmost - rect->leftmost;

  2765. +              h = rect->lower - rect->upper;

  2766.                return true;

  2767.            }

  2768.  

  2769. @@ -3362,7 +3352,7 @@ private:

  2770.                {

  2771.                    alreadyInside = true;

  2772.                    getTopLevelComponent()->toFront (true);

  2773. -                  owner.dispatch (Vst2::effEditMouse, x, y, 0, 0);

  2774. +                  owner.dispatch (Vst2::plugInOpcodeGetMouse, x, y, 0, 0);

  2775.                    alreadyInside = false;

  2776.                }

  2777.                else

  2778. @@ -3376,13 +3366,13 @@ private:

  2779.                if (auto* peer = getPeer())

  2780.                {

  2781.                    auto pos = peer->globalToLocal (getScreenPosition());

  2782. -                  Vst2::ERect r;

  2783. -                  r.left   = (int16) pos.getX();

  2784. -                  r.top    = (int16) pos.getY();

  2785. -                  r.right  = (int16) (r.left + getWidth());

  2786. -                  r.bottom = (int16) (r.top + getHeight());

  2787. +                  Vst2::VstEditorBounds r;

  2788. +                  r.leftmost  = (int16) pos.getX();

  2789. +                  r.upper     = (int16) pos.getY();

  2790. +                  r.rightmost = (int16) (r.leftmost + getWidth());

  2791. +                  r.lower     = (int16) (r.upper + getHeight());

  2792.  

  2793. -                  owner.dispatch (Vst2::effEditDraw, 0, 0, &r, 0);

  2794. +                  owner.dispatch (Vst2::plugInOpcodeDrawEditor, 0, 0, &r, 0);

  2795.                }

  2796.            }

  2797.  

  2798. @@ -3507,10 +3497,10 @@ bool VSTPluginInstance::updateSizeFromEditor (int w, int h)

  2799.  

  2800.  //==============================================================================

  2801.  // entry point for all callbacks from the plugin

  2802. -static pointer_sized_int VSTCALLBACK audioMaster (Vst2::AEffect* effect, int32 opcode, int32 index, pointer_sized_int value, void* ptr, float opt)

  2803. +static pointer_sized_int VSTINTERFACECALL audioMaster (Vst2::VstEffectInterface* effect, int32 opcode, int32 index, pointer_sized_int value, void* ptr, float opt)

  2804.  {

  2805.      if (effect != nullptr)

  2806. -        if (auto* instance = (VSTPluginInstance*) (effect->resvd2))

  2807. +        if (auto* instance = (VSTPluginInstance*) (effect->hostSpace2))

  2808.              return instance->handleCallback (opcode, index, value, ptr, opt);

  2809.  

  2810.      return VSTPluginInstance::handleGeneralCallback (opcode, index, value, ptr, opt);

  2811. @@ -3561,7 +3551,7 @@ void VSTPluginFormat::findAllTypesForFile (OwnedArray<PluginDescription>& result

  2812.          // Normal plugin...

  2813.          results.add (new PluginDescription (desc));

  2814.  

  2815. -        instance->dispatch (Vst2::effOpen, 0, 0, nullptr, 0);

  2816. +        instance->dispatch (Vst2::plugInOpcodeOpen, 0, 0, nullptr, 0);

  2817.      }

  2818.      else

  2819.      {

  2820. @@ -3569,7 +3559,7 @@ void VSTPluginFormat::findAllTypesForFile (OwnedArray<PluginDescription>& result

  2821.          for (;;)

  2822.          {

  2823.              char shellEffectName [256] = { 0 };

  2824. -            auto uid = (int) instance->dispatch (Vst2::effShellGetNextPlugin, 0, 0, shellEffectName, 0);

  2825. +            auto uid = (int) instance->dispatch (Vst2::plugInOpcodeNextPlugInUniqueID, 0, 0, shellEffectName, 0);

  2826.  

  2827.              if (uid == 0)

  2828.                  break;

  2829. @@ -3788,8 +3778,8 @@ void VSTPluginFormat::setExtraFunctions (AudioPluginInstance* plugin, ExtraFunct

  2830.  

  2831.  AudioPluginInstance* VSTPluginFormat::getPluginInstanceFromVstEffectInterface (void* aEffect)

  2832.  {

  2833. -    if (auto* vstAEffect = reinterpret_cast<Vst2::AEffect*> (aEffect))

  2834. -        if (auto* instanceVST = reinterpret_cast<VSTPluginInstance*> (vstAEffect->resvd2))

  2835. +    if (auto* vstAEffect = reinterpret_cast<Vst2::VstEffectInterface*> (aEffect))

  2836. +        if (auto* instanceVST = reinterpret_cast<VSTPluginInstance*> (vstAEffect->hostSpace2))

  2837.              return dynamic_cast<AudioPluginInstance*> (instanceVST);

  2838.  

  2839.      return nullptr;