mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

VST3: Fixed some build errors and warnings with JUCE_VST3_CAN_REPLACE_VST2=1 on Linux

Browse source
This commit is contained in:
ed 2020-07-03 15:36:45 +01:00
parent 819ccc08ca
commit 31022e4521
6 changed files with 123 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

70
modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp
View file

@ -27,9 +27,9 @@
#include <juce_core/system/juce_TargetPlatform.h>
//==============================================================================
#if JucePlugin_Build_VST3 && (__APPLE_CPP__ || __APPLE_CC__ || _WIN32 || _WIN64 || LINUX || __linux__)
#if JucePlugin_Build_VST3 && (JUCE_MAC || JUCE_WINDOWS || JUCE_LINUX)
#if JUCE_PLUGINHOST_VST3 && (JUCE_MAC || JUCE_WINDOWS || JUCE_LINUX)
#if JUCE_PLUGINHOST_VST3
#if JUCE_MAC
#include <CoreFoundation/CoreFoundation.h>
#endif
@ -56,10 +56,16 @@
#endif
#if JUCE_VST3_CAN_REPLACE_VST2
namespace Vst2
{
#include "pluginterfaces/vst2.x/vstfxstore.h"
}
#if ! JUCE_MSVC
#define __cdecl
#endif
namespace Vst2
{
#include "pluginterfaces/vst2.x/vstfxstore.h"
}
#endif
#ifndef JUCE_VST3_EMULATE_MIDI_CC_WITH_PARAMETERS
@ -69,6 +75,8 @@ namespace Vst2
#endif
#if JUCE_LINUX
#include <unordered_map>
std::vector<std::pair<int, std::function<void (int)>>> getFdReadCallbacks();
#endif
@ -1951,10 +1959,10 @@ public:
#if JUCE_VST3_CAN_REPLACE_VST2
bool loadVST2VstWBlock (const char* data, int size)
{
jassert ('VstW' == htonl (readUnaligned<juce::int32> (data)));
jassert (1 == htonl (readUnaligned<juce::int32> (data + 8))); // version should be 1 according to Steinberg's docs
jassert (ByteOrder::bigEndianInt ("VstW") == htonl ((uint32) readUnaligned<int32> (data)));
jassert (1 == htonl ((uint32) readUnaligned<int32> (data + 8))); // version should be 1 according to Steinberg's docs
auto headerLen = (int) htonl (readUnaligned<juce::int32> (data + 4)) + 8;
auto headerLen = (int) htonl ((uint32) readUnaligned<int32> (data + 4)) + 8;
return loadVST2CcnKBlock (data + headerLen, size - headerLen);
}
@ -1962,14 +1970,14 @@ public:
{
auto* bank = reinterpret_cast<const Vst2::fxBank*> (data);
jassert ('CcnK' == htonl (bank->chunkMagic));
jassert ('FBCh' == htonl (bank->fxMagic));
jassert (htonl (bank->version) == 1 || htonl (bank->version) == 2);
jassert (JucePlugin_VSTUniqueID == htonl (bank->fxID));
jassert (ByteOrder::bigEndianInt ("CcnK") == htonl ((uint32) bank->chunkMagic));
jassert (ByteOrder::bigEndianInt ("FBCh") == htonl ((uint32) bank->fxMagic));
jassert (htonl ((uint32) bank->version) == 1 || htonl ((uint32) bank->version) == 2);
jassert (JucePlugin_VSTUniqueID == htonl ((uint32) bank->fxID));
setStateInformation (bank->content.data.chunk,
jmin ((int) (size - (bank->content.data.chunk - data)),
(int) htonl (bank->content.data.size)));
(int) htonl ((uint32) bank->content.data.size)));
return true;
}
@ -1998,7 +2006,7 @@ public:
auto chunkOffset = ByteOrder::littleEndianInt64 (data + entryOffset + 4);
auto chunkSize = ByteOrder::littleEndianInt64 (data + entryOffset + 12);
if (chunkOffset + chunkSize > static_cast<juce::uint64> (size))
if (static_cast<uint64> (chunkOffset + chunkSize) > static_cast<uint64> (size))
{
jassertfalse;
return false;
@ -2016,12 +2024,12 @@ public:
if (size < 4)
return false;
auto header = htonl (readUnaligned<juce::int32> (data));
auto header = htonl ((uint32) readUnaligned<int32> (data));
if (header == 'VstW')
if (header == ByteOrder::bigEndianInt ("VstW"))
return loadVST2VstWBlock (data, size);
if (header == 'CcnK')
if (header == ByteOrder::bigEndianInt ("CcnK"))
return loadVST2CcnKBlock (data, size);
if (memcmp (data, "VST3", 4) == 0)
@ -2132,19 +2140,19 @@ public:
}
#if JUCE_VST3_CAN_REPLACE_VST2
static tresult writeVST2Int (IBStream* state, int n)
{
juce::int32 t = (juce::int32) htonl (n);
return state->write (&t, 4);
}
static tresult writeVST2Header (IBStream* state, bool bypassed)
{
tresult status = writeVST2Int (state, 'VstW');
auto writeVST2IntToState = [state] (uint32 n)
{
auto t = (int32) htonl (n);
return state->write (&t, 4);
};
if (status == kResultOk) status = writeVST2Int (state, 8); // header size
if (status == kResultOk) status = writeVST2Int (state, 1); // version
if (status == kResultOk) status = writeVST2Int (state, bypassed ? 1 : 0); // bypass
auto status = writeVST2IntToState (ByteOrder::bigEndianInt ("VstW"));
if (status == kResultOk) status = writeVST2IntToState (8); // header size
if (status == kResultOk) status = writeVST2IntToState (1); // version
if (status == kResultOk) status = writeVST2IntToState (bypassed ? 1 : 0); // bypass
return status;
}
@ -2155,7 +2163,7 @@ public:
if (state == nullptr)
return kInvalidArgument;
juce::MemoryBlock mem;
MemoryBlock mem;
getStateInformation (mem);
#if JUCE_VST3_CAN_REPLACE_VST2
@ -2168,9 +2176,9 @@ public:
Vst2::fxBank bank;
zerostruct (bank);
bank.chunkMagic = (int32) htonl ('CcnK');
bank.chunkMagic = (int32) htonl (ByteOrder::bigEndianInt ("CcnK"));
bank.byteSize = (int32) htonl (bankBlockSize - 8 + (unsigned int) mem.getSize());
bank.fxMagic = (int32) htonl ('FBCh');
bank.fxMagic = (int32) htonl (ByteOrder::bigEndianInt ("FBCh"));
bank.version = (int32) htonl (2);
bank.fxID = (int32) htonl (JucePlugin_VSTUniqueID);
bank.fxVersion = (int32) htonl (JucePlugin_VersionCode);