X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fautomatable.h;h=69ef7d3ecb2e5b0b93dc3a0618cf60a754779ecc;hb=a473d630eb165272992e90f8d854b1d66ec0be63;hp=f90f1dec4867fd781e9e5a5129118c7aa99b0a96;hpb=d2c23d82047cf465b87c502eccc87582654fe43f;p=ardour.git

diff --git a/libs/ardour/ardour/automatable.h b/libs/ardour/ardour/automatable.h
index f90f1dec48..69ef7d3ecb 100644
--- a/libs/ardour/ardour/automatable.h
+++ b/libs/ardour/ardour/automatable.h
@@ -43,8 +43,7 @@ class Automatable : virtual public Evoral::ControlSet
 {
 public:
 	Automatable(Session&);
-        Automatable (const Automatable& other);
-	Automatable();
+	Automatable (const Automatable& other);
 
 	virtual ~Automatable() {}
 
@@ -60,10 +59,11 @@ public:
 	virtual void add_control(boost::shared_ptr<Evoral::Control>);
 	void clear_controls ();
 
-	virtual void automation_snapshot(nframes_t now, bool force);
+	virtual void automation_snapshot (framepos_t now, bool force);
 	virtual void transport_stopped (framepos_t now);
 
 	virtual std::string describe_parameter(Evoral::Parameter param);
+	virtual std::string value_as_string (boost::shared_ptr<AutomationControl>) const;
 
 	AutoState get_parameter_automation_state (Evoral::Parameter param);
 	virtual void set_parameter_automation_state (Evoral::Parameter param, AutoState);
@@ -78,24 +78,26 @@ 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;
 
+	static const std::string xml_node_name;
+
 	int set_automation_xml_state (const XMLNode&, Evoral::Parameter default_param);
 	XMLNode& get_automation_xml_state();
-	
+
   protected:
 	Session& _a_session;
 
@@ -109,8 +111,8 @@ 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