merge (w/fix) with master

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

diff --git a/libs/ardour/ardour/automatable.h b/libs/ardour/ardour/automatable.h
index dc86c0cdddc5298f9924d08eedc6b4b2e71a2465..11fb48904c808e03115ca4cb77bc91424a39e4cc 100644 (file)
--- a/libs/ardour/ardour/automatable.h
+++ b/libs/ardour/ardour/automatable.h
@@ -26,6 +26,7 @@
 #include <boost/shared_ptr.hpp>
 #include "pbd/signals.h"
 #include "evoral/ControlSet.hpp"
+#include "ardour/libardour_visibility.h"
 #include "ardour/types.h"
 
 class XMLNode;
@@ -35,17 +36,16 @@ namespace ARDOUR {
 class Session;
 class AutomationControl;
 
-
-/** Note this class is abstract, actual objects must either be
- * an AutomatableControls or an AutomatableSequence
+/* The inherited ControlSet is virtual because AutomatableSequence inherits
+ * from this AND EvoralSequence, which is also a ControlSet
  */
-class Automatable : virtual public Evoral::ControlSet
+class LIBARDOUR_API Automatable : virtual public Evoral::ControlSet
 {
 public:
        Automatable(Session&);
        Automatable (const Automatable& other);
 
-       virtual ~Automatable() {}
+        virtual ~Automatable();
 
        boost::shared_ptr<Evoral::Control>
        control_factory(const Evoral::Parameter& id);
@@ -59,7 +59,7 @@ public:
        virtual void add_control(boost::shared_ptr<Evoral::Control>);
        void clear_controls ();
 
-       virtual void automation_snapshot (framepos_t now, bool force);
+        virtual void transport_located (framepos_t now);
        virtual void transport_stopped (framepos_t now);
 
        virtual std::string describe_parameter(Evoral::Parameter param);
@@ -76,19 +76,6 @@ public:
        const std::set<Evoral::Parameter>& what_can_be_automated() const { return _can_automate_list; }
        void what_has_existing_automation (std::set<Evoral::Parameter>&) const;
 
-       inline bool should_snapshot (framepos_t now) {
-               return (_last_automation_snapshot > now
-                               || (now - _last_automation_snapshot) > _automation_interval);
-       }
-
-       static void set_automation_interval (framecnt_t frames) {
-               _automation_interval = frames;
-       }
-
-       static framecnt_t automation_interval() {
-               return _automation_interval;
-       }
-
        static const std::string xml_node_name;
 
        int set_automation_xml_state (const XMLNode&, Evoral::Parameter default_param);
@@ -107,7 +94,6 @@ public:
        std::set<Evoral::Parameter> _can_automate_list;
 
        framepos_t _last_automation_snapshot;
-       static framecnt_t _automation_interval;
 
 private:
        PBD::ScopedConnectionList _control_connections; ///< connections to our controls' signals