Another not-quite-there-but-better commit.

Brought plugin automation into the fold of new automation system.
Fixed plugin automation, broke panner automation :] (pending Panner work).
Made AutomationController better at automatically following it's controller value (mimic what gain meter does).
Fixed some visible automation track bugs (but still broken WRT serialization).


git-svn-id: svn://localhost/ardour2/trunk@2092 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 5 insertions, 3 deletions

diff --git a/libs/ardour/ardour/automatable.h b/libs/ardour/ardour/automatable.h
index a1161db80d..c0d80dbb85 100644
--- a/libs/ardour/ardour/automatable.h
+++ b/libs/ardour/ardour/automatable.h
@@ -48,10 +48,14 @@ public:
 
 	virtual boost::shared_ptr<AutomationControl> control(ParamID id, bool create_if_missing=false);
 	virtual boost::shared_ptr<const AutomationControl> control(ParamID id) const;
+	
+	typedef std::map<ParamID,boost::shared_ptr<AutomationControl> > Controls;
+	Controls controls() { return _controls; }
 
 	virtual void add_control(boost::shared_ptr<AutomationControl>);
 
 	virtual void automation_snapshot(nframes_t now);
+	virtual void transport_stopped(nframes_t now);
 
 	virtual bool find_next_event(nframes_t start, nframes_t end, ControlEvent& ev) const;
 	
@@ -60,7 +64,7 @@ public:
 	
 	virtual void clear_automation();
 
-	AutoState get_parameter_automation_state (ParamID param);
+	AutoState get_parameter_automation_state (ParamID param, bool lock = true);
 	virtual void set_parameter_automation_state (ParamID param, AutoState);
 	
 	AutoStyle get_parameter_automation_style (ParamID param);
@@ -88,8 +92,6 @@ protected:
 
 	mutable Glib::Mutex _automation_lock;
 	
-	typedef std::map<ParamID,boost::shared_ptr<AutomationControl> > Controls;
-	
 	Controls          _controls;
 	std::set<ParamID> _visible_controls;
 	std::set<ParamID> _can_automate_list;