ardour/livetrax
13
0
Fork 0
Code

Fix clang/C++11 builds, add missing override

Browse Source
This commit is contained in:
Robin Gareus 2020-10-10 00:18:41 +02:00
parent c2125eedc6
commit 4da9441691
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,13 +31,13 @@
#include "ardour/libardour_visibility.h" #include "ardour/libardour_visibility.h"
#include "vst3/vst3.h" #include "vst3/vst3.h"
#define QUERY_INTERFACE_IMPL(Interface) \ #define QUERY_INTERFACE_IMPL(Interface) \
tresult PLUGIN_API queryInterface (const TUID _iid, void** obj) \ tresult PLUGIN_API queryInterface (const TUID _iid, void** obj) SMTG_OVERRIDE \
{ \ { \
QUERY_INTERFACE (_iid, obj, FUnknown::iid, Interface) \ QUERY_INTERFACE (_iid, obj, FUnknown::iid, Interface) \
QUERY_INTERFACE (_iid, obj, Interface::iid, Interface) \ QUERY_INTERFACE (_iid, obj, Interface::iid, Interface) \
*obj = nullptr; \ *obj = nullptr; \
return kNoInterface; \ return kNoInterface; \
} }
#if defined(__clang__) #if defined(__clang__)
@ -317,11 +317,11 @@ public:
uint32 PLUGIN_API addRef () SMTG_OVERRIDE { return 1; } uint32 PLUGIN_API addRef () SMTG_OVERRIDE { return 1; }
uint32 PLUGIN_API release () SMTG_OVERRIDE { return 1; } uint32 PLUGIN_API release () SMTG_OVERRIDE { return 1; }
int32 PLUGIN_API PLUGIN_API getEventCount() { int32 PLUGIN_API PLUGIN_API getEventCount() SMTG_OVERRIDE {
return _events.size (); return _events.size ();
} }
tresult PLUGIN_API getEvent (int32 index, Vst::Event& e) { tresult PLUGIN_API getEvent (int32 index, Vst::Event& e) SMTG_OVERRIDE {
if (index >= 0 && index < (int32)_events.size ()) { if (index >= 0 && index < (int32)_events.size ()) {
e = _events[index]; e = _events[index];
return kResultTrue; return kResultTrue;
@ -330,7 +330,7 @@ public:
} }
} }
tresult PLUGIN_API addEvent (Vst::Event& e) { tresult PLUGIN_API addEvent (Vst::Event& e) SMTG_OVERRIDE {
_events.push_back (e); _events.push_back (e);
return kResultTrue; return kResultTrue;
} }

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

@ -88,14 +88,14 @@ public:
tresult PLUGIN_API notifyProgramListChange (Vst::ProgramListID, int32) SMTG_OVERRIDE; tresult PLUGIN_API notifyProgramListChange (Vst::ProgramListID, int32) SMTG_OVERRIDE;
/* IContextInfoProvider3 API */ /* IContextInfoProvider3 API */
tresult PLUGIN_API getContextInfoValue (int32&, FIDString); tresult PLUGIN_API getContextInfoValue (int32&, FIDString) SMTG_OVERRIDE;
tresult PLUGIN_API getContextInfoString (Vst::TChar*, int32, FIDString); tresult PLUGIN_API getContextInfoString (Vst::TChar*, int32, FIDString) SMTG_OVERRIDE;
tresult PLUGIN_API getContextInfoValue (double&, FIDString); tresult PLUGIN_API getContextInfoValue (double&, FIDString) SMTG_OVERRIDE;
tresult PLUGIN_API setContextInfoValue (FIDString, double); tresult PLUGIN_API setContextInfoValue (FIDString, double) SMTG_OVERRIDE;
tresult PLUGIN_API setContextInfoValue (FIDString, int32); tresult PLUGIN_API setContextInfoValue (FIDString, int32) SMTG_OVERRIDE;
tresult PLUGIN_API setContextInfoString (FIDString, Vst::TChar*); tresult PLUGIN_API setContextInfoString (FIDString, Vst::TChar*) SMTG_OVERRIDE;
tresult PLUGIN_API beginEditContextInfoValue (FIDString); tresult PLUGIN_API beginEditContextInfoValue (FIDString) SMTG_OVERRIDE;
tresult PLUGIN_API endEditContextInfoValue (FIDString); tresult PLUGIN_API endEditContextInfoValue (FIDString) SMTG_OVERRIDE;
/* GUI */ /* GUI */
bool has_editor () const; bool has_editor () const;
@ -107,7 +107,7 @@ public:
#endif #endif
void update_contoller_param (); void update_contoller_param ();
tresult PLUGIN_API queryInterface (const TUID _iid, void** obj); tresult PLUGIN_API queryInterface (const TUID _iid, void** obj) SMTG_OVERRIDE;
uint32 PLUGIN_API addRef () SMTG_OVERRIDE { return 1; } uint32 PLUGIN_API addRef () SMTG_OVERRIDE { return 1; }
uint32 PLUGIN_API release () SMTG_OVERRIDE { return 1; } uint32 PLUGIN_API release () SMTG_OVERRIDE { return 1; }