Simple approach to putting plugin controls into the

processor box.


git-svn-id: svn://localhost/ardour2/branches/3.0@11288 d708f5d6-7413-0410-9779-e7cbd77b26cf

8 files changed, 392 insertions, 83 deletions

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index 52f4f902f6..cd169afe86 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -527,6 +527,8 @@
     <menuitem action='newsend'/>
     <menuitem action='newaux'/>
     <separator/>
+    <menuitem action='controls'/>
+    <separator/>
     <menuitem action='clear'/>
     <menuitem action='clear_pre'/>
     <menuitem action='clear_post'/>
@@ -546,7 +548,6 @@
     <menuitem action='ab_plugins'/>
     <separator/>
     <menuitem action='edit'/>
-    <menuitem action='controls'/>
   </popup>
 
   <popup name='ShuttleUnitPopup'>
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index c923e718b7..b750809b33 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -290,7 +290,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 
 		GainMeter::setup_slider_pix ();
 		RouteTimeAxisView::setup_slider_pix ();
-		SendProcessorEntry::setup_slider_pix ();
+		ProcessorEntry::setup_slider_pix ();
 		SessionEvent::create_per_thread_pool ("GUI", 512);
 
 	} catch (failed_constructor& err) {
diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h
index bb29c564c1..2c891524b8 100644
--- a/gtk2_ardour/axis_view.h
+++ b/gtk2_ardour/axis_view.h
@@ -68,6 +68,8 @@ class AxisView : public virtual Selectable, public PBD::ScopedConnectionList, pu
 
 	bool marked_for_display () const;
 	virtual bool set_marked_for_display (bool);
+
+	static GUIObjectState& gui_object_state();
 	
   protected:
 
@@ -90,10 +92,6 @@ class AxisView : public virtual Selectable, public PBD::ScopedConnectionList, pu
 
 	bool _marked_for_display;
 	uint32_t _old_order_key;
-
-protected:
-	static GUIObjectState& gui_object_state();
-
 }; /* class AxisView */
 
 #endif /* __ardour_gtk_axis_view_h__ */
diff --git a/gtk2_ardour/gui_object.cc b/gtk2_ardour/gui_object.cc
index 2b516d04da..84c9fe7c67 100644
--- a/gtk2_ardour/gui_object.cc
+++ b/gtk2_ardour/gui_object.cc
@@ -34,9 +34,9 @@ GUIObjectState::GUIObjectState ()
 }
 
 XMLNode *
-GUIObjectState::find_node (const string& id) const
+GUIObjectState::get_node (const XMLNode* parent, const string& id)
 {
-	XMLNodeList const & children = _state.children ();
+	XMLNodeList const & children = parent->children ();
 	for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) {
 		if ((*i)->name() != X_("Object")) {
 			continue;
@@ -51,6 +51,25 @@ GUIObjectState::find_node (const string& id) const
 	return 0;
 }
 
+XMLNode *
+GUIObjectState::get_or_add_node (XMLNode* parent, const string& id)
+{
+	XMLNode* child = get_node (parent, id);
+	if (!child) {
+		child = new XMLNode (X_("Object"));
+		child->add_property (X_("id"), id);
+		parent->add_child_nocopy (*child);
+	}
+
+	return child;
+}
+
+XMLNode *
+GUIObjectState::get_or_add_node (const string& id)
+{
+	return get_or_add_node (&_state, id);
+}
+
 /** Get a string from our state.
  *  @param id property of Object node to look for.
  *  @param prop_name name of the Object property to return.
@@ -61,7 +80,7 @@ GUIObjectState::find_node (const string& id) const
 string 
 GUIObjectState::get_string (const string& id, const string& prop_name, bool* empty)
 {
-	XMLNode* child = find_node (id);
+	XMLNode* child = get_node (&_state, id);
 	if (!child) {
 		if (empty) {
 			*empty = true;
diff --git a/gtk2_ardour/gui_object.h b/gtk2_ardour/gui_object.h
index 3cbd85c171..694a5e9212 100644
--- a/gtk2_ardour/gui_object.h
+++ b/gtk2_ardour/gui_object.h
@@ -46,23 +46,20 @@ public:
 	std::string get_string (const std::string& id, const std::string& prop_name, bool* empty = 0);
 
 	template<typename T> void set (const std::string& id, const std::string& prop_name, const T& val) {
-		XMLNode* child = find_node (id);
-		if (!child) {
-			child = new XMLNode (X_("Object"));
-			child->add_property (X_("id"), id);
-			_state.add_child_nocopy (*child);
-		}
-		
+		XMLNode* child = get_or_add_node (id);
 		std::stringstream s;
 		s << val;
 		child->add_property (prop_name.c_str(), s.str());
 	}
 
 	std::list<std::string> all_ids () const;
+
+	static XMLNode* get_node (const XMLNode *, const std::string &);
+	XMLNode* get_or_add_node (const std::string &);
+	static XMLNode* get_or_add_node (XMLNode *, const std::string &);
 	
   private:
-	XMLNode* find_node (const std::string &) const;
-
+	
 	XMLNode _state;
 };
 
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 4da1695c13..bccac4b1b3 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -382,10 +382,13 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 		rec_solo_table.remove (*show_sends_button);
 	}
 
-	processor_box.set_route (rt);
-
 	RouteUI::set_route (rt);
 
+	/* ProcessorBox needs access to _route so that it can read
+	   GUI object state.
+	*/
+	processor_box.set_route (rt);
+
 	/* map the current state */
 
 	mute_changed (0);
diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index 6b09addf79..60e87ab77e 100644
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -28,6 +28,7 @@
 #include <sigc++/bind.h>
 
 #include "pbd/convert.h"
+#include "pbd/stacktrace.h"
 
 #include <glibmm/miscutils.h>
 
@@ -93,7 +94,7 @@ RefPtr<Action> ProcessorBox::cut_action;
 RefPtr<Action> ProcessorBox::rename_action;
 RefPtr<Action> ProcessorBox::edit_action;
 RefPtr<Action> ProcessorBox::controls_action;
-Glib::RefPtr<Gdk::Pixbuf> SendProcessorEntry::_slider;
+Glib::RefPtr<Gdk::Pixbuf> ProcessorEntry::_slider_pixbuf;
 
 ProcessorEntry::ProcessorEntry (boost::shared_ptr<Processor> p, Width w)
 	: _button (ArdourButton::led_default_elements)
@@ -122,6 +123,17 @@ ProcessorEntry::ProcessorEntry (boost::shared_ptr<Processor> p, Width w)
 		_processor->ActiveChanged.connect (active_connection, invalidator (*this), boost::bind (&ProcessorEntry::processor_active_changed, this), gui_context());
 		_processor->PropertyChanged.connect (name_connection, invalidator (*this), ui_bind (&ProcessorEntry::processor_property_changed, this, _1), gui_context());
 
+		set<Evoral::Parameter> p = _processor->what_can_be_automated ();
+		for (set<Evoral::Parameter>::iterator i = p.begin(); i != p.end(); ++i) {
+			if (boost::dynamic_pointer_cast<Amp> (_processor)) {
+				continue;
+			}
+			
+			Control* c = new Control (_slider_pixbuf, _processor->automation_control (*i), _processor->describe_parameter (*i));
+			_controls.push_back (c);
+			_vbox.pack_start (c->box);
+		}
+
 		setup_tooltip ();
 		setup_visuals ();
 	} else {
@@ -280,6 +292,194 @@ ProcessorEntry::name (Width w) const
 	return name_display;
 }
 
+void
+ProcessorEntry::setup_slider_pix ()
+{
+	_slider_pixbuf = ::get_icon ("fader_belt_h_thin");
+	assert (_slider_pixbuf);
+}
+
+void
+ProcessorEntry::set_pixel_width (int p)
+{
+	for (list<Control*>::iterator i = _controls.begin(); i != _controls.end(); ++i) {
+		(*i)->set_pixel_width (p);
+	}
+}
+
+void
+ProcessorEntry::show_all_controls ()
+{
+	for (list<Control*>::iterator i = _controls.begin(); i != _controls.end(); ++i) {
+		(*i)->show ();
+	}
+}
+
+void
+ProcessorEntry::hide_all_controls ()
+{
+	for (list<Control*>::iterator i = _controls.begin(); i != _controls.end(); ++i) {
+		(*i)->hide ();
+	}
+}
+
+void
+ProcessorEntry::add_control_state (XMLNode* node) const
+{
+	for (list<Control*>::const_iterator i = _controls.begin(); i != _controls.end(); ++i) {
+		(*i)->add_state (node);
+	}
+}
+
+void
+ProcessorEntry::set_control_state (XMLNode const * node)
+{
+	for (list<Control*>::const_iterator i = _controls.begin(); i != _controls.end(); ++i) {
+		(*i)->set_state (node);
+	}
+}
+
+string
+ProcessorEntry::state_id () const
+{
+	return string_compose ("processor %1", _processor->id().to_s());
+}
+
+void
+ProcessorEntry::hide_things ()
+{
+	for (list<Control*>::iterator i = _controls.begin(); i != _controls.end(); ++i) {
+		(*i)->hide_things ();
+	}
+}
+
+ProcessorEntry::Control::Control (Glib::RefPtr<Gdk::Pixbuf> s, boost::shared_ptr<AutomationControl> c, string const & l)
+	: _control (c)
+	, _adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), 0, 1, 0.01, 0.1)
+	, _slider (s, &_adjustment, 0, false)
+	, _ignore_slider_adjustment (false)
+	, _visible (false)
+{
+	_slider.set_controllable (c);
+
+	if (!l.empty ()) {
+		box.pack_start (_label);
+		_label.show ();
+		_label.set_text (l);
+	}
+
+	_slider.show ();
+	box.pack_start (_slider);
+
+	double const lo = c->user_to_ui (c->lower ());
+	double const up = c->user_to_ui (c->upper ());
+	
+	_adjustment.set_lower (lo);
+	_adjustment.set_upper (up);
+	_adjustment.set_step_increment ((up - lo) / 100);
+	_adjustment.set_page_increment ((up - lo) / 10);
+	_slider.set_default_value (up);
+
+	_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &Control::slider_adjusted));
+	c->Changed.connect (_connection, MISSING_INVALIDATOR, boost::bind (&Control::control_changed, this), gui_context ());
+
+	control_changed ();
+}
+
+void
+ProcessorEntry::Control::set_pixel_width (int p)
+{
+	_slider.set_fader_length (p);
+}
+
+void
+ProcessorEntry::Control::slider_adjusted ()
+{
+	if (_ignore_slider_adjustment) {
+		return;
+	}
+	
+	boost::shared_ptr<AutomationControl> c = _control.lock ();
+
+	if (!c) {
+		return;
+	}
+	
+	c->set_value (c->ui_to_user (_adjustment.get_value ()));
+}
+
+void
+ProcessorEntry::Control::control_changed ()
+{
+	boost::shared_ptr<AutomationControl> c = _control.lock ();
+	if (!c) {
+		return;
+	}
+
+	_ignore_slider_adjustment = true;
+	_adjustment.set_value (c->user_to_ui (c->get_value ()));
+	_ignore_slider_adjustment = false;
+}
+
+void
+ProcessorEntry::Control::add_state (XMLNode* node) const
+{
+	XMLNode* c = new XMLNode (X_("Object"));
+	c->add_property (X_("id"), state_id ());
+	c->add_property (X_("visible"), _visible);
+	node->add_child_nocopy (*c);
+}
+
+void
+ProcessorEntry::Control::set_state (XMLNode const * node)
+{
+	XMLNode* n = GUIObjectState::get_node (node, state_id ());
+	if (n) {
+		XMLProperty* p = n->property (X_("visible"));
+		if (p && string_is_affirmative (p->value ())) {
+			show ();
+		} else {
+			hide ();
+		}
+	} else {
+		hide ();
+	}
+}
+
+void
+ProcessorEntry::Control::show ()
+{
+	box.show ();
+	_visible = true;
+}
+
+void
+ProcessorEntry::Control::hide ()
+{
+	box.hide ();
+	_visible = false;
+}
+
+/** Called when the Editor might have re-shown things that
+    we want hidden.
+*/
+void
+ProcessorEntry::Control::hide_things ()
+{
+	if (!_visible) {
+		box.hide ();
+	}
+}
+
+string
+ProcessorEntry::Control::state_id () const
+{
+	boost::shared_ptr<AutomationControl> c = _control.lock ();
+	assert (c);
+
+	return string_compose (X_("control %1"), c->id().to_s ());
+}
+
 BlankProcessorEntry::BlankProcessorEntry (Width w)
 	: ProcessorEntry (boost::shared_ptr<Processor>(), w)
 {
@@ -289,7 +489,7 @@ SendProcessorEntry::SendProcessorEntry (boost::shared_ptr<Send> s, Width w)
 	: ProcessorEntry (s, w)
 	, _send (s)
 	, _adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), 0, 1, 0.01, 0.1)
-	, _fader (_slider, &_adjustment, 0, false)
+	, _fader (_slider_pixbuf, &_adjustment, 0, false)
 	, _ignore_gain_change (false)
 	, _data_type (DataType::AUDIO)
 {
@@ -334,13 +534,6 @@ SendProcessorEntry::setup_gain_adjustment ()
 }
 
 void
-SendProcessorEntry::setup_slider_pix ()
-{
-	_slider = ::get_icon ("fader_belt_h_thin");
-	assert (_slider);
-}
-
-void
 SendProcessorEntry::show_gain ()
 {
 	gain_t value = 0;
@@ -426,6 +619,7 @@ PluginInsertProcessorEntry::plugin_insert_splitting_changed ()
 void
 PluginInsertProcessorEntry::hide_things ()
 {
+	ProcessorEntry::hide_things ();
 	plugin_insert_splitting_changed ();
 }
 
@@ -688,6 +882,28 @@ ProcessorBox::show_processor_menu (int arg)
 		}
 	}
 
+	boost::shared_ptr<Processor> single_selection;
+	if (processor_display.selection().size() == 1) {
+		single_selection = processor_display.selection().front()->processor ();
+	}
+
+	/* And the controls submenu */
+
+	Gtk::MenuItem* controls_menu_item = dynamic_cast<Gtk::MenuItem*>(ActionManager::get_widget("/ProcessorMenu/controls"));
+
+	if (controls_menu_item) {
+		if (single_selection) {
+			Menu* m = build_controls_menu (single_selection);
+			if (m && !m->items().empty()) {
+				controls_menu_item->set_submenu (*m);
+				controls_menu_item->set_sensitive (true);
+			} else {
+				gtk_menu_item_set_submenu (controls_menu_item->gobj(), 0);
+				controls_menu_item->set_sensitive (false);
+			}
+		}
+	}
+
 	/* Sensitise actions as approprioate */
 
         cut_action->set_sensitive (can_cut());
@@ -697,19 +913,11 @@ ProcessorBox::show_processor_menu (int arg)
 	ActionManager::set_sensitive (ActionManager::plugin_selection_sensitive_actions, sensitive);
 	edit_action->set_sensitive (one_processor_can_be_edited ());
 
-	boost::shared_ptr<Processor> single_selection;
-	if (processor_display.selection().size() == 1) {
-		single_selection = processor_display.selection().front()->processor ();
-	}
-
 	boost::shared_ptr<PluginInsert> pi;
 	if (single_selection) {
 		pi = boost::dynamic_pointer_cast<PluginInsert> (single_selection);
 	}
 
-	/* enable gui for plugin inserts with editors */
-	controls_action->set_sensitive(pi && pi->plugin()->has_editor());
-
 	/* disallow rename for multiple selections, for plugin inserts and for the fader */
 	rename_action->set_sensitive (single_selection && !pi && !boost::dynamic_pointer_cast<Amp> (single_selection));
 
@@ -1242,7 +1450,6 @@ ProcessorBox::add_processor_to_display (boost::weak_ptr<Processor> p)
 		return;
 	}
 
-
 	boost::shared_ptr<Send> send = boost::dynamic_pointer_cast<Send> (processor);
 	boost::shared_ptr<PluginInsert> plugin_insert = boost::dynamic_pointer_cast<PluginInsert> (processor);
 	ProcessorEntry* e = 0;
@@ -1255,6 +1462,13 @@ ProcessorBox::add_processor_to_display (boost::weak_ptr<Processor> p)
 	}
 
 	e->set_pixel_width (get_allocation().get_width());
+
+	/* Set up this entry's state from the GUIObjectState */
+	XMLNode* proc = entry_gui_object_state (e);
+	if (proc) {
+		e->set_control_state (proc);
+	}
+	
 	processor_display.add_child (e);
 }
 
@@ -1917,28 +2131,6 @@ ProcessorBox::toggle_edit_processor (boost::shared_ptr<Processor> processor)
 }
 
 void
-ProcessorBox::toggle_processor_controls (boost::shared_ptr<Processor> processor)
-{
-	boost::shared_ptr<PluginInsert> plugin_insert
-		= boost::dynamic_pointer_cast<PluginInsert>(processor);
-	if (!plugin_insert) {
-		return;
-	}
-
-	Container*      toplevel  = get_toplevel();
-	Window*         win       = dynamic_cast<Gtk::Window*>(toplevel);
-	PluginUIWindow* plugin_ui = new PluginUIWindow(win, plugin_insert, true, false);
-	plugin_ui->set_title(generate_processor_title (plugin_insert));
-
-	if (plugin_ui->is_visible()) {
-		plugin_ui->hide();
-	} else {
-		plugin_ui->show_all();
-		plugin_ui->present();
-	}
-}
-
-void
 ProcessorBox::register_actions ()
 {
 	Glib::RefPtr<Gtk::ActionGroup> popup_act_grp = Gtk::ActionGroup::create(X_("ProcessorMenu"));
@@ -1957,6 +2149,8 @@ ProcessorBox::register_actions ()
 
 	ActionManager::register_action (popup_act_grp, X_("newaux"), _("New Aux Send ..."));
 
+	ActionManager::register_action (popup_act_grp, X_("controls"), _("Controls"));
+
 	ActionManager::register_action (popup_act_grp, X_("clear"), _("Clear (all)"),
 			sigc::ptr_fun (ProcessorBox::rb_clear));
 	ActionManager::register_action (popup_act_grp, X_("clear_pre"), _("Clear (pre-fader)"),
@@ -1999,11 +2193,6 @@ ProcessorBox::register_actions ()
 		popup_act_grp, X_("edit"), _("Edit..."),
 		sigc::ptr_fun (ProcessorBox::rb_edit));
 
-	/* show plugin GUI */
-	controls_action = ActionManager::register_action (
-			popup_act_grp, X_("controls"), _("Controls..."),
-			sigc::ptr_fun (ProcessorBox::rb_controls));
-
 	ActionManager::add_action_group (popup_act_grp);
 }
 
@@ -2184,16 +2373,6 @@ ProcessorBox::rb_edit ()
 }
 
 void
-ProcessorBox::rb_controls ()
-{
-	if (_current_processor_box == 0) {
-		return;
-	}
-
-	_current_processor_box->for_selected_processors (&ProcessorBox::toggle_processor_controls);
-}
-
-void
 ProcessorBox::route_property_changed (const PropertyChange& what_changed)
 {
 	if (!what_changed.contains (ARDOUR::Properties::name)) {
@@ -2328,6 +2507,7 @@ ProcessorBox::mixer_strip_delivery_changed (boost::weak_ptr<Delivery> w)
 	}
 }
 
+/** Called to repair the damage of Editor::show_window doing a show_all() */
 void
 ProcessorBox::hide_things ()
 {
@@ -2343,6 +2523,78 @@ ProcessorBox::processor_menu_unmapped ()
 	processor_display.remove_placeholder ();
 }
 
+Menu *
+ProcessorBox::build_controls_menu (boost::shared_ptr<Processor> p)
+{
+	using namespace Menu_Helpers;
+	Menu* menu = manage (new Menu);
+	MenuList& items = menu->items ();
+
+	items.push_back (
+		MenuElem (_("Show All Controls"), sigc::bind (sigc::mem_fun (*this, &ProcessorBox::show_or_hide_all_controls), boost::weak_ptr<Processor> (p), true)
+			));
+	
+	items.push_back (
+		MenuElem (_("Hide All Controls"), sigc::bind (sigc::mem_fun (*this, &ProcessorBox::show_or_hide_all_controls), boost::weak_ptr<Processor> (p), false)
+			));
+
+	return menu;
+}
+
+void
+ProcessorBox::show_or_hide_all_controls (boost::weak_ptr<Processor> w, bool show)
+{
+	boost::shared_ptr<Processor> p (w.lock ());
+	if (!p) {
+		return;
+	}
+
+	list<ProcessorEntry*> processors = processor_display.children ();
+	list<ProcessorEntry*>::iterator i = processors.begin();
+	while (i != processors.end () && (*i)->processor() != p) {
+		++i;
+	}
+
+	if (i == processors.end ()) {
+		return;
+	}
+
+	if (show) {
+		(*i)->show_all_controls ();
+	} else {
+		(*i)->hide_all_controls ();
+	}
+
+	update_gui_object_state (*i);
+}
+
+XMLNode *
+ProcessorBox::entry_gui_object_state (ProcessorEntry* entry)
+{
+	if (!_parent_strip) {
+		return 0;
+	}
+
+	GUIObjectState& st = _parent_strip->gui_object_state ();
+	
+	XMLNode* strip = st.get_or_add_node (_parent_strip->state_id ());
+	assert (strip);
+	return st.get_or_add_node (strip, entry->state_id());
+}
+
+void
+ProcessorBox::update_gui_object_state (ProcessorEntry* entry)
+{
+	XMLNode* proc = entry_gui_object_state (entry);
+	if (!proc) {
+		return;
+	}
+
+	/* XXX: this is a bit inefficient; we just remove all child nodes and re-add them */
+	proc->remove_nodes_and_delete (X_("Object"));
+	entry->add_control_state (proc);
+}
+
 ProcessorWindowProxy::ProcessorWindowProxy (
 	string const & name,
 	XMLNode const * node,
diff --git a/gtk2_ardour/processor_box.h b/gtk2_ardour/processor_box.h
index 3caa2925c9..c949fa9176 100644
--- a/gtk2_ardour/processor_box.h
+++ b/gtk2_ardour/processor_box.h
@@ -118,10 +118,18 @@ public:
 	void set_position (Position);
 	boost::shared_ptr<ARDOUR::Processor> processor () const;
 	void set_enum_width (Width);
-	virtual void set_pixel_width (int) {}
+	virtual void set_pixel_width (int);
 
 	/** Hide any widgets that should be hidden */
-	virtual void hide_things () {}
+	virtual void hide_things ();
+
+	void show_all_controls ();
+	void hide_all_controls ();
+	void add_control_state (XMLNode *) const;
+	void set_control_state (XMLNode const *);
+	std::string state_id () const;
+
+	static void setup_slider_pix ();
 
 protected:
 	ArdourButton _button;
@@ -130,6 +138,8 @@ protected:
 
 	virtual void setup_visuals ();
 
+	static Glib::RefPtr<Gdk::Pixbuf> _slider_pixbuf;
+
 private:
 	void led_clicked();
 	void processor_active_changed ();
@@ -142,6 +152,35 @@ private:
 	Gtk::StateType _visual_state;
 	PBD::ScopedConnection active_connection;
 	PBD::ScopedConnection name_connection;
+
+	class Control {
+	public:
+		Control (Glib::RefPtr<Gdk::Pixbuf>, boost::shared_ptr<ARDOUR::AutomationControl>, std::string const &);
+
+		void set_pixel_width (int);
+		void show ();
+		void hide ();
+		void add_state (XMLNode *) const;
+		void set_state (XMLNode const *);
+		void hide_things ();
+		
+		Gtk::VBox box;
+
+	private:
+		void slider_adjusted ();
+		void control_changed ();
+		std::string state_id () const;
+
+		boost::weak_ptr<ARDOUR::AutomationControl> _control;
+		Gtk::Adjustment _adjustment;
+		Gtkmm2ext::HSliderController _slider;
+		Gtk::Label _label;
+		bool _ignore_slider_adjustment;
+		PBD::ScopedConnection _connection;
+		bool _visible;
+	};
+
+	std::list<Control*> _controls;
 };
 
 class BlankProcessorEntry : public ProcessorEntry
@@ -155,8 +194,6 @@ class SendProcessorEntry : public ProcessorEntry
 public:
 	SendProcessorEntry (boost::shared_ptr<ARDOUR::Send>, Width);
 
-	static void setup_slider_pix ();
-
 	void set_enum_width (Width, int);
 	void set_pixel_width (int);
 
@@ -171,8 +208,6 @@ private:
 	bool _ignore_gain_change;
 	PBD::ScopedConnectionList _send_connections;
 	ARDOUR::DataType _data_type;
-
-	static Glib::RefPtr<Gdk::Pixbuf> _slider;
 };
 
 class PluginInsertProcessorEntry : public ProcessorEntry
@@ -231,7 +266,6 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject, public ARD
 
 	Gtk::Window* get_processor_ui (boost::shared_ptr<ARDOUR::Processor>) const;
 	void toggle_edit_processor (boost::shared_ptr<ARDOUR::Processor>);
-	void toggle_processor_controls (boost::shared_ptr<ARDOUR::Processor>);
 
 	sigc::signal<void,boost::shared_ptr<ARDOUR::Processor> > ProcessorSelected;
 	sigc::signal<void,boost::shared_ptr<ARDOUR::Processor> > ProcessorUnselected;
@@ -276,6 +310,9 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject, public ARD
 	Gtk::Menu * build_processor_menu ();
 	void show_processor_menu (int);
 	Gtk::Menu* build_possible_aux_menu();
+	Gtk::Menu* build_controls_menu (boost::shared_ptr<ARDOUR::Processor>);
+
+	void show_or_hide_all_controls (boost::weak_ptr<ARDOUR::Processor>, bool);
 
 	void choose_aux (boost::weak_ptr<ARDOUR::Route>);
 	void choose_send ();
@@ -364,7 +401,6 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject, public ARD
 	static void rb_deactivate_all ();
 	static void rb_ab_plugins ();
 	static void rb_edit ();
-	static void rb_controls ();
 
 	void route_property_changed (const PBD::PropertyChange&);
 	std::string generate_processor_title (boost::shared_ptr<ARDOUR::PluginInsert> pi);
@@ -377,6 +413,9 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject, public ARD
 	bool processor_can_be_edited (boost::shared_ptr<ARDOUR::Processor>);
 
 	void mixer_strip_delivery_changed (boost::weak_ptr<ARDOUR::Delivery>);
+
+	void update_gui_object_state (ProcessorEntry *);
+	XMLNode* entry_gui_object_state (ProcessorEntry *);
 };
 
 #endif /* __ardour_gtk_processor_box__ */