Respond to MMC even when synced to JACK. Fixes #3700.

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

diff --git a/libs/ardour/ardour/automatable.h b/libs/ardour/ardour/automatable.h
index 9b83705b0a02e28a124a80b28c44c3f79aab2e05..541e9d562d4abd6357998bfd06b1d35ad089a27e 100644 (file)
--- a/libs/ardour/ardour/automatable.h
+++ b/libs/ardour/ardour/automatable.h
@@ -24,6 +24,7 @@
 #include <set>
 #include <string>
 #include <boost/shared_ptr.hpp>
+#include "pbd/signals.h"
 #include "evoral/ControlSet.hpp"
 #include "ardour/types.h"
 
@@ -57,13 +58,14 @@ public:
        automation_control (const Evoral::Parameter& id) const;
 
        virtual void add_control(boost::shared_ptr<Evoral::Control>);
+       void clear_controls ();
 
-       virtual void automation_snapshot(nframes_t now, bool force);
-       virtual void transport_stopped (sframes_t now);
+       virtual void automation_snapshot (framepos_t now, bool force);
+       virtual void transport_stopped (framepos_t now);
 
        virtual std::string describe_parameter(Evoral::Parameter param);
 
-       AutoState get_parameter_automation_state (Evoral::Parameter param, bool lock = true);
+       AutoState get_parameter_automation_state (Evoral::Parameter param);
        virtual void set_parameter_automation_state (Evoral::Parameter param, AutoState);
 
        AutoStyle get_parameter_automation_style (Evoral::Parameter param);
@@ -76,30 +78,30 @@ public:
 
        void mark_automation_visible(Evoral::Parameter, bool);
 
-       inline bool should_snapshot (nframes_t now) {
+       inline bool should_snapshot (framepos_t now) {
                return (_last_automation_snapshot > now
                                || (now - _last_automation_snapshot) > _automation_interval);
        }
 
-       static void set_automation_interval (jack_nframes_t frames) {
+       static void set_automation_interval (framecnt_t frames) {
                _automation_interval = frames;
        }
 
-       static jack_nframes_t automation_interval() {
+       static framecnt_t automation_interval() {
                return _automation_interval;
        }
 
        typedef Evoral::ControlSet::Controls Controls;
 
-       int set_automation_state (const XMLNode&, Evoral::Parameter default_param);
-       XMLNode& get_automation_state();
-
+       int set_automation_xml_state (const XMLNode&, Evoral::Parameter default_param);
+       XMLNode& get_automation_xml_state();
+       
   protected:
        Session& _a_session;
 
        void can_automate(Evoral::Parameter);
 
-       virtual void auto_state_changed (Evoral::Parameter /*which*/) {}
+       virtual void automation_list_automation_state_changed (Evoral::Parameter, AutoState) {}
 
        int load_automation (const std::string& path);
        int old_set_automation_state(const XMLNode&);
@@ -107,8 +109,11 @@ public:
        std::set<Evoral::Parameter> _visible_controls;
        std::set<Evoral::Parameter> _can_automate_list;
 
-       nframes_t        _last_automation_snapshot;
-       static nframes_t _automation_interval;
+       framepos_t _last_automation_snapshot;
+       static framecnt_t _automation_interval;
+
+private:
+       PBD::ScopedConnectionList _control_connections; ///< connections to our controls' signals
 };