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.
504 Commits
6 Branches
234MB
Tree: f4798ec9c6
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from 'f4798ec9c6'
${ noResults }
DISTRHO-Ports/libs/juce-current/patches/04_vst2-interface.patch

3256 lines
166KB
Raw Blame History 

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

  2. index f9b8bed8a..23484732b 100644

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

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

  5. @@ -78,14 +78,7 @@ JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4458)

  6.  

  7.  namespace Vst2

  8.  {

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

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

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

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

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

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

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

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

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

  18.  }

  19.  

  20.  JUCE_END_IGNORE_WARNINGS_MSVC

  21. @@ -96,7 +89,6 @@ JUCE_END_IGNORE_WARNINGS_GCC_LIKE

  22.   #pragma pack (push, 8)

  23.  #endif

  24.  

  25. -#define JUCE_VSTINTERFACE_H_INCLUDED 1

  26.  #define JUCE_GUI_BASICS_INCLUDE_XHEADERS 1

  27.  

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

  29. @@ -289,7 +281,7 @@ private:

  30.  

  31.  public:

  32.      //==============================================================================

  33. -    JuceVSTWrapper (Vst2::audioMasterCallback cb, AudioProcessor* af)

  34. +    JuceVSTWrapper (Vst2::VstHostCallback cb, AudioProcessor* af)

  35.         : hostCallback (cb),

  36.           processor (af)

  37.      {

  38. @@ -320,41 +312,41 @@ public:

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

  40.  

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

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

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

  44. -        vstEffect.process = nullptr;

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

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

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

  48. +        vstEffect.dispatchFunction = dispatcherCB;

  49. +        vstEffect.processAudioFunction = nullptr;

  50. +        vstEffect.setParameterValueFunction = setParameterCB;

  51. +        vstEffect.getParameterValueFunction = getParameterCB;

  52.          vstEffect.numPrograms = jmax (1, af->getNumPrograms());

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

  54. -        vstEffect.numInputs = maxNumInChannels;

  55. -        vstEffect.numOutputs = maxNumOutChannels;

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

  57. -        vstEffect.object = this;

  58. -        vstEffect.uniqueID = JucePlugin_VSTUniqueID;

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

  60. +        vstEffect.numInputChannels = maxNumInChannels;

  61. +        vstEffect.numOutputChannels = maxNumOutChannels;

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

  63. +        vstEffect.effectPointer = this;

  64. +        vstEffect.plugInIdentifier = JucePlugin_VSTUniqueID;

  65.  

  66.         #ifdef JucePlugin_VSTChunkStructureVersion

  67. -        vstEffect.version = JucePlugin_VSTChunkStructureVersion;

  68. +        vstEffect.plugInVersion = JucePlugin_VSTChunkStructureVersion;

  69.         #else

  70. -        vstEffect.version = JucePlugin_VersionCode;

  71. +        vstEffect.plugInVersion = JucePlugin_VersionCode;

  72.         #endif

  73.  

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

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

  76. +        vstEffect.processAudioInplaceFunction = processReplacingCB;

  77. +        vstEffect.processDoubleAudioInplaceFunction = processDoubleReplacingCB;

  78.  

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

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

  81.  

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

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

  84.          if (processor->supportsDoublePrecisionProcessing())

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

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

  87.  

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

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

  90.  

  91.         #if JucePlugin_IsSynth

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

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

  94.         #else

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

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

  97. +            vstEffect.flags |= 512;

  98.         #endif

  99.  

  100.          activePlugins.add (this);

  101. @@ -398,7 +390,7 @@ public:

  102.          }

  103.      }

  104.  

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

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

  107.  

  108.      template <typename FloatType>

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

  110. @@ -533,7 +525,7 @@ public:

  111.  

  112.              // Send VST events to the host.

  113.              if (hostCallback != nullptr)

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

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

  116.             #elif JUCE_DEBUG

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

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

  119. @@ -562,7 +554,7 @@ public:

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

  121.      }

  122.  

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

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

  125.      {

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

  127.      }

  128. @@ -573,7 +565,7 @@ public:

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

  130.      }

  131.  

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

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

  134.      {

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

  136.      }

  137. @@ -585,7 +577,7 @@ public:

  138.          {

  139.              isProcessing = true;

  140.  

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

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

  143.              floatTempBuffers .channels.calloc (numInAndOutChannels);

  144.              doubleTempBuffers.channels.calloc (numInAndOutChannels);

  145.  

  146. @@ -604,16 +596,16 @@ public:

  147.              midiEvents.ensureSize (2048);

  148.              midiEvents.clear();

  149.  

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

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

  152.  

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

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

  155.                  some hosts rely on this behaviour.

  156.              */

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

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

  159.              {

  160.                  if (hostCallback != nullptr)

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

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

  163.              }

  164.  

  165.              if (getHostType().isAbletonLive()

  166. @@ -627,7 +619,7 @@ public:

  167.                  hostCmd.commandSize = sizeof (int);

  168.                  hostCmd.flags = AbletonLiveHostSpecific::KCantBeSuspended;

  169.  

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

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

  172.              }

  173.  

  174.             #if JucePlugin_ProducesMidiOutput || JucePlugin_IsMidiEffect

  175. @@ -654,28 +646,28 @@ public:

  176.      //==============================================================================

  177.      bool getCurrentPosition (AudioPlayHead::CurrentPositionInfo& info) override

  178.      {

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

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

  181.  

  182.          if (hostCallback != nullptr)

  183.          {

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

  185. -                        | Vst2::kVstBarsValid    | Vst2::kVstCyclePosValid

  186. -                        | Vst2::kVstTimeSigValid | Vst2::kVstSmpteValid

  187. -                        | Vst2::kVstClockValid;

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

  189. +                              | Vst2::vstTimingInfoFlagLastBarPositionValid | Vst2::vstTimingInfoFlagLoopPositionValid

  190. +                              | Vst2::vstTimingInfoFlagTimeSignatureValid | Vst2::vstTimingInfoFlagSmpteValid

  191. +                              | Vst2::vstTimingInfoFlagNearestClockValid;

  192.  

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

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

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

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

  197.          }

  198.  

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

  200.              return false;

  201.  

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

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

  204.  

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

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

  207.          {

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

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

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

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

  212.          }

  213.          else

  214.          {

  215. @@ -683,34 +675,34 @@ public:

  216.              info.timeSigDenominator = 4;

  217.          }

  218.  

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

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

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

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

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

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

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

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

  227.  

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

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

  230.          {

  231.              AudioPlayHead::FrameRateType rate = AudioPlayHead::fpsUnknown;

  232.              double fps = 1.0;

  233.  

  234. -            switch (ti->smpteFrameRate)

  235. +            switch (ti->smpteRate)

  236.              {

  237. -                case Vst2::kVstSmpte239fps:       rate = AudioPlayHead::fps23976;    fps = 24.0 * 1000.0 / 1001.0; break;

  238. -                case Vst2::kVstSmpte24fps:        rate = AudioPlayHead::fps24;       fps = 24.0;  break;

  239. -                case Vst2::kVstSmpte25fps:        rate = AudioPlayHead::fps25;       fps = 25.0;  break;

  240. -                case Vst2::kVstSmpte2997fps:      rate = AudioPlayHead::fps2997;     fps = 30.0 * 1000.0 / 1001.0; break;

  241. -                case Vst2::kVstSmpte30fps:        rate = AudioPlayHead::fps30;       fps = 30.0;  break;

  242. -                case Vst2::kVstSmpte2997dfps:     rate = AudioPlayHead::fps2997drop; fps = 30.0 * 1000.0 / 1001.0; break;

  243. -                case Vst2::kVstSmpte30dfps:       rate = AudioPlayHead::fps30drop;   fps = 30.0;  break;

  244. -

  245. -                case Vst2::kVstSmpteFilm16mm:

  246. -                case Vst2::kVstSmpteFilm35mm:     fps = 24.0; break;

  247. -

  248. -                case Vst2::kVstSmpte249fps:       fps = 25.0 * 1000.0 / 1001.0; break;

  249. -                case Vst2::kVstSmpte599fps:       fps = 60.0 * 1000.0 / 1001.0; break;

  250. -                case Vst2::kVstSmpte60fps:        fps = 60; break;

  251. -

  252. -                default:                          jassertfalse; // unknown frame-rate..

  253. +                case Vst2::vstSmpteRateFps239:       rate = AudioPlayHead::fps23976;    fps = 24.0 * 1000.0 / 1001.0; break;

  254. +                case Vst2::vstSmpteRateFps24:        rate = AudioPlayHead::fps24;       fps = 24.0;  break;

  255. +                case Vst2::vstSmpteRateFps25:        rate = AudioPlayHead::fps25;       fps = 25.0;  break;

  256. +                case Vst2::vstSmpteRateFps2997:      rate = AudioPlayHead::fps2997;     fps = 30.0 * 1000.0 / 1001.0; break;

  257. +                case Vst2::vstSmpteRateFps30:        rate = AudioPlayHead::fps30;       fps = 30.0;  break;

  258. +                case Vst2::vstSmpteRateFps2997drop:  rate = AudioPlayHead::fps2997drop; fps = 30.0 * 1000.0 / 1001.0; break;

  259. +                case Vst2::vstSmpteRateFps30drop:    rate = AudioPlayHead::fps30drop;   fps = 30.0;  break;

  260. +

  261. +                case Vst2::vstSmpteRate16mmFilm:

  262. +                case Vst2::vstSmpteRate35mmFilm:     fps = 24.0; break;

  263. +

  264. +                case Vst2::vstSmpteRateFps249:       fps = 25.0 * 1000.0 / 1001.0; break;

  265. +                case Vst2::vstSmpteRateFps599:       fps = 60.0 * 1000.0 / 1001.0; break;

  266. +                case Vst2::vstSmpteRateFps60:        fps = 60; break;

  267. +

  268. +                default:                       jassertfalse; // unknown frame-rate..

  269.              }

  270.  

  271.              info.frameRate = rate;

  272. @@ -722,14 +714,14 @@ public:

  273.              info.editOriginTime = 0;

  274.          }

  275.  

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

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

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

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

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

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

  282.  

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

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

  285.          {

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

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

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

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

  290.          }

  291.          else

  292.          {

  293. @@ -749,7 +741,7 @@ public:

  294.          return 0.0f;

  295.      }

  296.  

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

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

  299.      {

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

  301.      }

  302. @@ -765,7 +757,7 @@ public:

  303.          }

  304.      }

  305.  

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

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

  308.      {

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

  310.      }

  311. @@ -779,19 +771,19 @@ public:

  312.          }

  313.  

  314.          if (hostCallback != nullptr)

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

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

  317.      }

  318.  

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

  320.      {

  321.          if (hostCallback != nullptr)

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

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

  324.      }

  325.  

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

  327.      {

  328.          if (hostCallback != nullptr)

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

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

  331.      }

  332.  

  333.      void parameterValueChanged (int, float newValue) override

  334. @@ -804,7 +796,7 @@ public:

  335.  

  336.      void audioProcessorChanged (AudioProcessor*) override

  337.      {

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

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

  340.          triggerAsyncUpdate();

  341.      }

  342.  

  343. @@ -812,12 +804,12 @@ public:

  344.      {

  345.          if (hostCallback != nullptr)

  346.          {

  347. -            hostCallback (&vstEffect, Vst2::audioMasterUpdateDisplay, 0, 0, nullptr, 0);

  348. -            hostCallback (&vstEffect, Vst2::audioMasterIOChanged,     0, 0, nullptr, 0);

  349. +            hostCallback (&vstEffect, Vst2::hostOpcodeUpdateView, 0, 0, nullptr, 0);

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

  351.          }

  352.      }

  353.  

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

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

  356.      {

  357.          if (processor->isMidiEffect())

  358.              return false;

  359. @@ -826,9 +818,9 @@ public:

  360.  

  361.          // fill with default

  362.          properties.flags = 0;

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

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

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

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

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

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

  369.  

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

  371.          {

  372. @@ -836,8 +828,8 @@ public:

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

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

  375.  

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

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

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

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

  380.              String label = bus.getName();

  381.  

  382.             #ifdef JucePlugin_PreferredChannelConfigurations

  383. @@ -847,8 +839,8 @@ public:

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

  385.             #endif

  386.  

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

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

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

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

  391.  

  392.              if (channelType == AudioChannelSet::left

  393.                  || channelType == AudioChannelSet::leftSurround

  394. @@ -858,7 +850,7 @@ public:

  395.                  || channelType == AudioChannelSet::topRearLeft

  396.                  || channelType == AudioChannelSet::leftSurroundRear

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

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

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

  400.  

  401.              return true;

  402.          }

  403. @@ -893,15 +885,15 @@ public:

  404.  

  405.      void setHasEditorFlag (bool shouldSetHasEditor)

  406.      {

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

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

  409.  

  410.          if (shouldSetHasEditor == hasEditor)

  411.              return;

  412.  

  413.          if (shouldSetHasEditor)

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

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

  416.          else

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

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

  419.      }

  420.  

  421.      void createEditorComp()

  422. @@ -968,59 +960,59 @@ public:

  423.  

  424.          switch (opCode)

  425.          {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  468. -            default:                                return 0;

  469. -        }

  470. -    }

  471. -

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  515. +            default:                                            return 0;

  516. +        }

  517. +    }

  518. +

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

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

  521.      {

  522.          auto* wrapper = getWrapper (vstInterface);

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

  524.  

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

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

  527.          {

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

  529.              delete wrapper;

  530. @@ -1068,7 +1060,7 @@ public:

  531.  

  532.          void paint (Graphics&) override {}

  533.  

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

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

  536.          {

  537.              auto b = getSizeToContainChild();

  538.              bounds = convertToHostBounds ({ 0, 0, (int16) b.getHeight(), (int16) b.getWidth() });

  539. @@ -1224,20 +1216,20 @@ public:

  540.          void resizeHostWindow (int newWidth, int newHeight)

  541.          {

  542.              auto rect = convertToHostBounds ({ 0, 0, (int16) newHeight, (int16) newWidth });

  543. -            newWidth = rect.right - rect.left;

  544. -            newHeight = rect.bottom - rect.top;

  545. +            newWidth = rect.rightmost - rect.leftmost;

  546. +            newHeight = rect.lower - rect.upper;

  547.  

  548.              bool sizeWasSuccessful = false;

  549.  

  550.              if (auto host = wrapper.hostCallback)

  551.              {

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

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

  554.  

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

  556.                  {

  557.                      const ScopedValueSetter<bool> inSizeWindowSetter (isInSizeWindow, true);

  558.  

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

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

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

  562.                  }

  563.              }

  564. @@ -1359,17 +1351,17 @@ public:

  565.         #endif

  566.  

  567.          //==============================================================================

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

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

  570.          {

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

  572.  

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

  574.                  return rect;

  575.  

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

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

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

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

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

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

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

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

  584.          }

  585.  

  586.          //==============================================================================

  587. @@ -1398,12 +1390,12 @@ public:

  588.  

  589.      //==============================================================================

  590.  private:

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

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

  593.  

  594.      bool isProcessLevelOffline()

  595.      {

  596.          return hostCallback != nullptr

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

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

  599.      }

  600.  

  601.      static int32 convertHexVersionToDecimal (const unsigned int hexVersion)

  602. @@ -1471,8 +1463,8 @@ private:

  603.          tmpBuffers.release();

  604.  

  605.          if (processor != nullptr)

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

  607. -                                                                 + vstEffect.numOutputs);

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

  609. +                                                                 + vstEffect.numOutputChannels);

  610.      }

  611.  

  612.      void deleteTempChannels()

  613. @@ -1632,7 +1624,7 @@ private:

  614.          if (editorComp != nullptr)

  615.          {

  616.              editorComp->getEditorBounds (editorBounds);

  617. -            *((Vst2::ERect**) args.ptr) = &editorBounds;

  618. +            *((Vst2::VstEditorBounds**) args.ptr) = &editorBounds;

  619.              return (pointer_sized_int) &editorBounds;

  620.          }

  621.  

  622. @@ -1722,7 +1714,7 @@ private:

  623.      pointer_sized_int handlePreAudioProcessingEvents (VstOpCodeArguments args)

  624.      {

  625.         #if JucePlugin_WantsMidiInput || JucePlugin_IsMidiEffect

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

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

  628.          return 1;

  629.         #else

  630.          ignoreUnused (args);

  631. @@ -1773,12 +1765,12 @@ private:

  632.  

  633.      pointer_sized_int handleGetInputPinProperties (VstOpCodeArguments args)

  634.      {

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

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

  637.      }

  638.  

  639.      pointer_sized_int handleGetOutputPinProperties (VstOpCodeArguments args)

  640.      {

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

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

  643.      }

  644.  

  645.      pointer_sized_int handleGetPlugInCategory (VstOpCodeArguments)

  646. @@ -1788,8 +1780,8 @@ private:

  647.  

  648.      pointer_sized_int handleSetSpeakerConfiguration (VstOpCodeArguments args)

  649.      {

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

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

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

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

  654.  

  655.          if (processor->isMidiEffect())

  656.              return 0;

  657. @@ -1800,29 +1792,29 @@ private:

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

  659.          {

  660.              // inconsistent request?

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

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

  663.                  return 0;

  664.          }

  665.  

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

  667.          {

  668.              // inconsistent request?

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

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

  671.                  return 0;

  672.          }

  673.  

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

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

  676.              return 0;

  677.  

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

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

  680.              return 0;

  681.  

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

  683.  

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

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

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

  687.  

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

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

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

  691.  

  692.         #ifdef JucePlugin_PreferredChannelConfigurations

  693. @@ -1870,7 +1862,7 @@ private:

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

  695.              return handleSetContentScaleFactor (args.opt);

  696.  

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

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

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

  700.  

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

  702. @@ -1965,7 +1957,7 @@ private:

  703.  

  704.      pointer_sized_int handleGetVstInterfaceVersion (VstOpCodeArguments)

  705.      {

  706. -        return kVstVersion;

  707. +        return Vst2::juceVstInterfaceVersion;

  708.      }

  709.  

  710.      pointer_sized_int handleGetCurrentMidiProgram (VstOpCodeArguments)

  711. @@ -1975,8 +1967,8 @@ private:

  712.  

  713.      pointer_sized_int handleGetSpeakerConfiguration (VstOpCodeArguments args)

  714.      {

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

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

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

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

  719.  

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

  721.              return false;

  722. @@ -1984,10 +1976,10 @@ private:

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

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

  725.  

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

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

  728.  

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

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

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

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

  733.  

  734.          *pluginInput  = cachedInArrangement. getData();

  735.          *pluginOutput = cachedOutArrangement.getData();

  736. @@ -2009,7 +2001,7 @@ private:

  737.          {

  738.              if (processor != nullptr)

  739.              {

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

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

  742.                                                       && processor->supportsDoublePrecisionProcessing())

  743.                                                           ? AudioProcessor::doublePrecision

  744.                                                           : AudioProcessor::singlePrecision);

  745. @@ -2083,16 +2075,16 @@ private:

  746.      }

  747.  

  748.      //==============================================================================

  749. -    Vst2::audioMasterCallback hostCallback;

  750. +    Vst2::VstHostCallback hostCallback;

  751.      AudioProcessor* processor = {};

  752.      double sampleRate = 44100.0;

  753.      int32 blockSize = 1024;

  754. -    Vst2::AEffect vstEffect;

  755. +    Vst2::VstEffectInterface vstEffect;

  756.      CriticalSection stateInformationLock;

  757.      juce::MemoryBlock chunkMemory;

  758.      uint32 chunkMemoryTime = 0;

  759.      std::unique_ptr<EditorCompWrapper> editorComp;

  760. -    Vst2::ERect editorBounds;

  761. +    Vst2::VstEditorBounds editorBounds;

  762.      MidiBuffer midiEvents;

  763.      VSTMidiEventList outgoingEvents;

  764.  

  765. @@ -2117,7 +2109,7 @@ private:

  766.      VstTempBuffers<double> doubleTempBuffers;

  767.      int maxNumInChannels = 0, maxNumOutChannels = 0;

  768.  

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

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

  771.  

  772.      ThreadLocalValue<bool> inParameterChangedCallback;

  773.  

  774. @@ -2129,7 +2121,7 @@ private:

  775.  //==============================================================================

  776.  namespace

  777.  {

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

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

  780.      {

  781.          JUCE_AUTORELEASEPOOL

  782.          {

  783. @@ -2137,7 +2129,7 @@ namespace

  784.  

  785.              try

  786.              {

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

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

  789.                  {

  790.                     #if JUCE_LINUX

  791.                      MessageManagerLock mmLock;

  792. @@ -2174,8 +2166,8 @@ namespace

  793.  // Mac startup code..

  794.  #if JUCE_MAC

  795.  

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

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

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

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

  800.      {

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

  802.  

  803. @@ -2183,8 +2175,8 @@ namespace

  804.          return pluginEntryPoint (audioMaster);

  805.      }

  806.  

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

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

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

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

  811.      {

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

  813.  

  814. @@ -2196,8 +2188,8 @@ namespace

  815.  // Linux startup code..

  816.  #elif JUCE_LINUX

  817.  

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

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

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

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

  822.      {

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

  824.  

  825. @@ -2205,8 +2197,8 @@ namespace

  826.          return pluginEntryPoint (audioMaster);

  827.      }

  828.  

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

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

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

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

  833.      {

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

  835.  

  836. @@ -2221,7 +2213,7 @@ namespace

  837.  // Win32 startup code..

  838.  #else

  839.  

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

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

  842.      {

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

  844.  

  845. @@ -2229,7 +2221,7 @@ namespace

  846.      }

  847.  

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

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

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

  851.      {

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

  853.  

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

  855. index e3bd4edc4..b948abe2b 100644

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

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

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

  859.  

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

  861.      {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  879. -

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  898. +

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

  900.          {

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

  902.              {

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

  904.          return AudioChannelSet::discreteChannels (fallbackNumChannels);

  905.      }

  906.  

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

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

  909.      {

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

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

  912.      }

  913.  

  914.      static int32 channelSetToVstArrangementType (AudioChannelSet channels)

  915.      {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  950.  

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

  952. -            return Vst2::kSpeakerArrEmpty;

  953. +            return Vst2::vstSpeakerConfigTypeEmpty;

  954.  

  955.          auto chans = channels.getChannelTypes();

  956.  

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

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

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

  960.                  return m->vst2;

  961.  

  962. -        return Vst2::kSpeakerArrUserDefined;

  963. +        return Vst2::vstSpeakerConfigTypeUser;

  964.      }

  965.  

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

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

  968.      {

  969.          result.type = channelSetToVstArrangementType (channels);

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

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

  972.  

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

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

  975.          {

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

  977.  

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

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

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

  981.          }

  982.      }

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

  984.              clear();

  985.          }

  986.  

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

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

  989.          {

  990.              operator= (vstConfig);

  991.          }

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

  993.          VstSpeakerConfigurationHolder (const AudioChannelSet& channels)

  994.          {

  995.              auto numberOfChannels = channels.size();

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

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

  998.  

  999.              dst.type = channelSetToVstArrangementType (channels);

  1000. -            dst.numChannels = numberOfChannels;

  1001. +            dst.numberOfChannels = numberOfChannels;

  1002.  

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

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

  1005.              {

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

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

  1008.  

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

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

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

  1012.              }

  1013.          }

  1014.  

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

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

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

  1018.          {

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

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

  1021.  

  1022.              dst.type             = vstConfig.type;

  1023. -            dst.numChannels      = vstConfig.numChannels;

  1024. +            dst.numberOfChannels = vstConfig.numberOfChannels;

  1025.  

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

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

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

  1029.  

  1030.              return *this;

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

  1032.              return *this;

  1033.          }

  1034.  

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

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

  1037.  

  1038.      private:

  1039.          JUCE_LEAK_DETECTOR (VstSpeakerConfigurationHolder)

  1040.  

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

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

  1043.  

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

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

  1046.          {

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

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

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

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

  1051.  

  1052.              storage.malloc (1, arrangementSize);

  1053.              return storage.get();

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

  1055.  

  1056.          void clear()

  1057.          {

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

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

  1060.  

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

  1062. -            dst.numChannels = 0;

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

  1064. +            dst.numberOfChannels = 0;

  1065.          }

  1066.      };

  1067.  

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

  1069.      {

  1070.          static const Mapping mappings[] =

  1071.          {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  1132.          };

  1133.  

  1134.          return mappings;

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

  1136.      {

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

  1138.          {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  1177.          };

  1178.  

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

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

  1181.      {

  1182.          switch (type)

  1183.          {

  1184. -            case Vst2::kSpeakerL:      return AudioChannelSet::left;

  1185. -            case Vst2::kSpeakerR:      return AudioChannelSet::right;

  1186. -            case Vst2::kSpeakerC:      return AudioChannelSet::centre;

  1187. -            case Vst2::kSpeakerLfe:    return AudioChannelSet::LFE;

  1188. -            case Vst2::kSpeakerLs:     return AudioChannelSet::leftSurround;

  1189. -            case Vst2::kSpeakerRs:     return AudioChannelSet::rightSurround;

  1190. -            case Vst2::kSpeakerLc:     return AudioChannelSet::leftCentre;

  1191. -            case Vst2::kSpeakerRc:     return AudioChannelSet::rightCentre;

  1192. -            case Vst2::kSpeakerS:      return AudioChannelSet::surround;

  1193. -            case Vst2::kSpeakerSl:     return AudioChannelSet::leftSurroundRear;

  1194. -            case Vst2::kSpeakerSr:     return AudioChannelSet::rightSurroundRear;

  1195. -            case Vst2::kSpeakerTm:     return AudioChannelSet::topMiddle;

  1196. -            case Vst2::kSpeakerTfl:    return AudioChannelSet::topFrontLeft;

  1197. -            case Vst2::kSpeakerTfc:    return AudioChannelSet::topFrontCentre;

  1198. -            case Vst2::kSpeakerTfr:    return AudioChannelSet::topFrontRight;

  1199. -            case Vst2::kSpeakerTrl:    return AudioChannelSet::topRearLeft;

  1200. -            case Vst2::kSpeakerTrc:    return AudioChannelSet::topRearCentre;

  1201. -            case Vst2::kSpeakerTrr:    return AudioChannelSet::topRearRight;

  1202. -            case Vst2::kSpeakerLfe2:   return AudioChannelSet::LFE2;

  1203. +            case Vst2::vstIndividualSpeakerTypeLeft:                 return AudioChannelSet::left;

  1204. +            case Vst2::vstIndividualSpeakerTypeRight:                return AudioChannelSet::right;

  1205. +            case Vst2::vstIndividualSpeakerTypeCentre:               return AudioChannelSet::centre;

  1206. +            case Vst2::vstIndividualSpeakerTypeLFE:                  return AudioChannelSet::LFE;

  1207. +            case Vst2::vstIndividualSpeakerTypeLeftSurround:         return AudioChannelSet::leftSurround;

  1208. +            case Vst2::vstIndividualSpeakerTypeRightSurround:        return AudioChannelSet::rightSurround;

  1209. +            case Vst2::vstIndividualSpeakerTypeLeftCentre:           return AudioChannelSet::leftCentre;

  1210. +            case Vst2::vstIndividualSpeakerTypeRightCentre:          return AudioChannelSet::rightCentre;

  1211. +            case Vst2::vstIndividualSpeakerTypeSurround:             return AudioChannelSet::surround;

  1212. +            case Vst2::vstIndividualSpeakerTypeLeftRearSurround:     return AudioChannelSet::leftSurroundRear;

  1213. +            case Vst2::vstIndividualSpeakerTypeRightRearSurround:    return AudioChannelSet::rightSurroundRear;

  1214. +            case Vst2::vstIndividualSpeakerTypeTopMiddle:            return AudioChannelSet::topMiddle;

  1215. +            case Vst2::vstIndividualSpeakerTypeTopFrontLeft:         return AudioChannelSet::topFrontLeft;

  1216. +            case Vst2::vstIndividualSpeakerTypeTopFrontCentre:       return AudioChannelSet::topFrontCentre;

  1217. +            case Vst2::vstIndividualSpeakerTypeTopFrontRight:        return AudioChannelSet::topFrontRight;

  1218. +            case Vst2::vstIndividualSpeakerTypeTopRearLeft:          return AudioChannelSet::topRearLeft;

  1219. +            case Vst2::vstIndividualSpeakerTypeTopRearCentre:        return AudioChannelSet::topRearCentre;

  1220. +            case Vst2::vstIndividualSpeakerTypeTopRearRight:         return AudioChannelSet::topRearRight;

  1221. +            case Vst2::vstIndividualSpeakerTypeLFE2:                 return AudioChannelSet::LFE2;

  1222.              default: break;

  1223.          }

  1224.  

  1225. diff --git a/modules/juce_audio_processors/format_types/juce_VSTInterface.h b/modules/juce_audio_processors/format_types/juce_VSTInterface.h

  1226. new file mode 100644

  1227. index 000000000..1b3eb7d08

  1228. --- /dev/null

  1229. +++ b/modules/juce_audio_processors/format_types/juce_VSTInterface.h

  1230. @@ -0,0 +1,532 @@

  1231. +/*

  1232. +  ==============================================================================

  1233. +

  1234. +   This file is part of the JUCE library.

  1235. +   Copyright (c) 2017 - ROLI Ltd.

  1236. +

  1237. +   JUCE is an open source library subject to commercial or open-source

  1238. +   licensing.

  1239. +

  1240. +   By using JUCE, you agree to the terms of both the JUCE 5 End-User License

  1241. +   Agreement and JUCE 5 Privacy Policy (both updated and effective as of the

  1242. +   27th April 2017).

  1243. +

  1244. +   End User License Agreement: www.juce.com/juce-5-licence

  1245. +   Privacy Policy: www.juce.com/juce-5-privacy-policy

  1246. +

  1247. +   Or: You may also use this code under the terms of the GPL v3 (see

  1248. +   www.gnu.org/licenses).

  1249. +

  1250. +   JUCE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL WARRANTIES, WHETHER

  1251. +   EXPRESSED OR IMPLIED, INCLUDING MERCHANTABILITY AND FITNESS FOR PURPOSE, ARE

  1252. +   DISCLAIMED.

  1253. +

  1254. +  ==============================================================================

  1255. +*/

  1256. +

  1257. +#ifndef JUCE_VSTINTERFACE_H_INCLUDED

  1258. +#define JUCE_VSTINTERFACE_H_INCLUDED

  1259. +

  1260. +using namespace juce;

  1261. +

  1262. +#if JUCE_MSVC

  1263. + #define VSTINTERFACECALL __cdecl

  1264. + #pragma pack(push)

  1265. + #pragma pack(8)

  1266. +#elif JUCE_MAC || JUCE_IOS

  1267. + #define VSTINTERFACECALL

  1268. + #if JUCE_64BIT

  1269. +  #pragma options align=power

  1270. + #else

  1271. +  #pragma options align=mac68k

  1272. + #endif

  1273. +#else

  1274. + #define VSTINTERFACECALL

  1275. + #pragma pack(push, 8)

  1276. +#endif

  1277. +

  1278. +const int32 juceVstInterfaceVersion = 2400;

  1279. +const int32 juceVstInterfaceIdentifier = 0x56737450;    // The "magic" identifier in the SDK is 'VstP'.

  1280. +

  1281. +//==============================================================================

  1282. +/** Structure used for VSTs

  1283. +

  1284. +    @tags{Audio}

  1285. +*/

  1286. +struct VstEffectInterface

  1287. +{

  1288. +    int32 interfaceIdentifier;

  1289. +    pointer_sized_int (VSTINTERFACECALL* dispatchFunction)          (VstEffectInterface*, int32 op, int32 index, pointer_sized_int value, void* ptr, float opt);

  1290. +    void              (VSTINTERFACECALL* processAudioFunction)      (VstEffectInterface*, float** inputs, float** outputs, int32 numSamples);

  1291. +    void              (VSTINTERFACECALL* setParameterValueFunction) (VstEffectInterface*, int32 parameterIndex, float value);

  1292. +    float             (VSTINTERFACECALL* getParameterValueFunction) (VstEffectInterface*, int32 parameterIndex);

  1293. +    int32 numPrograms;

  1294. +    int32 numParameters;

  1295. +    int32 numInputChannels;

  1296. +    int32 numOutputChannels;

  1297. +    int32 flags;

  1298. +    pointer_sized_int hostSpace1;

  1299. +    pointer_sized_int hostSpace2;

  1300. +    int32 latency;

  1301. +    int32 deprecated1;

  1302. +    int32 deprecated2;

  1303. +    float deprecated3;

  1304. +    void* effectPointer;

  1305. +    void* userPointer;

  1306. +    int32 plugInIdentifier;

  1307. +    int32 plugInVersion;

  1308. +    void (VSTINTERFACECALL* processAudioInplaceFunction)       (VstEffectInterface*, float**  inputs, float**  outputs, int32 numSamples);

  1309. +    void (VSTINTERFACECALL* processDoubleAudioInplaceFunction) (VstEffectInterface*, double** inputs, double** outputs, int32 numSamples);

  1310. +    char emptySpace[56];

  1311. +};

  1312. +

  1313. +typedef pointer_sized_int (VSTINTERFACECALL* VstHostCallback) (VstEffectInterface*, int32 op, int32 index, pointer_sized_int value, void* ptr, float opt);

  1314. +

  1315. +enum VstEffectInterfaceFlags

  1316. +{

  1317. +    vstEffectFlagHasEditor          = 1,

  1318. +    vstEffectFlagInplaceAudio       = 16,

  1319. +    vstEffectFlagDataInChunks       = 32,

  1320. +    vstEffectFlagIsSynth            = 256,

  1321. +    vstEffectFlagInplaceDoubleAudio = 4096

  1322. +};

  1323. +

  1324. +//==============================================================================

  1325. +enum VstHostToPlugInOpcodes

  1326. +{

  1327. +    plugInOpcodeOpen,

  1328. +    plugInOpcodeClose,

  1329. +    plugInOpcodeSetCurrentProgram,

  1330. +    plugInOpcodeGetCurrentProgram,

  1331. +    plugInOpcodeSetCurrentProgramName,

  1332. +    plugInOpcodeGetCurrentProgramName,

  1333. +    plugInOpcodeGetParameterLabel,

  1334. +    plugInOpcodeGetParameterText,

  1335. +    plugInOpcodeGetParameterName,

  1336. +    plugInOpcodeSetSampleRate = plugInOpcodeGetParameterName + 2,

  1337. +    plugInOpcodeSetBlockSize,

  1338. +    plugInOpcodeResumeSuspend,

  1339. +    plugInOpcodeGetEditorBounds,

  1340. +    plugInOpcodeOpenEditor,

  1341. +    plugInOpcodeCloseEditor,

  1342. +    plugInOpcodeDrawEditor,

  1343. +    plugInOpcodeGetMouse,

  1344. +    plugInOpcodeEditorIdle = plugInOpcodeGetMouse + 2,

  1345. +    plugInOpcodeeffEditorTop,

  1346. +    plugInOpcodeSleepEditor,

  1347. +    plugInOpcodeIdentify,

  1348. +    plugInOpcodeGetData,

  1349. +    plugInOpcodeSetData,

  1350. +    plugInOpcodePreAudioProcessingEvents,

  1351. +    plugInOpcodeIsParameterAutomatable,

  1352. +    plugInOpcodeParameterValueForText,

  1353. +    plugInOpcodeGetProgramName = plugInOpcodeParameterValueForText + 2,

  1354. +    plugInOpcodeConnectInput = plugInOpcodeGetProgramName + 2,

  1355. +    plugInOpcodeConnectOutput,

  1356. +    plugInOpcodeGetInputPinProperties,

  1357. +    plugInOpcodeGetOutputPinProperties,

  1358. +    plugInOpcodeGetPlugInCategory,

  1359. +    plugInOpcodeSetSpeakerConfiguration = plugInOpcodeGetPlugInCategory + 7,

  1360. +    plugInOpcodeSetBypass = plugInOpcodeSetSpeakerConfiguration + 2,

  1361. +    plugInOpcodeGetPlugInName,

  1362. +    plugInOpcodeGetManufacturerName = plugInOpcodeGetPlugInName + 2,

  1363. +    plugInOpcodeGetManufacturerProductName,

  1364. +    plugInOpcodeGetManufacturerVersion,

  1365. +    plugInOpcodeManufacturerSpecific,

  1366. +    plugInOpcodeCanPlugInDo,

  1367. +    plugInOpcodeGetTailSize,

  1368. +    plugInOpcodeIdle,

  1369. +    plugInOpcodeKeyboardFocusRequired = plugInOpcodeIdle + 4,

  1370. +    plugInOpcodeGetVstInterfaceVersion,

  1371. +    plugInOpcodeGetCurrentMidiProgram = plugInOpcodeGetVstInterfaceVersion + 5,

  1372. +    plugInOpcodeGetSpeakerArrangement = plugInOpcodeGetCurrentMidiProgram + 6,

  1373. +    plugInOpcodeNextPlugInUniqueID,

  1374. +    plugInOpcodeStartProcess,

  1375. +    plugInOpcodeStopProcess,

  1376. +    plugInOpcodeSetNumberOfSamplesToProcess,

  1377. +    plugInOpcodeSetSampleFloatType = plugInOpcodeSetNumberOfSamplesToProcess + 4,

  1378. +    pluginOpcodeGetNumMidiInputChannels,

  1379. +    pluginOpcodeGetNumMidiOutputChannels,

  1380. +    plugInOpcodeMaximum = pluginOpcodeGetNumMidiOutputChannels

  1381. +};

  1382. +

  1383. +

  1384. +enum VstPlugInToHostOpcodes

  1385. +{

  1386. +    hostOpcodeParameterChanged,

  1387. +    hostOpcodeVstVersion,

  1388. +    hostOpcodeCurrentId,

  1389. +    hostOpcodeIdle,

  1390. +    hostOpcodePinConnected,

  1391. +    hostOpcodePlugInWantsMidi = hostOpcodePinConnected + 2,

  1392. +    hostOpcodeGetTimingInfo,

  1393. +    hostOpcodePreAudioProcessingEvents,

  1394. +    hostOpcodeSetTime,

  1395. +    hostOpcodeTempoAt,

  1396. +    hostOpcodeGetNumberOfAutomatableParameters,

  1397. +    hostOpcodeGetParameterInterval,

  1398. +    hostOpcodeIOModified,

  1399. +    hostOpcodeNeedsIdle,

  1400. +    hostOpcodeWindowSize,

  1401. +    hostOpcodeGetSampleRate,

  1402. +    hostOpcodeGetBlockSize,

  1403. +    hostOpcodeGetInputLatency,

  1404. +    hostOpcodeGetOutputLatency,

  1405. +    hostOpcodeGetPreviousPlugIn,

  1406. +    hostOpcodeGetNextPlugIn,

  1407. +    hostOpcodeWillReplace,

  1408. +    hostOpcodeGetCurrentAudioProcessingLevel,

  1409. +    hostOpcodeGetAutomationState,

  1410. +    hostOpcodeOfflineStart,

  1411. +    hostOpcodeOfflineReadSource,

  1412. +    hostOpcodeOfflineWrite,

  1413. +    hostOpcodeOfflineGetCurrentPass,

  1414. +    hostOpcodeOfflineGetCurrentMetaPass,

  1415. +    hostOpcodeSetOutputSampleRate,

  1416. +    hostOpcodeGetOutputSpeakerConfiguration,

  1417. +    hostOpcodeGetManufacturerName,

  1418. +    hostOpcodeGetProductName,

  1419. +    hostOpcodeGetManufacturerVersion,

  1420. +    hostOpcodeManufacturerSpecific,

  1421. +    hostOpcodeSetIcon,

  1422. +    hostOpcodeCanHostDo,

  1423. +    hostOpcodeGetLanguage,

  1424. +    hostOpcodeOpenEditorWindow,

  1425. +    hostOpcodeCloseEditorWindow,

  1426. +    hostOpcodeGetDirectory,

  1427. +    hostOpcodeUpdateView,

  1428. +    hostOpcodeParameterChangeGestureBegin,

  1429. +    hostOpcodeParameterChangeGestureEnd,

  1430. +};

  1431. +

  1432. +//==============================================================================

  1433. +enum VstProcessingSampleType

  1434. +{

  1435. +    vstProcessingSampleTypeFloat,

  1436. +    vstProcessingSampleTypeDouble

  1437. +};

  1438. +

  1439. +//==============================================================================

  1440. +// These names must be identical to the Steinberg SDK so JUCE users can set

  1441. +// exactly what they want.

  1442. +enum VstPlugInCategory

  1443. +{

  1444. +    kPlugCategUnknown,

  1445. +    kPlugCategEffect,

  1446. +    kPlugCategSynth,

  1447. +    kPlugCategAnalysis,

  1448. +    kPlugCategMastering,

  1449. +    kPlugCategSpacializer,

  1450. +    kPlugCategRoomFx,

  1451. +    kPlugSurroundFx,

  1452. +    kPlugCategRestoration,

  1453. +    kPlugCategOfflineProcess,

  1454. +    kPlugCategShell,

  1455. +    kPlugCategGenerator

  1456. +};

  1457. +

  1458. +//==============================================================================

  1459. +/** Structure used for VSTs

  1460. +

  1461. +    @tags{Audio}

  1462. +*/

  1463. +struct VstEditorBounds

  1464. +{

  1465. +    int16 upper;

  1466. +    int16 leftmost;

  1467. +    int16 lower;

  1468. +    int16 rightmost;

  1469. +};

  1470. +

  1471. +//==============================================================================

  1472. +enum VstMaxStringLengths

  1473. +{

  1474. +    vstMaxNameLength                     = 64,

  1475. +    vstMaxParameterOrPinLabelLength      = 64,

  1476. +    vstMaxParameterOrPinShortLabelLength = 8,

  1477. +    vstMaxCategoryLength                 = 24,

  1478. +    vstMaxManufacturerStringLength       = 64,

  1479. +    vstMaxPlugInNameStringLength         = 64

  1480. +};

  1481. +

  1482. +//==============================================================================

  1483. +/** Structure used for VSTs

  1484. +

  1485. +    @tags{Audio}

  1486. +*/

  1487. +struct VstPinInfo

  1488. +{

  1489. +    char text[vstMaxParameterOrPinLabelLength];

  1490. +    int32 flags;

  1491. +    int32 configurationType;

  1492. +    char shortText[vstMaxParameterOrPinShortLabelLength];

  1493. +    char unused[48];

  1494. +};

  1495. +

  1496. +enum VstPinInfoFlags

  1497. +{

  1498. +    vstPinInfoFlagIsActive = 1,

  1499. +    vstPinInfoFlagIsStereo = 2,

  1500. +    vstPinInfoFlagValid    = 4

  1501. +};

  1502. +

  1503. +//==============================================================================

  1504. +/** Structure used for VSTs

  1505. +

  1506. +    @tags{Audio}

  1507. +*/

  1508. +struct VstEvent

  1509. +{

  1510. +    int32 type;

  1511. +    int32 size;

  1512. +    int32 sampleOffset;

  1513. +    int32 flags;

  1514. +    char content[16];

  1515. +};

  1516. +

  1517. +enum VstEventTypes

  1518. +{

  1519. +    vstMidiEventType  = 1,

  1520. +    vstSysExEventType = 6

  1521. +};

  1522. +

  1523. +/** Structure used for VSTs

  1524. +

  1525. +    @tags{Audio}

  1526. +*/

  1527. +struct VstEventBlock

  1528. +{

  1529. +    int32 numberOfEvents;

  1530. +    pointer_sized_int future;

  1531. +    VstEvent* events[2];

  1532. +};

  1533. +

  1534. +/** Structure used for VSTs

  1535. +

  1536. +    @tags{Audio}

  1537. +*/

  1538. +struct VstMidiEvent

  1539. +{

  1540. +    int32 type;

  1541. +    int32 size;

  1542. +    int32 sampleOffset;

  1543. +    int32 flags;

  1544. +    int32 noteSampleLength;

  1545. +    int32 noteSampleOffset;

  1546. +    char midiData[4];

  1547. +    char tuning;

  1548. +    char noteVelocityOff;

  1549. +    char future1;

  1550. +    char future2;

  1551. +};

  1552. +

  1553. +enum VstMidiEventFlags

  1554. +{

  1555. +    vstMidiEventIsRealtime = 1

  1556. +};

  1557. +

  1558. +/** Structure used for VSTs

  1559. +

  1560. +    @tags{Audio}

  1561. +*/

  1562. +struct VstSysExEvent

  1563. +{

  1564. +    int32 type;

  1565. +    int32 size;

  1566. +    int32 offsetSamples;

  1567. +    int32 flags;

  1568. +    int32 sysExDumpSize;

  1569. +    pointer_sized_int future1;

  1570. +    char* sysExDump;

  1571. +    pointer_sized_int future2;

  1572. +};

  1573. +

  1574. +//==============================================================================

  1575. +/** Structure used for VSTs

  1576. +

  1577. +    @tags{Audio}

  1578. +*/

  1579. +struct VstTimingInformation

  1580. +{

  1581. +    double samplePosition;

  1582. +    double sampleRate;

  1583. +    double systemTimeNanoseconds;

  1584. +    double musicalPosition;

  1585. +    double tempoBPM;

  1586. +    double lastBarPosition;

  1587. +    double loopStartPosition;

  1588. +    double loopEndPosition;

  1589. +    int32 timeSignatureNumerator;

  1590. +    int32 timeSignatureDenominator;

  1591. +    int32 smpteOffset;

  1592. +    int32 smpteRate;

  1593. +    int32 samplesToNearestClock;

  1594. +    int32 flags;

  1595. +};

  1596. +

  1597. +enum VstTimingInformationFlags

  1598. +{

  1599. +    vstTimingInfoFlagTransportChanged          = 1,

  1600. +    vstTimingInfoFlagCurrentlyPlaying          = 2,

  1601. +    vstTimingInfoFlagLoopActive                = 4,

  1602. +    vstTimingInfoFlagCurrentlyRecording        = 8,

  1603. +    vstTimingInfoFlagAutomationWriteModeActive = 64,

  1604. +    vstTimingInfoFlagAutomationReadModeActive  = 128,

  1605. +    vstTimingInfoFlagNanosecondsValid          = 256,

  1606. +    vstTimingInfoFlagMusicalPositionValid      = 512,

  1607. +    vstTimingInfoFlagTempoValid                = 1024,

  1608. +    vstTimingInfoFlagLastBarPositionValid      = 2048,

  1609. +    vstTimingInfoFlagLoopPositionValid         = 4096,

  1610. +    vstTimingInfoFlagTimeSignatureValid        = 8192,

  1611. +    vstTimingInfoFlagSmpteValid                = 16384,

  1612. +    vstTimingInfoFlagNearestClockValid         = 32768

  1613. +};

  1614. +

  1615. +//==============================================================================

  1616. +enum VstSmpteRates

  1617. +{

  1618. +    vstSmpteRateFps24,

  1619. +    vstSmpteRateFps25,

  1620. +    vstSmpteRateFps2997,

  1621. +    vstSmpteRateFps30,

  1622. +    vstSmpteRateFps2997drop,

  1623. +    vstSmpteRateFps30drop,

  1624. +

  1625. +    vstSmpteRate16mmFilm,

  1626. +    vstSmpteRate35mmFilm,

  1627. +

  1628. +    vstSmpteRateFps239 = vstSmpteRate35mmFilm + 3,

  1629. +    vstSmpteRateFps249 ,

  1630. +    vstSmpteRateFps599,

  1631. +    vstSmpteRateFps60

  1632. +};

  1633. +

  1634. +//==============================================================================

  1635. +/** Structure used for VSTs

  1636. +

  1637. +    @tags{Audio}

  1638. +*/

  1639. +struct VstIndividualSpeakerInfo

  1640. +{

  1641. +    float azimuthalAngle;

  1642. +    float elevationAngle;

  1643. +    float radius;

  1644. +    float reserved;

  1645. +    char label[vstMaxNameLength];

  1646. +    int32 type;

  1647. +    char unused[28];

  1648. +};

  1649. +

  1650. +enum VstIndividualSpeakerType

  1651. +{

  1652. +    vstIndividualSpeakerTypeUndefined = 0x7fffffff,

  1653. +    vstIndividualSpeakerTypeMono = 0,

  1654. +    vstIndividualSpeakerTypeLeft,

  1655. +    vstIndividualSpeakerTypeRight,

  1656. +    vstIndividualSpeakerTypeCentre,

  1657. +    vstIndividualSpeakerTypeLFE,

  1658. +    vstIndividualSpeakerTypeLeftSurround,

  1659. +    vstIndividualSpeakerTypeRightSurround,

  1660. +    vstIndividualSpeakerTypeLeftCentre,

  1661. +    vstIndividualSpeakerTypeRightCentre,

  1662. +    vstIndividualSpeakerTypeSurround,

  1663. +    vstIndividualSpeakerTypeCentreSurround = vstIndividualSpeakerTypeSurround,

  1664. +    vstIndividualSpeakerTypeLeftRearSurround,

  1665. +    vstIndividualSpeakerTypeRightRearSurround,

  1666. +    vstIndividualSpeakerTypeTopMiddle,

  1667. +    vstIndividualSpeakerTypeTopFrontLeft,

  1668. +    vstIndividualSpeakerTypeTopFrontCentre,

  1669. +    vstIndividualSpeakerTypeTopFrontRight,

  1670. +    vstIndividualSpeakerTypeTopRearLeft,

  1671. +    vstIndividualSpeakerTypeTopRearCentre,

  1672. +    vstIndividualSpeakerTypeTopRearRight,

  1673. +    vstIndividualSpeakerTypeLFE2

  1674. +};

  1675. +

  1676. +/** Structure used for VSTs

  1677. +

  1678. +    @tags{Audio}

  1679. +*/

  1680. +struct VstSpeakerConfiguration

  1681. +{

  1682. +    int32 type;

  1683. +    int32 numberOfChannels;

  1684. +    VstIndividualSpeakerInfo speakers[8];

  1685. +};

  1686. +

  1687. +enum VstSpeakerConfigurationType

  1688. +{

  1689. +    vstSpeakerConfigTypeUser  = -2,

  1690. +    vstSpeakerConfigTypeEmpty = -1,

  1691. +    vstSpeakerConfigTypeMono  = 0,

  1692. +    vstSpeakerConfigTypeLR,

  1693. +    vstSpeakerConfigTypeLsRs,

  1694. +    vstSpeakerConfigTypeLcRc,

  1695. +    vstSpeakerConfigTypeSlSr,

  1696. +    vstSpeakerConfigTypeCLfe,

  1697. +    vstSpeakerConfigTypeLRC,

  1698. +    vstSpeakerConfigTypeLRS,

  1699. +    vstSpeakerConfigTypeLRCLfe,

  1700. +    vstSpeakerConfigTypeLRLfeS,

  1701. +    vstSpeakerConfigTypeLRCS,

  1702. +    vstSpeakerConfigTypeLRLsRs,

  1703. +    vstSpeakerConfigTypeLRCLfeS,

  1704. +    vstSpeakerConfigTypeLRLfeLsRs,

  1705. +    vstSpeakerConfigTypeLRCLsRs,

  1706. +    vstSpeakerConfigTypeLRCLfeLsRs,

  1707. +    vstSpeakerConfigTypeLRCLsRsCs,

  1708. +    vstSpeakerConfigTypeLRLsRsSlSr,

  1709. +    vstSpeakerConfigTypeLRCLfeLsRsCs,

  1710. +    vstSpeakerConfigTypeLRLfeLsRsSlSr,

  1711. +    vstSpeakerConfigTypeLRCLsRsLcRc,

  1712. +    vstSpeakerConfigTypeLRCLsRsSlSr,

  1713. +    vstSpeakerConfigTypeLRCLfeLsRsLcRc,

  1714. +    vstSpeakerConfigTypeLRCLfeLsRsSlSr,

  1715. +    vstSpeakerConfigTypeLRCLsRsLcRcCs,

  1716. +    vstSpeakerConfigTypeLRCLsRsCsSlSr,

  1717. +    vstSpeakerConfigTypeLRCLfeLsRsLcRcCs,

  1718. +    vstSpeakerConfigTypeLRCLfeLsRsCsSlSr,

  1719. +    vstSpeakerConfigTypeLRCLfeLsRsTflTfcTfrTrlTrrLfe2

  1720. +};

  1721. +

  1722. +#if JUCE_BIG_ENDIAN

  1723. + #define JUCE_MULTICHAR_CONSTANT(a, b, c, d) (a | (((uint32) b) << 8) | (((uint32) c) << 16) | (((uint32) d) << 24))

  1724. +#else

  1725. + #define JUCE_MULTICHAR_CONSTANT(a, b, c, d) (d | (((uint32) c) << 8) | (((uint32) b) << 16) | (((uint32) a) << 24))

  1726. +#endif

  1727. +

  1728. +enum PresonusExtensionConstants

  1729. +{

  1730. +    presonusVendorID                = JUCE_MULTICHAR_CONSTANT ('P', 'r', 'e', 'S'),

  1731. +    presonusSetContentScaleFactor   = JUCE_MULTICHAR_CONSTANT ('A', 'e', 'C', 's')

  1732. +};

  1733. +

  1734. +//==============================================================================

  1735. +/** Structure used for VSTs

  1736. +

  1737. +    @tags{Audio}

  1738. +*/

  1739. +struct fxBank

  1740. +{

  1741. +    int32 magic1;

  1742. +    int32 size;

  1743. +    int32 magic2;

  1744. +    int32 version1;

  1745. +    int32 fxID;

  1746. +    int32 version2;

  1747. +    int32 elements;

  1748. +    int32 current;

  1749. +    char shouldBeZero[124];

  1750. +    int32 chunkSize;

  1751. +    char chunk[1];

  1752. +};

  1753. +

  1754. +#if JUCE_MSVC

  1755. + #pragma pack(pop)

  1756. +#elif JUCE_MAC || JUCE_IOS

  1757. + #pragma options align=reset

  1758. +#else

  1759. + #pragma pack(pop)

  1760. +#endif

  1761. +

  1762. +#endif // JUCE_VSTINTERFACE_H_INCLUDED

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

  1764. index 49f0d3b3b..6e99d63d0 100644

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

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

  1767. @@ -57,7 +57,7 @@ public:

  1768.          numEventsUsed = 0;

  1769.  

  1770.          if (events != nullptr)

  1771. -            events->numEvents = 0;

  1772. +            events->numberOfEvents = 0;

  1773.      }

  1774.  

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

  1776. @@ -66,50 +66,50 @@ public:

  1777.  

  1778.          void* const ptr = (Vst2::VstMidiEvent*) (events->events [numEventsUsed]);

  1779.          auto* const e = (Vst2::VstMidiEvent*) ptr;

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

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

  1782.  

  1783.          if (numBytes <= 4)

  1784.          {

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

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

  1787.              {

  1788. -                delete[] (((Vst2::VstMidiSysexEvent*) ptr)->sysexDump);

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

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

  1791. -                e->noteLength = 0;

  1792. -                e->noteOffset = 0;

  1793. -                e->detune = 0;

  1794. -                e->noteOffVelocity = 0;

  1795. +                delete[] (((Vst2::VstSysExEvent*) ptr)->sysExDump);

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

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

  1798. +                e->noteSampleLength = 0;

  1799. +                e->noteSampleOffset = 0;

  1800. +                e->tuning = 0;

  1801. +                e->noteVelocityOff = 0;

  1802.              }

  1803.  

  1804. -            e->deltaFrames = frameOffset;

  1805. +            e->sampleOffset = frameOffset;

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

  1807.          }

  1808.          else

  1809.          {

  1810. -            auto* const se = (Vst2::VstMidiSysexEvent*) ptr;

  1811. +            auto* const se = (Vst2::VstSysExEvent*) ptr;

  1812.  

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

  1814. -                delete[] se->sysexDump;

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

  1816. +                delete[] se->sysExDump;

  1817.  

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

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

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

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

  1822.  

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

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

  1825. -            se->deltaFrames = frameOffset;

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

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

  1828. +            se->offsetSamples = frameOffset;

  1829.              se->flags = 0;

  1830. -            se->dumpBytes = numBytes;

  1831. -            se->resvd1 = 0;

  1832. -            se->resvd2 = 0;

  1833. +            se->sysExDumpSize = numBytes;

  1834. +            se->future1 = 0;

  1835. +            se->future2 = 0;

  1836.          }

  1837.      }

  1838.  

  1839.      //==============================================================================

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

  1841.      // or plugin.

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

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

  1844.      {

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

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

  1847.          {

  1848.              const Vst2::VstEvent* const e = events->events[i];

  1849.  

  1850. @@ -117,17 +117,17 @@ public:

  1851.              {

  1852.                  const void* const ptr = events->events[i];

  1853.  

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

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

  1856.                  {

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

  1858. -                                   4, e->deltaFrames);

  1859. +                                   4, e->sampleOffset);

  1860.                  }

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

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

  1863.                  {

  1864. -                    const auto* se = (const Vst2::VstMidiSysexEvent*) ptr;

  1865. -                    dest.addEvent ((const juce::uint8*) se->sysexDump,

  1866. -                                   (int) se->dumpBytes,

  1867. -                                   e->deltaFrames);

  1868. +                    const auto* se = (const Vst2::VstSysExEvent*) ptr;

  1869. +                    dest.addEvent ((const juce::uint8*) se->sysExDump,

  1870. +                                   (int) se->sysExDumpSize,

  1871. +                                   e->sampleOffset);

  1872.                  }

  1873.              }

  1874.          }

  1875. @@ -168,25 +168,25 @@ public:

  1876.      }

  1877.  

  1878.      //==============================================================================

  1879. -    HeapBlock<Vst2::VstEvents> events;

  1880. +    HeapBlock<Vst2::VstEventBlock> events;

  1881.  

  1882.  private:

  1883.      int numEventsUsed, numEventsAllocated;

  1884.  

  1885.      static Vst2::VstEvent* allocateVSTEvent()

  1886.      {

  1887. -        auto e = (Vst2::VstEvent*) std::calloc (1, sizeof (Vst2::VstMidiEvent) > sizeof (Vst2::VstMidiSysexEvent) ? sizeof (Vst2::VstMidiEvent)

  1888. -                                                                                            : sizeof (Vst2::VstMidiSysexEvent));

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

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

  1891. +        auto e = (Vst2::VstEvent*) std::calloc (1, sizeof (Vst2::VstMidiEvent) > sizeof (Vst2::VstSysExEvent) ? sizeof (Vst2::VstMidiEvent)

  1892. +                                                                                            : sizeof (Vst2::VstSysExEvent));

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

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

  1895.          return e;

  1896.      }

  1897.  

  1898.      static void freeVSTEvent (Vst2::VstEvent* e)

  1899.      {

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

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

  1902.          {

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

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

  1905.          }

  1906.  

  1907.          std::free (e);

  1908. diff --git a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp

  1909. index 871a69bb1..adf058959 100644

  1910. --- a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp

  1911. +++ b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp

  1912. @@ -37,7 +37,6 @@ JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wzero-as-null-pointer-constant")

  1913.  JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4996)

  1914.  

  1915.  #define VST_FORCE_DEPRECATED 0

  1916. -#define JUCE_VSTINTERFACE_H_INCLUDED 1

  1917.  

  1918.  namespace Vst2

  1919.  {

  1920. @@ -46,8 +45,7 @@ namespace Vst2

  1921.  // paths or use the "VST (Legacy) SDK Folder" field in the Projucer. The VST2

  1922.  // SDK can be obtained from the vstsdk3610_11_06_2018_build_37 (or older) VST3

  1923.  // SDK or JUCE version 5.3.2.

  1924. -#include <pluginterfaces/vst2.x/aeffect.h>

  1925. -#include <pluginterfaces/vst2.x/aeffectx.h>

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

  1927.  }

  1928.  

  1929.  #include "juce_VSTCommon.h"

  1930. @@ -76,7 +74,7 @@ JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4355)

  1931.  #endif

  1932.  

  1933.  #ifndef JUCE_VST_WRAPPER_INVOKE_MAIN

  1934. -#define JUCE_VST_WRAPPER_INVOKE_MAIN  effect = module->moduleMain ((Vst2::audioMasterCallback) &audioMaster);

  1935. + #define JUCE_VST_WRAPPER_INVOKE_MAIN  effect = module->moduleMain (&audioMaster);

  1936.  #endif

  1937.  

  1938.  //==============================================================================

  1939. @@ -216,8 +214,8 @@ namespace

  1940.  }

  1941.  

  1942.  //==============================================================================

  1943. -typedef Vst2::AEffect* (VSTCALLBACK *MainCall) (Vst2::audioMasterCallback);

  1944. -static pointer_sized_int VSTCALLBACK audioMaster (Vst2::AEffect*, int32, int32, pointer_sized_int, void*, float);

  1945. +typedef Vst2::VstEffectInterface* (VSTINTERFACECALL *MainCall) (Vst2::VstHostCallback);

  1946. +static pointer_sized_int VSTINTERFACECALL audioMaster (Vst2::VstEffectInterface*, int32, int32, pointer_sized_int, void*, float);

  1947.  

  1948.  //==============================================================================

  1949.  // Change this to disable logging of various VST activities

  1950. @@ -685,9 +683,9 @@ struct ModuleHandle    : public ReferenceCountedObject

  1951.          module.close();

  1952.      }

  1953.  

  1954. -    void closeEffect (Vst2::AEffect* eff)

  1955. +    void closeEffect (Vst2::VstEffectInterface* eff)

  1956.      {

  1957. -        eff->dispatcher (eff, Vst2::effClose, 0, 0, nullptr, 0);

  1958. +        eff->dispatchFunction (eff, Vst2::plugInOpcodeClose, 0, 0, nullptr, 0);

  1959.      }

  1960.  

  1961.     #if JUCE_WINDOWS

  1962. @@ -811,9 +809,9 @@ struct ModuleHandle    : public ReferenceCountedObject

  1963.          }

  1964.      }

  1965.  

  1966. -    void closeEffect (Vst2::AEffect* eff)

  1967. +    void closeEffect (Vst2::VstEffectInterface* eff)

  1968.      {

  1969. -        eff->dispatcher (eff, Vst2::effClose, 0, 0, nullptr, 0);

  1970. +        eff->dispatchFunction (eff, Vst2::plugInOpcodeClose, 0, 0, nullptr, 0);

  1971.      }

  1972.  

  1973.    #endif

  1974. @@ -865,7 +863,7 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  1975.              {

  1976.                  const ScopedLock sl (pluginInstance.lock);

  1977.  

  1978. -                return effect->getParameter (effect, getParameterIndex());

  1979. +                return effect->getParameterValueFunction (effect, getParameterIndex());

  1980.              }

  1981.  

  1982.              return 0.0f;

  1983. @@ -877,8 +875,8 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  1984.              {

  1985.                  const ScopedLock sl (pluginInstance.lock);

  1986.  

  1987. -                if (effect->getParameter (effect, getParameterIndex()) != newValue)

  1988. -                    effect->setParameter (effect, getParameterIndex(), newValue);

  1989. +                if (effect->getParameterValueFunction (effect, getParameterIndex()) != newValue)

  1990. +                    effect->setParameterValueFunction (effect, getParameterIndex(), newValue);

  1991.              }

  1992.          }

  1993.  

  1994. @@ -911,7 +909,7 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  1995.              if (valueType != nullptr || ! vstValueStrings.isEmpty())

  1996.                  return getText (getValue(), 1024);

  1997.  

  1998. -            return pluginInstance.getTextForOpcode (getParameterIndex(), Vst2::effGetParamDisplay);

  1999. +            return pluginInstance.getTextForOpcode (getParameterIndex(), Vst2::plugInOpcodeGetParameterText);

  2000.          }

  2001.  

  2002.          float getDefaultValue() const override

  2003. @@ -923,7 +921,7 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2004.          {

  2005.              if (name.isEmpty())

  2006.                  return pluginInstance.getTextForOpcode (getParameterIndex(),

  2007. -                                                        Vst2::effGetParamName);

  2008. +                                                        Vst2::plugInOpcodeGetParameterName);

  2009.  

  2010.              if (name.length() <= maximumStringLength)

  2011.                  return name;

  2012. @@ -943,7 +941,7 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2013.          String getLabel() const override

  2014.          {

  2015.              return label.isEmpty() ? pluginInstance.getTextForOpcode (getParameterIndex(),

  2016. -                                                                      Vst2::effGetParamLabel)

  2017. +                                                                      Vst2::plugInOpcodeGetParameterLabel)

  2018.                                     : label;

  2019.          }

  2020.  

  2021. @@ -985,7 +983,7 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2022.          const VSTXMLInfo::ValueType* const valueType;

  2023.      };

  2024.  

  2025. -    VSTPluginInstance (const ModuleHandle::Ptr& mh, const BusesProperties& ioConfig, Vst2::AEffect* effect,

  2026. +    VSTPluginInstance (const ModuleHandle::Ptr& mh, const BusesProperties& ioConfig, Vst2::VstEffectInterface* effect,

  2027.                         double sampleRateToUse, int blockSizeToUse)

  2028.          : AudioPluginInstance (ioConfig),

  2029.            vstEffect (effect),

  2030. @@ -1008,13 +1006,13 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2031.      {

  2032.          AudioProcessorParameterGroup newParameterTree;

  2033.  

  2034. -        for (int i = 0; i < vstEffect->numParams; ++i)

  2035. +        for (int i = 0; i < vstEffect->numParameters; ++i)

  2036.          {

  2037.              String paramName;

  2038.              Array<String> shortParamNames;

  2039.              float defaultValue = 0;

  2040.              String label;

  2041. -            bool isAutomatable = dispatch (Vst2::effCanBeAutomated, i, 0, nullptr, 0) != 0;

  2042. +            bool isAutomatable = dispatch (Vst2::plugInOpcodeIsParameterAutomatable, i, 0, nullptr, 0) != 0;

  2043.              bool isDiscrete = false;

  2044.              int numSteps = AudioProcessor::getDefaultNumParameterSteps();

  2045.              bool isBoolSwitch = false;

  2046. @@ -1082,7 +1080,7 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2047.  

  2048.      ~VSTPluginInstance() override

  2049.      {

  2050. -        if (vstEffect != nullptr && vstEffect->magic == 0x56737450 /* 'VstP' */)

  2051. +        if (vstEffect != nullptr && vstEffect->interfaceIdentifier == Vst2::juceVstInterfaceIdentifier)

  2052.          {

  2053.              struct VSTDeleter : public CallbackMessage

  2054.              {

  2055. @@ -1115,7 +1113,7 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2056.  

  2057.      void cleanup()

  2058.      {

  2059. -        if (vstEffect != nullptr && vstEffect->magic == 0x56737450 /* 'VstP' */)

  2060. +        if (vstEffect != nullptr && vstEffect->interfaceIdentifier == Vst2::juceVstInterfaceIdentifier)

  2061.          {

  2062.             #if JUCE_MAC

  2063.              if (vstModule->resFileId != 0)

  2064. @@ -1140,16 +1138,16 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2065.      {

  2066.          if (auto* newEffect = constructEffect (newModule))

  2067.          {

  2068. -            newEffect->resvd2 = 0;

  2069. +            newEffect->hostSpace2 = 0;

  2070.  

  2071. -            newEffect->dispatcher (newEffect, Vst2::effIdentify, 0, 0, nullptr, 0);

  2072. +            newEffect->dispatchFunction (newEffect, Vst2::plugInOpcodeIdentify, 0, 0, nullptr, 0);

  2073.  

  2074.              auto blockSize = jmax (32, initialBlockSize);

  2075.  

  2076. -            newEffect->dispatcher (newEffect, Vst2::effSetSampleRate, 0, 0, nullptr, static_cast<float> (initialSampleRate));

  2077. -            newEffect->dispatcher (newEffect, Vst2::effSetBlockSize,  0, blockSize, nullptr, 0);

  2078. +            newEffect->dispatchFunction (newEffect, Vst2::plugInOpcodeSetSampleRate, 0, 0, nullptr, static_cast<float> (initialSampleRate));

  2079. +            newEffect->dispatchFunction (newEffect, Vst2::plugInOpcodeSetBlockSize,  0, blockSize, nullptr, 0);

  2080.  

  2081. -            newEffect->dispatcher (newEffect, Vst2::effOpen, 0, 0, nullptr, 0);

  2082. +            newEffect->dispatchFunction (newEffect, Vst2::plugInOpcodeOpen, 0, 0, nullptr, 0);

  2083.              BusesProperties ioConfig = queryBusIO (newEffect);

  2084.  

  2085.              return new VSTPluginInstance (newModule, ioConfig, newEffect, initialSampleRate, blockSize);

  2086. @@ -1165,7 +1163,7 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2087.  

  2088.          {

  2089.              char buffer[512] = { 0 };

  2090. -            dispatch (Vst2::effGetEffectName, 0, 0, buffer, 0);

  2091. +            dispatch (Vst2::plugInOpcodeGetPlugInName, 0, 0, buffer, 0);

  2092.  

  2093.              desc.descriptiveName = String::createStringFromData (buffer, (int) sizeof (buffer)).trim();

  2094.  

  2095. @@ -1182,7 +1180,7 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2096.  

  2097.          {

  2098.              char buffer[512] = { 0 };

  2099. -            dispatch (Vst2::effGetVendorString, 0, 0, buffer, 0);

  2100. +            dispatch (Vst2::plugInOpcodeGetManufacturerName, 0, 0, buffer, 0);

  2101.              desc.manufacturerName = String::createStringFromData (buffer, (int) sizeof (buffer)).trim();

  2102.          }

  2103.  

  2104. @@ -1196,7 +1194,7 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2105.      {

  2106.          if (vstEffect != nullptr)

  2107.          {

  2108. -            vstEffect->resvd2 = (pointer_sized_int) (pointer_sized_int) this;

  2109. +            vstEffect->hostSpace2 = (pointer_sized_int) (pointer_sized_int) this;

  2110.              initialise (initialSampleRate, initialBlockSize);

  2111.              return true;

  2112.          }

  2113. @@ -1222,25 +1220,25 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2114.  

  2115.          setRateAndBufferSizeDetails (initialSampleRate, initialBlockSize);

  2116.  

  2117. -        dispatch (Vst2::effIdentify, 0, 0, nullptr, 0);

  2118. +        dispatch (Vst2::plugInOpcodeIdentify, 0, 0, nullptr, 0);

  2119.  

  2120.          if (getSampleRate() > 0)

  2121. -            dispatch (Vst2::effSetSampleRate, 0, 0, nullptr, (float) getSampleRate());

  2122. +            dispatch (Vst2::plugInOpcodeSetSampleRate, 0, 0, nullptr, (float) getSampleRate());

  2123.  

  2124.          if (getBlockSize() > 0)

  2125. -            dispatch (Vst2::effSetBlockSize, 0, jmax (32, getBlockSize()), nullptr, 0);

  2126. +            dispatch (Vst2::plugInOpcodeSetBlockSize, 0, jmax (32, getBlockSize()), nullptr, 0);

  2127.  

  2128. -        dispatch (Vst2::effOpen, 0, 0, nullptr, 0);

  2129. +        dispatch (Vst2::plugInOpcodeOpen, 0, 0, nullptr, 0);

  2130.  

  2131.          setRateAndBufferSizeDetails (getSampleRate(), getBlockSize());

  2132.  

  2133.          if (getNumPrograms() > 1)

  2134.              setCurrentProgram (0);

  2135.          else

  2136. -            dispatch (Vst2::effSetProgram, 0, 0, nullptr, 0);

  2137. +            dispatch (Vst2::plugInOpcodeSetCurrentProgram, 0, 0, nullptr, 0);

  2138.  

  2139. -        for (int i = vstEffect->numInputs;  --i >= 0;)  dispatch (Vst2::effConnectInput,  i, 1, nullptr, 0);

  2140. -        for (int i = vstEffect->numOutputs; --i >= 0;)  dispatch (Vst2::effConnectOutput, i, 1, nullptr, 0);

  2141. +        for (int i = vstEffect->numInputChannels;  --i >= 0;)  dispatch (Vst2::plugInOpcodeConnectInput,  i, 1, nullptr, 0);

  2142. +        for (int i = vstEffect->numOutputChannels; --i >= 0;)  dispatch (Vst2::plugInOpcodeConnectOutput, i, 1, nullptr, 0);

  2143.  

  2144.          if (getVstCategory() != Vst2::kPlugCategShell) // (workaround for Waves 5 plugins which crash during this call)

  2145.              updateStoredProgramNames();

  2146. @@ -1251,7 +1249,7 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2147.          usesCocoaNSView = ((unsigned int) pluginCanDo ("hasCockosViewAsConfig") & 0xffff0000ul) == 0xbeef0000ul;

  2148.         #endif

  2149.  

  2150. -        setLatencySamples (vstEffect->initialDelay);

  2151. +        setLatencySamples (vstEffect->latency);

  2152.      }

  2153.  

  2154.      void* getPlatformSpecificData() override    { return vstEffect; }

  2155. @@ -1262,7 +1260,7 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2156.          {

  2157.              char buffer[512] = { 0 };

  2158.  

  2159. -            if (dispatch (Vst2::effGetProductString, 0, 0, buffer, 0) != 0)

  2160. +            if (dispatch (Vst2::plugInOpcodeGetManufacturerProductName, 0, 0, buffer, 0) != 0)

  2161.              {

  2162.                  String productName = String::createStringFromData (buffer, (int) sizeof (buffer));

  2163.  

  2164. @@ -1276,7 +1274,7 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2165.  

  2166.      int getUID() const

  2167.      {

  2168. -        int uid = vstEffect != nullptr ? vstEffect->uniqueID : 0;

  2169. +        int uid = vstEffect != nullptr ? vstEffect->plugInIdentifier : 0;

  2170.  

  2171.          if (uid == 0)

  2172.              uid = vstModule->file.hashCode();

  2173. @@ -1289,10 +1287,10 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2174.          if (vstEffect == nullptr)

  2175.              return 0.0;

  2176.  

  2177. -        if ((vstEffect->flags & Vst2::effFlagsNoSoundInStop) != 0)

  2178. +        if ((vstEffect->flags & 512) != 0)

  2179.              return 0.0;

  2180.  

  2181. -        auto tailSize = dispatch (Vst2::effGetTailSize, 0, 0, nullptr, 0);

  2182. +        auto tailSize = dispatch (Vst2::plugInOpcodeGetTailSize, 0, 0, nullptr, 0);

  2183.          auto sampleRate = getSampleRate();

  2184.  

  2185.          // remain backward compatible with old JUCE plug-ins: anything larger

  2186. @@ -1312,11 +1310,11 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2187.      bool producesMidi() const override   { return pluginCanDo ("sendVstMidiEvent") > 0; }

  2188.      bool supportsMPE() const override    { return pluginCanDo ("MPE") > 0; }

  2189.  

  2190. -    Vst2::VstPlugCategory getVstCategory() const noexcept     { return (Vst2::VstPlugCategory) dispatch (Vst2::effGetPlugCategory, 0, 0, nullptr, 0); }

  2191. +    Vst2::VstPlugInCategory getVstCategory() const noexcept     { return (Vst2::VstPlugInCategory) dispatch (Vst2::plugInOpcodeGetPlugInCategory, 0, 0, nullptr, 0); }

  2192.  

  2193. -    bool isSynthPlugin() const  { return (vstEffect != nullptr && (vstEffect->flags & Vst2::effFlagsIsSynth) != 0); }

  2194. +    bool isSynthPlugin() const  { return (vstEffect != nullptr && (vstEffect->flags & Vst2::vstEffectFlagIsSynth) != 0); }

  2195.  

  2196. -    int pluginCanDo (const char* text) const  { return (int) dispatch (Vst2::effCanDo, 0, 0, (void*) text,  0); }

  2197. +    int pluginCanDo (const char* text) const  { return (int) dispatch (Vst2::plugInOpcodeCanPlugInDo, 0, 0, (void*) text,  0); }

  2198.  

  2199.      //==============================================================================

  2200.      void prepareToPlay (double rate, int samplesPerBlockExpected) override

  2201. @@ -1331,17 +1329,17 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2202.              SpeakerMappings::VstSpeakerConfigurationHolder inArr  (getChannelLayoutOfBus (true,  0));

  2203.              SpeakerMappings::VstSpeakerConfigurationHolder outArr (getChannelLayoutOfBus (false, 0));

  2204.  

  2205. -            dispatch (Vst2::effSetSpeakerArrangement, 0, (pointer_sized_int) &inArr.get(), (void*) &outArr.get(), 0.0f);

  2206. +            dispatch (Vst2::plugInOpcodeSetSpeakerConfiguration, 0, (pointer_sized_int) &inArr.get(), (void*) &outArr.get(), 0.0f);

  2207.          }

  2208.  

  2209. -        vstHostTime.tempo = 120.0;

  2210. -        vstHostTime.timeSigNumerator = 4;

  2211. -        vstHostTime.timeSigDenominator = 4;

  2212. +        vstHostTime.tempoBPM = 120.0;

  2213. +        vstHostTime.timeSignatureNumerator = 4;

  2214. +        vstHostTime.timeSignatureDenominator = 4;

  2215.          vstHostTime.sampleRate = rate;

  2216. -        vstHostTime.samplePos = 0;

  2217. -        vstHostTime.flags = Vst2::kVstNanosValid

  2218. -                              | Vst2::kVstAutomationWriting

  2219. -                              | Vst2::kVstAutomationReading;

  2220. +        vstHostTime.samplePosition = 0;

  2221. +        vstHostTime.flags = Vst2::vstTimingInfoFlagNanosecondsValid

  2222. +                              | Vst2::vstTimingInfoFlagAutomationWriteModeActive

  2223. +                              | Vst2::vstTimingInfoFlagAutomationReadModeActive;

  2224.  

  2225.          initialise (rate, samplesPerBlockExpected);

  2226.  

  2227. @@ -1356,18 +1354,18 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2228.  

  2229.              incomingMidi.clear();

  2230.  

  2231. -            dispatch (Vst2::effSetSampleRate, 0, 0, nullptr, (float) rate);

  2232. -            dispatch (Vst2::effSetBlockSize, 0, jmax (16, samplesPerBlockExpected), nullptr, 0);

  2233. +            dispatch (Vst2::plugInOpcodeSetSampleRate, 0, 0, nullptr, (float) rate);

  2234. +            dispatch (Vst2::plugInOpcodeSetBlockSize, 0, jmax (16, samplesPerBlockExpected), nullptr, 0);

  2235.  

  2236.              if (supportsDoublePrecisionProcessing())

  2237.              {

  2238. -                int32 vstPrecision = isUsingDoublePrecision() ? Vst2::kVstProcessPrecision64

  2239. -                                                              : Vst2::kVstProcessPrecision32;

  2240. +                int32 vstPrecision = isUsingDoublePrecision() ? Vst2::vstProcessingSampleTypeDouble

  2241. +                                                              : Vst2::vstProcessingSampleTypeFloat;

  2242.  

  2243. -                dispatch (Vst2::effSetProcessPrecision, 0, (pointer_sized_int) vstPrecision, nullptr, 0);

  2244. +                dispatch (Vst2::plugInOpcodeSetSampleFloatType, 0, (pointer_sized_int) vstPrecision, nullptr, 0);

  2245.              }

  2246.  

  2247. -            auto maxChannels = jmax (1, jmax (vstEffect->numInputs, vstEffect->numOutputs));

  2248. +            auto maxChannels = jmax (1, jmax (vstEffect->numInputChannels, vstEffect->numOutputChannels));

  2249.  

  2250.              tmpBufferFloat .setSize (maxChannels, samplesPerBlockExpected);

  2251.              tmpBufferDouble.setSize (maxChannels, samplesPerBlockExpected);

  2252. @@ -1375,7 +1373,7 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2253.              channelBufferFloat .calloc (static_cast<size_t> (maxChannels));

  2254.              channelBufferDouble.calloc (static_cast<size_t> (maxChannels));

  2255.  

  2256. -            outOfPlaceBuffer.setSize (jmax (1, vstEffect->numOutputs), samplesPerBlockExpected);

  2257. +            outOfPlaceBuffer.setSize (jmax (1, vstEffect->numOutputChannels), samplesPerBlockExpected);

  2258.  

  2259.              if (! isPowerOn)

  2260.                  setPower (true);

  2261. @@ -1391,9 +1389,9 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2262.                  }

  2263.              }

  2264.  

  2265. -            dispatch (Vst2::effStartProcess, 0, 0, nullptr, 0);

  2266. +            dispatch (Vst2::plugInOpcodeStartProcess, 0, 0, nullptr, 0);

  2267.  

  2268. -            setLatencySamples (vstEffect->initialDelay);

  2269. +            setLatencySamples (vstEffect->latency);

  2270.          }

  2271.      }

  2272.  

  2273. @@ -1401,7 +1399,7 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2274.      {

  2275.          if (initialised)

  2276.          {

  2277. -            dispatch (Vst2::effStopProcess, 0, 0, nullptr, 0);

  2278. +            dispatch (Vst2::plugInOpcodeStopProcess, 0, 0, nullptr, 0);

  2279.              setPower (false);

  2280.          }

  2281.  

  2282. @@ -1454,8 +1452,8 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2283.      //==============================================================================

  2284.      bool supportsDoublePrecisionProcessing() const override

  2285.      {

  2286. -        return ((vstEffect->flags & Vst2::effFlagsCanReplacing) != 0

  2287. -             && (vstEffect->flags & Vst2::effFlagsCanDoubleReplacing) != 0);

  2288. +        return ((vstEffect->flags & Vst2::vstEffectFlagInplaceAudio) != 0

  2289. +             && (vstEffect->flags & Vst2::vstEffectFlagInplaceDoubleAudio) != 0);

  2290.      }

  2291.  

  2292.      AudioProcessorParameter* getBypassParameter() const override               { return vstSupportsBypass ? bypassParam.get() : nullptr; }

  2293. @@ -1473,15 +1471,15 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2294.          if (numInputBuses > 1 || numOutputBuses > 1)

  2295.              return (layouts == getBusesLayout());

  2296.  

  2297. -        return (layouts.getNumChannels (true,  0) <= vstEffect->numInputs

  2298. -             && layouts.getNumChannels (false, 0) <= vstEffect->numOutputs);

  2299. +        return (layouts.getNumChannels (true,  0) <= vstEffect->numInputChannels

  2300. +             && layouts.getNumChannels (false, 0) <= vstEffect->numOutputChannels);

  2301.      }

  2302.  

  2303.      //==============================================================================

  2304.     #if JUCE_IOS || JUCE_ANDROID

  2305.      bool hasEditor() const override                  { return false; }

  2306.     #else

  2307. -    bool hasEditor() const override                  { return vstEffect != nullptr && (vstEffect->flags & Vst2::effFlagsHasEditor) != 0; }

  2308. +    bool hasEditor() const override                  { return vstEffect != nullptr && (vstEffect->flags & Vst2::vstEffectFlagHasEditor) != 0; }

  2309.     #endif

  2310.  

  2311.      AudioProcessorEditor* createEditor() override;

  2312. @@ -1491,9 +1489,9 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2313.      {

  2314.          if (isValidChannel (index, true))

  2315.          {

  2316. -            Vst2::VstPinProperties pinProps;

  2317. -            if (dispatch (Vst2::effGetInputProperties, index, 0, &pinProps, 0.0f) != 0)

  2318. -                return String (pinProps.label, sizeof (pinProps.label));

  2319. +            Vst2::VstPinInfo pinProps;

  2320. +            if (dispatch (Vst2::plugInOpcodeGetInputPinProperties, index, 0, &pinProps, 0.0f) != 0)

  2321. +                return String (pinProps.text, sizeof (pinProps.text));

  2322.          }

  2323.  

  2324.          return {};

  2325. @@ -1504,9 +1502,9 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2326.          if (! isValidChannel (index, true))

  2327.              return false;

  2328.  

  2329. -        Vst2::VstPinProperties pinProps;

  2330. -        if (dispatch (Vst2::effGetInputProperties, index, 0, &pinProps, 0.0f) != 0)

  2331. -            return (pinProps.flags & Vst2::kVstPinIsStereo) != 0;

  2332. +        Vst2::VstPinInfo pinProps;

  2333. +        if (dispatch (Vst2::plugInOpcodeGetInputPinProperties, index, 0, &pinProps, 0.0f) != 0)

  2334. +            return (pinProps.flags & Vst2::vstPinInfoFlagIsStereo) != 0;

  2335.  

  2336.          return true;

  2337.      }

  2338. @@ -1515,9 +1513,9 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2339.      {

  2340.          if (isValidChannel (index, false))

  2341.          {

  2342. -            Vst2::VstPinProperties pinProps;

  2343. -            if (dispatch (Vst2::effGetOutputProperties, index, 0, &pinProps, 0.0f) != 0)

  2344. -                return String (pinProps.label, sizeof (pinProps.label));

  2345. +            Vst2::VstPinInfo pinProps;

  2346. +            if (dispatch (Vst2::plugInOpcodeGetOutputPinProperties, index, 0, &pinProps, 0.0f) != 0)

  2347. +                return String (pinProps.text, sizeof (pinProps.text));

  2348.          }

  2349.  

  2350.          return {};

  2351. @@ -1528,9 +1526,9 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2352.          if (! isValidChannel (index, false))

  2353.              return false;

  2354.  

  2355. -        Vst2::VstPinProperties pinProps;

  2356. -        if (dispatch (Vst2::effGetOutputProperties, index, 0, &pinProps, 0.0f) != 0)

  2357. -            return (pinProps.flags & Vst2::kVstPinIsStereo) != 0;

  2358. +        Vst2::VstPinInfo pinProps;

  2359. +        if (dispatch (Vst2::plugInOpcodeGetOutputPinProperties, index, 0, &pinProps, 0.0f) != 0)

  2360. +            return (pinProps.flags & Vst2::vstPinInfoFlagIsStereo) != 0;

  2361.  

  2362.          return true;

  2363.      }

  2364. @@ -1545,12 +1543,12 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2365.      int getNumPrograms() override          { return vstEffect != nullptr ? jmax (0, vstEffect->numPrograms) : 0; }

  2366.  

  2367.      // NB: some plugs return negative numbers from this function.

  2368. -    int getCurrentProgram() override       { return (int) dispatch (Vst2::effGetProgram, 0, 0, nullptr, 0); }

  2369. +    int getCurrentProgram() override       { return (int) dispatch (Vst2::plugInOpcodeGetCurrentProgram, 0, 0, 0, 0); }

  2370.  

  2371.      void setCurrentProgram (int newIndex) override

  2372.      {

  2373.          if (getNumPrograms() > 0 && newIndex != getCurrentProgram())

  2374. -            dispatch (Vst2::effSetProgram, 0, jlimit (0, getNumPrograms() - 1, newIndex), nullptr, 0);

  2375. +            dispatch (Vst2::plugInOpcodeSetCurrentProgram, 0, jlimit (0, getNumPrograms() - 1, newIndex), 0, 0);

  2376.      }

  2377.  

  2378.      const String getProgramName (int index) override

  2379. @@ -1564,7 +1562,7 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2380.              {

  2381.                  char nm[264] = { 0 };

  2382.  

  2383. -                if (dispatch (Vst2::effGetProgramNameIndexed, jlimit (0, getNumPrograms(), index), -1, nm, 0) != 0)

  2384. +                if (dispatch (Vst2::plugInOpcodeGetProgramName, jlimit (0, getNumPrograms(), index), -1, nm, 0) != 0)

  2385.                      return String::fromUTF8 (nm).trim();

  2386.              }

  2387.          }

  2388. @@ -1577,7 +1575,7 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2389.          if (index >= 0 && index == getCurrentProgram())

  2390.          {

  2391.              if (getNumPrograms() > 0 && newName != getCurrentProgramName())

  2392. -                dispatch (Vst2::effSetProgramName, 0, 0, (void*) newName.substring (0, 24).toRawUTF8(), 0.0f);

  2393. +                dispatch (Vst2::plugInOpcodeSetCurrentProgramName, 0, 0, (void*) newName.substring (0, 24).toRawUTF8(), 0.0f);

  2394.          }

  2395.          else

  2396.          {

  2397. @@ -1595,7 +1593,7 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2398.      //==============================================================================

  2399.      void timerCallback() override

  2400.      {

  2401. -        if (dispatch (Vst2::effIdle, 0, 0, nullptr, 0) == 0)

  2402. +        if (dispatch (Vst2::plugInOpcodeIdle, 0, 0, nullptr, 0) == 0)

  2403.              stopTimer();

  2404.      }

  2405.  

  2406. @@ -1609,7 +1607,7 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2407.      {

  2408.          switch (opcode)

  2409.          {

  2410. -            case Vst2::audioMasterAutomate:

  2411. +            case Vst2::hostOpcodeParameterChanged:

  2412.                  if (auto* param = getParameters()[index])

  2413.                      param->sendValueChangedMessageToListeners (opt);

  2414.                  else

  2415. @@ -1617,23 +1615,23 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2416.  

  2417.                  break;

  2418.  

  2419. -            case Vst2::audioMasterProcessEvents:            handleMidiFromPlugin ((const Vst2::VstEvents*) ptr); break;

  2420. -            case Vst2::audioMasterGetTime:                  return getVSTTime();

  2421. -            case Vst2::audioMasterIdle:                     handleIdle(); break;

  2422. -            case Vst2::audioMasterSizeWindow:               setWindowSize (index, (int) value); return 1;

  2423. -            case Vst2::audioMasterUpdateDisplay:            triggerAsyncUpdate(); break;

  2424. -            case Vst2::audioMasterIOChanged:                setLatencySamples (vstEffect->initialDelay); break;

  2425. -            case Vst2::audioMasterNeedIdle:                 startTimer (50); break;

  2426. +            case Vst2::hostOpcodePreAudioProcessingEvents:    handleMidiFromPlugin ((const Vst2::VstEventBlock*) ptr); break;

  2427. +            case Vst2::hostOpcodeGetTimingInfo:               return getVSTTime();

  2428. +            case Vst2::hostOpcodeIdle:                        handleIdle(); break;

  2429. +            case Vst2::hostOpcodeWindowSize:                  setWindowSize (index, (int) value); return 1;

  2430. +            case Vst2::hostOpcodeUpdateView:                  triggerAsyncUpdate(); break;

  2431. +            case Vst2::hostOpcodeIOModified:                  setLatencySamples (vstEffect->latency); break;

  2432. +            case Vst2::hostOpcodeNeedsIdle:                   startTimer (50); break;

  2433.  

  2434. -            case Vst2::audioMasterGetSampleRate:            return (pointer_sized_int) (getSampleRate() > 0 ? getSampleRate() : defaultVSTSampleRateValue);

  2435. -            case Vst2::audioMasterGetBlockSize:             return (pointer_sized_int) (getBlockSize() > 0  ? getBlockSize()  : defaultVSTBlockSizeValue);

  2436. -            case Vst2::audioMasterWantMidi:                 wantsMidiMessages = true; break;

  2437. -            case Vst2::audioMasterGetDirectory:             return getVstDirectory();

  2438. +            case Vst2::hostOpcodeGetSampleRate:               return (pointer_sized_int) (getSampleRate() > 0 ? getSampleRate() : defaultVSTSampleRateValue);

  2439. +            case Vst2::hostOpcodeGetBlockSize:                return (pointer_sized_int) (getBlockSize() > 0  ? getBlockSize()  : defaultVSTBlockSizeValue);

  2440. +            case Vst2::hostOpcodePlugInWantsMidi:             wantsMidiMessages = true; break;

  2441. +            case Vst2::hostOpcodeGetDirectory:                return getVstDirectory();

  2442.  

  2443. -            case Vst2::audioMasterTempoAt:                  return (pointer_sized_int) (extraFunctions != nullptr ? extraFunctions->getTempoAt ((int64) value) : 0);

  2444. -            case Vst2::audioMasterGetAutomationState:       return (pointer_sized_int) (extraFunctions != nullptr ? extraFunctions->getAutomationState() : 0);

  2445. +            case Vst2::hostOpcodeTempoAt:                     return (pointer_sized_int) (extraFunctions != nullptr ? extraFunctions->getTempoAt ((int64) value) : 0);

  2446. +            case Vst2::hostOpcodeGetAutomationState:          return (pointer_sized_int) (extraFunctions != nullptr ? extraFunctions->getAutomationState() : 0);

  2447.  

  2448. -            case Vst2::audioMasterBeginEdit:

  2449. +            case Vst2::hostOpcodeParameterChangeGestureBegin:

  2450.                  if (auto* param = getParameters()[index])

  2451.                      param->beginChangeGesture();

  2452.                  else

  2453. @@ -1641,7 +1639,7 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2454.  

  2455.                  break;

  2456.  

  2457. -            case Vst2::audioMasterEndEdit:

  2458. +            case Vst2::hostOpcodeParameterChangeGestureEnd:

  2459.                  if (auto* param = getParameters()[index])

  2460.                      param->endChangeGesture();

  2461.                  else

  2462. @@ -1649,28 +1647,28 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2463.  

  2464.                  break;

  2465.  

  2466. -            case Vst2::audioMasterPinConnected:             return isValidChannel (index, value == 0) ? 0 : 1; // (yes, 0 = true)

  2467. -            case Vst2::audioMasterGetCurrentProcessLevel:   return isNonRealtime() ? 4 : 0;

  2468. +            case Vst2::hostOpcodePinConnected:                   return isValidChannel (index, value == 0) ? 0 : 1; // (yes, 0 = true)

  2469. +            case Vst2::hostOpcodeGetCurrentAudioProcessingLevel: return isNonRealtime() ? 4 : 0;

  2470.  

  2471.              // none of these are handled (yet)...

  2472. -            case Vst2::audioMasterSetTime:

  2473. -            case Vst2::audioMasterGetParameterQuantization:

  2474. -            case Vst2::audioMasterGetInputLatency:

  2475. -            case Vst2::audioMasterGetOutputLatency:

  2476. -            case Vst2::audioMasterGetPreviousPlug:

  2477. -            case Vst2::audioMasterGetNextPlug:

  2478. -            case Vst2::audioMasterWillReplaceOrAccumulate:

  2479. -            case Vst2::audioMasterOfflineStart:

  2480. -            case Vst2::audioMasterOfflineRead:

  2481. -            case Vst2::audioMasterOfflineWrite:

  2482. -            case Vst2::audioMasterOfflineGetCurrentPass:

  2483. -            case Vst2::audioMasterOfflineGetCurrentMetaPass:

  2484. -            case Vst2::audioMasterGetOutputSpeakerArrangement:

  2485. -            case Vst2::audioMasterVendorSpecific:

  2486. -            case Vst2::audioMasterSetIcon:

  2487. -            case Vst2::audioMasterGetLanguage:

  2488. -            case Vst2::audioMasterOpenWindow:

  2489. -            case Vst2::audioMasterCloseWindow:

  2490. +            case Vst2::hostOpcodeSetTime:

  2491. +            case Vst2::hostOpcodeGetParameterInterval:

  2492. +            case Vst2::hostOpcodeGetInputLatency:

  2493. +            case Vst2::hostOpcodeGetOutputLatency:

  2494. +            case Vst2::hostOpcodeGetPreviousPlugIn:

  2495. +            case Vst2::hostOpcodeGetNextPlugIn:

  2496. +            case Vst2::hostOpcodeWillReplace:

  2497. +            case Vst2::hostOpcodeOfflineStart:

  2498. +            case Vst2::hostOpcodeOfflineReadSource:

  2499. +            case Vst2::hostOpcodeOfflineWrite:

  2500. +            case Vst2::hostOpcodeOfflineGetCurrentPass:

  2501. +            case Vst2::hostOpcodeOfflineGetCurrentMetaPass:

  2502. +            case Vst2::hostOpcodeGetOutputSpeakerConfiguration:

  2503. +            case Vst2::hostOpcodeManufacturerSpecific:

  2504. +            case Vst2::hostOpcodeSetIcon:

  2505. +            case Vst2::hostOpcodeGetLanguage:

  2506. +            case Vst2::hostOpcodeOpenEditorWindow:

  2507. +            case Vst2::hostOpcodeCloseEditorWindow:

  2508.                  break;

  2509.  

  2510.              default:

  2511. @@ -1685,19 +1683,19 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2512.      {

  2513.          switch (opcode)

  2514.          {

  2515. -            case Vst2::audioMasterCanDo:                        return handleCanDo ((const char*) ptr);

  2516. -            case Vst2::audioMasterVersion:                      return 2400;

  2517. -            case Vst2::audioMasterCurrentId:                    return shellUIDToCreate;

  2518. -            case Vst2::audioMasterGetNumAutomatableParameters:  return 0;

  2519. -            case Vst2::audioMasterGetAutomationState:           return 1;

  2520. -            case Vst2::audioMasterGetVendorVersion:             return 0x0101;

  2521. +            case Vst2::hostOpcodeCanHostDo:                         return handleCanDo ((const char*) ptr);

  2522. +            case Vst2::hostOpcodeVstVersion:                        return 2400;

  2523. +            case Vst2::hostOpcodeCurrentId:                         return shellUIDToCreate;

  2524. +            case Vst2::hostOpcodeGetNumberOfAutomatableParameters:  return 0;

  2525. +            case Vst2::hostOpcodeGetAutomationState:                return 1;

  2526. +            case Vst2::hostOpcodeGetManufacturerVersion:            return 0x0101;

  2527.  

  2528. -            case Vst2::audioMasterGetVendorString:

  2529. -            case Vst2::audioMasterGetProductString:             return getHostName ((char*) ptr);

  2530. +            case Vst2::hostOpcodeGetManufacturerName:

  2531. +            case Vst2::hostOpcodeGetProductName:                    return getHostName ((char*) ptr);

  2532.  

  2533. -            case Vst2::audioMasterGetSampleRate:                return (pointer_sized_int) defaultVSTSampleRateValue;

  2534. -            case Vst2::audioMasterGetBlockSize:                 return (pointer_sized_int) defaultVSTBlockSizeValue;

  2535. -            case Vst2::audioMasterSetOutputSampleRate:          return 0;

  2536. +            case Vst2::hostOpcodeGetSampleRate:                     return (pointer_sized_int) defaultVSTSampleRateValue;

  2537. +            case Vst2::hostOpcodeGetBlockSize:                      return (pointer_sized_int) defaultVSTBlockSizeValue;

  2538. +            case Vst2::hostOpcodeSetOutputSampleRate:               return 0;

  2539.  

  2540.              default:

  2541.                  DBG ("*** Unhandled VST Callback: " + String ((int) opcode));

  2542. @@ -1726,7 +1724,7 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2543.                      UseResFile (vstModule->resFileId);

  2544.                 #endif

  2545.  

  2546. -                result = vstEffect->dispatcher (vstEffect, opcode, index, value, ptr, opt);

  2547. +                result = vstEffect->dispatchFunction (vstEffect, opcode, index, value, ptr, opt);

  2548.  

  2549.                 #if JUCE_MAC

  2550.                  auto newResFile = CurResFile();

  2551. @@ -1932,14 +1930,14 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2552.          return true;

  2553.      }

  2554.  

  2555. -    bool usesChunks() const noexcept        { return vstEffect != nullptr && (vstEffect->flags & Vst2::effFlagsProgramChunks) != 0; }

  2556. +    bool usesChunks() const noexcept        { return vstEffect != nullptr && (vstEffect->flags & Vst2::vstEffectFlagDataInChunks) != 0; }

  2557.  

  2558.      bool getChunkData (MemoryBlock& mb, bool isPreset, int maxSizeMB) const

  2559.      {

  2560.          if (usesChunks())

  2561.          {

  2562.              void* data = nullptr;

  2563. -            auto bytes = (size_t) dispatch (Vst2::effGetChunk, isPreset ? 1 : 0, 0, &data, 0.0f);

  2564. +            auto bytes = (size_t) dispatch (Vst2::plugInOpcodeGetData, isPreset ? 1 : 0, 0, &data, 0.0f);

  2565.  

  2566.              if (data != nullptr && bytes <= (size_t) maxSizeMB * 1024 * 1024)

  2567.              {

  2568. @@ -1957,7 +1955,7 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2569.      {

  2570.          if (size > 0 && usesChunks())

  2571.          {

  2572. -            dispatch (Vst2::effSetChunk, isPreset ? 1 : 0, size, (void*) data, 0.0f);

  2573. +            dispatch (Vst2::plugInOpcodeSetData, isPreset ? 1 : 0, size, (void*) data, 0.0f);

  2574.  

  2575.              if (! isPreset)

  2576.                  updateStoredProgramNames();

  2577. @@ -1968,7 +1966,7 @@ struct VSTPluginInstance     : public AudioPluginInstance,

  2578.          return false;

  2579.      }

  2580.  

  2581. -    Vst2::AEffect* vstEffect;

  2582. +    Vst2::VstEffectInterface* vstEffect;

  2583.      ModuleHandle::Ptr vstModule;

  2584.  

  2585.      std::unique_ptr<VSTPluginFormat::ExtraFunctions> extraFunctions;

  2586. @@ -1991,7 +1989,7 @@ private:

  2587.              currentValue = (newValue != 0.0f);

  2588.  

  2589.              if (parent.vstSupportsBypass)

  2590. -                parent.dispatch (Vst2::effSetBypass, 0, currentValue ? 1 : 0, nullptr, 0.0f);

  2591. +                parent.dispatch (Vst2::plugInOpcodeSetBypass, 0, currentValue ? 1 : 0, nullptr, 0.0f);

  2592.          }

  2593.  

  2594.          float getValueForText (const String& text) const override

  2595. @@ -2038,7 +2036,7 @@ private:

  2596.      CriticalSection midiInLock;

  2597.      MidiBuffer incomingMidi;

  2598.      VSTMidiEventList midiEventsToSend;

  2599. -    Vst2::VstTimeInfo vstHostTime;

  2600. +    Vst2::VstTimingInformation vstHostTime;

  2601.  

  2602.      AudioBuffer<float> tmpBufferFloat;

  2603.      HeapBlock<float*> channelBufferFloat;

  2604. @@ -2075,7 +2073,7 @@ private:

  2605.          if (auto* app = JUCEApplicationBase::getInstance())

  2606.              hostName = app->getApplicationName();

  2607.  

  2608. -        hostName.copyToUTF8 (name, (size_t) jmin (Vst2::kVstMaxVendorStrLen, Vst2::kVstMaxProductStrLen) - 1);

  2609. +        hostName.copyToUTF8 (name, (size_t) jmin (Vst2::vstMaxManufacturerStringLength, Vst2::vstMaxPlugInNameStringLength) - 1);

  2610.          return 1;

  2611.      }

  2612.  

  2613. @@ -2096,7 +2094,7 @@ private:

  2614.  

  2615.             #if JUCE_MAC

  2616.              if (getActiveEditor() != nullptr)

  2617. -                dispatch (Vst2::effEditIdle, 0, 0, nullptr, 0);

  2618. +                dispatch (Vst2::plugInOpcodeEditorIdle, 0, 0, nullptr, 0);

  2619.             #endif

  2620.  

  2621.              Timer::callPendingTimersSynchronously();

  2622. @@ -2131,9 +2129,9 @@ private:

  2623.      }

  2624.  

  2625.      //==============================================================================

  2626. -    static Vst2::AEffect* constructEffect (const ModuleHandle::Ptr& module)

  2627. +    static Vst2::VstEffectInterface* constructEffect (const ModuleHandle::Ptr& module)

  2628.      {

  2629. -        Vst2::AEffect* effect = nullptr;

  2630. +        Vst2::VstEffectInterface* effect = nullptr;

  2631.          try

  2632.          {

  2633.              const IdleCallRecursionPreventer icrp;

  2634. @@ -2150,10 +2148,10 @@ private:

  2635.                  JUCE_VST_WRAPPER_INVOKE_MAIN

  2636.              }

  2637.  

  2638. -            if (effect != nullptr && effect->magic == 0x56737450 /* 'VstP' */)

  2639. +            if (effect != nullptr && effect->interfaceIdentifier == Vst2::juceVstInterfaceIdentifier)

  2640.              {

  2641. -                jassert (effect->resvd2 == 0);

  2642. -                jassert (effect->object != nullptr);

  2643. +                jassert (effect->hostSpace2 == 0);

  2644. +                jassert (effect->effectPointer != 0);

  2645.  

  2646.                  _fpreset(); // some dodgy plugs mess around with this

  2647.              }

  2648. @@ -2168,11 +2166,11 @@ private:

  2649.          return effect;

  2650.      }

  2651.  

  2652. -    static BusesProperties queryBusIO (Vst2::AEffect* effect)

  2653. +    static BusesProperties queryBusIO (Vst2::VstEffectInterface* effect)

  2654.      {

  2655.          BusesProperties returnValue;

  2656.  

  2657. -        if (effect->numInputs == 0 && effect->numOutputs == 0)

  2658. +        if (effect->numInputChannels == 0 && effect->numOutputChannels == 0)

  2659.              return returnValue;

  2660.  

  2661.          // Workaround for old broken JUCE plug-ins which would return an invalid

  2662. @@ -2183,14 +2181,14 @@ private:

  2663.          // plug-in is reporting.

  2664.          if (! pluginHasDefaultChannelLayouts (effect))

  2665.          {

  2666. -            SpeakerMappings::VstSpeakerConfigurationHolder canonicalIn  (AudioChannelSet::canonicalChannelSet (effect->numInputs));

  2667. -            SpeakerMappings::VstSpeakerConfigurationHolder canonicalOut (AudioChannelSet::canonicalChannelSet (effect->numOutputs));

  2668. +            SpeakerMappings::VstSpeakerConfigurationHolder canonicalIn  (AudioChannelSet::canonicalChannelSet (effect->numInputChannels));

  2669. +            SpeakerMappings::VstSpeakerConfigurationHolder canonicalOut (AudioChannelSet::canonicalChannelSet (effect->numOutputChannels));

  2670.  

  2671. -            effect->dispatcher (effect, Vst2::effSetSpeakerArrangement, 0,

  2672. +            effect->dispatchFunction (effect, Vst2::plugInOpcodeSetSpeakerConfiguration, 0,

  2673.                                        (pointer_sized_int) &canonicalIn.get(), (void*) &canonicalOut.get(), 0.0f);

  2674.          }

  2675.  

  2676. -        HeapBlock<Vst2::VstSpeakerArrangement> inArrBlock (1, true), outArrBlock (1, true);

  2677. +        HeapBlock<Vst2::VstSpeakerConfiguration> inArrBlock (1, true), outArrBlock (1, true);

  2678.  

  2679.          auto* inArr  = inArrBlock.get();

  2680.          auto* outArr = outArrBlock.get();

  2681. @@ -2201,35 +2199,35 @@ private:

  2682.          for (int dir = 0; dir < 2; ++dir)

  2683.          {

  2684.              const bool isInput = (dir == 0);

  2685. -            const int opcode = (isInput ? Vst2::effGetInputProperties : Vst2::effGetOutputProperties);

  2686. -            const int maxChannels = (isInput ? effect->numInputs : effect->numOutputs);

  2687. -            const Vst2::VstSpeakerArrangement* arr = (isInput ? inArr : outArr);

  2688. +            const int opcode = (isInput ? Vst2::plugInOpcodeGetInputPinProperties : Vst2::plugInOpcodeGetOutputPinProperties);

  2689. +            const int maxChannels = (isInput ? effect->numInputChannels : effect->numOutputChannels);

  2690. +            const Vst2::VstSpeakerConfiguration* arr = (isInput ? inArr : outArr);

  2691.              bool busAdded = false;

  2692.  

  2693. -            Vst2::VstPinProperties pinProps;

  2694. +            Vst2::VstPinInfo pinProps;

  2695.              AudioChannelSet layout;

  2696.  

  2697.              for (int ch = 0; ch < maxChannels; ch += layout.size())

  2698.              {

  2699. -                if (effect->dispatcher (effect, opcode, ch, 0, &pinProps, 0.0f) == 0)

  2700. +                if (effect->dispatchFunction (effect, opcode, ch, 0, &pinProps, 0.0f) == 0)

  2701.                      break;

  2702.  

  2703. -                if ((pinProps.flags & Vst2::kVstPinUseSpeaker) != 0)

  2704. +                if ((pinProps.flags & Vst2::vstPinInfoFlagValid) != 0)

  2705.                  {

  2706. -                    layout = SpeakerMappings::vstArrangementTypeToChannelSet (pinProps.arrangementType, 0);

  2707. +                    layout = SpeakerMappings::vstArrangementTypeToChannelSet (pinProps.configurationType, 0);

  2708.  

  2709.                      if (layout.isDisabled())

  2710.                          break;

  2711.                  }

  2712.                  else if (arr == nullptr)

  2713.                  {

  2714. -                    layout = ((pinProps.flags & Vst2::kVstPinIsStereo) != 0 ? AudioChannelSet::stereo() : AudioChannelSet::mono());

  2715. +                    layout = ((pinProps.flags & Vst2::vstPinInfoFlagIsStereo) != 0 ? AudioChannelSet::stereo() : AudioChannelSet::mono());

  2716.                  }

  2717.                  else

  2718.                      break;

  2719.  

  2720.                  busAdded = true;

  2721. -                returnValue.addBus (isInput, pinProps.label, layout, true);

  2722. +                returnValue.addBus (isInput, pinProps.text, layout, true);

  2723.              }

  2724.  

  2725.              // no buses?

  2726. @@ -2237,8 +2235,8 @@ private:

  2727.              {

  2728.                  String busName = (isInput ? "Input" : "Output");

  2729.  

  2730. -                if (effect->dispatcher (effect, opcode, 0, 0, &pinProps, 0.0f) != 0)

  2731. -                    busName = pinProps.label;

  2732. +                if (effect->dispatchFunction (effect, opcode, 0, 0, &pinProps, 0.0f) != 0)

  2733. +                    busName = pinProps.text;

  2734.  

  2735.                  if (arr != nullptr)

  2736.                      layout = SpeakerMappings::vstArrangementTypeToChannelSet (*arr);

  2737. @@ -2252,9 +2250,9 @@ private:

  2738.          return returnValue;

  2739.      }

  2740.  

  2741. -    static bool pluginHasDefaultChannelLayouts (Vst2::AEffect* effect)

  2742. +    static bool pluginHasDefaultChannelLayouts (Vst2::VstEffectInterface* effect)

  2743.      {

  2744. -        HeapBlock<Vst2::VstSpeakerArrangement> inArrBlock (1, true), outArrBlock (1, true);

  2745. +        HeapBlock<Vst2::VstSpeakerConfiguration> inArrBlock (1, true), outArrBlock (1, true);

  2746.  

  2747.          auto* inArr  = inArrBlock.get();

  2748.          auto* outArr = outArrBlock.get();

  2749. @@ -2265,40 +2263,40 @@ private:

  2750.          for (int dir = 0; dir < 2; ++dir)

  2751.          {

  2752.              const bool isInput = (dir == 0);

  2753. -            const int opcode = (isInput ? Vst2::effGetInputProperties : Vst2::effGetOutputProperties);

  2754. -            const int maxChannels = (isInput ? effect->numInputs : effect->numOutputs);

  2755. +            const int opcode = (isInput ? Vst2::plugInOpcodeGetInputPinProperties : Vst2::plugInOpcodeGetOutputPinProperties);

  2756. +            const int maxChannels = (isInput ? effect->numInputChannels : effect->numOutputChannels);

  2757.  

  2758.              int channels = 1;

  2759.  

  2760.              for (int ch = 0; ch < maxChannels; ch += channels)

  2761.              {

  2762. -                Vst2::VstPinProperties pinProps;

  2763. +                Vst2::VstPinInfo pinProps;

  2764.  

  2765. -                if (effect->dispatcher (effect, opcode, ch, 0, &pinProps, 0.0f) == 0)

  2766. +                if (effect->dispatchFunction (effect, opcode, ch, 0, &pinProps, 0.0f) == 0)

  2767.                      return false;

  2768.  

  2769. -                if ((pinProps.flags & Vst2::kVstPinUseSpeaker) != 0)

  2770. +                if ((pinProps.flags & Vst2::vstPinInfoFlagValid) != 0)

  2771.                      return true;

  2772.  

  2773. -                channels = (pinProps.flags & Vst2::kVstPinIsStereo) != 0 ? 2 : 1;

  2774. +                channels = (pinProps.flags & Vst2::vstPinInfoFlagIsStereo) != 0 ? 2 : 1;

  2775.              }

  2776.          }

  2777.  

  2778.          return false;

  2779.      }

  2780.  

  2781. -    static bool getSpeakerArrangementWrapper (Vst2::AEffect* effect,

  2782. -                                              Vst2::VstSpeakerArrangement* inArr,

  2783. -                                              Vst2::VstSpeakerArrangement* outArr)

  2784. +    static bool getSpeakerArrangementWrapper (Vst2::VstEffectInterface* effect,

  2785. +                                              Vst2::VstSpeakerConfiguration* inArr,

  2786. +                                              Vst2::VstSpeakerConfiguration* outArr)

  2787.      {

  2788.          // Workaround: unfortunately old JUCE VST-2 plug-ins had a bug and would crash if

  2789.          // you try to get the speaker arrangement when there are no input channels present.

  2790.          // Hopefully, one day (when there are no more old JUCE plug-ins around), we can

  2791.          // comment out the next two lines.

  2792. -        if (effect->numInputs == 0)

  2793. +        if (effect->numInputChannels == 0)

  2794.              return false;

  2795.  

  2796. -        return (effect->dispatcher (effect, Vst2::effGetSpeakerArrangement, 0,

  2797. +        return (effect->dispatchFunction (effect, Vst2::plugInOpcodeGetSpeakerArrangement, 0,

  2798.                                            reinterpret_cast<pointer_sized_int> (&inArr), &outArr, 0.0f) != 0);

  2799.      }

  2800.  

  2801. @@ -2332,57 +2330,57 @@ private:

  2802.                  if (currentPlayHead->getCurrentPosition (position))

  2803.                  {

  2804.  

  2805. -                    vstHostTime.samplePos          = (double) position.timeInSamples;

  2806. -                    vstHostTime.tempo              = position.bpm;

  2807. -                    vstHostTime.timeSigNumerator   = position.timeSigNumerator;

  2808. -                    vstHostTime.timeSigDenominator = position.timeSigDenominator;

  2809. -                    vstHostTime.ppqPos             = position.ppqPosition;

  2810. -                    vstHostTime.barStartPos        = position.ppqPositionOfLastBarStart;

  2811. -                    vstHostTime.flags |= Vst2::kVstTempoValid

  2812. -                                           | Vst2::kVstTimeSigValid

  2813. -                                           | Vst2::kVstPpqPosValid

  2814. -                                           | Vst2::kVstBarsValid;

  2815. +                    vstHostTime.samplePosition           = (double) position.timeInSamples;

  2816. +                    vstHostTime.tempoBPM                 = position.bpm;

  2817. +                    vstHostTime.timeSignatureNumerator   = position.timeSigNumerator;

  2818. +                    vstHostTime.timeSignatureDenominator = position.timeSigDenominator;

  2819. +                    vstHostTime.musicalPosition          = position.ppqPosition;

  2820. +                    vstHostTime.lastBarPosition          = position.ppqPositionOfLastBarStart;

  2821. +                    vstHostTime.flags |= Vst2::vstTimingInfoFlagTempoValid

  2822. +                                           | Vst2::vstTimingInfoFlagTimeSignatureValid

  2823. +                                           | Vst2::vstTimingInfoFlagMusicalPositionValid

  2824. +                                           | Vst2::vstTimingInfoFlagLastBarPositionValid;

  2825.  

  2826.                      int32 newTransportFlags = 0;

  2827. -                    if (position.isPlaying)     newTransportFlags |= Vst2::kVstTransportPlaying;

  2828. -                    if (position.isRecording)   newTransportFlags |= Vst2::kVstTransportRecording;

  2829. +                    if (position.isPlaying)     newTransportFlags |= Vst2::vstTimingInfoFlagCurrentlyPlaying;

  2830. +                    if (position.isRecording)   newTransportFlags |= Vst2::vstTimingInfoFlagCurrentlyRecording;

  2831.  

  2832. -                    if (newTransportFlags != (vstHostTime.flags & (Vst2::kVstTransportPlaying

  2833. -                                                                   | Vst2::kVstTransportRecording)))

  2834. -                        vstHostTime.flags = (vstHostTime.flags & ~(Vst2::kVstTransportPlaying | Vst2::kVstTransportRecording)) | newTransportFlags | Vst2::kVstTransportChanged;

  2835. +                    if (newTransportFlags != (vstHostTime.flags & (Vst2::vstTimingInfoFlagCurrentlyPlaying

  2836. +                                                                   | Vst2::vstTimingInfoFlagCurrentlyRecording)))

  2837. +                        vstHostTime.flags = (vstHostTime.flags & ~(Vst2::vstTimingInfoFlagCurrentlyPlaying | Vst2::vstTimingInfoFlagCurrentlyRecording)) | newTransportFlags | Vst2::vstTimingInfoFlagTransportChanged;

  2838.                      else

  2839. -                        vstHostTime.flags &= ~Vst2::kVstTransportChanged;

  2840. +                        vstHostTime.flags &= ~Vst2::vstTimingInfoFlagTransportChanged;

  2841.  

  2842.                      switch (position.frameRate)

  2843.                      {

  2844. -                        case AudioPlayHead::fps24:       setHostTimeFrameRate (Vst2::kVstSmpte24fps, 24.0, position.timeInSeconds); break;

  2845. -                        case AudioPlayHead::fps25:       setHostTimeFrameRate (Vst2::kVstSmpte25fps, 25.0, position.timeInSeconds); break;

  2846. -                        case AudioPlayHead::fps30:       setHostTimeFrameRate (Vst2::kVstSmpte30fps, 30.0, position.timeInSeconds); break;

  2847. -                        case AudioPlayHead::fps60:       setHostTimeFrameRate (Vst2::kVstSmpte60fps, 60.0, position.timeInSeconds); break;

  2848. -

  2849. -                        case AudioPlayHead::fps23976:    setHostTimeFrameRateDrop (Vst2::kVstSmpte239fps,   24.0, position.timeInSeconds); break;

  2850. -                        case AudioPlayHead::fps2997:     setHostTimeFrameRateDrop (Vst2::kVstSmpte2997fps,  30.0, position.timeInSeconds); break;

  2851. -                        case AudioPlayHead::fps2997drop: setHostTimeFrameRateDrop (Vst2::kVstSmpte2997dfps, 30.0, position.timeInSeconds); break;

  2852. -                        case AudioPlayHead::fps30drop:   setHostTimeFrameRateDrop (Vst2::kVstSmpte30dfps,   30.0, position.timeInSeconds); break;

  2853. -                        case AudioPlayHead::fps60drop:   setHostTimeFrameRateDrop (Vst2::kVstSmpte599fps,   60.0, position.timeInSeconds); break;

  2854. +                        case AudioPlayHead::fps24:       setHostTimeFrameRate (Vst2::vstSmpteRateFps24, 24.0, position.timeInSeconds); break;

  2855. +                        case AudioPlayHead::fps25:       setHostTimeFrameRate (Vst2::vstSmpteRateFps25, 25.0, position.timeInSeconds); break;

  2856. +                        case AudioPlayHead::fps30:       setHostTimeFrameRate (Vst2::vstSmpteRateFps30, 30.0, position.timeInSeconds); break;

  2857. +                        case AudioPlayHead::fps60:       setHostTimeFrameRate (Vst2::vstSmpteRateFps60, 60.0, position.timeInSeconds); break;

  2858. +

  2859. +                        case AudioPlayHead::fps23976:    setHostTimeFrameRateDrop (Vst2::vstSmpteRateFps239,      24.0, position.timeInSeconds); break;

  2860. +                        case AudioPlayHead::fps2997:     setHostTimeFrameRateDrop (Vst2::vstSmpteRateFps2997,     30.0, position.timeInSeconds); break;

  2861. +                        case AudioPlayHead::fps2997drop: setHostTimeFrameRateDrop (Vst2::vstSmpteRateFps2997drop, 30.0, position.timeInSeconds); break;

  2862. +                        case AudioPlayHead::fps30drop:   setHostTimeFrameRateDrop (Vst2::vstSmpteRateFps30drop,   30.0, position.timeInSeconds); break;

  2863. +                        case AudioPlayHead::fps60drop:   setHostTimeFrameRateDrop (Vst2::vstSmpteRateFps599,      60.0, position.timeInSeconds); break;

  2864.                          case AudioPlayHead::fpsUnknown:

  2865.                          default: break;

  2866.                      }

  2867.  

  2868.                      if (position.isLooping)

  2869.                      {

  2870. -                        vstHostTime.cycleStartPos = position.ppqLoopStart;

  2871. -                        vstHostTime.cycleEndPos   = position.ppqLoopEnd;

  2872. -                        vstHostTime.flags |= (Vst2::kVstCyclePosValid | Vst2::kVstTransportCycleActive);

  2873. +                        vstHostTime.loopStartPosition = position.ppqLoopStart;

  2874. +                        vstHostTime.loopEndPosition   = position.ppqLoopEnd;

  2875. +                        vstHostTime.flags |= (Vst2::vstTimingInfoFlagLoopPositionValid | Vst2::vstTimingInfoFlagLoopActive);

  2876.                      }

  2877.                      else

  2878.                      {

  2879. -                        vstHostTime.flags &= ~(Vst2::kVstCyclePosValid | Vst2::kVstTransportCycleActive);

  2880. +                        vstHostTime.flags &= ~(Vst2::vstTimingInfoFlagLoopPositionValid | Vst2::vstTimingInfoFlagLoopActive);

  2881.                      }

  2882.                  }

  2883.              }

  2884.  

  2885. -            vstHostTime.nanoSeconds = getVSTHostTimeNanoseconds();

  2886. +            vstHostTime.systemTimeNanoseconds = getVSTHostTimeNanoseconds();

  2887.  

  2888.              if (wantsMidiMessages)

  2889.              {

  2890. @@ -2393,13 +2391,13 @@ private:

  2891.                      midiEventsToSend.addEvent (metadata.data, metadata.numBytes,

  2892.                                                 jlimit (0, numSamples - 1, metadata.samplePosition));

  2893.  

  2894. -                vstEffect->dispatcher (vstEffect, Vst2::effProcessEvents, 0, 0, midiEventsToSend.events, 0);

  2895. +                vstEffect->dispatchFunction (vstEffect, Vst2::plugInOpcodePreAudioProcessingEvents, 0, 0, midiEventsToSend.events, 0);

  2896.              }

  2897.  

  2898.              _clearfp();

  2899.  

  2900.              // always ensure that the buffer is at least as large as the maximum number of channels

  2901. -            auto maxChannels = jmax (vstEffect->numInputs, vstEffect->numOutputs);

  2902. +            auto maxChannels = jmax (vstEffect->numInputChannels, vstEffect->numOutputChannels);

  2903.              auto channels = channelBuffer.get();

  2904.  

  2905.              if (numChannels < maxChannels)

  2906. @@ -2438,35 +2436,35 @@ private:

  2907.      //==============================================================================

  2908.      inline void invokeProcessFunction (AudioBuffer<float>& buffer, int32 sampleFrames)

  2909.      {

  2910. -        if ((vstEffect->flags & Vst2::effFlagsCanReplacing) != 0)

  2911. +        if ((vstEffect->flags & Vst2::vstEffectFlagInplaceAudio) != 0)

  2912.          {

  2913. -            vstEffect->processReplacing (vstEffect, buffer.getArrayOfWritePointers(),

  2914. +            vstEffect->processAudioInplaceFunction (vstEffect, buffer.getArrayOfWritePointers(),

  2915.                                                      buffer.getArrayOfWritePointers(), sampleFrames);

  2916.          }

  2917.          else

  2918.          {

  2919. -            outOfPlaceBuffer.setSize (vstEffect->numOutputs, sampleFrames);

  2920. +            outOfPlaceBuffer.setSize (vstEffect->numOutputChannels, sampleFrames);

  2921.              outOfPlaceBuffer.clear();

  2922.  

  2923. -            vstEffect->process (vstEffect, buffer.getArrayOfWritePointers(),

  2924. -                                           outOfPlaceBuffer.getArrayOfWritePointers(), sampleFrames);

  2925. +            vstEffect->processAudioFunction (vstEffect, buffer.getArrayOfWritePointers(),

  2926. +                                             outOfPlaceBuffer.getArrayOfWritePointers(), sampleFrames);

  2927.  

  2928. -            for (int i = vstEffect->numOutputs; --i >= 0;)

  2929. +            for (int i = vstEffect->numOutputChannels; --i >= 0;)

  2930.                  buffer.copyFrom (i, 0, outOfPlaceBuffer.getReadPointer (i), sampleFrames);

  2931.          }

  2932.      }

  2933.  

  2934.      inline void invokeProcessFunction (AudioBuffer<double>& buffer, int32 sampleFrames)

  2935.      {

  2936. -        vstEffect->processDoubleReplacing (vstEffect, buffer.getArrayOfWritePointers(),

  2937. +        vstEffect->processDoubleAudioInplaceFunction (vstEffect, buffer.getArrayOfWritePointers(),

  2938.                                                        buffer.getArrayOfWritePointers(), sampleFrames);

  2939.      }

  2940.  

  2941.      //==============================================================================

  2942.      void setHostTimeFrameRate (long frameRateIndex, double frameRate, double currentTime) noexcept

  2943.      {

  2944. -        vstHostTime.flags |= Vst2::kVstSmpteValid;

  2945. -        vstHostTime.smpteFrameRate   = (int32) frameRateIndex;

  2946. +        vstHostTime.flags |= Vst2::vstTimingInfoFlagSmpteValid;

  2947. +        vstHostTime.smpteRate   = (int32) frameRateIndex;

  2948.          vstHostTime.smpteOffset = (int32) (currentTime * 80.0 * frameRate + 0.5);

  2949.      }

  2950.  

  2951. @@ -2497,7 +2495,7 @@ private:

  2952.          if (vstEffect == nullptr)

  2953.              return {};

  2954.  

  2955. -        jassert (index >= 0 && index < vstEffect->numParams);

  2956. +        jassert (index >= 0 && index < vstEffect->numParameters);

  2957.          char nm[256] = { 0 };

  2958.          dispatch (opcode, index, 0, nm, 0);

  2959.          return String::createStringFromData (nm, (int) sizeof (nm)).trim();

  2960. @@ -2511,7 +2509,7 @@ private:

  2961.          {

  2962.              {

  2963.                  char nm[256] = { 0 };

  2964. -                dispatch (Vst2::effGetProgramName, 0, 0, nm, 0);

  2965. +                dispatch (Vst2::plugInOpcodeGetCurrentProgramName, 0, 0, nm, 0);

  2966.                  progName = String::createStringFromData (nm, (int) sizeof (nm)).trim();

  2967.              }

  2968.  

  2969. @@ -2555,7 +2553,7 @@ private:

  2970.              char nm[256] = { 0 };

  2971.  

  2972.              // only do this if the plugin can't use indexed names..

  2973. -            if (dispatch (Vst2::effGetProgramNameIndexed, 0, -1, nm, 0) == 0)

  2974. +            if (dispatch (Vst2::plugInOpcodeGetProgramName, 0, -1, nm, 0) == 0)

  2975.              {

  2976.                  auto oldProgram = getCurrentProgram();

  2977.                  MemoryBlock oldSettings;

  2978. @@ -2573,7 +2571,7 @@ private:

  2979.          }

  2980.      }

  2981.  

  2982. -    void handleMidiFromPlugin (const Vst2::VstEvents* events)

  2983. +    void handleMidiFromPlugin (const Vst2::VstEventBlock* events)

  2984.      {

  2985.          if (events != nullptr)

  2986.          {

  2987. @@ -2620,11 +2618,11 @@ private:

  2988.      }

  2989.  

  2990.      //==============================================================================

  2991. -    int getVersionNumber() const noexcept   { return vstEffect != nullptr ? vstEffect->version : 0; }

  2992. +    int getVersionNumber() const noexcept   { return vstEffect != nullptr ? vstEffect->plugInVersion : 0; }

  2993.  

  2994.      String getVersion() const

  2995.      {

  2996. -        auto v = (unsigned int) dispatch (Vst2::effGetVendorVersion, 0, 0, nullptr, 0);

  2997. +        auto v = (unsigned int) dispatch (Vst2::plugInOpcodeGetManufacturerVersion, 0, 0, nullptr, 0);

  2998.  

  2999.          String s;

  3000.  

  3001. @@ -2692,7 +2690,6 @@ private:

  3002.              case Vst2::kPlugCategOfflineProcess:  return "Offline Process";

  3003.              case Vst2::kPlugCategShell:           return "Shell";

  3004.              case Vst2::kPlugCategUnknown:         return "Unknown";

  3005. -            case Vst2::kPlugCategMaxCount:

  3006.              default:                              break;

  3007.          }

  3008.  

  3009. @@ -2701,7 +2698,7 @@ private:

  3010.  

  3011.      void setPower (const bool on)

  3012.      {

  3013. -        dispatch (Vst2::effMainsChanged, 0, on ? 1 : 0, nullptr, 0);

  3014. +        dispatch (Vst2::plugInOpcodeResumeSuspend, 0, on ? 1 : 0, nullptr, 0);

  3015.          isPowerOn = on;

  3016.      }

  3017.  

  3018. @@ -2768,11 +2765,11 @@ public:

  3019.  

  3020.          activeVSTWindows.add (this);

  3021.  

  3022. -        Vst2::ERect* rect = nullptr;

  3023. -        dispatch (Vst2::effEditGetRect, 0, 0, &rect, 0);

  3024. +        Vst2::VstEditorBounds* rect = nullptr;

  3025. +        dispatch (Vst2::plugInOpcodeGetEditorBounds, 0, 0, &rect, 0);

  3026.  

  3027.          if (rect != nullptr)

  3028. -            setSize (rect->right - rect->left, rect->bottom - rect->top);

  3029. +            setSize (rect->rightmost - rect->leftmost, rect->lower - rect->upper);

  3030.          else

  3031.              setSize (1, 1);

  3032.  

  3033. @@ -2944,7 +2941,7 @@ public:

  3034.          nativeScaleFactor = (float) newScaleFactor;

  3035.  

  3036.          if (pluginRespondsToDPIChanges)

  3037. -            dispatch (Vst2::effVendorSpecific,

  3038. +            dispatch (Vst2::plugInOpcodeManufacturerSpecific,

  3039.                        (int) ByteOrder::bigEndianInt ("PreS"),

  3040.                        (int) ByteOrder::bigEndianInt ("AeCs"),

  3041.                        nullptr, nativeScaleFactor);

  3042. @@ -2973,7 +2970,7 @@ public:

  3043.              if (! reentrantGuard)

  3044.              {

  3045.                  reentrantGuard = true;

  3046. -                plugin.dispatch (Vst2::effEditIdle, 0, 0, nullptr, 0);

  3047. +                plugin.dispatch (Vst2::plugInOpcodeEditorIdle, 0, 0, nullptr, 0);

  3048.                  reentrantGuard = false;

  3049.              }

  3050.  

  3051. @@ -3005,7 +3002,7 @@ public:

  3052.          activeVSTWindows.add (this);

  3053.  

  3054.         #if JUCE_MAC

  3055. -        dispatch (Vst2::effEditTop, 0, 0, nullptr, 0);

  3056. +        dispatch (Vst2::plugInOpcodeeffEditorTop, 0, 0, nullptr, 0);

  3057.         #endif

  3058.      }

  3059.  

  3060. @@ -3035,24 +3032,24 @@ private:

  3061.  

  3062.          isOpen = true;

  3063.  

  3064. -        Vst2::ERect* rect = nullptr;

  3065. -        dispatch (Vst2::effEditGetRect, 0, 0, &rect, 0);

  3066. -        dispatch (Vst2::effEditOpen, 0, 0, parentWindow, 0);

  3067. +        Vst2::VstEditorBounds* rect = nullptr;

  3068. +        dispatch (Vst2::plugInOpcodeGetEditorBounds, 0, 0, &rect, 0);

  3069. +        dispatch (Vst2::plugInOpcodeOpenEditor, 0, 0, parentWindow, 0);

  3070.  

  3071.          // do this before and after like in the steinberg example

  3072. -        dispatch (Vst2::effEditGetRect, 0, 0, &rect, 0);

  3073. -        dispatch (Vst2::effGetProgram, 0, 0, nullptr, 0); // also in steinberg code

  3074. +        dispatch (Vst2::plugInOpcodeGetEditorBounds, 0, 0, &rect, 0);

  3075. +        dispatch (Vst2::plugInOpcodeGetCurrentProgram, 0, 0, nullptr, 0); // also in steinberg code

  3076.  

  3077.          // Install keyboard hooks

  3078. -        pluginWantsKeys = (dispatch (Vst2::effKeysRequired, 0, 0, nullptr, 0) == 0);

  3079. +        pluginWantsKeys = (dispatch (Vst2::plugInOpcodeKeyboardFocusRequired, 0, 0, nullptr, 0) == 0);

  3080.  

  3081.          // double-check it's not too tiny

  3082.          int w = 250, h = 150;

  3083.  

  3084.          if (rect != nullptr)

  3085.          {

  3086. -            w = rect->right - rect->left;

  3087. -            h = rect->bottom - rect->top;

  3088. +            w = rect->rightmost - rect->leftmost;

  3089. +            h = rect->lower - rect->upper;

  3090.  

  3091.              if (w == 0 || h == 0)

  3092.              {

  3093. @@ -3083,14 +3080,14 @@ private:

  3094.          if (auto* peer = getTopLevelComponent()->getPeer())

  3095.              setScaleFactorAndDispatchMessage (peer->getPlatformScaleFactor());

  3096.  

  3097. -        Vst2::ERect* rect = nullptr;

  3098. +        Vst2::VstEditorBounds* rect = nullptr;

  3099.  

  3100. -        dispatch (Vst2::effEditGetRect, 0, 0, &rect, 0);

  3101. -        dispatch (Vst2::effEditOpen, 0, 0, getWindowHandle(), 0);

  3102. -        dispatch (Vst2::effEditGetRect, 0, 0, &rect, 0);  // do this before and after like in the steinberg example

  3103. -        dispatch (Vst2::effGetProgram, 0, 0, nullptr, 0); // also in steinberg code

  3104. +        dispatch (Vst2::plugInOpcodeGetEditorBounds, 0, 0, &rect, 0);

  3105. +        dispatch (Vst2::plugInOpcodeOpenEditor, 0, 0, getWindowHandle(), 0);

  3106. +        dispatch (Vst2::plugInOpcodeGetEditorBounds, 0, 0, &rect, 0);  // do this before and after like in the steinberg example

  3107. +        dispatch (Vst2::plugInOpcodeGetCurrentProgram, 0, 0, nullptr, 0); // also in steinberg code

  3108.  

  3109. -        pluginWantsKeys = (dispatch (Vst2::effKeysRequired, 0, 0, nullptr, 0) == 0);

  3110. +        pluginWantsKeys = (dispatch (Vst2::plugInOpcodeKeyboardFocusRequired, 0, 0, nullptr, 0) == 0);

  3111.  

  3112.         #if JUCE_WINDOWS

  3113.          originalWndProc = 0;

  3114. @@ -3120,8 +3117,8 @@ private:

  3115.  

  3116.          if (rect != nullptr)

  3117.          {

  3118. -            auto rw = rect->right - rect->left;

  3119. -            auto rh = rect->bottom - rect->top;

  3120. +            auto rw = rect->rightmost - rect->leftmost;

  3121. +            auto rh = rect->lower - rect->upper;

  3122.  

  3123.              if ((rw > 50 && rh > 50 && rw < 2000 && rh < 2000 && (! isWithin (w, rw, 2) || ! isWithin (h, rh, 2)))

  3124.                  || ((w == 0 && rw > 0) || (h == 0 && rh > 0)))

  3125. @@ -3156,8 +3153,8 @@ private:

  3126.  

  3127.          if (rect != nullptr)

  3128.          {

  3129. -            w = rect->right - rect->left;

  3130. -            h = rect->bottom - rect->top;

  3131. +            w = rect->rightmost - rect->leftmost;

  3132. +            h = rect->lower - rect->upper;

  3133.  

  3134.              if (w == 0 || h == 0)

  3135.              {

  3136. @@ -3206,7 +3203,7 @@ private:

  3137.  

  3138.              JUCE_VST_LOG ("Closing VST UI: " + plugin.getName());

  3139.              isOpen = false;

  3140. -            dispatch (Vst2::effEditClose, 0, 0, nullptr, 0);

  3141. +            dispatch (Vst2::plugInOpcodeCloseEditor, 0, 0, nullptr, 0);

  3142.              stopTimer();

  3143.  

  3144.             #if JUCE_WINDOWS

  3145. @@ -3249,11 +3246,11 @@ private:

  3146.      {

  3147.          if (! pluginRespondsToDPIChanges)

  3148.          {

  3149. -            Vst2::ERect* rect = nullptr;

  3150. -            dispatch (Vst2::effEditGetRect, 0, 0, &rect, 0);

  3151. +            Vst2::VstEditorBounds* rect = nullptr;

  3152. +            dispatch (Vst2::plugInOpcodeGetEditorBounds, 0, 0, &rect, 0);

  3153.  

  3154. -            auto w = roundToInt ((rect->right - rect->left) / nativeScaleFactor);

  3155. -            auto h = roundToInt ((rect->bottom - rect->top) / nativeScaleFactor);

  3156. +            auto w = roundToInt ((rect->rightmost - rect->leftmost) / nativeScaleFactor);

  3157. +            auto h = roundToInt ((rect->lower - rect->upper) / nativeScaleFactor);

  3158.  

  3159.              if (! isWindowSizeCorrectForPlugin (w, h))

  3160.              {

  3161. @@ -3332,17 +3329,17 @@ private:

  3162.                if (owner.isOpen)

  3163.                {

  3164.                    owner.isOpen = false;

  3165. -                  owner.dispatch (Vst2::effEditClose, 0, 0, 0, 0);

  3166. -                  owner.dispatch (Vst2::effEditSleep, 0, 0, 0, 0);

  3167. +                  owner.dispatch (Vst2::plugInOpcodeCloseEditor, 0, 0, 0, 0);

  3168. +                  owner.dispatch (Vst2::plugInOpcodeSleepEditor, 0, 0, 0, 0);

  3169.                }

  3170.            }

  3171.  

  3172.            bool getEmbeddedViewSize (int& w, int& h) override

  3173.            {

  3174. -              Vst2::ERect* rect = nullptr;

  3175. -              owner.dispatch (Vst2::effEditGetRect, 0, 0, &rect, 0);

  3176. -              w = rect->right - rect->left;

  3177. -              h = rect->bottom - rect->top;

  3178. +              Vst2::VstEditorBounds* rect = nullptr;

  3179. +              owner.dispatch (Vst2::plugInOpcodeGetEditorBounds, 0, 0, &rect, 0);

  3180. +              w = rect->rightmost - rect->leftmost;

  3181. +              h = rect->lower - rect->upper;

  3182.                return true;

  3183.            }

  3184.  

  3185. @@ -3352,7 +3349,7 @@ private:

  3186.                {

  3187.                    alreadyInside = true;

  3188.                    getTopLevelComponent()->toFront (true);

  3189. -                  owner.dispatch (Vst2::effEditMouse, x, y, 0, 0);

  3190. +                  owner.dispatch (Vst2::plugInOpcodeGetMouse, x, y, 0, 0);

  3191.                    alreadyInside = false;

  3192.                }

  3193.                else

  3194. @@ -3366,13 +3363,13 @@ private:

  3195.                if (auto* peer = getPeer())

  3196.                {

  3197.                    auto pos = peer->globalToLocal (getScreenPosition());

  3198. -                  Vst2::ERect r;

  3199. -                  r.left   = (int16) pos.getX();

  3200. -                  r.top    = (int16) pos.getY();

  3201. -                  r.right  = (int16) (r.left + getWidth());

  3202. -                  r.bottom = (int16) (r.top + getHeight());

  3203. +                  Vst2::VstEditorBounds r;

  3204. +                  r.leftmost  = (int16) pos.getX();

  3205. +                  r.upper     = (int16) pos.getY();

  3206. +                  r.rightmost = (int16) (r.leftmost + getWidth());

  3207. +                  r.lower     = (int16) (r.upper + getHeight());

  3208.  

  3209. -                  owner.dispatch (Vst2::effEditDraw, 0, 0, &r, 0);

  3210. +                  owner.dispatch (Vst2::plugInOpcodeDrawEditor, 0, 0, &r, 0);

  3211.                }

  3212.            }

  3213.  

  3214. @@ -3439,10 +3436,10 @@ AudioProcessorEditor* VSTPluginInstance::createEditor()

  3215.  

  3216.  //==============================================================================

  3217.  // entry point for all callbacks from the plugin

  3218. -static pointer_sized_int VSTCALLBACK audioMaster (Vst2::AEffect* effect, int32 opcode, int32 index, pointer_sized_int value, void* ptr, float opt)

  3219. +static pointer_sized_int VSTINTERFACECALL audioMaster (Vst2::VstEffectInterface* effect, int32 opcode, int32 index, pointer_sized_int value, void* ptr, float opt)

  3220.  {

  3221.      if (effect != nullptr)

  3222. -        if (auto* instance = (VSTPluginInstance*) (effect->resvd2))

  3223. +        if (auto* instance = (VSTPluginInstance*) (effect->hostSpace2))

  3224.              return instance->handleCallback (opcode, index, value, ptr, opt);

  3225.  

  3226.      return VSTPluginInstance::handleGeneralCallback (opcode, index, value, ptr, opt);

  3227. @@ -3493,7 +3490,7 @@ void VSTPluginFormat::findAllTypesForFile (OwnedArray<PluginDescription>& result

  3228.          // Normal plugin...

  3229.          results.add (new PluginDescription (desc));

  3230.  

  3231. -        instance->dispatch (Vst2::effOpen, 0, 0, nullptr, 0);

  3232. +        instance->dispatch (Vst2::plugInOpcodeOpen, 0, 0, nullptr, 0);

  3233.      }

  3234.      else

  3235.      {

  3236. @@ -3501,7 +3498,7 @@ void VSTPluginFormat::findAllTypesForFile (OwnedArray<PluginDescription>& result

  3237.          for (;;)

  3238.          {

  3239.              char shellEffectName [256] = { 0 };

  3240. -            auto uid = (int) instance->dispatch (Vst2::effShellGetNextPlugin, 0, 0, shellEffectName, 0);

  3241. +            auto uid = (int) instance->dispatch (Vst2::plugInOpcodeNextPlugInUniqueID, 0, 0, shellEffectName, 0);

  3242.  

  3243.              if (uid == 0)

  3244.                  break;

  3245. @@ -3724,8 +3721,8 @@ void VSTPluginFormat::setExtraFunctions (AudioPluginInstance* plugin, ExtraFunct

  3246.  

  3247.  AudioPluginInstance* VSTPluginFormat::getPluginInstanceFromVstEffectInterface (void* aEffect)

  3248.  {

  3249. -    if (auto* vstAEffect = reinterpret_cast<Vst2::AEffect*> (aEffect))

  3250. -        if (auto* instanceVST = reinterpret_cast<VSTPluginInstance*> (vstAEffect->resvd2))

  3251. +    if (auto* vstAEffect = reinterpret_cast<Vst2::VstEffectInterface*> (aEffect))

  3252. +        if (auto* instanceVST = reinterpret_cast<VSTPluginInstance*> (vstAEffect->hostSpace2))

  3253.              return dynamic_cast<AudioPluginInstance*> (instanceVST);

  3254.  

  3255.      return nullptr;