Prepare generic spill ([mix]busses)
[ardour.git] / gtk2_ardour / mixer_ui.cc
index fb3701b8b6e7c24a0e30f5079662556a1e81e075..4f87e04c7a1fd90cfd62d5351b6d2796c330c5e1 100644 (file)
@@ -25,6 +25,8 @@
 #include <map>
 #include <sigc++/bind.h>
 
+#include <boost/foreach.hpp>
+
 #include <gtkmm/accelmap.h>
 
 #include "pbd/convert.h"
@@ -69,7 +71,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;
@@ -108,13 +110,14 @@ Mixer_UI::Mixer_UI ()
        , _following_editor_selection (false)
        , _maximised (false)
        , _show_mixer_list (true)
+       , myactions (X_("mixer"))
 {
-       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::sync_treeview_from_presentation_info, this), gui_context());
+
        scroller.set_can_default (true);
        // set_default (scroller);
 
@@ -134,9 +137,12 @@ Mixer_UI::Mixer_UI ()
 
        _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 +151,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 +167,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;
 
@@ -221,6 +228,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);
@@ -246,17 +254,7 @@ Mixer_UI::Mixer_UI ()
 
        list_vpacker.pack_start (rhs_pane2, true, true);
 
-       string vca_text = _("Control Masters");
-       Gtk::HBox* vca_top_padding = manage (new Gtk::HBox);
-       vca_top_padding->set_size_request (-1, 2);
-       vca_vpacker.pack_start (*vca_top_padding, false, false);
-
-       vca_label.set_text (vca_text);
-       vca_label_bar.set_size_request (-1, 16); /* must match height in GroupTabs::set_size_request() */
-
-       vca_label_bar.set_name (X_("VCALabelBar"));
-       vca_label_bar.add (vca_label);
-
+       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);
@@ -279,6 +277,7 @@ Mixer_UI::Mixer_UI ()
        list_hpane.set_check_divider_position (true);
        list_hpane.add (list_vpacker);
        list_hpane.add (global_hpacker);
+       list_hpane.set_child_minsize (list_vpacker, 1);
 
 
        XMLNode const * settings = ARDOUR_UI::instance()->mixer_settings();
@@ -343,7 +342,6 @@ Mixer_UI::Mixer_UI ()
        rhs_pane2.show();
        strip_packer.show();
        inner_pane.show();
-       vca_top_padding->show ();
        vca_scroller.show();
        vca_vpacker.show();
        vca_hpacker.show();
@@ -403,7 +401,6 @@ Mixer_UI::use_own_window (bool 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 ();
@@ -616,7 +613,7 @@ Mixer_UI::add_stripables (StripableList& slist)
 
                        (*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;
@@ -709,6 +706,14 @@ Mixer_UI::sync_presentation_info_from_treeview ()
        bool change = false;
        uint32_t order = 0;
 
+       OrderingKeys sorted;
+       const size_t cmp_max = rows.size ();
+
+       // special case master if it's got PI order 0 lets keep it there
+       if (_session->master_out() && (_session->master_out()->presentation_info().order() == 0)) {
+               order++;
+       }
+
        for (ri = rows.begin(); ri != rows.end(); ++ri) {
                bool visible = (*ri)[stripable_columns.visible];
                boost::shared_ptr<Stripable> stripable = (*ri)[stripable_columns.stripable];
@@ -731,17 +736,37 @@ Mixer_UI::sync_presentation_info_from_treeview ()
 
                stripable->presentation_info().set_hidden (!visible);
 
+               // master may not get set here, but if it is zero keep it there
+               if (stripable->is_master() && (stripable->presentation_info().order() == 0)) {
+                       continue;
+               }
+
                if (order != stripable->presentation_info().order()) {
-                       stripable->set_presentation_order_explicit (order);
+                       stripable->set_presentation_order (order, false);
                        change = true;
                }
 
+               sorted.push_back (OrderKeys (order, stripable, cmp_max));
+
                ++order;
        }
 
+       if (!change) {
+               // VCA (and Mixbus) special cases according to SortByNewDisplayOrder
+               uint32_t n = 0;
+               SortByNewDisplayOrder cmp;
+               sort (sorted.begin(), sorted.end(), cmp);
+               for (OrderingKeys::iterator sr = sorted.begin(); sr != sorted.end(); ++sr, ++n) {
+                       if (sr->old_display_order != n) {
+                               change = true;
+                       }
+               }
+       }
+
        if (change) {
                DEBUG_TRACE (DEBUG::OrderKeys, "... notify PI change from mixer GUI\n");
                _session->notify_presentation_info_change ();
+               _session->set_dirty();
        }
 }
 
@@ -769,10 +794,11 @@ Mixer_UI::sync_treeview_from_presentation_info ()
        }
 
        OrderingKeys sorted;
+       const size_t cmp_max = rows.size ();
 
        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 (OrderKeys (old_order, stripable, cmp_max));
        }
 
        SortByNewDisplayOrder cmp;
@@ -814,11 +840,11 @@ Mixer_UI::follow_editor_selection ()
        _selection.clear_routes ();
 
        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);
+               TimeAxisView* tav = dynamic_cast<TimeAxisView*> (*i);
+               if (tav) {
+                       AxisView* axis = axis_by_stripable (tav->stripable());
+                       if (axis) {
+                               _selection.add (axis);
                        }
                }
        }
@@ -829,9 +855,9 @@ Mixer_UI::follow_editor_selection ()
 
 
 MixerStrip*
-Mixer_UI::strip_by_route (boost::shared_ptr<Route> r)
+Mixer_UI::strip_by_route (boost::shared_ptr<Route> r) const
 {
-       for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
+       for (list<MixerStrip *>::const_iterator i = strips.begin(); i != strips.end(); ++i) {
                if ((*i)->route() == r) {
                        return (*i);
                }
@@ -840,6 +866,18 @@ Mixer_UI::strip_by_route (boost::shared_ptr<Route> r)
        return 0;
 }
 
+AxisView*
+Mixer_UI::axis_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);
+               }
+       }
+
+       return 0;
+}
+
 bool
 Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip)
 {
@@ -848,7 +886,7 @@ Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *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) {
+                       } else if (_selection.axes.size() > 1) {
                                /* de-select others */
                                _selection.set (strip);
                        }
@@ -920,6 +958,10 @@ Mixer_UI::set_session (Session* sess)
 
        _group_tabs->set_session (sess);
 
+       if (_monitor_section) {
+               _monitor_section->set_session (_session);
+       }
+
        if (!_session) {
                return;
        }
@@ -1040,7 +1082,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;
                }
        }
@@ -1058,7 +1101,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;
                }
        }
@@ -1246,8 +1290,18 @@ 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::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::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];
                MixerStrip* strip = dynamic_cast<MixerStrip*> (av);
@@ -1266,7 +1320,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) {
 
                        if (strip->packed()) {
                                strip_packer.reorder_child (*strip, -1); /* put at end */
@@ -1292,11 +1354,13 @@ 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();
@@ -1442,6 +1506,7 @@ Mixer_UI::initial_track_display ()
        }
 
        redisplay_track_list ();
+       sync_treeview_from_presentation_info ();
 }
 
 void
@@ -1461,10 +1526,54 @@ Mixer_UI::track_display_button_press (GdkEventButton* ev)
                show_track_list_menu ();
                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;
+       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);
+                       break;
+               }
+       }
+       if (!found) {
+               return;
+       }
+
+       Adjustment* adj = scroller.get_hscrollbar()->get_adjustment();
+       scroller.get_hscrollbar()->set_value (max (adj->get_lower(), min (adj->get_upper(), x0 - 1.0)));
+}
+
 void
 Mixer_UI::build_track_menu ()
 {
@@ -1550,7 +1659,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);
@@ -1562,7 +1671,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;
@@ -1826,7 +1935,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);
        }
 
@@ -2025,8 +2134,23 @@ 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) {
+               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
@@ -2034,8 +2158,22 @@ 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) {
+               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
@@ -2112,13 +2250,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);
@@ -2128,7 +2266,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));
@@ -2218,12 +2356,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;
        }
 
@@ -2249,13 +2387,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();
                }
        }
@@ -2385,6 +2523,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
@@ -2456,7 +2597,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"),
@@ -2573,17 +2714,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);
@@ -2685,13 +2832,13 @@ 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 */
-               if (vca) {
+       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 ();
@@ -2701,7 +2848,230 @@ Mixer_UI::show_vca_slaves (boost::shared_ptr<VCA> vca)
 }
 
 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 vca == spilled_vca.lock();
+       return s == spilled_strip.lock();
+}
+
+void
+Mixer_UI::register_actions ()
+{
+       Glib::RefPtr<ActionGroup> group = myactions.create_action_group (X_("Mixer"));
+
+       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, "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);
+}
+
+void
+Mixer_UI::step_gain_up_action ()
+{
+       set_axis_targets_for_operation ();
+
+       BOOST_FOREACH(AxisView* r, _axis_targets) {
+               MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
+               if (ms) {
+                       ms->step_gain_up ();
+               }
+       }
+}
+
+void
+Mixer_UI::step_gain_down_action ()
+{
+       set_axis_targets_for_operation ();
+
+       BOOST_FOREACH(AxisView* r, _axis_targets) {
+               MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
+               if (ms) {
+                       ms->step_gain_down ();
+               }
+       }
+}
+
+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 ();
+#if 0
+       BOOST_FOREACH(AxisView* r, _axis_targets) {
+               MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
+               if (ms) {
+                       ms->vca_assign (vca);
+               }
+       }
+#endif
+}
+
+void
+Mixer_UI::vca_unassign (boost::shared_ptr<VCA> vca)
+{
+       set_axis_targets_for_operation ();
+#if 0
+       BOOST_FOREACH(AxisView* r, _axis_targets) {
+               MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
+               if (ms) {
+                       ms->vca_unassign (vca);
+               }
+       }
+#endif
 }