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

79 lines
3.6KB
Raw Blame History 

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

  2. index 3e63d3372..c09d99fc3 100644

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

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

  5. @@ -61,10 +61,7 @@

  6.    #define __cdecl

  7.   #endif

  8.  

  9. - namespace Vst2

  10. - {

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

  12. - }

  13. + #include <juce_audio_processors/format_types/juce_VSTInterface.h>

  14.  

  15.  #endif

  16.  

  17. @@ -1967,16 +1964,16 @@ public:

  18.  

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

  20.      {

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

  22. +        auto* bank = reinterpret_cast<const vst2FxBank*> (data);

  23.  

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

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

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

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

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

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

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

  31.  

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

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

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

  35. +        setStateInformation (bank->chunk,

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

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

  38.          return true;

  39.      }

  40.  

  41. @@ -2172,16 +2169,16 @@ public:

  42.              return status;

  43.  

  44.          const int bankBlockSize = 160;

  45. -        Vst2::fxBank bank;

  46. +        vst2FxBank bank;

  47.  

  48.          zerostruct (bank);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  63.  

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

  65.  

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

  67. index 1b3eb7d08..58179be1a 100644

  68. --- a/modules/juce_audio_processors/format_types/juce_VSTInterface.h

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

  70. @@ -506,7 +506,7 @@ enum PresonusExtensionConstants

  71.  

  72.      @tags{Audio}

  73.  */

  74. -struct fxBank

  75. +struct vst2FxBank

  76.  {

  77.      int32 magic1;

  78.      int32 size;