diff options
author | Robin Gareus <robin@gareus.org> | 2019-09-06 20:35:49 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2019-09-06 20:35:49 +0200 |
commit | 33c251a6235df3e292ab9a03bcb41546afe20d1f (patch) | |
tree | a5c2ed4f207a640e749e2f5b68e1be617a2529d6 /libs/surfaces | |
parent | 5963104378f891c1fa3c5750ee16c60e5b5490fe (diff) |
Fix MSVC compilation
This resolves a circular dependency:
libardour calls methods from libardour_cp and vice versa.
Since 9bb2f2bb libardour is also calling active() and that method
needs to be forced to use late binding. -- compare to b9bbea71748
Diffstat (limited to 'libs/surfaces')
-rw-r--r-- | libs/surfaces/control_protocol/control_protocol/control_protocol.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/surfaces/control_protocol/control_protocol/control_protocol.h b/libs/surfaces/control_protocol/control_protocol/control_protocol.h index edab893ea6..fbf2852331 100644 --- a/libs/surfaces/control_protocol/control_protocol/control_protocol.h +++ b/libs/surfaces/control_protocol/control_protocol/control_protocol.h @@ -50,8 +50,8 @@ class LIBCONTROLCP_API ControlProtocol : public PBD::Stateful, public PBD::Scope virtual std::string name() const { return _name; } - virtual int set_active (bool yn); - bool active() const { return _active; } + virtual int set_active (bool yn); + virtual bool active() const { return _active; } virtual int set_feedback (bool /*yn*/) { return 0; } virtual bool get_feedback () const { return false; } |