rearrange inheritance so that Automatable IS-A Slavable

[ardour.git] / libs / ardour / ardour / vca.h

diff --git a/libs/ardour/ardour/vca.h b/libs/ardour/ardour/vca.h
index 926cd500e03df94fb7044626e6fcbb7a821c9f15..4225605f9b41b43a0b740c42e6b609c6932bae57 100644 (file)
--- a/libs/ardour/ardour/vca.h
+++ b/libs/ardour/ardour/vca.h
@@ -46,7 +46,6 @@ class LIBARDOUR_API VCA : public Stripable,
                           public Soloable,
                           public Muteable,
                           public Automatable,
-                          public Slavable,
                           public Recordable,
                           public Monitorable,
                           public boost::enable_shared_from_this<VCA> {
@@ -132,10 +131,6 @@ class LIBARDOUR_API VCA : public Stripable,
        virtual std::string send_name (uint32_t n) const { return std::string(); }
        virtual boost::shared_ptr<AutomationControl> master_send_enable_controllable () const { return boost::shared_ptr<AutomationControl>(); }
 
-  protected:
-       int assign_controls (boost::shared_ptr<VCA>);
-       int unassign_controls (boost::shared_ptr<VCA>);
-
   private:
        uint32_t    _number;