ardour/livetrax
13
0
Fork 0
Code

Fix w32 builds (VST stdcall API)

Browse Source
This commit is contained in:
Robin Gareus 2020-09-17 12:55:18 +02:00
parent fab92d313f
commit a8c9bdbbd0
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 63 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
libs/ardour/ardour/vst3_host.h
View File

@ -31,7 +31,7 @@
#include "vst3/vst3.h"
#define QUERY_INTERFACE_IMPL(Interface) \
tresult queryInterface (const TUID _iid, void** obj) \
tresult PLUGIN_API queryInterface (const TUID _iid, void** obj) \
{ \
QUERY_INTERFACE (_iid, obj, FUnknown::iid, Interface) \
QUERY_INTERFACE (_iid, obj, Interface::iid, Interface) \
@ -145,8 +145,8 @@ class LIBARDOUR_API RefObject : public FUnknown
public:
RefObject ();
virtual ~RefObject () {}
uint32 addRef ();
uint32 release ();
uint32 PLUGIN_API addRef ();
uint32 PLUGIN_API release ();
private:
gint _cnt; // atomic
@ -159,17 +159,17 @@ public:
virtual ~HostAttributeList ();
QUERY_INTERFACE_IMPL (Vst::IAttributeList);
uint32 addRef () SMTG_OVERRIDE { return RefObject::addRef (); }
uint32 release () SMTG_OVERRIDE { return RefObject::release (); }
uint32 PLUGIN_API addRef () SMTG_OVERRIDE { return RefObject::addRef (); }
uint32 PLUGIN_API release () SMTG_OVERRIDE { return RefObject::release (); }
tresult setInt (AttrID aid, int64 value) SMTG_OVERRIDE;
tresult getInt (AttrID aid, int64& value) SMTG_OVERRIDE;
tresult setFloat (AttrID aid, double value) SMTG_OVERRIDE;
tresult getFloat (AttrID aid, double& value) SMTG_OVERRIDE;
tresult setString (AttrID aid, const Vst::TChar* string) SMTG_OVERRIDE;
tresult getString (AttrID aid, Vst::TChar* string, uint32 size) SMTG_OVERRIDE;
tresult setBinary (AttrID aid, const void* data, uint32 size) SMTG_OVERRIDE;
tresult getBinary (AttrID aid, const void*& data, uint32& size) SMTG_OVERRIDE;
tresult PLUGIN_API setInt (AttrID aid, int64 value) SMTG_OVERRIDE;
tresult PLUGIN_API getInt (AttrID aid, int64& value) SMTG_OVERRIDE;
tresult PLUGIN_API setFloat (AttrID aid, double value) SMTG_OVERRIDE;
tresult PLUGIN_API getFloat (AttrID aid, double& value) SMTG_OVERRIDE;
tresult PLUGIN_API setString (AttrID aid, const Vst::TChar* string) SMTG_OVERRIDE;
tresult PLUGIN_API getString (AttrID aid, Vst::TChar* string, uint32 size) SMTG_OVERRIDE;
tresult PLUGIN_API setBinary (AttrID aid, const void* data, uint32 size) SMTG_OVERRIDE;
tresult PLUGIN_API getBinary (AttrID aid, const void*& data, uint32& size) SMTG_OVERRIDE;
protected:
void removeAttrID (AttrID aid);
@ -184,12 +184,12 @@ public:
virtual ~HostMessage ();
QUERY_INTERFACE_IMPL (Vst::IMessage);
uint32 addRef () SMTG_OVERRIDE { return RefObject::addRef (); }
uint32 release () SMTG_OVERRIDE { return RefObject::release (); }
uint32 PLUGIN_API addRef () SMTG_OVERRIDE { return RefObject::addRef (); }
uint32 PLUGIN_API release () SMTG_OVERRIDE { return RefObject::release (); }
const char* getMessageID () SMTG_OVERRIDE;
void setMessageID (const char* messageID) SMTG_OVERRIDE;
Vst::IAttributeList* getAttributes () SMTG_OVERRIDE;
const char* PLUGIN_API getMessageID () SMTG_OVERRIDE;
void PLUGIN_API setMessageID (const char* messageID) SMTG_OVERRIDE;
Vst::IAttributeList* PLUGIN_API getAttributes () SMTG_OVERRIDE;
protected:
char* _messageId;
@ -201,10 +201,11 @@ class LIBARDOUR_API PlugInterfaceSupport : public Vst::IPlugInterfaceSupport
public:
PlugInterfaceSupport ();
QUERY_INTERFACE_IMPL (Vst::IPlugInterfaceSupport);
uint32 addRef () SMTG_OVERRIDE { return 1; }
uint32 release () SMTG_OVERRIDE { return 1; }
uint32 PLUGIN_API addRef () SMTG_OVERRIDE { return 1; }
uint32 PLUGIN_API release () SMTG_OVERRIDE { return 1; }
tresult PLUGIN_API isPlugInterfaceSupported (const TUID) SMTG_OVERRIDE;
tresult isPlugInterfaceSupported (const TUID) SMTG_OVERRIDE;
void addPlugInterfaceSupported (const TUID);
private:
@ -222,13 +223,13 @@ public:
HostApplication ();
virtual ~HostApplication () {}
tresult queryInterface (const TUID _iid, void** obj) SMTG_OVERRIDE;
tresult PLUGIN_API queryInterface (const TUID _iid, void** obj) SMTG_OVERRIDE;
uint32 addRef () SMTG_OVERRIDE { return 1; }
uint32 release () SMTG_OVERRIDE { return 1; }
uint32 PLUGIN_API addRef () SMTG_OVERRIDE { return 1; }
uint32 PLUGIN_API release () SMTG_OVERRIDE { return 1; }
tresult getName (Vst::String128 name) SMTG_OVERRIDE;
tresult createInstance (TUID cid, TUID _iid, void** obj) SMTG_OVERRIDE;
tresult PLUGIN_API getName (Vst::String128 name) SMTG_OVERRIDE;
tresult PLUGIN_API createInstance (TUID cid, TUID _iid, void** obj) SMTG_OVERRIDE;
protected:
boost::shared_ptr<PlugInterfaceSupport> _plug_interface_support;
@ -238,8 +239,8 @@ class LIBARDOUR_LOCAL Vst3ParamValueQueue : public Vst::IParamValueQueue
{
public:
QUERY_INTERFACE_IMPL (Vst::IParamValueQueue);
uint32 addRef () SMTG_OVERRIDE { return 1; }
uint32 release () SMTG_OVERRIDE { return 1; }
uint32 PLUGIN_API addRef () SMTG_OVERRIDE { return 1; }
uint32 PLUGIN_API release () SMTG_OVERRIDE { return 1; }
static const int maxNumPoints = 64;
@ -248,16 +249,16 @@ public:
_id = Vst::kNoParamId;
}
Vst::ParamID getParameterId() SMTG_OVERRIDE { return _id; }
Vst::ParamID PLUGIN_API getParameterId() SMTG_OVERRIDE { return _id; }
void setParameterId (Vst::ParamID id) {
_values.clear();
_id = id;
}
int32 getPointCount() SMTG_OVERRIDE { return _values.size(); }
tresult getPoint (int32 index, int32&, Vst::ParamValue&) SMTG_OVERRIDE;
tresult addPoint (int32, Vst::ParamValue, int32&) SMTG_OVERRIDE;
int32 PLUGIN_API getPointCount() SMTG_OVERRIDE { return _values.size(); }
tresult PLUGIN_API getPoint (int32 index, int32&, Vst::ParamValue&) SMTG_OVERRIDE;
tresult PLUGIN_API addPoint (int32, Vst::ParamValue, int32&) SMTG_OVERRIDE;
protected:
struct Value {
@ -277,8 +278,8 @@ class LIBARDOUR_LOCAL Vst3ParameterChanges : public Vst::IParameterChanges
{
public:
QUERY_INTERFACE_IMPL (Vst::IParameterChanges);
uint32 addRef () SMTG_OVERRIDE { return 1; }
uint32 release () SMTG_OVERRIDE { return 1; }
uint32 PLUGIN_API addRef () SMTG_OVERRIDE { return 1; }
uint32 PLUGIN_API release () SMTG_OVERRIDE { return 1; }
Vst3ParameterChanges () {
clear ();
@ -292,12 +293,12 @@ public:
_used_queue_count = 0;
}
int32 getParameterCount() SMTG_OVERRIDE {
int32 PLUGIN_API getParameterCount() SMTG_OVERRIDE {
return _used_queue_count;
}
Vst::IParamValueQueue* getParameterData (int32 index) SMTG_OVERRIDE;
Vst::IParamValueQueue* addParameterData (Vst::ParamID const& id, int32& index) SMTG_OVERRIDE;
Vst::IParamValueQueue* PLUGIN_API getParameterData (int32 index) SMTG_OVERRIDE;
Vst::IParamValueQueue* PLUGIN_API addParameterData (Vst::ParamID const& id, int32& index) SMTG_OVERRIDE;
protected:
std::vector<Vst3ParamValueQueue> _queue;
@ -312,10 +313,10 @@ public:
}
QUERY_INTERFACE_IMPL (Vst::IEventList)
uint32 addRef () SMTG_OVERRIDE { return 1; }
uint32 release () SMTG_OVERRIDE { return 1; }
uint32 PLUGIN_API addRef () SMTG_OVERRIDE { return 1; }
uint32 PLUGIN_API release () SMTG_OVERRIDE { return 1; }
int32 PLUGIN_API getEventCount() {
int32 PLUGIN_API PLUGIN_API getEventCount() {
return _events.size ();
}
@ -351,8 +352,8 @@ public:
virtual ~RAMStream ();
QUERY_INTERFACE_IMPL (IBStream)
uint32 addRef () SMTG_OVERRIDE { return 1; }
uint32 release () SMTG_OVERRIDE { return 1; }
uint32 PLUGIN_API addRef () SMTG_OVERRIDE { return 1; }
uint32 PLUGIN_API release () SMTG_OVERRIDE { return 1; }
/* IBStream API */
tresult PLUGIN_API read (void* buffer, int32 numBytes, int32* numBytesRead) SMTG_OVERRIDE;

24
libs/ardour/ardour/vst3_plugin.h
View File

@ -56,18 +56,20 @@ public:
virtual ~VST3PI ();
/* IComponentHandler */
tresult beginEdit (Vst::ParamID id) SMTG_OVERRIDE;
tresult performEdit (Vst::ParamID id, Vst::ParamValue value) SMTG_OVERRIDE;
tresult endEdit (Vst::ParamID id) SMTG_OVERRIDE;
tresult restartComponent (int32 flags) SMTG_OVERRIDE;
tresult PLUGIN_API beginEdit (Vst::ParamID id) SMTG_OVERRIDE;
tresult PLUGIN_API performEdit (Vst::ParamID id, Vst::ParamValue value) SMTG_OVERRIDE;
tresult PLUGIN_API endEdit (Vst::ParamID id) SMTG_OVERRIDE;
tresult PLUGIN_API restartComponent (int32 flags) SMTG_OVERRIDE;
/* IConnectionPoint API */
tresult connect (Vst::IConnectionPoint* other) SMTG_OVERRIDE;
tresult disconnect (Vst::IConnectionPoint* other) SMTG_OVERRIDE;
tresult notify (Vst::IMessage* message) SMTG_OVERRIDE;
tresult PLUGIN_API connect (Vst::IConnectionPoint* other) SMTG_OVERRIDE;
tresult PLUGIN_API disconnect (Vst::IConnectionPoint* other) SMTG_OVERRIDE;
tresult PLUGIN_API notify (Vst::IMessage* message) SMTG_OVERRIDE;
/* IPlugFrame */
tresult PLUGIN_API resizeView (IPlugView* view, ViewRect* newSize) SMTG_OVERRIDE;
/* GUI */
tresult resizeView (IPlugView* view, ViewRect* newSize) SMTG_OVERRIDE;
IPlugView* view ();
void close_view ();
PBD::Signal2<void, int, int> OnResizeView;
@ -76,9 +78,9 @@ public:
#endif
void update_contoller_param ();
tresult queryInterface (const TUID _iid, void** obj);
uint32 addRef () SMTG_OVERRIDE { return 1; }
uint32 release () SMTG_OVERRIDE { return 1; }
tresult PLUGIN_API queryInterface (const TUID _iid, void** obj);
uint32 PLUGIN_API addRef () SMTG_OVERRIDE { return 1; }
uint32 PLUGIN_API release () SMTG_OVERRIDE { return 1; }
/* Ardour Preset Helpers */
Vst::IUnitInfo* unit_info ();