diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-04-25 13:41:38 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-31 15:30:41 -0400 |
| commit | f485cfa324717f57b9f820f43f1b53307b96a8b9 (patch) | |
| tree | 39ad198f588b521e748356809d255a3c4c6f4c08 /libs/ardour/ardour/slavable.h | |
| parent | eee3837245f570d36e5d4d92409660c8ff777b5b (diff) | |
rearrange inheritance so that Automatable IS-A Slavable
Share assign code via Slavable; add visibility tags to Slavable+SlavableAutomationControl
Diffstat (limited to 'libs/ardour/ardour/slavable.h')
| -rw-r--r-- | libs/ardour/ardour/slavable.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/libs/ardour/ardour/slavable.h b/libs/ardour/ardour/slavable.h index b0ef33e1b4..147f90fda0 100644 --- a/libs/ardour/ardour/slavable.h +++ b/libs/ardour/ardour/slavable.h @@ -26,7 +26,11 @@ #include <boost/shared_ptr.hpp> -#include <pbd/signals.h> +#include "pbd/signals.h" + +#include "evoral/Parameter.hpp" + +#include "ardour/libardour_visibility.h" class XMLNode; @@ -34,8 +38,9 @@ namespace ARDOUR { class VCA; class VCAManager; +class AutomationControl; -class Slavable +class LIBARDOUR_API Slavable { public: Slavable (); @@ -47,14 +52,16 @@ class Slavable void assign (boost::shared_ptr<VCA>); void unassign (boost::shared_ptr<VCA>); + virtual boost::shared_ptr<AutomationControl> automation_control (const Evoral::Parameter& id) = 0; + static std::string xml_node_name; /* signal sent VCAManager once assignment is possible */ static PBD::Signal1<void,VCAManager*> Assign; protected: - virtual int assign_controls (boost::shared_ptr<VCA>) = 0; - virtual int unassign_controls (boost::shared_ptr<VCA>) = 0; + virtual int assign_controls (boost::shared_ptr<VCA>); + virtual int unassign_controls (boost::shared_ptr<VCA>); private: mutable Glib::Threads::RWLock master_lock; |