X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_ui.cc;h=5e9126e08af4a8ec51c1f8aae83dd52578e6183f;hb=e42d1e49c749bd8eb09d7f916f7ed36add52819b;hp=6f7c1c82d7204146ef90890c2c63725f5010e6fb;hpb=669b7453294703c8dd4e763a1900c9464bff8ac4;p=ardour.git

diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 6f7c1c82d7..5e9126e08a 100644
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -25,31 +25,36 @@
 #include <map>
 #include <sigc++/bind.h>
 
+#include <boost/foreach.hpp>
+
+#include <glibmm/threads.h>
+
 #include <gtkmm/accelmap.h>
+#include <gtkmm/stock.h>
 
 #include "pbd/convert.h"
 #include "pbd/stacktrace.h"
 #include "pbd/unwind.h"
 
-#include <glibmm/threads.h>
-
-#include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/keyboard.h>
-#include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/tearoff.h>
-#include <gtkmm2ext/window_title.h>
-#include <gtkmm2ext/doi.h>
-
 #include "ardour/amp.h"
 #include "ardour/debug.h"
 #include "ardour/audio_track.h"
 #include "ardour/midi_track.h"
 #include "ardour/plugin_manager.h"
 #include "ardour/route_group.h"
+#include "ardour/selection.h"
 #include "ardour/session.h"
 #include "ardour/vca.h"
 #include "ardour/vca_manager.h"
 
+#include "gtkmm2ext/gtk_ui.h"
+#include "gtkmm2ext/keyboard.h"
+#include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/window_title.h"
+#include "gtkmm2ext/doi.h"
+
+#include "widgets/tearoff.h"
+
 #include "keyboard.h"
 #include "mixer_ui.h"
 #include "mixer_strip.h"
@@ -58,7 +63,6 @@
 #include "public_editor.h"
 #include "mouse_cursors.h"
 #include "ardour_ui.h"
-#include "prompter.h"
 #include "utils.h"
 #include "route_sorter.h"
 #include "actions.h"
@@ -69,7 +73,7 @@
 #include "ui_config.h"
 #include "vca_master_strip.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace ARDOUR_UI_UTILS;
@@ -103,18 +107,20 @@ Mixer_UI::Mixer_UI ()
 	, _plugin_selector (0)
 	, _strip_width (UIConfiguration::instance().get_default_narrow_ms() ? Narrow : Wide)
 	, ignore_reorder (false)
-        , _in_group_rebuild_or_clear (false)
-        , _route_deletion_in_progress (false)
-	, _following_editor_selection (false)
+	, _in_group_rebuild_or_clear (false)
+	, _route_deletion_in_progress (false)
 	, _maximised (false)
 	, _show_mixer_list (true)
+	, _strip_selection_change_without_scroll (false)
+	, myactions (X_("mixer"))
+	, _selection (*this, *this)
 {
-	PresentationInfo::Change.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::sync_treeview_from_presentation_info, this), gui_context());
-
-	/* bindings was already set in MixerActor constructor */
-
+	register_actions ();
+	load_bindings ();
 	_content.set_data ("ardour-bindings", bindings);
 
+	PresentationInfo::Change.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::presentation_info_changed, this, _1), gui_context());
+
 	scroller.set_can_default (true);
 	// set_default (scroller);
 
@@ -129,14 +135,40 @@ Mixer_UI::Mixer_UI ()
 	scroller_base.drag_dest_set (target_table);
 	scroller_base.signal_drag_data_received().connect (sigc::mem_fun(*this, &Mixer_UI::scroller_drag_data_received));
 
-	// add as last item of strip packer
+	/* create a button to add VCA strips ... will get packed in redisplay_track_list() */
+	Widget* w = manage (new Image (Stock::ADD, ICON_SIZE_BUTTON));
+	w->show ();
+	add_vca_button.add (*w);
+	add_vca_button.set_can_focus(false);
+	add_vca_button.signal_clicked().connect (sigc::mem_fun (*this, &Mixer_UI::new_track_or_bus));
+
+	/* create a button to add mixer strips */
+	w = manage (new Image (Stock::ADD, ICON_SIZE_BUTTON));
+	w->show ();
+	add_button.add (*w);
+	add_button.set_can_focus(false);
+	add_button.signal_clicked().connect (sigc::mem_fun (*this, &Mixer_UI::new_track_or_bus));
+
+	/* add as last item of strip packer */
 	strip_packer.pack_end (scroller_base, true, true);
+	strip_packer.pack_end (add_button, false, false);
+
+#ifdef MIXBUS
+	/* create a drop-shadow at the end of the mixer strips */
+	mb_shadow.set_size_request( 4, -1 );
+	mb_shadow.set_name("EditorWindow");
+	mb_shadow.show();
+	strip_packer.pack_end (mb_shadow, false, false);
+#endif
 
 	_group_tabs = new MixerGroupTabs (this);
 	VBox* b = manage (new VBox);
+	b->set_spacing (0);
+	b->set_border_width (0);
 	b->pack_start (*_group_tabs, PACK_SHRINK);
 	b->pack_start (strip_packer);
 	b->show_all ();
+	b->signal_scroll_event().connect (sigc::mem_fun (*this, &Mixer_UI::on_scroll_event), false);
 
 	scroller.add (*b);
 	scroller.set_policy (Gtk::POLICY_ALWAYS, Gtk::POLICY_AUTOMATIC);
@@ -145,12 +177,13 @@ Mixer_UI::Mixer_UI ()
 
 	group_model = ListStore::create (group_columns);
 	group_display.set_model (group_model);
-	group_display.append_column (_("Group"), group_columns.text);
 	group_display.append_column (_("Show"), group_columns.visible);
+	group_display.append_column (_("Group"), group_columns.text);
 	group_display.get_column (0)->set_data (X_("colnum"), GUINT_TO_POINTER(0));
 	group_display.get_column (1)->set_data (X_("colnum"), GUINT_TO_POINTER(1));
-	group_display.get_column (0)->set_expand(true);
-	group_display.get_column (1)->set_expand(false);
+	group_display.get_column (0)->set_expand(false);
+	group_display.get_column (1)->set_expand(true);
+	group_display.get_column (1)->set_sizing (Gtk::TREE_VIEW_COLUMN_FIXED);
 	group_display.set_name ("EditGroupList");
 	group_display.get_selection()->set_mode (Gtk::SELECTION_SINGLE);
 	group_display.set_reorderable (true);
@@ -160,13 +193,13 @@ Mixer_UI::Mixer_UI ()
 
 	/* name is directly editable */
 
-	CellRendererText* name_cell = dynamic_cast<CellRendererText*>(group_display.get_column_cell_renderer (0));
+	CellRendererText* name_cell = dynamic_cast<CellRendererText*>(group_display.get_column_cell_renderer (1));
 	name_cell->property_editable() = true;
 	name_cell->signal_edited().connect (sigc::mem_fun (*this, &Mixer_UI::route_group_name_edit));
 
 	/* use checkbox for the active column */
 
-	CellRendererToggle* active_cell = dynamic_cast<CellRendererToggle*>(group_display.get_column_cell_renderer (1));
+	CellRendererToggle* active_cell = dynamic_cast<CellRendererToggle*>(group_display.get_column_cell_renderer (0));
 	active_cell->property_activatable() = true;
 	active_cell->property_radio() = false;
 
@@ -178,37 +211,13 @@ Mixer_UI::Mixer_UI ()
 	group_display_scroller.add (group_display);
 	group_display_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
 
-	HBox* route_group_display_button_box = manage (new HBox());
-
-	Button* route_group_add_button = manage (new Button ());
-	Button* route_group_remove_button = manage (new Button ());
-
-	Widget* w;
-
-	w = manage (new Image (Stock::ADD, ICON_SIZE_BUTTON));
-	w->show();
-	route_group_add_button->add (*w);
-
-	w = manage (new Image (Stock::REMOVE, ICON_SIZE_BUTTON));
-	w->show();
-	route_group_remove_button->add (*w);
-
-	route_group_display_button_box->set_homogeneous (true);
-
-	route_group_add_button->signal_clicked().connect (sigc::mem_fun (*this, &Mixer_UI::new_route_group));
-	route_group_remove_button->signal_clicked().connect (sigc::mem_fun (*this, &Mixer_UI::remove_selected_route_group));
-
-	route_group_display_button_box->add (*route_group_add_button);
-	route_group_display_button_box->add (*route_group_remove_button);
 
 	group_display_vbox.pack_start (group_display_scroller, true, true);
-	group_display_vbox.pack_start (*route_group_display_button_box, false, false);
 
 	group_display_frame.set_name ("BaseFrame");
 	group_display_frame.set_shadow_type (Gtk::SHADOW_IN);
 	group_display_frame.add (group_display_vbox);
 
-
 	list<TargetEntry> target_list;
 	target_list.push_back (TargetEntry ("PluginPresetPtr"));
 
@@ -221,6 +230,7 @@ Mixer_UI::Mixer_UI ()
 	favorite_plugins_display.set_headers_visible (true);
 	favorite_plugins_display.set_rules_hint (true);
 	favorite_plugins_display.set_can_focus (false);
+	favorite_plugins_display.set_tooltip_column (0);
 	favorite_plugins_display.add_object_drag (favorite_plugins_columns.plugin.index(), "PluginFavoritePtr");
 	favorite_plugins_display.set_drag_column (favorite_plugins_columns.name.index());
 	favorite_plugins_display.add_drop_targets (target_list);
@@ -236,62 +246,66 @@ Mixer_UI::Mixer_UI ()
 
 	favorite_plugins_frame.set_name ("BaseFrame");
 	favorite_plugins_frame.set_shadow_type (Gtk::SHADOW_IN);
-	favorite_plugins_frame.add (favorite_plugins_scroller);
+	favorite_plugins_frame.add (favorite_plugins_vbox);
+
+	favorite_plugins_vbox.pack_start (favorite_plugins_scroller, true, true);
+	favorite_plugins_vbox.pack_start (favorite_plugins_tag_combo, false, false);
+	favorite_plugins_tag_combo.signal_changed().connect (sigc::mem_fun (*this, &Mixer_UI::tag_combo_changed));
 
 	rhs_pane1.add (favorite_plugins_frame);
 	rhs_pane1.add (track_display_frame);
+
 	rhs_pane2.add (rhs_pane1);
 	rhs_pane2.add (group_display_frame);
 
 	list_vpacker.pack_start (rhs_pane2, true, true);
 
+	vca_label_bar.set_size_request (-1, 16 + 1); /* must match height in GroupTabs::set_size_request()  + 1 border px*/
+	vca_vpacker.pack_start (vca_label_bar, false, false);
+
 	vca_scroller_base.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
-	vca_scroller_base.set_name ("MixerWindow");
+	vca_scroller_base.set_name (X_("MixerWindow"));
 	vca_scroller_base.signal_button_release_event().connect (sigc::mem_fun(*this, &Mixer_UI::masters_scroller_button_release), false);
-	vca_packer.pack_end (vca_scroller_base, true, true);
 
-	vca_scroller.add (vca_packer);
+	vca_scroller.add (vca_hpacker);
 	vca_scroller.set_policy (Gtk::POLICY_ALWAYS, Gtk::POLICY_AUTOMATIC);
 	vca_scroller.signal_button_release_event().connect (sigc::mem_fun(*this, &Mixer_UI::strip_scroller_button_release));
 
+	vca_vpacker.pack_start (vca_scroller, true, true);
+
 	inner_pane.add (scroller);
-	inner_pane.add (vca_scroller);
+	inner_pane.add (vca_vpacker);
 
 	global_hpacker.pack_start (inner_pane, true, true);
 	global_hpacker.pack_start (out_packer, false, false);
 
+	list_hpane.set_check_divider_position (true);
 	list_hpane.add (list_vpacker);
 	list_hpane.add (global_hpacker);
-
+	list_hpane.set_child_minsize (list_vpacker, 30);
 
 	XMLNode const * settings = ARDOUR_UI::instance()->mixer_settings();
-	XMLProperty const * prop;
 	float fract;
 
-	{
-		LocaleGuard lg;
+	if (!settings || !settings->get_property ("mixer-rhs-pane1-pos", fract) || fract > 1.0) {
+		fract = 0.6f;
+	}
+	rhs_pane1.set_divider (0, fract);
 
-		if (!settings || ((prop = settings->property ("mixer-rhs-pane1-pos")) == 0) || ((fract = atof (prop->value())) > 1.0)) {
-			rhs_pane1.set_divider (0, 0.6f);
-		} else {
-			rhs_pane1.set_divider (0, fract);
-		}
-		if (!settings || ((prop = settings->property ("mixer-rhs-pane2-pos")) == 0) || ((fract = atof (prop->value())) > 1.0)) {
-			rhs_pane2.set_divider (0, 0.7f);
-		} else {
-			rhs_pane2.set_divider (0, fract);
-		}
-		if (!settings || ((prop = settings->property ("mixer-list-hpane-pos")) == 0) || ((fract = atof (prop->value())) > 1.0)) {
-			list_hpane.set_divider (0, 0.2f);
-		} else {
-			list_hpane.set_divider (0, fract);
-		}
-		if (!settings || ((prop = settings->property ("mixer-inner-pane-pos")) == 0)  || ((fract = atof (prop->value())) > 1.0)) {
-			inner_pane.set_divider (0, 0.8f);
-		} else {
-			inner_pane.set_divider (0, atof (prop->value()));
-		}
+	if (!settings || !settings->get_property ("mixer-rhs-pane2-pos", fract) || fract > 1.0) {
+		fract = 0.7f;
 	}
+	rhs_pane2.set_divider (0, fract);
+
+	if (!settings || !settings->get_property ("mixer-list-hpane-pos", fract) || fract > 1.0) {
+		fract = 0.2f;
+	}
+	list_hpane.set_divider (0, fract);
+
+	if (!settings || !settings->get_property ("mixer-inner-pane-pos", fract) || fract > 1.0) {
+		fract = 0.8f;
+	}
+	inner_pane.set_divider (0, fract);
 
 	rhs_pane1.set_drag_cursor (*PublicEditor::instance().cursors()->expand_up_down);
 	rhs_pane2.set_drag_cursor (*PublicEditor::instance().cursors()->expand_up_down);
@@ -302,10 +316,6 @@ Mixer_UI::Mixer_UI ()
 
 	update_title ();
 
-	route_group_display_button_box->show();
-	route_group_add_button->show();
-	route_group_remove_button->show();
-
 	_content.show ();
 	_content.set_name ("MixerWindow");
 
@@ -316,7 +326,6 @@ Mixer_UI::Mixer_UI ()
 	mixer_scroller_vpacker.show();
 	list_vpacker.show();
 	group_display_button_label.show();
-	group_display_button.show();
 	group_display_scroller.show();
 	favorite_plugins_scroller.show();
 	group_display_vbox.show();
@@ -327,14 +336,19 @@ Mixer_UI::Mixer_UI ()
 	strip_packer.show();
 	inner_pane.show();
 	vca_scroller.show();
-	vca_packer.show();
+	vca_vpacker.show();
+	vca_hpacker.show();
+	vca_label_bar.show();
+	vca_label.show();
 	vca_scroller_base.show();
 	out_packer.show();
 	list_hpane.show();
 	group_display.show();
 	favorite_plugins_display.show();
+	add_button.show ();
 
 	MixerStrip::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::remove_strip, this, _1), gui_context());
+	VCAMasterStrip::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::remove_master, this, _1), gui_context());
 
 	/* handle escape */
 
@@ -345,8 +359,9 @@ Mixer_UI::Mixer_UI ()
 #else
 #error implement deferred Plugin-Favorite list
 #endif
-	PluginManager::instance ().PluginListChanged.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::refill_favorite_plugins, this), gui_context());
-	PluginManager::instance ().PluginStatusesChanged.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::refill_favorite_plugins, this), gui_context());
+
+	PluginManager::instance ().PluginListChanged.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::plugin_list_changed, this), gui_context());
+	PluginManager::instance ().PluginStatusChanged.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::plugin_list_changed, this), gui_context());
 	ARDOUR::Plugin::PresetsChanged.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::refill_favorite_plugins, this), gui_context());
 }
 
@@ -357,6 +372,7 @@ Mixer_UI::~Mixer_UI ()
 		delete _monitor_section;
 	}
 	delete _plugin_selector;
+	delete track_menu;
 }
 
 void
@@ -366,9 +382,9 @@ Mixer_UI::escape ()
 }
 
 void
-Mixer_UI::track_editor_selection ()
+Mixer_UI::tag_combo_changed ()
 {
-	PublicEditor::instance().get_selection().TracksChanged.connect (sigc::mem_fun (*this, &Mixer_UI::follow_editor_selection));
+	refill_favorite_plugins();
 }
 
 Gtk::Window*
@@ -378,14 +394,16 @@ Mixer_UI::use_own_window (bool and_fill_it)
 
 	Gtk::Window* win = Tabbable::use_own_window (and_fill_it);
 
-
 	if (win && new_window) {
 		win->set_name ("MixerWindow");
 		ARDOUR_UI::instance()->setup_toplevel_window (*win, _("Mixer"), this);
-		win->signal_scroll_event().connect (sigc::mem_fun (*this, &Mixer_UI::on_scroll_event), false);
 		win->signal_event().connect (sigc::bind (sigc::ptr_fun (&Keyboard::catch_user_event_for_pre_dialog_focus), win));
 		win->set_data ("ardour-bindings", bindings);
 		update_title ();
+		if (!win->get_focus()) {
+			/* set focus widget to something, anything */
+			win->set_focus (scroller);
+		}
 	}
 
 	return win;
@@ -432,7 +450,7 @@ Mixer_UI::remove_master (VCAMasterStrip* vms)
 
 	for (ri = rows.begin(); ri != rows.end(); ++ri) {
 		if ((*ri)[stripable_columns.strip] == vms) {
-                        PBD::Unwinder<bool> uw (_route_deletion_in_progress, true);
+			PBD::Unwinder<bool> uw (_route_deletion_in_progress, true);
 			track_model->erase (ri);
 			break;
 		}
@@ -483,7 +501,7 @@ Mixer_UI::add_stripables (StripableList& slist)
 	bool from_scratch = (track_model->children().size() == 0);
 	uint32_t nroutes = 0;
 
-	slist.sort (StripablePresentationInfoSorter());
+	slist.sort (Stripable::Sorter());
 
 	for (Gtk::TreeModel::Children::iterator it = track_model->children().begin(); it != track_model->children().end(); ++it) {
 		boost::shared_ptr<Stripable> s = (*it)[stripable_columns.stripable];
@@ -494,6 +512,7 @@ Mixer_UI::add_stripables (StripableList& slist)
 
 		nroutes++;
 
+		// XXX what does this special case do?
 		if (s->presentation_info().order() == (slist.front()->presentation_info().order() + slist.size())) {
 			insert_iter = it;
 			break;
@@ -503,7 +522,8 @@ Mixer_UI::add_stripables (StripableList& slist)
 	MixerStrip* strip;
 
 	try {
-		no_track_list_redisplay = true;
+		PBD::Unwinder<bool> uw (no_track_list_redisplay, true);
+
 		track_display.set_model (Glib::RefPtr<ListStore>());
 
 		for (StripableList::iterator s = slist.begin(); s != slist.end(); ++s) {
@@ -518,11 +538,11 @@ Mixer_UI::add_stripables (StripableList& slist)
 				TreeModel::Row row = *(track_model->append());
 
 				row[stripable_columns.text] = vca->name();
-				row[stripable_columns.visible] = !vca->presentation_info().hidden();
+				row[stripable_columns.visible] = vms->marked_for_display ();
 				row[stripable_columns.strip] = vms;
 				row[stripable_columns.stripable] = vca;
 
-				vms->CatchDeletion.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::remove_master, this, _1), gui_context());
+				vms->signal_button_release_event().connect (sigc::bind (sigc::mem_fun(*this, &Mixer_UI::vca_button_release_event), vms));
 
 			} else if ((route = boost::dynamic_pointer_cast<Route> (*s))) {
 
@@ -548,7 +568,11 @@ Mixer_UI::add_stripables (StripableList& slist)
 					_monitor_section->tearoff().Detach.connect (sigc::mem_fun(*this, &Mixer_UI::monitor_section_detached));
 					_monitor_section->tearoff().Attach.connect (sigc::mem_fun(*this, &Mixer_UI::monitor_section_attached));
 
-					monitor_section_attached ();
+					if (_monitor_section->tearoff().torn_off()) {
+						monitor_section_detached ();
+					} else {
+						monitor_section_attached ();
+					}
 
 					route->DropReferences.connect (*this, invalidator(*this), boost::bind (&Mixer_UI::monitor_section_going_away, this), gui_context());
 
@@ -568,34 +592,43 @@ Mixer_UI::add_stripables (StripableList& slist)
 
 				show_strip (strip);
 
-				TreeModel::Row row = *(track_model->insert (insert_iter));
+				if (route->is_master()) {
 
-				row[stripable_columns.text] = route->name();
-				row[stripable_columns.visible] = route->is_master() ? true : strip->marked_for_display();
-				row[stripable_columns.stripable] = route;
-				row[stripable_columns.strip] = strip;
+					out_packer.pack_start (*strip, false, false);
+					strip->set_packed (true);
 
-				if (nroutes != 0) {
-					_selection.add (strip);
-				}
+				} else {
 
-				route->PropertyChanged.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::strip_property_changed, this, _1, strip), gui_context());
+					TreeModel::Row row = *(track_model->insert (insert_iter));
+
+					row[stripable_columns.text] = route->name();
+					row[stripable_columns.visible] = strip->marked_for_display();
+					row[stripable_columns.stripable] = route;
+					row[stripable_columns.strip] = strip;
+				}
 
 				strip->WidthChanged.connect (sigc::mem_fun(*this, &Mixer_UI::strip_width_changed));
 				strip->signal_button_release_event().connect (sigc::bind (sigc::mem_fun(*this, &Mixer_UI::strip_button_release_event), strip));
 			}
+
+			(*s)->presentation_info().PropertyChanged.connect (*this, invalidator(*this), boost::bind (&Mixer_UI::stripable_property_changed, this, _1, boost::weak_ptr<Stripable>(*s)), gui_context());
+			(*s)->PropertyChanged.connect (*this, invalidator(*this), boost::bind (&Mixer_UI::stripable_property_changed, this, _1, boost::weak_ptr<Stripable>(*s)), gui_context());
 		}
 
 	} catch (const std::exception& e) {
 		error << string_compose (_("Error adding GUI elements for new tracks/busses %1"), e.what()) << endmsg;
 	}
 
-	no_track_list_redisplay = false;
 	track_display.set_model (track_model);
 
+	/* catch up on selection state, which we left to the editor to set */
+	sync_treeview_from_presentation_info (PropertyChange (Properties::selected));
+
 	if (!from_scratch) {
 		sync_presentation_info_from_treeview ();
 	}
+
+	redisplay_track_list ();
 }
 
 void
@@ -607,13 +640,9 @@ Mixer_UI::deselect_all_strip_processors ()
 }
 
 void
-Mixer_UI::select_strip (MixerStrip& ms, bool add)
+Mixer_UI::select_all_tracks ()
 {
-	if (add) {
-		_selection.add (&ms);
-	} else {
-		_selection.set (&ms);
-	}
+	PublicEditor::instance().select_all_tracks ();
 }
 
 void
@@ -648,15 +677,34 @@ Mixer_UI::remove_strip (MixerStrip* strip)
 		strips.erase (i);
 	}
 
+	PBD::Unwinder<bool> uwi (ignore_reorder, true);
+
 	for (ri = rows.begin(); ri != rows.end(); ++ri) {
 		if ((*ri)[stripable_columns.strip] == strip) {
-                        PBD::Unwinder<bool> uw (_route_deletion_in_progress, true);
+			PBD::Unwinder<bool> uw (_route_deletion_in_progress, true);
 			track_model->erase (ri);
 			break;
 		}
 	}
 }
 
+void
+Mixer_UI::presentation_info_changed (PropertyChange const & what_changed)
+{
+	if (what_changed.contains (Properties::selected)) {
+		_selection.presentation_info_changed (what_changed);
+	}
+
+	PropertyChange soh;
+	soh.add (Properties::selected);
+	soh.add (Properties::order);
+	soh.add (Properties::hidden);
+
+	if (what_changed.contains (soh)) {
+		sync_treeview_from_presentation_info (what_changed);
+	}
+}
+
 void
 Mixer_UI::sync_presentation_info_from_treeview ()
 {
@@ -674,46 +722,55 @@ Mixer_UI::sync_presentation_info_from_treeview ()
 
 	TreeModel::Children::iterator ri;
 	bool change = false;
-	uint32_t order = 0;
+
+	PresentationInfo::order_t master_key = _session->master_order_key ();
+	PresentationInfo::order_t order = 0;
+
+	PresentationInfo::ChangeSuspender cs;
 
 	for (ri = rows.begin(); ri != rows.end(); ++ri) {
 		bool visible = (*ri)[stripable_columns.visible];
 		boost::shared_ptr<Stripable> stripable = (*ri)[stripable_columns.stripable];
 
+#ifndef NDEBUG // these should not exist in the mixer's treeview
 		if (!stripable) {
+			assert (0);
 			continue;
 		}
-
-		/* Monitor and Auditioner do not get their presentation
-		 * info reset here.
-		 */
-
 		if (stripable->is_monitor() || stripable->is_auditioner()) {
+			assert (0);
 			continue;
 		}
-
-		/* Master also doesn't get set here but since the editor allows
-		 * it to be reordered, we need to preserve its ordering.
-		 */
+		if (stripable->is_master()) {
+			assert (0);
+			continue;
+		}
+#endif
 
 		stripable->presentation_info().set_hidden (!visible);
 
+		// leave master where it is.
+		if (order == master_key) {
+			++order;
+		}
+
 		if (order != stripable->presentation_info().order()) {
-			stripable->set_presentation_order_explicit (order);
+			stripable->set_presentation_order (order);
 			change = true;
 		}
-
 		++order;
 	}
 
+	change |= _session->ensure_stripable_sort_order ();
+
 	if (change) {
 		DEBUG_TRACE (DEBUG::OrderKeys, "... notify PI change from mixer GUI\n");
-		_session->notify_presentation_info_change ();
+		_session->set_dirty();
 	}
 }
 
 void
-Mixer_UI::sync_treeview_from_presentation_info ()
+Mixer_UI::sync_treeview_from_presentation_info (PropertyChange const & what_changed)
 {
 	if (!_session || _session->deletion_in_progress()) {
 		return;
@@ -735,21 +792,20 @@ Mixer_UI::sync_treeview_from_presentation_info ()
 		return;
 	}
 
-	OrderingKeys sorted;
-
+	TreeOrderKeys sorted;
 	for (TreeModel::Children::iterator ri = rows.begin(); ri != rows.end(); ++ri, ++old_order) {
 		boost::shared_ptr<Stripable> stripable = (*ri)[stripable_columns.stripable];
-		sorted.push_back (OrderKeys (old_order, stripable->presentation_info().order()));
+		sorted.push_back (TreeOrderKey (old_order, stripable));
 	}
 
-	SortByNewDisplayOrder cmp;
+	TreeOrderKeySorter cmp;
 
 	sort (sorted.begin(), sorted.end(), cmp);
 	neworder.assign (sorted.size(), 0);
 
 	uint32_t n = 0;
 
-	for (OrderingKeys::iterator sr = sorted.begin(); sr != sorted.end(); ++sr, ++n) {
+	for (TreeOrderKeys::iterator sr = sorted.begin(); sr != sorted.end(); ++sr, ++n) {
 
 		neworder[n] = sr->old_display_order;
 
@@ -763,43 +819,92 @@ Mixer_UI::sync_treeview_from_presentation_info ()
 		track_model->reorder (neworder);
 	}
 
+	if (what_changed.contains (Properties::selected)) {
+
+		PresentationInfo::ChangeSuspender cs;
+
+		for (list<MixerStrip *>::const_iterator i = strips.begin(); i != strips.end(); ++i) {
+			boost::shared_ptr<Stripable> stripable = (*i)->stripable();
+			if (stripable && stripable->is_selected()) {
+				_selection.add (*i);
+			} else {
+				_selection.remove (*i);
+			}
+		}
+
+		if (!_selection.axes.empty() && !PublicEditor::instance().track_selection_change_without_scroll () && !_strip_selection_change_without_scroll) {
+			move_stripable_into_view ((*_selection.axes.begin())->stripable());
+		}
+
+		TreeModel::Children rows = track_model->children();
+		for (TreeModel::Children::const_iterator i = rows.begin(); i != rows.end(); ++i) {
+			AxisView* av = (*i)[stripable_columns.strip];
+			VCAMasterStrip* vms = dynamic_cast<VCAMasterStrip*> (av);
+			if (!vms) {
+				continue;
+			}
+			if (vms->vca() && vms->vca()->is_selected()) {
+				_selection.add (vms);
+			} else {
+				_selection.remove (vms);
+			}
+		}
+	}
+
 	redisplay_track_list ();
 }
 
-void
-Mixer_UI::follow_editor_selection ()
+
+MixerStrip*
+Mixer_UI::strip_by_route (boost::shared_ptr<Route> r) const
 {
-	if (_following_editor_selection) {
-		return;
+	for (list<MixerStrip *>::const_iterator i = strips.begin(); i != strips.end(); ++i) {
+		if ((*i)->route() == r) {
+			return (*i);
+		}
 	}
 
-	_following_editor_selection = true;
-	_selection.block_routes_changed (true);
+	return 0;
+}
+
+MixerStrip*
+Mixer_UI::strip_by_stripable (boost::shared_ptr<Stripable> s) const
+{
+	for (list<MixerStrip *>::const_iterator i = strips.begin(); i != strips.end(); ++i) {
+		if ((*i)->stripable() == s) {
+			return (*i);
+		}
+	}
 
-	TrackSelection& s (PublicEditor::instance().get_selection().tracks);
+	return 0;
+}
 
-	_selection.clear_routes ();
+AxisView*
+Mixer_UI::axis_view_by_stripable (boost::shared_ptr<Stripable> s) const
+{
+	for (list<MixerStrip *>::const_iterator i = strips.begin(); i != strips.end(); ++i) {
+		if ((*i)->stripable() == s) {
+			return (*i);
+		}
+	}
 
-	for (TrackViewList::iterator i = s.begin(); i != s.end(); ++i) {
-		RouteTimeAxisView* rtav = dynamic_cast<RouteTimeAxisView*> (*i);
-		if (rtav) {
-			MixerStrip* ms = strip_by_route (rtav->route());
-			if (ms) {
-				_selection.add (ms);
-			}
+	TreeModel::Children rows = track_model->children();
+	for (TreeModel::Children::const_iterator i = rows.begin(); i != rows.end(); ++i) {
+		AxisView* av = (*i)[stripable_columns.strip];
+		VCAMasterStrip* vms = dynamic_cast<VCAMasterStrip*> (av);
+		if (vms && vms->stripable () == s) {
+			return av;
 		}
 	}
 
-	_following_editor_selection = false;
-	_selection.block_routes_changed (false);
+	return 0;
 }
 
-
-MixerStrip*
-Mixer_UI::strip_by_route (boost::shared_ptr<Route> r)
+AxisView*
+Mixer_UI::axis_view_by_control (boost::shared_ptr<AutomationControl> c) const
 {
-	for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
-		if ((*i)->route() == r) {
+	for (list<MixerStrip *>::const_iterator i = strips.begin(); i != strips.end(); ++i) {
+		if ((*i)->control() == c) {
 			return (*i);
 		}
 	}
@@ -807,21 +912,46 @@ Mixer_UI::strip_by_route (boost::shared_ptr<Route> r)
 	return 0;
 }
 
+struct MixerStripSorter {
+	bool operator() (const MixerStrip* ms_a, const MixerStrip* ms_b)
+	{
+		boost::shared_ptr<ARDOUR::Stripable> const& a = ms_a->stripable ();
+		boost::shared_ptr<ARDOUR::Stripable> const& b = ms_b->stripable ();
+		return ARDOUR::Stripable::Sorter(true)(a, b);
+	}
+};
+
 bool
 Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip)
 {
+	/* Selecting a mixer-strip may also select grouped-tracks, and
+	 * presentation_info_changed() being emitted and
+	 * _selection.axes.begin() is being moved into view. This may
+	 * effectively move the track that was clicked-on out of view.
+	 *
+	 * So here only the track that is actually clicked-on is moved into
+	 * view (in case it's partially visible)
+	 */
+	PBD::Unwinder<bool> uw (_strip_selection_change_without_scroll, true);
+	move_stripable_into_view (strip->stripable());
+
 	if (ev->button == 1) {
 		if (_selection.selected (strip)) {
 			/* primary-click: toggle selection state of strip */
 			if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
-				_selection.remove (strip);
-			} else if (_selection.routes.size() > 1) {
+				_selection.remove (strip, true);
+			} else if (_selection.axes.size() > 1) {
 				/* de-select others */
 				_selection.set (strip);
 			}
+			PublicEditor& pe = PublicEditor::instance();
+			TimeAxisView* tav = pe.time_axis_view_from_stripable (strip->stripable());
+			if (tav) {
+				pe.set_selected_mixer_strip (*tav);
+			}
 		} else {
 			if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
-				_selection.add (strip);
+				_selection.add (strip, true);
 			} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::RangeSelectModifier)) {
 
 				/* extend selection */
@@ -830,10 +960,13 @@ Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip)
 				bool accumulate = false;
 				bool found_another = false;
 
-				tmp.push_back (strip);
+				strips.sort (MixerStripSorter());
 
 				for (list<MixerStrip*>::iterator i = strips.begin(); i != strips.end(); ++i) {
-					if ((*i) == strip) {
+					MixerStrip* ms = *i;
+					assert (ms);
+
+					if (ms == strip) {
 						/* hit clicked strip, start accumulating till we hit the first
 						   selected strip
 						*/
@@ -843,7 +976,7 @@ Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip)
 						} else {
 							accumulate = true;
 						}
-					} else if (_selection.selected (*i)) {
+					} else if (_selection.selected (ms)) {
 						/* hit selected strip. if currently accumulating others,
 						   we're done. if not accumulating others, start doing so.
 						*/
@@ -856,17 +989,21 @@ Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip)
 						}
 					} else {
 						if (accumulate) {
-							tmp.push_back (*i);
+							tmp.push_back (ms);
 						}
 					}
 				}
 
+				tmp.push_back (strip);
+
 				if (found_another) {
+					PresentationInfo::ChangeSuspender cs;
 					for (vector<MixerStrip*>::iterator i = tmp.begin(); i != tmp.end(); ++i) {
-						_selection.add (*i);
+						_selection.add (*i, true);
 					}
-				} else
+				} else {
 					_selection.set (strip);  //user wants to start a range selection, but there aren't any others selected yet
+				}
 			} else {
 				_selection.set (strip);
 			}
@@ -876,6 +1013,13 @@ Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip)
 	return true;
 }
 
+bool
+Mixer_UI::vca_button_release_event (GdkEventButton *ev, VCAMasterStrip *strip)
+{
+	_selection.set (strip);
+	return true;
+}
+
 void
 Mixer_UI::set_session (Session* sess)
 {
@@ -887,11 +1031,17 @@ Mixer_UI::set_session (Session* sess)
 
 	_group_tabs->set_session (sess);
 
+	if (_monitor_section) {
+		_monitor_section->set_session (_session);
+	}
+
 	if (!_session) {
+		_selection.clear ();
 		return;
 	}
 
 	refill_favorite_plugins();
+	refill_tag_combo();
 
 	XMLNode* node = ARDOUR_UI::instance()->mixer_settings();
 	set_state (*node, 0);
@@ -917,6 +1067,13 @@ Mixer_UI::set_session (Session* sess)
 	if (_visible) {
 		show_window();
 	}
+
+	/* catch up on selection state, etc. */
+
+	PropertyChange sc;
+	sc.add (Properties::selected);
+	_selection.presentation_info_changed (sc);
+
 	start_updating ();
 }
 
@@ -962,14 +1119,12 @@ Mixer_UI::track_visibility_changed (std::string const & path)
 	TreeIter iter;
 
 	if ((iter = track_model->get_iter (path))) {
+
 		AxisView* av = (*iter)[stripable_columns.strip];
-		MixerStrip* strip = dynamic_cast<MixerStrip*> (av);
-		if (strip) {
-			bool visible = (*iter)[stripable_columns.visible];
+		bool visible = (*iter)[stripable_columns.visible];
 
-			if (strip->set_marked_for_display (!visible)) {
-				update_track_visibility ();
-			}
+		if (av->set_marked_for_display (!visible)) {
+			update_track_visibility ();
 		}
 	}
 }
@@ -985,10 +1140,7 @@ Mixer_UI::update_track_visibility ()
 
 		for (i = rows.begin(); i != rows.end(); ++i) {
 			AxisView* av = (*i)[stripable_columns.strip];
-			MixerStrip* strip = dynamic_cast<MixerStrip*> (av);
-			if (strip) {
-				(*i)[stripable_columns.visible] = strip->marked_for_display ();
-			}
+			(*i)[stripable_columns.visible] = av->marked_for_display ();
 		}
 
 		/* force presentation catch up with visibility changes
@@ -1012,7 +1164,8 @@ Mixer_UI::show_strip (MixerStrip* ms)
 		MixerStrip* strip = dynamic_cast<MixerStrip*> (av);
 		if (strip == ms) {
 			(*i)[stripable_columns.visible] = true;
-			redisplay_track_list ();
+			av->set_marked_for_display (true);
+			update_track_visibility ();
 			break;
 		}
 	}
@@ -1030,7 +1183,8 @@ Mixer_UI::hide_strip (MixerStrip* ms)
 		MixerStrip* strip = dynamic_cast<MixerStrip*> (av);
 		if (strip == ms) {
 			(*i)[stripable_columns.visible] = false;
-			redisplay_track_list ();
+			av->set_marked_for_display (false);
+			update_track_visibility ();
 			break;
 		}
 	}
@@ -1039,15 +1193,15 @@ Mixer_UI::hide_strip (MixerStrip* ms)
 gint
 Mixer_UI::start_updating ()
 {
-    fast_screen_update_connection = Timers::super_rapid_connect (sigc::mem_fun(*this, &Mixer_UI::fast_update_strips));
-    return 0;
+	fast_screen_update_connection = Timers::super_rapid_connect (sigc::mem_fun(*this, &Mixer_UI::fast_update_strips));
+	return 0;
 }
 
 gint
 Mixer_UI::stop_updating ()
 {
-    fast_screen_update_connection.disconnect();
-    return 0;
+	fast_screen_update_connection.disconnect();
+	return 0;
 }
 
 void
@@ -1189,7 +1343,6 @@ Mixer_UI::hide_all_miditracks ()
 	set_all_audio_midi_visibility (3, false);
 }
 
-
 void
 Mixer_UI::track_list_reorder (const TreeModel::Path&, const TreeModel::iterator&, int* /*new_order*/)
 {
@@ -1210,20 +1363,31 @@ Mixer_UI::track_list_delete (const Gtk::TreeModel::Path&)
 	DEBUG_TRACE (DEBUG::OrderKeys, "mixer UI treeview row deleted\n");
 	sync_presentation_info_from_treeview ();
 
-        if (_route_deletion_in_progress) {
-                redisplay_track_list ();
-        }
+	if (_route_deletion_in_progress) {
+		redisplay_track_list ();
+	}
 }
 
 void
 Mixer_UI::spill_redisplay (boost::shared_ptr<VCA> vca)
 {
 	TreeModel::Children rows = track_model->children();
+	std::list<boost::shared_ptr<VCA> > vcas;
+	vcas.push_back (vca);
 
-	for (TreeModel::Children::iterator i = rows.begin(); i != rows.end(); ++i) {
+	for (TreeModel::Children::const_iterator i = rows.begin(); i != rows.end(); ++i) {
+		AxisView* av = (*i)[stripable_columns.strip];
+		VCAMasterStrip* vms = dynamic_cast<VCAMasterStrip*> (av);
+		if (vms && vms->vca()->slaved_to (vca)) {
+			vcas.push_back (vms->vca());
+		}
+	}
+
+	for (TreeModel::Children::const_iterator i = rows.begin(); i != rows.end(); ++i) {
 
 		AxisView* av = (*i)[stripable_columns.strip];
 		MixerStrip* strip = dynamic_cast<MixerStrip*> (av);
+		bool const visible = (*i)[stripable_columns.visible];
 
 		if (!strip) {
 			/* we're in the middle of changing a row, don't worry */
@@ -1239,7 +1403,15 @@ Mixer_UI::spill_redisplay (boost::shared_ptr<VCA> vca)
 			continue;
 		}
 
-		if (strip->route()->slaved_to (vca)) {
+		bool slaved = false;
+		for (std::list<boost::shared_ptr<VCA> >::const_iterator m = vcas.begin(); m != vcas.end(); ++m) {
+			if (strip->route()->slaved_to (*m)) {
+				slaved = true;
+				break;
+			}
+		}
+
+		if (slaved && visible) {
 
 			if (strip->packed()) {
 				strip_packer.reorder_child (*strip, -1); /* put at end */
@@ -1265,23 +1437,32 @@ Mixer_UI::redisplay_track_list ()
 		return;
 	}
 
-	boost::shared_ptr<VCA> sv = spilled_vca.lock ();
-
-	if (sv) {
-		spill_redisplay (sv);
-		return;
+	boost::shared_ptr<Stripable> ss = spilled_strip.lock ();
+	if (ss) {
+		boost::shared_ptr<VCA> sv = boost::dynamic_pointer_cast<VCA> (ss);
+		if (sv) {
+			spill_redisplay (sv);
+			return;
+		}
 	}
 
 	TreeModel::Children rows = track_model->children();
 	TreeModel::Children::iterator i;
 	uint32_t n_masters = 0;
 
-	container_clear (vca_packer);
-	vca_packer.pack_end (vca_scroller_base, true, true);
+	container_clear (vca_hpacker);
+
+	vca_hpacker.pack_end (vca_scroller_base, true, true);
+	vca_hpacker.pack_end (add_vca_button, false, false);
+
+	add_vca_button.show ();
+	vca_scroller_base.show();
 
 	for (i = rows.begin(); i != rows.end(); ++i) {
 
 		AxisView* s = (*i)[stripable_columns.strip];
+		bool const visible = (*i)[stripable_columns.visible];
+		boost::shared_ptr<Stripable> stripable = (*i)[stripable_columns.stripable];
 
 		if (!s) {
 			/* we're in the middle of changing a row, don't worry */
@@ -1291,9 +1472,11 @@ Mixer_UI::redisplay_track_list ()
 		VCAMasterStrip* vms;
 
 		if ((vms = dynamic_cast<VCAMasterStrip*> (s))) {
-			vca_packer.pack_start (*vms, false, false);
-			vms->show ();
-			n_masters++;
+			if (visible) {
+				vca_hpacker.pack_start (*vms, false, false);
+				vms->show ();
+				n_masters++;
+			}
 			continue;
 		}
 
@@ -1303,32 +1486,18 @@ Mixer_UI::redisplay_track_list ()
 			continue;
 		}
 
-		bool const visible = (*i)[stripable_columns.visible];
-
 		if (visible) {
 
 			if (strip->packed()) {
-
-				if (strip->route()->is_master() || strip->route()->is_monitor()) {
-					out_packer.reorder_child (*strip, -1);
-
-				} else {
-					strip_packer.reorder_child (*strip, -1); /* put at end */
-				}
-
+				strip_packer.reorder_child (*strip, -1); /* put at end */
 			} else {
-
-				if (strip->route()->is_master() || strip->route()->is_monitor()) {
-					out_packer.pack_start (*strip, false, false);
-				} else {
-					strip_packer.pack_start (*strip, false, false);
-				}
+				strip_packer.pack_start (*strip, false, false);
 				strip->set_packed (true);
 			}
 
 		} else {
 
-			if (strip->route()->is_master() || strip->route()->is_monitor()) {
+			if (stripable->is_master() || stripable->is_monitor()) {
 				/* do nothing, these cannot be hidden */
 			} else {
 				if (strip->packed()) {
@@ -1343,10 +1512,17 @@ Mixer_UI::redisplay_track_list ()
 
 	if (n_masters == 0) {
 		UIConfiguration::instance().set_mixer_strip_visibility (VisibilityGroup::remove_element (UIConfiguration::instance().get_mixer_strip_visibility(), X_("VCA")));
-		vca_scroller.hide ();
+		vca_vpacker.hide ();
 	} else {
 		UIConfiguration::instance().set_mixer_strip_visibility (VisibilityGroup::add_element (UIConfiguration::instance().get_mixer_strip_visibility(), X_("VCA")));
-		vca_scroller.show ();
+
+		Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleVCAPane");
+		if (act) {
+			Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
+			showhide_vcas (tact->get_active());
+		} else {
+			vca_vpacker.show ();
+		}
 	}
 
 	_group_tabs->set_dirty ();
@@ -1424,30 +1600,75 @@ Mixer_UI::initial_track_display ()
 		add_stripables (sl);
 	}
 
-	redisplay_track_list ();
-}
-
-void
-Mixer_UI::show_track_list_menu ()
-{
-	if (track_menu == 0) {
-		build_track_menu ();
-	}
-
-	track_menu->popup (1, gtk_get_current_event_time());
+	sync_treeview_from_presentation_info (Properties::order);
 }
 
 bool
 Mixer_UI::track_display_button_press (GdkEventButton* ev)
 {
 	if (Keyboard::is_context_menu_event (ev)) {
-		show_track_list_menu ();
+		if (track_menu == 0) {
+			build_track_menu ();
+		}
+		track_menu->popup (ev->button, ev->time);
 		return true;
 	}
+	if ((ev->type == GDK_BUTTON_PRESS) && (ev->button == 1)) {
+		TreeModel::Path path;
+		TreeViewColumn* column;
+		int cellx, celly;
+		if (track_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) {
+			TreeIter iter = track_model->get_iter (path);
+			if ((*iter)[stripable_columns.visible]) {
+				boost::shared_ptr<ARDOUR::Stripable> s = (*iter)[stripable_columns.stripable];
+				move_stripable_into_view (s);
+			}
+		}
+	}
 
 	return false;
 }
 
+void
+Mixer_UI::move_stripable_into_view (boost::shared_ptr<ARDOUR::Stripable> s)
+{
+	if (!scroller.get_hscrollbar()) {
+		return;
+	}
+	if (s->presentation_info().special () || s->presentation_info().flag_match (PresentationInfo::VCA)) {
+		return;
+	}
+#ifdef MIXBUS
+	if (s->mixbus ()) {
+		return;
+	}
+#endif
+	bool found = false;
+	int x0 = 0;
+	Gtk::Allocation alloc;
+	for (list<MixerStrip *>::const_iterator i = strips.begin(); i != strips.end(); ++i) {
+		if ((*i)->route() == s) {
+			int y;
+			found = true;
+			(*i)->translate_coordinates (strip_packer, 0, 0, x0, y);
+			alloc = (*i)->get_allocation ();
+			break;
+		}
+	}
+	if (!found) {
+		return;
+	}
+
+	Adjustment* adj = scroller.get_hscrollbar()->get_adjustment();
+
+	if (x0 < adj->get_value()) {
+		adj->set_value (max (adj->get_lower(), min (adj->get_upper(), (double) x0)));
+	} else if (x0 + alloc.get_width() >= adj->get_value() + adj->get_page_size()) {
+		int x1 = x0 + alloc.get_width() - adj->get_page_size();
+		adj->set_value (max (adj->get_lower(), min (adj->get_upper(), (double) x1)));
+	}
+}
+
 void
 Mixer_UI::build_track_menu ()
 {
@@ -1470,24 +1691,43 @@ Mixer_UI::build_track_menu ()
 }
 
 void
-Mixer_UI::strip_property_changed (const PropertyChange& what_changed, MixerStrip* mx)
+Mixer_UI::stripable_property_changed (const PropertyChange& what_changed, boost::weak_ptr<Stripable> ws)
 {
-	if (!what_changed.contains (ARDOUR::Properties::name)) {
+	if (!what_changed.contains (ARDOUR::Properties::hidden) && !what_changed.contains (ARDOUR::Properties::name)) {
 		return;
 	}
 
-	ENSURE_GUI_THREAD (*this, &Mixer_UI::strip_name_changed, what_changed, mx)
+	boost::shared_ptr<Stripable> s = ws.lock ();
+
+	if (!s) {
+		return;
+	}
 
 	TreeModel::Children rows = track_model->children();
 	TreeModel::Children::iterator i;
 
 	for (i = rows.begin(); i != rows.end(); ++i) {
-		if ((*i)[stripable_columns.strip] == mx) {
-			(*i)[stripable_columns.text] = mx->route()->name();
+		boost::shared_ptr<Stripable> ss = (*i)[stripable_columns.stripable];
+
+		if (s == ss) {
+
+			if (what_changed.contains (ARDOUR::Properties::name)) {
+				(*i)[stripable_columns.text] = s->name();
+			}
+
+			if (what_changed.contains (ARDOUR::Properties::hidden)) {
+				(*i)[stripable_columns.visible] = !s->presentation_info().hidden();
+				redisplay_track_list ();
+			}
+
 			return;
 		}
 	}
 
+	if (s->is_master ()) {
+		return;
+	}
+
 	error << _("track display list item for renamed strip not found!") << endmsg;
 }
 
@@ -1500,13 +1740,17 @@ Mixer_UI::group_display_button_press (GdkEventButton* ev)
 	int celly;
 
 	if (!group_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) {
-		_group_tabs->get_menu(0)->popup (1, ev->time);
+		if (ev->button == 3) {
+			_group_tabs->get_menu(0)->popup (ev->button, ev->time);
+		}
 		return true;
 	}
 
 	TreeIter iter = group_model->get_iter (path);
 	if (!iter) {
-		_group_tabs->get_menu(0)->popup (1, ev->time);
+		if (ev->button == 3) {
+			_group_tabs->get_menu(0)->popup (ev->button, ev->time);
+		}
 		return true;
 	}
 
@@ -1518,7 +1762,7 @@ Mixer_UI::group_display_button_press (GdkEventButton* ev)
 	}
 
 	switch (GPOINTER_TO_UINT (column->get_data (X_("colnum")))) {
-	case 0:
+	case 1:
 		if (Keyboard::is_edit_event (ev)) {
 			if (group) {
 				// edit_route_group (group);
@@ -1530,7 +1774,7 @@ Mixer_UI::group_display_button_press (GdkEventButton* ev)
 		}
 		break;
 
-	case 1:
+	case 0:
 	{
 		bool visible = (*iter)[group_columns.visible];
 		(*iter)[group_columns.visible] = !visible;
@@ -1596,9 +1840,7 @@ Mixer_UI::route_groups_changed ()
 void
 Mixer_UI::new_route_group ()
 {
-	RouteList rl;
-
-	_group_tabs->run_new_group_dialog (rl, false);
+	_group_tabs->run_new_group_dialog (0, false);
 }
 
 void
@@ -1796,7 +2038,7 @@ Mixer_UI::add_route_group (RouteGroup* group)
 
 	if (focus) {
 		TreeViewColumn* col = group_display.get_column (0);
-		CellRendererText* name_cell = dynamic_cast<CellRendererText*>(group_display.get_column_cell_renderer (0));
+		CellRendererText* name_cell = dynamic_cast<CellRendererText*>(group_display.get_column_cell_renderer (1));
 		group_display.set_cursor (group_model->get_path (row), *col, *name_cell, true);
 	}
 
@@ -1821,7 +2063,6 @@ Mixer_UI::strip_scroller_button_release (GdkEventButton* ev)
 void
 Mixer_UI::scroller_drag_data_received (const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, const Gtk::SelectionData& data, guint info, guint time)
 {
-	printf ("Mixer_UI::scroller_drag_data_received\n");
 	if (data.get_target() != "PluginFavoritePtr") {
 		context->drag_finish (false, false, time);
 		return;
@@ -1843,7 +2084,7 @@ Mixer_UI::scroller_drag_data_received (const Glib::RefPtr<Gdk::DragContext>& con
 		if (!pip->is_instrument ()) {
 			continue;
 		}
-		ARDOUR_UI::instance()->session_add_midi_track ((RouteGroup*) 0, 1, _("MIDI"), Config->get_strict_io (), pip, ppp->_preset.valid ? &ppp->_preset : 0, PresentationInfo::max_order);
+		ARDOUR_UI::instance()->session_add_midi_route (true, (RouteGroup*) 0, 1, _("MIDI"), Config->get_strict_io (), pip, ppp->_preset.valid ? &ppp->_preset : 0, PresentationInfo::max_order);
 		ok = true;
 	}
 
@@ -1886,27 +2127,21 @@ private:
 int
 Mixer_UI::set_state (const XMLNode& node, int version)
 {
-	XMLProperty const * prop;
-	LocaleGuard lg;
+	bool yn;
 
 	Tabbable::set_state (node, version);
 
-	if ((prop = node.property ("narrow-strips"))) {
-		if (string_is_affirmative (prop->value())) {
+	if (node.get_property ("narrow-strips", yn)) {
+		if (yn) {
 			set_strip_width (Narrow);
 		} else {
 			set_strip_width (Wide);
 		}
 	}
 
-	if ((prop = node.property ("show-mixer"))) {
-		if (string_is_affirmative (prop->value())) {
-		       _visible = true;
-		}
-	}
+	node.get_property ("show-mixer", _visible);
 
-	if ((prop = node.property ("maximised"))) {
-		bool yn = string_is_affirmative (prop->value());
+	if (node.get_property ("maximised", yn)) {
 		Glib::RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleMaximalMixer"));
 		assert (act);
 		Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
@@ -1916,8 +2151,7 @@ Mixer_UI::set_state (const XMLNode& node, int version)
 		}
 	}
 
-	if ((prop = node.property ("show-mixer-list"))) {
-		bool yn = string_is_affirmative (prop->value());
+	if (node.get_property ("show-mixer-list", yn)) {
 		Glib::RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleMixerList"));
 		assert (act);
 		Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
@@ -1927,65 +2161,107 @@ Mixer_UI::set_state (const XMLNode& node, int version)
 		tact->set_active (yn);
 	}
 
+	if (node.get_property ("monitor-section-visible", yn)) {
+		Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleMonitorSection");
+		Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
+		/* do it twice to force the change */
+		tact->set_active (yn);
+		show_monitor_section (yn);
+	}
 
-	XMLNode* plugin_order;
-	if ((plugin_order = find_named_node (node, "PluginOrder")) != 0) {
+	//check for the user's plugin_order file
+	XMLNode plugin_order_new(X_("PO"));
+	if (PluginManager::instance().load_plugin_order_file(plugin_order_new)) {
 		store_current_favorite_order ();
 		std::list<string> order;
-		const XMLNodeList& kids = plugin_order->children("PluginInfo");
+		const XMLNodeList& kids = plugin_order_new.children("PluginInfo");
 		XMLNodeConstIterator i;
 		for (i = kids.begin(); i != kids.end(); ++i) {
-			if ((prop = (*i)->property ("unique-id"))) {
-				std::string unique_id = prop->value();
+			std::string unique_id;
+			if ((*i)->get_property ("unique-id", unique_id)) {
 				order.push_back (unique_id);
-				if ((prop = (*i)->property ("expanded"))) {
-					favorite_ui_state[unique_id] = string_is_affirmative (prop->value());
+				if ((*i)->get_property ("expanded", yn)) {
+					favorite_ui_state[unique_id] = yn;
 				}
 			}
 		}
 		PluginStateSorter cmp (order);
 		favorite_order.sort (cmp);
 		sync_treeview_from_favorite_order ();
+
+	} else {
+		//if there is no user file, then use an existing one from instant.xml
+		//NOTE: if you are loading an old session, this might come from the session's instant.xml
+		//Todo:  in the next major version, we should probably stop doing the instant.xml check, and just use the new file
+		XMLNode* plugin_order;
+		if ((plugin_order = find_named_node (node, "PluginOrder")) != 0) {
+			store_current_favorite_order ();
+			std::list<string> order;
+			const XMLNodeList& kids = plugin_order->children("PluginInfo");
+			XMLNodeConstIterator i;
+			for (i = kids.begin(); i != kids.end(); ++i) {
+				std::string unique_id;
+				if ((*i)->get_property ("unique-id", unique_id)) {
+					order.push_back (unique_id);
+					if ((*i)->get_property ("expanded", yn)) {
+						favorite_ui_state[unique_id] = yn;
+					}
+				}
+			}
+
+			PluginStateSorter cmp (order);
+			favorite_order.sort (cmp);
+			sync_treeview_from_favorite_order ();
+		}
 	}
+
 	return 0;
 }
 
-XMLNode&
-Mixer_UI::get_state ()
+void
+Mixer_UI::save_plugin_order_file ()
 {
-	XMLNode* node = new XMLNode (X_("Mixer"));
-	char buf[128];
-	LocaleGuard lg;
+	//this writes the plugin order to the user's preference file ( plugin_metadata/plugin_order )
 
-	node->add_child_nocopy (Tabbable::get_state());
-
-	snprintf(buf,sizeof(buf), "%f", rhs_pane1.get_divider());
-	node->add_property(X_("mixer-rhs-pane1-pos"), string(buf));
-	snprintf(buf,sizeof(buf), "%f", rhs_pane2.get_divider());
-	node->add_property(X_("mixer-rhs_pane2-pos"), string(buf));
-	snprintf(buf,sizeof(buf), "%f", list_hpane.get_divider());
-	node->add_property(X_("mixer-list-hpane-pos"), string(buf));
-	snprintf(buf,sizeof(buf), "%f", inner_pane.get_divider());
-	node->add_property(X_("mixer-inner-pane-pos"), string(buf));
-
-	node->add_property ("narrow-strips", _strip_width == Narrow ? "yes" : "no");
-	node->add_property ("show-mixer", _visible ? "yes" : "no");
-	node->add_property ("show-mixer-list", _show_mixer_list ? "yes" : "no");
-	node->add_property ("maximised", _maximised ? "yes" : "no");
+	//NOTE:  this replaces the old code that stores info in instant.xml
+	//why?  because instant.xml prefers the per-session settings, and we want this to be a global pref
 
 	store_current_favorite_order ();
-	XMLNode* plugin_order = new XMLNode ("PluginOrder");
-	int cnt = 0;
+	XMLNode plugin_order ("PluginOrder");
+	uint32_t cnt = 0;
 	for (PluginInfoList::const_iterator i = favorite_order.begin(); i != favorite_order.end(); ++i, ++cnt) {
 		XMLNode* p = new XMLNode ("PluginInfo");
-		p->add_property ("sort", cnt);
-		p->add_property ("unique-id", (*i)->unique_id);
+		p->set_property ("sort", cnt);
+		p->set_property ("unique-id", (*i)->unique_id);
 		if (favorite_ui_state.find ((*i)->unique_id) != favorite_ui_state.end ()) {
-			p->add_property ("expanded", favorite_ui_state[(*i)->unique_id]);
+			p->set_property ("expanded", favorite_ui_state[(*i)->unique_id]);
 		}
-		plugin_order->add_child_nocopy (*p);
+		plugin_order.add_child_nocopy (*p);
 	}
-	node->add_child_nocopy (*plugin_order);
+	PluginManager::instance().save_plugin_order_file( plugin_order );
+}
+
+XMLNode&
+Mixer_UI::get_state ()
+{
+	XMLNode* node = new XMLNode (X_("Mixer"));
+
+	node->add_child_nocopy (Tabbable::get_state());
+
+	node->set_property (X_("mixer-rhs-pane1-pos"), rhs_pane1.get_divider());
+	node->set_property (X_("mixer-rhs_pane2-pos"), rhs_pane2.get_divider());
+	node->set_property (X_("mixer-list-hpane-pos"), list_hpane.get_divider());
+	node->set_property (X_("mixer-inner-pane-pos"),  inner_pane.get_divider());
+
+	node->set_property ("narrow-strips", (_strip_width == Narrow));
+	node->set_property ("show-mixer", _visible);
+	node->set_property ("show-mixer-list", _show_mixer_list);
+	node->set_property ("maximised", _maximised);
+
+	Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleMonitorSection");
+	Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
+	assert (tact);
+	node->set_property ("monitor-section-visible", tact->get_active ());
 
 	return *node;
 }
@@ -1995,8 +2271,31 @@ Mixer_UI::scroll_left ()
 {
 	if (!scroller.get_hscrollbar()) return;
 	Adjustment* adj = scroller.get_hscrollbar()->get_adjustment();
-	/* stupid GTK: can't rely on clamping across versions */
-	scroller.get_hscrollbar()->set_value (max (adj->get_lower(), adj->get_value() - adj->get_step_increment()));
+	int sc_w = scroller.get_width();
+	int sp_w = strip_packer.get_width();
+	if (sp_w <= sc_w) {
+		return;
+	}
+	int lp = adj->get_value();
+	int lm = 0;
+	using namespace Gtk::Box_Helpers;
+	const BoxList& strips = strip_packer.children();
+	for (BoxList::const_iterator i = strips.begin(); i != strips.end(); ++i) {
+		if (i->get_widget() == & add_button) {
+			continue;
+		}
+#ifdef MIXBUS
+		if (i->get_widget() == &mb_shadow) {
+			continue;
+		}
+#endif
+		lm += i->get_widget()->get_width ();
+		if (lm >= lp) {
+			lm -= i->get_widget()->get_width ();
+			break;
+		}
+	}
+	scroller.get_hscrollbar()->set_value (max (adj->get_lower(), min (adj->get_upper(), lm - 1.0)));
 }
 
 void
@@ -2004,8 +2303,30 @@ Mixer_UI::scroll_right ()
 {
 	if (!scroller.get_hscrollbar()) return;
 	Adjustment* adj = scroller.get_hscrollbar()->get_adjustment();
-	/* stupid GTK: can't rely on clamping across versions */
-	scroller.get_hscrollbar()->set_value (min (adj->get_upper(), adj->get_value() + adj->get_step_increment()));
+	int sc_w = scroller.get_width();
+	int sp_w = strip_packer.get_width();
+	if (sp_w <= sc_w) {
+		return;
+	}
+	int lp = adj->get_value();
+	int lm = 0;
+	using namespace Gtk::Box_Helpers;
+	const BoxList& strips = strip_packer.children();
+	for (BoxList::const_iterator i = strips.begin(); i != strips.end(); ++i) {
+		if (i->get_widget() == & add_button) {
+			continue;
+		}
+#ifdef MIXBUS
+		if (i->get_widget() == &mb_shadow) {
+			continue;
+		}
+#endif
+		lm += i->get_widget()->get_width ();
+		if (lm > lp + 1) {
+			break;
+		}
+	}
+	scroller.get_hscrollbar()->set_value (max (adj->get_lower(), min (adj->get_upper(), lm - 1.0)));
 }
 
 bool
@@ -2053,10 +2374,6 @@ Mixer_UI::parameter_changed (string const & p)
 		for (list<MixerStrip*>::iterator i = strips.begin(); i != strips.end(); ++i) {
 			(*i)->set_width_enum (s ? Narrow : Wide, this);
 		}
-	} else if (p == "use-monitor-bus") {
-		if (_session && !_session->monitor_out()) {
-			monitor_section_detached ();
-		}
 	}
 }
 
@@ -2082,13 +2399,13 @@ Mixer_UI::setup_track_display ()
 {
 	track_model = ListStore::create (stripable_columns);
 	track_display.set_model (track_model);
-	track_display.append_column (_("Strips"), stripable_columns.text);
 	track_display.append_column (_("Show"), stripable_columns.visible);
+	track_display.append_column (_("Strips"), stripable_columns.text);
 	track_display.get_column (0)->set_data (X_("colnum"), GUINT_TO_POINTER(0));
 	track_display.get_column (1)->set_data (X_("colnum"), GUINT_TO_POINTER(1));
-	track_display.get_column (0)->set_expand(true);
-	track_display.get_column (1)->set_expand(false);
-	track_display.get_column (0)->set_sizing (Gtk::TREE_VIEW_COLUMN_FIXED);
+	track_display.get_column (0)->set_expand(false);
+	track_display.get_column (1)->set_expand(true);
+	track_display.get_column (1)->set_sizing (Gtk::TREE_VIEW_COLUMN_FIXED);
 	track_display.set_name (X_("EditGroupList"));
 	track_display.get_selection()->set_mode (Gtk::SELECTION_NONE);
 	track_display.set_reorderable (true);
@@ -2098,7 +2415,7 @@ Mixer_UI::setup_track_display ()
 	track_model->signal_row_deleted().connect (sigc::mem_fun (*this, &Mixer_UI::track_list_delete));
 	track_model->signal_rows_reordered().connect (sigc::mem_fun (*this, &Mixer_UI::track_list_reorder));
 
-	CellRendererToggle* track_list_visible_cell = dynamic_cast<CellRendererToggle*>(track_display.get_column_cell_renderer (1));
+	CellRendererToggle* track_list_visible_cell = dynamic_cast<CellRendererToggle*>(track_display.get_column_cell_renderer (0));
 	track_list_visible_cell->property_activatable() = true;
 	track_list_visible_cell->property_radio() = false;
 	track_list_visible_cell->signal_toggled().connect (sigc::mem_fun (*this, &Mixer_UI::track_visibility_changed));
@@ -2112,16 +2429,6 @@ Mixer_UI::setup_track_display ()
 	v->show ();
 	v->pack_start (track_display_scroller, true, true);
 
-	Button* b = manage (new Button);
-	b->show ();
-	Widget* w = manage (new Image (Stock::ADD, ICON_SIZE_BUTTON));
-	w->show ();
-	b->add (*w);
-
-	b->signal_clicked().connect (sigc::mem_fun (*this, &Mixer_UI::new_track_or_bus));
-
-	v->pack_start (*b, false, false);
-
 	track_display_frame.set_name("BaseFrame");
 	track_display_frame.set_shadow_type (Gtk::SHADOW_IN);
 	track_display_frame.add (*v);
@@ -2188,12 +2495,12 @@ Mixer_UI::strip_by_x (int x)
 }
 
 void
-Mixer_UI::set_route_targets_for_operation ()
+Mixer_UI::set_axis_targets_for_operation ()
 {
-	_route_targets.clear ();
+	_axis_targets.clear ();
 
 	if (!_selection.empty()) {
-		_route_targets = _selection.routes;
+		_axis_targets = _selection.axes;
 		return;
 	}
 
@@ -2205,6 +2512,22 @@ void
 Mixer_UI::monitor_section_going_away ()
 {
 	if (_monitor_section) {
+		XMLNode* ui_node = Config->extra_xml(X_("UI"));
+		/* immediate state save.
+		 *
+		 * Tearoff settings are otherwise only stored during
+		 * save_ardour_state(). The mon-section may or may not
+		 * exist at that point.
+		 * */
+		if (ui_node) {
+			XMLNode* tearoff_node = ui_node->child (X_("Tearoffs"));
+			if (tearoff_node) {
+				tearoff_node->remove_nodes_and_delete (X_("monitor-section"));
+				XMLNode* t = new XMLNode (X_("monitor-section"));
+				_monitor_section->tearoff().add_state (*t);
+				tearoff_node->add_child_nocopy (*t);
+			}
+		}
 		monitor_section_detached ();
 		out_packer.remove (_monitor_section->tearoff());
 		_monitor_section->set_session (0);
@@ -2219,13 +2542,13 @@ Mixer_UI::toggle_midi_input_active (bool flip_others)
 	boost::shared_ptr<RouteList> rl (new RouteList);
 	bool onoff = false;
 
-	set_route_targets_for_operation ();
+	set_axis_targets_for_operation ();
 
-	for (RouteUISelection::iterator r = _route_targets.begin(); r != _route_targets.end(); ++r) {
-		boost::shared_ptr<MidiTrack> mt = (*r)->midi_track();
+	for (AxisViewSelection::iterator r = _axis_targets.begin(); r != _axis_targets.end(); ++r) {
+		boost::shared_ptr<MidiTrack> mt = boost::dynamic_pointer_cast<MidiTrack> ((*r)->stripable());
 
 		if (mt) {
-			rl->push_back ((*r)->route());
+			rl->push_back (mt);
 			onoff = !mt->input_active();
 		}
 	}
@@ -2269,7 +2592,7 @@ Mixer_UI::monitor_section_attached ()
 	Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleMonitorSection");
 	Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
 	act->set_sensitive (true);
-	tact->set_active ();
+	show_monitor_section (tact->get_active ());
 }
 
 void
@@ -2309,9 +2632,24 @@ Mixer_UI::refiller (PluginInfoList& result, const PluginInfoList& plugs)
 {
 	PluginManager& manager (PluginManager::instance());
 	for (PluginInfoList::const_iterator i = plugs.begin(); i != plugs.end(); ++i) {
+
+		/* not a Favorite? skip it */
 		if (manager.get_status (*i) != PluginManager::Favorite) {
 			continue;
 		}
+
+		/* Check the tag combo selection, and skip this plugin if it doesn't match the selected tag(s) */
+		string test = favorite_plugins_tag_combo.get_active_text();
+		if (test != _("Show All")) {
+			vector<string> tags = manager.get_tags(*i);
+
+			//does the selected tag match any of the tags in the plugin?
+			vector<string>::iterator tt =  find (tags.begin(), tags.end(), test);
+			if (tt == tags.end()) {
+				continue;
+			}
+		}
+
 		result.push_back (*i);
 	}
 }
@@ -2355,6 +2693,9 @@ Mixer_UI::refill_favorite_plugins ()
 #ifdef LXVST_SUPPORT
 	refiller (plugs, mgr.lxvst_plugin_info ());
 #endif
+#ifdef MACVST_SUPPORT
+	refiller (plugs, mgr.mac_vst_plugin_info ());
+#endif
 #ifdef AUDIOUNIT_SUPPORT
 	refiller (plugs, mgr.au_plugin_info ());
 #endif
@@ -2371,6 +2712,30 @@ Mixer_UI::refill_favorite_plugins ()
 	sync_treeview_from_favorite_order ();
 }
 
+void
+Mixer_UI::plugin_list_changed ()
+{
+	refill_favorite_plugins();
+	refill_tag_combo();
+}
+
+void
+Mixer_UI::refill_tag_combo ()
+{
+	PluginManager& mgr (PluginManager::instance());
+
+	std::vector<std::string> tags = mgr.get_all_tags (PluginManager::OnlyFavorites);
+
+	favorite_plugins_tag_combo.clear();
+	favorite_plugins_tag_combo.append_text (_("Show All"));
+
+	for (vector<string>::iterator t = tags.begin (); t != tags.end (); ++t) {
+		favorite_plugins_tag_combo.append_text (*t);
+	}
+
+	favorite_plugins_tag_combo.set_active_text (_("Show All"));
+}
+
 void
 Mixer_UI::sync_treeview_favorite_ui_state (const TreeModel::Path& path, const TreeModel::iterator&)
 {
@@ -2426,7 +2791,7 @@ Mixer_UI::popup_note_context_menu (GdkEventButton *ev)
 	Gtk::Menu* m = manage (new Menu);
 	MenuList& items = m->items ();
 
-	if (_selection.routes.empty()) {
+	if (_selection.axes.empty()) {
 		items.push_back (MenuElem (_("No Track/Bus is selected.")));
 	} else {
 		items.push_back (MenuElem (_("Add at the top"),
@@ -2457,7 +2822,7 @@ Mixer_UI::popup_note_context_menu (GdkEventButton *ev)
 bool
 Mixer_UI::plugin_row_button_press (GdkEventButton *ev)
 {
-	if ((ev->type == GDK_BUTTON_PRESS) && (ev->button == 3) ) {
+	if ((ev->type == GDK_BUTTON_PRESS) && (ev->button == 3)) {
 		TreeModel::Path path;
 		TreeViewColumn* column;
 		int cellx, celly;
@@ -2543,17 +2908,23 @@ Mixer_UI::plugin_row_activated (const TreeModel::Path& path, TreeViewColumn* col
 void
 Mixer_UI::add_favorite_processor (ARDOUR::PluginPresetPtr ppp, ProcessorPosition pos)
 {
-	if (!_session || _selection.routes.empty()) {
+	if (!_session || _selection.axes.empty()) {
 		return;
 	}
 
 	PluginInfoPtr pip = ppp->_pip;
-	for (RouteUISelection::iterator i = _selection.routes.begin(); i != _selection.routes.end(); ++i) {
-		boost::shared_ptr<ARDOUR::Route> rt = (*i)->route();
-		if (!rt) { continue; }
+	for (AxisViewSelection::iterator i = _selection.axes.begin(); i != _selection.axes.end(); ++i) {
+		boost::shared_ptr<ARDOUR::Route> rt = boost::dynamic_pointer_cast<ARDOUR::Route> ((*i)->stripable());
+
+		if (!rt) {
+			continue;
+		}
 
 		PluginPtr p = pip->load (*_session);
-		if (!p) { continue; }
+
+		if (!p) {
+			continue;
+		}
 
 		if (ppp->_preset.valid) {
 			p->load_preset (ppp->_preset);
@@ -2655,18 +3026,266 @@ Mixer_UI::do_vca_unassign (boost::shared_ptr<VCA> vca)
 }
 
 void
-Mixer_UI::show_vca_slaves (boost::shared_ptr<VCA> vca)
+Mixer_UI::show_spill (boost::shared_ptr<Stripable> s)
 {
-	boost::shared_ptr<VCA> v = spilled_vca.lock();
-	if (v != vca) {
-		spilled_vca = vca;
-		show_vca_change (vca); /* EMIT SIGNAL */
+	boost::shared_ptr<Stripable> ss = spilled_strip.lock();
+	if (ss != s) {
+		spilled_strip = s;
+		show_spill_change (s); /* EMIT SIGNAL */
+		if (s) {
+			_group_tabs->hide ();
+		} else {
+			_group_tabs->show ();
+		}
 		redisplay_track_list ();
 	}
 }
 
 bool
-Mixer_UI::showing_vca_slaves_for (boost::shared_ptr<VCA> vca) const
+Mixer_UI::showing_spill_for (boost::shared_ptr<Stripable> s) const
+{
+	return s == spilled_strip.lock();
+}
+
+void
+Mixer_UI::show_editor_window () const
+{
+	PublicEditor::instance().make_visible ();
+}
+
+void
+Mixer_UI::register_actions ()
+{
+	Glib::RefPtr<ActionGroup> group = myactions.create_action_group (X_("Mixer"));
+
+	myactions.register_action (group, "show-editor", _("Show Editor"), sigc::mem_fun (*this, &Mixer_UI::show_editor_window));
+
+	myactions.register_action (group, "solo", _("Toggle Solo on Mixer-Selected Tracks/Busses"), sigc::mem_fun (*this, &Mixer_UI::solo_action));
+	myactions.register_action (group, "mute", _("Toggle Mute on Mixer-Selected Tracks/Busses"), sigc::mem_fun (*this, &Mixer_UI::mute_action));
+	myactions.register_action (group, "recenable", _("Toggle Rec-enable on Mixer-Selected Tracks/Busses"), sigc::mem_fun (*this, &Mixer_UI::rec_enable_action));
+	myactions.register_action (group, "increment-gain", _("Decrease Gain on Mixer-Selected Tracks/Busses"), sigc::mem_fun (*this, &Mixer_UI::step_gain_up_action));
+	myactions.register_action (group, "decrement-gain", _("Increase Gain on Mixer-Selected Tracks/Busses"), sigc::mem_fun (*this, &Mixer_UI::step_gain_down_action));
+	myactions.register_action (group, "unity-gain", _("Set Gain to 0dB on Mixer-Selected Tracks/Busses"), sigc::mem_fun (*this, &Mixer_UI::unity_gain_action));
+
+
+	myactions.register_action (group, "copy-processors", _("Copy Selected Processors"), sigc::mem_fun (*this, &Mixer_UI::copy_processors));
+	myactions.register_action (group, "cut-processors", _("Cut Selected Processors"), sigc::mem_fun (*this, &Mixer_UI::cut_processors));
+	myactions.register_action (group, "paste-processors", _("Paste Selected Processors"), sigc::mem_fun (*this, &Mixer_UI::paste_processors));
+	myactions.register_action (group, "delete-processors", _("Delete Selected Processors"), sigc::mem_fun (*this, &Mixer_UI::delete_processors));
+	myactions.register_action (group, "select-all-processors", _("Select All (visible) Processors"), sigc::mem_fun (*this, &Mixer_UI::select_all_processors));
+	myactions.register_action (group, "toggle-processors", _("Toggle Selected Processors"), sigc::mem_fun (*this, &Mixer_UI::toggle_processors));
+	myactions.register_action (group, "ab-plugins", _("Toggle Selected Plugins"), sigc::mem_fun (*this, &Mixer_UI::ab_plugins));
+	myactions.register_action (group, "select-none", _("Deselect all strips and processors"), sigc::mem_fun (*this, &Mixer_UI::select_none));
+	myactions.register_action (group, "select-all-tracks", _("Select All Tracks"), sigc::mem_fun (*this, &Mixer_UI::select_all_tracks));
+
+	myactions.register_action (group, "scroll-left", _("Scroll Mixer Window to the left"), sigc::mem_fun (*this, &Mixer_UI::scroll_left));
+	myactions.register_action (group, "scroll-right", _("Scroll Mixer Window to the right"), sigc::mem_fun (*this, &Mixer_UI::scroll_right));
+
+	myactions.register_action (group, "toggle-midi-input-active", _("Toggle MIDI Input Active for Mixer-Selected Tracks/Busses"),
+	                           sigc::bind (sigc::mem_fun (*this, &Mixer_UI::toggle_midi_input_active), false));
+}
+
+void
+Mixer_UI::load_bindings ()
+{
+	bindings = Bindings::get_bindings (X_("Mixer"), myactions);
+}
+
+template<class T> void
+Mixer_UI::control_action (boost::shared_ptr<T> (Stripable::*get_control)() const)
+{
+	boost::shared_ptr<ControlList> cl (new ControlList);
+	boost::shared_ptr<AutomationControl> ac;
+	bool val = false;
+	bool have_val = false;
+
+	set_axis_targets_for_operation ();
+
+	BOOST_FOREACH(AxisView* r, _axis_targets) {
+		boost::shared_ptr<Stripable> s = r->stripable();
+		if (s) {
+			ac = (s.get()->*get_control)();
+			if (ac) {
+				cl->push_back (ac);
+				if (!have_val) {
+					val = !ac->get_value();
+					have_val = true;
+				}
+			}
+		}
+	}
+
+	_session->set_controls (cl,  val, Controllable::UseGroup);
+}
+
+void
+Mixer_UI::solo_action ()
+{
+	control_action (&Stripable::solo_control);
+}
+
+void
+Mixer_UI::mute_action ()
+{
+	control_action (&Stripable::mute_control);
+}
+
+void
+Mixer_UI::rec_enable_action ()
+{
+	control_action (&Stripable::rec_enable_control);
+}
+
+AutomationControlSet
+Mixer_UI::selected_gaincontrols ()
+{
+	set_axis_targets_for_operation ();
+	AutomationControlSet rv;
+	BOOST_FOREACH(AxisView* r, _axis_targets) {
+		MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
+		if (ms) {
+			boost::shared_ptr<GainControl> ac (ms->route()->gain_control());
+			ControlList cl (ac->grouped_controls());
+			for (ControlList::const_iterator c = cl.begin(); c != cl.end (); ++c) {
+				rv.insert (*c);
+			}
+			rv.insert (ac);
+		}
+	}
+	return rv;
+}
+
+void
+Mixer_UI::step_gain_up_action ()
+{
+	AutomationControlSet acs = selected_gaincontrols ();
+	for (AutomationControlSet::const_iterator i = acs.begin(); i != acs.end (); ++i) {
+		boost::shared_ptr<GainControl> ac = boost::dynamic_pointer_cast<GainControl> (*i);
+		assert (ac);
+		ac->set_value (dB_to_coefficient (accurate_coefficient_to_dB (ac->get_value()) + 0.1), Controllable::NoGroup);
+	}
+}
+
+void
+Mixer_UI::step_gain_down_action ()
 {
-       return vca == spilled_vca.lock();
+	AutomationControlSet acs = selected_gaincontrols ();
+	for (AutomationControlSet::const_iterator i = acs.begin(); i != acs.end (); ++i) {
+		boost::shared_ptr<GainControl> ac = boost::dynamic_pointer_cast<GainControl> (*i);
+		assert (ac);
+		ac->set_value (dB_to_coefficient (accurate_coefficient_to_dB (ac->get_value()) - 0.1), Controllable::NoGroup);
+	}
+}
+
+void
+Mixer_UI::unity_gain_action ()
+{
+	set_axis_targets_for_operation ();
+
+	BOOST_FOREACH(AxisView* r, _axis_targets) {
+		boost::shared_ptr<Stripable> s = r->stripable();
+		if (s) {
+			boost::shared_ptr<AutomationControl> ac = s->gain_control();
+			if (ac) {
+				ac->set_value (1.0, Controllable::UseGroup);
+			}
+		}
+	}
+}
+
+void
+Mixer_UI::copy_processors ()
+{
+	set_axis_targets_for_operation ();
+
+	BOOST_FOREACH(AxisView* r, _axis_targets) {
+		MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
+		if (ms) {
+			ms->copy_processors ();
+		}
+	}
+}
+void
+Mixer_UI::cut_processors ()
+{
+	set_axis_targets_for_operation ();
+
+	BOOST_FOREACH(AxisView* r, _axis_targets) {
+		MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
+		if (ms) {
+			ms->cut_processors ();
+		}
+	}
+}
+void
+Mixer_UI::paste_processors ()
+{
+	set_axis_targets_for_operation ();
+
+	BOOST_FOREACH(AxisView* r, _axis_targets) {
+		MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
+		if (ms) {
+			ms->paste_processors ();
+		}
+	}
+}
+void
+Mixer_UI::select_all_processors ()
+{
+	set_axis_targets_for_operation ();
+
+	BOOST_FOREACH(AxisView* r, _axis_targets) {
+		MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
+		if (ms) {
+			ms->select_all_processors ();
+		}
+	}
+}
+void
+Mixer_UI::toggle_processors ()
+{
+	set_axis_targets_for_operation ();
+
+	BOOST_FOREACH(AxisView* r, _axis_targets) {
+		MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
+		if (ms) {
+			ms->toggle_processors ();
+		}
+	}
+}
+void
+Mixer_UI::ab_plugins ()
+{
+	set_axis_targets_for_operation ();
+
+	BOOST_FOREACH(AxisView* r, _axis_targets) {
+		MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
+		if (ms) {
+			ms->ab_plugins ();
+		}
+	}
+}
+
+void
+Mixer_UI::vca_assign (boost::shared_ptr<VCA> vca)
+{
+	set_axis_targets_for_operation ();
+	BOOST_FOREACH(AxisView* r, _axis_targets) {
+		MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
+		if (ms) {
+			ms->vca_assign (vca);
+		}
+	}
+}
+
+void
+Mixer_UI::vca_unassign (boost::shared_ptr<VCA> vca)
+{
+	set_axis_targets_for_operation ();
+	BOOST_FOREACH(AxisView* r, _axis_targets) {
+		MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
+		if (ms) {
+			ms->vca_unassign (vca);
+		}
+	}
 }