first pass at making the GUI for a VCA visible
[ardour.git] / gtk2_ardour / mixer_ui.cc
index 474d2c00a223d9452960f86780fea051d5c8ab00..5e45b9338c00e040302a7f266def9c485a9b344f 100644 (file)
 #include <gtkmm/accelmap.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/midi_track.h"
 #include "ardour/plugin_manager.h"
 #include "ardour/route_group.h"
 #include "ardour/route_sorters.h"
 #include "ardour/session.h"
+#include "ardour/vca.h"
+#include "ardour/vca_manager.h"
 
 #include "keyboard.h"
 #include "mixer_ui.h"
@@ -57,6 +63,9 @@
 #include "actions.h"
 #include "gui_thread.h"
 #include "mixer_group_tabs.h"
+#include "timers.h"
+#include "ui_config.h"
+#include "vca_master_strip.h"
 
 #include "i18n.h"
 
@@ -74,42 +83,50 @@ using PBD::Unwinder;
 Mixer_UI* Mixer_UI::_instance = 0;
 
 Mixer_UI*
-Mixer_UI::instance () 
+Mixer_UI::instance ()
 {
        if (!_instance) {
                _instance  = new Mixer_UI;
-       } 
+       }
 
        return _instance;
 }
 
 Mixer_UI::Mixer_UI ()
-       : Window (Gtk::WINDOW_TOPLEVEL)
-       , VisibilityTracker (*((Gtk::Window*) this))
-       , _visible (false)
+       : Tabbable (_content, _("Mixer"))
        , no_track_list_redisplay (false)
        , in_group_row_change (false)
        , track_menu (0)
        , _monitor_section (0)
-       , _strip_width (Config->get_default_narrow_ms() ? Narrow : Wide)
+       , _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)
        , _maximised (false)
+       , _show_mixer_list (true)
 {
-       /* allow this window to become the key focus window */
-       set_flags (CAN_FOCUS);
-
        Route::SyncOrderKeys.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::sync_treeview_from_order_keys, this), gui_context());
 
+       /* bindings was already set in MixerActor constructor */
+
+       _content.set_data ("ardour-bindings", bindings);
+
        scroller.set_can_default (true);
-       set_default (scroller);
+       // set_default (scroller);
 
        scroller_base.set_flags (Gtk::CAN_FOCUS);
        scroller_base.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
        scroller_base.set_name ("MixerWindow");
        scroller_base.signal_button_release_event().connect (sigc::mem_fun(*this, &Mixer_UI::strip_scroller_button_release));
+
+       /* set up drag-n-drop */
+       vector<TargetEntry> target_table;
+       target_table.push_back (TargetEntry ("PluginFavoritePtr"));
+       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
        strip_packer.pack_end (scroller_base, true, true);
 
@@ -137,6 +154,7 @@ Mixer_UI::Mixer_UI ()
        group_display.set_reorderable (true);
        group_display.set_headers_visible (true);
        group_display.set_rules_hint (true);
+       group_display.set_can_focus(false);
 
        /* name is directly editable */
 
@@ -188,46 +206,69 @@ Mixer_UI::Mixer_UI ()
        group_display_frame.set_shadow_type (Gtk::SHADOW_IN);
        group_display_frame.add (group_display_vbox);
 
-       rhs_pane1.pack1 (track_display_frame);
-       rhs_pane1.pack2 (group_display_frame);
 
-       list_vpacker.pack_start (rhs_pane1, true, true);
+       list<TargetEntry> target_list;
+       target_list.push_back (TargetEntry ("PluginPresetPtr"));
+
+       favorite_plugins_model = PluginTreeStore::create (favorite_plugins_columns);
+       favorite_plugins_display.set_model (favorite_plugins_model);
+       favorite_plugins_display.append_column (_("Favorite Plugins"), favorite_plugins_columns.name);
+       favorite_plugins_display.set_name ("EditGroupList");
+       favorite_plugins_display.get_selection()->set_mode (Gtk::SELECTION_SINGLE);
+       favorite_plugins_display.set_reorderable (false);
+       favorite_plugins_display.set_headers_visible (true);
+       favorite_plugins_display.set_rules_hint (true);
+       favorite_plugins_display.set_can_focus (false);
+       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);
+       favorite_plugins_display.signal_row_activated().connect (sigc::mem_fun (*this, &Mixer_UI::plugin_row_activated));
+       favorite_plugins_display.signal_button_press_event().connect (sigc::mem_fun (*this, &Mixer_UI::plugin_row_button_press), false);
+       favorite_plugins_display.signal_drop.connect (sigc::mem_fun (*this, &Mixer_UI::plugin_drop));
+       favorite_plugins_display.signal_row_expanded().connect (sigc::mem_fun (*this, &Mixer_UI::save_favorite_ui_state));
+       favorite_plugins_display.signal_row_collapsed().connect (sigc::mem_fun (*this, &Mixer_UI::save_favorite_ui_state));
+       favorite_plugins_model->signal_row_has_child_toggled().connect (sigc::mem_fun (*this, &Mixer_UI::sync_treeview_favorite_ui_state));
+
+       favorite_plugins_scroller.add (favorite_plugins_display);
+       favorite_plugins_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
+
+       favorite_plugins_frame.set_name ("BaseFrame");
+       favorite_plugins_frame.set_shadow_type (Gtk::SHADOW_IN);
+       favorite_plugins_frame.add (favorite_plugins_scroller);
+
+       rhs_pane1.pack1 (favorite_plugins_frame, false, true);
+       rhs_pane1.pack2 (track_display_frame);
+       rhs_pane2.pack1 (rhs_pane1);
+       rhs_pane2.pack2 (group_display_frame);
+
+       list_vpacker.pack_start (rhs_pane2, true, true);
 
        global_hpacker.pack_start (scroller, true, true);
-#ifdef GTKOSX
-       /* current gtk-quartz has dirty updates on borders like this one */
-       global_hpacker.pack_start (out_packer, false, false, 0);
-#else
-       global_hpacker.pack_start (out_packer, false, false, 12);
-#endif
-       list_hpane.pack1(list_vpacker, true, true);
+       global_hpacker.pack_start (vca_packer, false, false);
+       global_hpacker.pack_start (out_packer, false, false);
+
+       list_hpane.pack1(list_vpacker, false, true);
        list_hpane.pack2(global_hpacker, true, false);
 
        rhs_pane1.signal_size_allocate().connect (sigc::bind (sigc::mem_fun(*this, &Mixer_UI::pane_allocation_handler),
                                                        static_cast<Gtk::Paned*> (&rhs_pane1)));
+       rhs_pane2.signal_size_allocate().connect (sigc::bind (sigc::mem_fun(*this, &Mixer_UI::pane_allocation_handler),
+                                                       static_cast<Gtk::Paned*> (&rhs_pane2)));
        list_hpane.signal_size_allocate().connect (sigc::bind (sigc::mem_fun(*this, &Mixer_UI::pane_allocation_handler),
                                                         static_cast<Gtk::Paned*> (&list_hpane)));
 
-       global_vpacker.pack_start (list_hpane, true, true);
-
-       add (global_vpacker);
-       set_name ("MixerWindow");
+       _content.pack_start (list_hpane, true, true);
 
        update_title ();
 
-       set_wmclass (X_("ardour_mixer"), PROGRAM_NAME);
-
-       signal_delete_event().connect (sigc::mem_fun (*this, &Mixer_UI::hide_window));
-       add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
-
-       signal_configure_event().connect (sigc::mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler));
-
        route_group_display_button_box->show();
        route_group_add_button->show();
        route_group_remove_button->show();
 
+       _content.show ();
+       _content.set_name ("MixerWindow");
+
        global_hpacker.show();
-       global_vpacker.show();
        scroller.show();
        scroller_base.show();
        scroller_hpacker.show();
@@ -236,28 +277,38 @@ Mixer_UI::Mixer_UI ()
        group_display_button_label.show();
        group_display_button.show();
        group_display_scroller.show();
+       favorite_plugins_scroller.show();
        group_display_vbox.show();
        group_display_frame.show();
+       favorite_plugins_frame.show();
        rhs_pane1.show();
+       rhs_pane2.show();
        strip_packer.show();
+       vca_packer.show();
        out_packer.show();
        list_hpane.show();
        group_display.show();
+       favorite_plugins_display.show();
 
        MixerStrip::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::remove_strip, this, _1), gui_context());
 
-        MonitorSection::setup_knob_images ();
-
 #ifndef DEFER_PLUGIN_SELECTOR_LOAD
        _plugin_selector = new PluginSelector (PluginManager::instance ());
+#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());
+       ARDOUR::Plugin::PresetsChanged.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::refill_favorite_plugins, this), gui_context());
 }
 
 Mixer_UI::~Mixer_UI ()
 {
        if (_monitor_section) {
+               monitor_section_detached ();
                delete _monitor_section;
        }
+       delete _plugin_selector;
 }
 
 void
@@ -266,52 +317,76 @@ Mixer_UI::track_editor_selection ()
        PublicEditor::instance().get_selection().TracksChanged.connect (sigc::mem_fun (*this, &Mixer_UI::follow_editor_selection));
 }
 
-
-void
-Mixer_UI::ensure_float (Window& win)
+Gtk::Window*
+Mixer_UI::use_own_window (bool and_fill_it)
 {
-       win.set_transient_for (*this);
+       bool new_window = !own_window();
+
+       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 ();
+       }
+
+       return win;
 }
 
 void
 Mixer_UI::show_window ()
 {
-       present ();
-       if (!_visible) {
-               set_window_pos_and_size ();
+       Tabbable::show_window ();
 
-               /* show/hide group tabs as required */
-               parameter_changed ("show-group-tabs");
+       /* show/hide group tabs as required */
+       parameter_changed ("show-group-tabs");
 
-               /* now reset each strips width so the right widgets are shown */
-               MixerStrip* ms;
+       /* now reset each strips width so the right widgets are shown */
+       MixerStrip* ms;
 
-               TreeModel::Children rows = track_model->children();
-               TreeModel::Children::iterator ri;
+       TreeModel::Children rows = track_model->children();
+       TreeModel::Children::iterator ri;
 
-               for (ri = rows.begin(); ri != rows.end(); ++ri) {
-                       ms = (*ri)[track_columns.strip];
-                       ms->set_width_enum (ms->get_width_enum (), ms->width_owner());
-                       /* Fix visibility of mixer strip stuff */
-                       ms->parameter_changed (X_("mixer-element-visibility"));
+       for (ri = rows.begin(); ri != rows.end(); ++ri) {
+               ms = (*ri)[track_columns.strip];
+               if (!ms) {
+                       continue;
                }
+               ms->set_width_enum (ms->get_width_enum (), ms->width_owner());
+               /* Fix visibility of mixer strip stuff */
+               ms->parameter_changed (X_("mixer-element-visibility"));
        }
-       
+
        /* force focus into main area */
        scroller_base.grab_focus ();
-
-       _visible = true;
 }
 
-bool
-Mixer_UI::hide_window (GdkEventAny *ev)
+void
+Mixer_UI::add_masters (VCAList& vcas)
 {
-       get_window_pos_and_size ();
+       cerr << "VCA added\n";
+
+       for (VCAList::iterator v = vcas.begin(); v != vcas.end(); ++v) {
+
+               VCAMasterStrip* vms = new VCAMasterStrip (_session, *v);
+
+               TreeModel::Row row = *(track_model->append());
+               row[track_columns.text] = (*v)->name();
+               row[track_columns.visible] = true;
+               row[track_columns.vca] = vms;
+       }
 
-       _visible = false;
-       return just_hide_it(ev, static_cast<Gtk::Window *>(this));
+       redisplay_track_list ();
 }
 
+void
+Mixer_UI::remove_master (VCAMasterStrip* vms)
+{
+}
 
 void
 Mixer_UI::add_strips (RouteList& routes)
@@ -322,6 +397,10 @@ Mixer_UI::add_strips (RouteList& routes)
        for (Gtk::TreeModel::Children::iterator it = track_model->children().begin(); it != track_model->children().end(); ++it) {
                boost::shared_ptr<Route> r = (*it)[track_columns.route];
 
+               if (!r) {
+                       continue;
+               }
+
                if (r->order_key() == (routes.front()->order_key() + routes.size())) {
                        insert_iter = it;
                        break;
@@ -340,66 +419,73 @@ Mixer_UI::add_strips (RouteList& routes)
 
                for (RouteList::iterator x = routes.begin(); x != routes.end(); ++x) {
                        boost::shared_ptr<Route> route = (*x);
-                       
+
                        if (route->is_auditioner()) {
                                continue;
                        }
-                       
+
                        if (route->is_monitor()) {
-                               
+
                                if (!_monitor_section) {
                                        _monitor_section = new MonitorSection (_session);
-                                       
+
                                        XMLNode* mnode = ARDOUR_UI::instance()->tearoff_settings (X_("monitor-section"));
                                        if (mnode) {
                                                _monitor_section->tearoff().set_state (*mnode);
                                        }
-                               } 
-                               
+                               }
+
                                out_packer.pack_end (_monitor_section->tearoff(), false, false);
                                _monitor_section->set_session (_session);
                                _monitor_section->tearoff().show_all ();
-                               
+
+                               _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 ();
+
                                route->DropReferences.connect (*this, invalidator(*this), boost::bind (&Mixer_UI::monitor_section_going_away, this), gui_context());
-                               
+
                                /* no regular strip shown for control out */
-                               
+
                                continue;
                        }
-                       
+
                        strip = new MixerStrip (*this, _session, route);
                        strips.push_back (strip);
 
-                       Config->get_default_narrow_ms() ? _strip_width = Narrow : _strip_width = Wide;
-                       
+                       UIConfiguration::instance().get_default_narrow_ms() ? _strip_width = Narrow : _strip_width = Wide;
+
                        if (strip->width_owner() != strip) {
                                strip->set_width_enum (_strip_width, this);
                        }
-                       
+
                        show_strip (strip);
-                       
+
                        TreeModel::Row row = *(track_model->insert(insert_iter));
                        row[track_columns.text] = route->name();
                        row[track_columns.visible] = strip->route()->is_master() ? true : strip->marked_for_display();
                        row[track_columns.route] = route;
                        row[track_columns.strip] = strip;
+                       row[track_columns.vca] = 0;
 
                        if (!from_scratch) {
                                _selection.add (strip);
                        }
-                       
+
                        route->PropertyChanged.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::strip_property_changed, this, _1, strip), gui_context());
-                       
+
                        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));
                }
 
-       } catch (...) {
+       } 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);
-       
+
        sync_order_keys_from_treeview ();
        redisplay_track_list ();
 }
@@ -439,11 +525,11 @@ Mixer_UI::remove_strip (MixerStrip* strip)
        TreeModel::Children rows = track_model->children();
        TreeModel::Children::iterator ri;
        list<MixerStrip *>::iterator i;
-       
+
        if ((i = find (strips.begin(), strips.end(), strip)) != strips.end()) {
                strips.erase (i);
        }
-       
+
        for (ri = rows.begin(); ri != rows.end(); ++ri) {
                if ((*ri)[track_columns.strip] == strip) {
                         PBD::Unwinder<bool> uw (_route_deletion_in_progress, true);
@@ -461,7 +547,7 @@ Mixer_UI::reset_remote_control_ids ()
        }
 
        TreeModel::Children rows = track_model->children();
-       
+
        if (rows.empty()) {
                return;
        }
@@ -474,18 +560,33 @@ Mixer_UI::reset_remote_control_ids ()
        uint32_t invisible_key = UINT32_MAX;
 
        for (ri = rows.begin(); ri != rows.end(); ++ri) {
+
+               /* skip two special values */
+
+               if (rid == Route::MasterBusRemoteControlID) {
+                       rid++;
+               }
+
+               if (rid == Route::MonitorBusRemoteControlID) {
+                       rid++;
+               }
+
                boost::shared_ptr<Route> route = (*ri)[track_columns.route];
                bool visible = (*ri)[track_columns.visible];
 
+               if (!route) {
+                       continue;
+               }
+
                if (!route->is_master() && !route->is_monitor()) {
-                       
+
                        uint32_t new_rid = (visible ? rid : invisible_key--);
-                       
+
                        if (new_rid != route->remote_control_id()) {
-                               route->set_remote_control_id_explicit (new_rid);        
+                               route->set_remote_control_id_explicit (new_rid);
                                rid_change = true;
                        }
-                       
+
                        if (visible) {
                                rid++;
                        }
@@ -506,7 +607,7 @@ Mixer_UI::sync_order_keys_from_treeview ()
        }
 
        TreeModel::Children rows = track_model->children();
-       
+
        if (rows.empty()) {
                return;
        }
@@ -524,6 +625,10 @@ Mixer_UI::sync_order_keys_from_treeview ()
                boost::shared_ptr<Route> route = (*ri)[track_columns.route];
                bool visible = (*ri)[track_columns.visible];
 
+               if (!route) {
+                       continue;
+               }
+
                uint32_t old_key = route->order_key ();
 
                if (order != old_key) {
@@ -536,10 +641,10 @@ Mixer_UI::sync_order_keys_from_treeview ()
                        uint32_t new_rid = (visible ? rid : invisible_key--);
 
                        if (new_rid != route->remote_control_id()) {
-                               route->set_remote_control_id_explicit (new_rid);        
+                               route->set_remote_control_id_explicit (new_rid);
                                rid_change = true;
                        }
-                       
+
                        if (visible) {
                                rid++;
                        }
@@ -587,6 +692,9 @@ Mixer_UI::sync_treeview_from_order_keys ()
 
        for (TreeModel::Children::iterator ri = rows.begin(); ri != rows.end(); ++ri, ++old_order) {
                boost::shared_ptr<Route> route = (*ri)[track_columns.route];
+               if (!route) {
+                       continue;
+               }
                sorted_routes.push_back (RoutePlusOrderKey (route, old_order, route->order_key ()));
        }
 
@@ -596,7 +704,7 @@ Mixer_UI::sync_treeview_from_order_keys ()
        neworder.assign (sorted_routes.size(), 0);
 
        uint32_t n = 0;
-       
+
        for (OrderKeySortedRoutes::iterator sr = sorted_routes.begin(); sr != sorted_routes.end(); ++sr, ++n) {
 
                neworder[n] = sr->old_display_order;
@@ -620,13 +728,13 @@ Mixer_UI::sync_treeview_from_order_keys ()
 void
 Mixer_UI::follow_editor_selection ()
 {
-       if (!Config->get_link_editor_and_mixer_selection() || _following_editor_selection) {
+       if (_following_editor_selection) {
                return;
        }
 
        _following_editor_selection = true;
        _selection.block_routes_changed (true);
-       
+
        TrackSelection& s (PublicEditor::instance().get_selection().tracks);
 
        _selection.clear_routes ();
@@ -666,24 +774,28 @@ 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) {
+                               /* de-select others */
+                               _selection.set (strip);
+                       }
                } else {
                        if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
                                _selection.add (strip);
                        } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::RangeSelectModifier)) {
 
                                if (!_selection.selected(strip)) {
-                               
+
                                        /* extend selection */
-                                       
+
                                        vector<MixerStrip*> tmp;
                                        bool accumulate = false;
-                                       
+                                       bool found_another = false;
+
                                        tmp.push_back (strip);
 
                                        for (list<MixerStrip*>::iterator i = strips.begin(); i != strips.end(); ++i) {
                                                if ((*i) == strip) {
-                                                       /* hit clicked strip, start accumulating till we hit the first 
+                                                       /* hit clicked strip, start accumulating till we hit the first
                                                           selected strip
                                                        */
                                                        if (accumulate) {
@@ -696,6 +808,7 @@ Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip)
                                                        /* hit selected strip. if currently accumulating others,
                                                           we're done. if not accumulating others, start doing so.
                                                        */
+                                                       found_another = true;
                                                        if (accumulate) {
                                                                /* done */
                                                                break;
@@ -709,9 +822,12 @@ Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip)
                                                }
                                        }
 
-                                       for (vector<MixerStrip*>::iterator i = tmp.begin(); i != tmp.end(); ++i) {
-                                               _selection.add (*i);
-                                       }
+                                       if (found_another) {
+                                               for (vector<MixerStrip*>::iterator i = tmp.begin(); i != tmp.end(); ++i) {
+                                                       _selection.add (*i);
+                                               }
+                                       } else
+                                               _selection.set (strip);  //user wants to start a range selection, but there aren't any others selected yet
                                }
 
                        } else {
@@ -738,8 +854,10 @@ Mixer_UI::set_session (Session* sess)
                return;
        }
 
+       refill_favorite_plugins();
+
        XMLNode* node = ARDOUR_UI::instance()->mixer_settings();
-       set_state (*node);
+       set_state (*node, 0);
 
        update_title ();
 
@@ -753,20 +871,15 @@ Mixer_UI::set_session (Session* sess)
        _session->DirtyChanged.connect (_session_connections, invalidator (*this), boost::bind (&Mixer_UI::update_title, this), gui_context());
        _session->StateSaved.connect (_session_connections, invalidator (*this), boost::bind (&Mixer_UI::update_title, this), gui_context());
 
+       _session->vca_manager().VCAAdded.connect (_session_connections, invalidator (*this), boost::bind (&Mixer_UI::add_masters, this, _1), gui_context());
+
        Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::parameter_changed, this, _1), gui_context ());
 
        route_groups_changed ();
 
        if (_visible) {
                show_window();
-
-               /* Bit of a hack; if we're here, we're opening the mixer because of our
-                  instant XML state having a show-mixer property.  Fix up the corresponding
-                  action state.
-               */
-               ActionManager::check_toggleaction ("<Actions>/Common/toggle-mixer");
        }
-
        start_updating ();
 }
 
@@ -786,9 +899,11 @@ Mixer_UI::session_going_away ()
                delete (*i);
        }
 
-        if (_monitor_section) {
-                _monitor_section->tearoff().hide_visible ();
-        }
+       if (_monitor_section) {
+               _monitor_section->tearoff().hide_visible ();
+       }
+
+       monitor_section_detached ();
 
        strips.clear ();
 
@@ -829,15 +944,17 @@ Mixer_UI::update_track_visibility ()
 
        {
                Unwinder<bool> uw (no_track_list_redisplay, true);
-               
+
                for (i = rows.begin(); i != rows.end(); ++i) {
                        MixerStrip *strip = (*i)[track_columns.strip];
-                       (*i)[track_columns.visible] = strip->marked_for_display ();
+                       if (strip) {
+                               (*i)[track_columns.visible] = strip->marked_for_display ();
+                       }
                }
-               
+
                /* force route order keys catch up with visibility changes
                 */
-               
+
                sync_order_keys_from_treeview ();
        }
 
@@ -881,7 +998,7 @@ Mixer_UI::hide_strip (MixerStrip* ms)
 gint
 Mixer_UI::start_updating ()
 {
-    fast_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (sigc::mem_fun(*this, &Mixer_UI::fast_update_strips));
+    fast_screen_update_connection = Timers::super_rapid_connect (sigc::mem_fun(*this, &Mixer_UI::fast_update_strips));
     return 0;
 }
 
@@ -895,7 +1012,7 @@ Mixer_UI::stop_updating ()
 void
 Mixer_UI::fast_update_strips ()
 {
-       if (is_mapped () && _session) {
+       if (_content.is_mapped () && _session) {
                for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
                        (*i)->fast_update ();
                }
@@ -910,20 +1027,20 @@ Mixer_UI::set_all_strips_visibility (bool yn)
 
        {
                Unwinder<bool> uw (no_track_list_redisplay, true);
-               
+
                for (i = rows.begin(); i != rows.end(); ++i) {
-                       
+
                        TreeModel::Row row = (*i);
                        MixerStrip* strip = row[track_columns.strip];
-                       
-                       if (strip == 0) {
+
+                       if (!strip) {
                                continue;
                        }
-                       
+
                        if (strip->route()->is_master() || strip->route()->is_monitor()) {
                                continue;
                        }
-                       
+
                        (*i)[track_columns.visible] = yn;
                }
        }
@@ -933,41 +1050,48 @@ Mixer_UI::set_all_strips_visibility (bool yn)
 
 
 void
-Mixer_UI::set_all_audio_visibility (int tracks, bool yn)
+Mixer_UI::set_all_audio_midi_visibility (int tracks, bool yn)
 {
        TreeModel::Children rows = track_model->children();
        TreeModel::Children::iterator i;
 
        {
                Unwinder<bool> uw (no_track_list_redisplay, true);
-               
+
                for (i = rows.begin(); i != rows.end(); ++i) {
                        TreeModel::Row row = (*i);
                        MixerStrip* strip = row[track_columns.strip];
-                       
-                       if (strip == 0) {
+
+                       if (!strip) {
                                continue;
                        }
-                       
+
                        if (strip->route()->is_master() || strip->route()->is_monitor()) {
                                continue;
                        }
-                       
+
                        boost::shared_ptr<AudioTrack> at = strip->audio_track();
-                       
+                       boost::shared_ptr<MidiTrack> mt = strip->midi_track();
+
                        switch (tracks) {
                        case 0:
                                (*i)[track_columns.visible] = yn;
                                break;
-                               
+
                        case 1:
                                if (at) { /* track */
                                        (*i)[track_columns.visible] = yn;
                                }
                                break;
-                               
+
                        case 2:
-                               if (!at) { /* bus */
+                               if (!at && !mt) { /* bus */
+                                       (*i)[track_columns.visible] = yn;
+                               }
+                               break;
+
+                       case 3:
+                               if (mt) { /* midi-track */
                                        (*i)[track_columns.visible] = yn;
                                }
                                break;
@@ -993,25 +1117,37 @@ Mixer_UI::show_all_routes ()
 void
 Mixer_UI::show_all_audiobus ()
 {
-       set_all_audio_visibility (2, true);
+       set_all_audio_midi_visibility (2, true);
 }
 void
 Mixer_UI::hide_all_audiobus ()
 {
-       set_all_audio_visibility (2, false);
+       set_all_audio_midi_visibility (2, false);
 }
 
 void
 Mixer_UI::show_all_audiotracks()
 {
-       set_all_audio_visibility (1, true);
+       set_all_audio_midi_visibility (1, true);
 }
 void
 Mixer_UI::hide_all_audiotracks ()
 {
-       set_all_audio_visibility (1, false);
+       set_all_audio_midi_visibility (1, false);
+}
+
+void
+Mixer_UI::show_all_miditracks()
+{
+       set_all_audio_midi_visibility (3, true);
+}
+void
+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*/)
 {
@@ -1024,7 +1160,7 @@ Mixer_UI::track_list_delete (const Gtk::TreeModel::Path&)
 {
        /* this happens as the second step of a DnD within the treeview as well
           as when a row/route is actually deleted.
-           
+
            if it was a deletion then we have to force a redisplay because
            order keys may not have changed.
        */
@@ -1042,16 +1178,27 @@ Mixer_UI::redisplay_track_list ()
 {
        TreeModel::Children rows = track_model->children();
        TreeModel::Children::iterator i;
-       
+
        if (no_track_list_redisplay) {
                return;
        }
 
+       container_clear (vca_packer);
+
        for (i = rows.begin(); i != rows.end(); ++i) {
 
+               VCAMasterStrip* vms = (*i)[track_columns.vca];
+
+               if (vms) {
+                       vca_packer.pack_start (*vms, false, false);
+                       vms->show ();
+                       cerr << "Packed vca into vca_packer\n";
+                       continue;
+               }
+
                MixerStrip* strip = (*i)[track_columns.strip];
 
-               if (strip == 0) {
+               if (!strip) {
                        /* we're in the middle of changing a row, don't worry */
                        continue;
                }
@@ -1103,7 +1250,7 @@ Mixer_UI::strip_width_changed ()
 {
        _group_tabs->set_dirty ();
 
-#ifdef GTKOSX
+#ifdef __APPLE__
        TreeModel::Children rows = track_model->children();
        TreeModel::Children::iterator i;
        long order;
@@ -1141,7 +1288,7 @@ Mixer_UI::initial_track_display ()
                track_model->clear ();
                add_strips (copy);
        }
-       
+
        _session->sync_order_keys ();
 
        redisplay_track_list ();
@@ -1184,6 +1331,8 @@ Mixer_UI::build_track_menu ()
        items.push_back (MenuElem (_("Hide All Audio Tracks"), sigc::mem_fun(*this, &Mixer_UI::hide_all_audiotracks)));
        items.push_back (MenuElem (_("Show All Audio Busses"), sigc::mem_fun(*this, &Mixer_UI::show_all_audiobus)));
        items.push_back (MenuElem (_("Hide All Audio Busses"), sigc::mem_fun(*this, &Mixer_UI::hide_all_audiobus)));
+       items.push_back (MenuElem (_("Show All Midi Tracks"), sigc::mem_fun (*this, &Mixer_UI::show_all_miditracks)));
+       items.push_back (MenuElem (_("Hide All Midi Tracks"), sigc::mem_fun (*this, &Mixer_UI::hide_all_miditracks)));
 
 }
 
@@ -1218,12 +1367,14 @@ 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)) {
-               return false;
+               _group_tabs->get_menu(0)->popup (1, ev->time);
+               return true;
        }
 
        TreeIter iter = group_model->get_iter (path);
        if (!iter) {
-               return false;
+               _group_tabs->get_menu(0)->popup (1, ev->time);
+               return true;
        }
 
        RouteGroup* group = (*iter)[group_columns.group];
@@ -1238,7 +1389,7 @@ Mixer_UI::group_display_button_press (GdkEventButton* ev)
                if (Keyboard::is_edit_event (ev)) {
                        if (group) {
                                // edit_route_group (group);
-#ifdef GTKOSX
+#ifdef __APPLE__
                                group_display.queue_draw();
 #endif
                                return true;
@@ -1250,7 +1401,7 @@ Mixer_UI::group_display_button_press (GdkEventButton* ev)
        {
                bool visible = (*iter)[group_columns.visible];
                (*iter)[group_columns.visible] = !visible;
-#ifdef GTKOSX
+#ifdef __APPLE__
                group_display.queue_draw();
 #endif
                return true;
@@ -1286,6 +1437,14 @@ Mixer_UI::route_groups_changed ()
 
        group_model->clear ();
 
+#if 0
+       /* this is currently not used,
+        * Mixer_UI::group_display_button_press() has a case for it,
+        * and a commented edit_route_group() but that's n/a since 2011.
+        *
+        * This code is left as reminder that
+        * row[group_columns.group] = 0 has special meaning.
+        */
        {
                TreeModel::Row row;
                row = *(group_model->append());
@@ -1293,6 +1452,7 @@ Mixer_UI::route_groups_changed ()
                row[group_columns.text] = (_("-all-"));
                row[group_columns.group] = 0;
        }
+#endif
 
        _session->foreach_route_group (sigc::mem_fun (*this, &Mixer_UI::add_route_group));
 
@@ -1381,6 +1541,40 @@ Mixer_UI::route_group_property_changed (RouteGroup* group, const PropertyChange&
        }
 }
 
+void
+Mixer_UI::show_mixer_list (bool yn)
+{
+       if (yn) {
+               list_vpacker.show ();
+
+               //if user wants to show the pane, we should make sure that it is wide enough to be visible
+               int width = list_hpane.get_position();
+               if (width < 40)
+                       list_hpane.set_position(40);
+       } else {
+               list_vpacker.hide ();
+       }
+
+       _show_mixer_list = yn;
+}
+
+void
+Mixer_UI::show_monitor_section (bool yn)
+{
+       if (!monitor_section()) {
+               return;
+       }
+       if (monitor_section()->tearoff().torn_off()) {
+               return;
+       }
+
+       if (yn) {
+               monitor_section()->tearoff().show();
+       } else {
+               monitor_section()->tearoff().hide();
+       }
+}
+
 void
 Mixer_UI::route_group_name_edit (const std::string& path, const std::string& new_text)
 {
@@ -1489,7 +1683,7 @@ Mixer_UI::strip_scroller_button_release (GdkEventButton* ev)
        using namespace Menu_Helpers;
 
        if (Keyboard::is_context_menu_event (ev)) {
-               ARDOUR_UI::instance()->add_route (this);
+               ARDOUR_UI::instance()->add_route ();
                return true;
        }
 
@@ -1497,73 +1691,76 @@ Mixer_UI::strip_scroller_button_release (GdkEventButton* ev)
 }
 
 void
-Mixer_UI::set_strip_width (Width w, bool save)
+Mixer_UI::scroller_drag_data_received (const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, const Gtk::SelectionData& data, guint info, guint time)
 {
-       _strip_width = w;
+       printf ("Mixer_UI::scroller_drag_data_received\n");
+       if (data.get_target() != "PluginFavoritePtr") {
+               context->drag_finish (false, false, time);
+               return;
+       }
 
-       for (list<MixerStrip*>::iterator i = strips.begin(); i != strips.end(); ++i) {
-               (*i)->set_width_enum (w, save ? (*i)->width_owner() : this);
+       const void * d = data.get_data();
+       const Gtkmm2ext::DnDTreeView<ARDOUR::PluginPresetPtr>* tv = reinterpret_cast<const Gtkmm2ext::DnDTreeView<ARDOUR::PluginPresetPtr>*>(d);                                                   
+
+       PluginPresetList nfos;
+       TreeView* source;
+       tv->get_object_drag_data (nfos, &source);
+
+       Route::ProcessorList pl;
+       bool ok = false;
+
+       for (list<PluginPresetPtr>::const_iterator i = nfos.begin(); i != nfos.end(); ++i) {
+               PluginPresetPtr ppp = (*i);
+               PluginInfoPtr pip = ppp->_pip;
+               if (!pip->is_instrument ()) {
+                       continue;
+               }
+               ARDOUR_UI::instance()->session_add_midi_track (NULL, 1, _("MIDI"), Config->get_strict_io (), pip, ppp->_preset.valid ? &ppp->_preset : 0);
+               ok = true;
        }
+
+       context->drag_finish (ok, false, time);
 }
 
 void
-Mixer_UI::set_window_pos_and_size ()
+Mixer_UI::set_strip_width (Width w, bool save)
 {
-       resize (m_width, m_height);
-       move (m_root_x, m_root_y);
-}
+       _strip_width = w;
 
-       void
-Mixer_UI::get_window_pos_and_size ()
-{
-       get_position(m_root_x, m_root_y);
-       get_size(m_width, m_height);
+       for (list<MixerStrip*>::iterator i = strips.begin(); i != strips.end(); ++i) {
+               (*i)->set_width_enum (w, save ? (*i)->width_owner() : this);
+       }
 }
 
-int
-Mixer_UI::set_state (const XMLNode& node)
-{
-       const XMLProperty* prop;
-       XMLNode* geometry;
-
-       m_width = default_width;
-       m_height = default_height;
-       m_root_x = 1;
-       m_root_y = 1;
 
-       if ((geometry = find_named_node (node, "geometry")) != 0) {
-
-               XMLProperty* prop;
-
-               if ((prop = geometry->property("x_size")) == 0) {
-                       prop = geometry->property ("x-size");
-               }
-               if (prop) {
-                       m_width = atoi(prop->value());
+struct PluginStateSorter {
+public:
+       bool operator() (PluginInfoPtr a, PluginInfoPtr b) const {
+               std::list<std::string>::const_iterator aiter = std::find(_user.begin(), _user.end(), (*a).unique_id);
+               std::list<std::string>::const_iterator biter = std::find(_user.begin(), _user.end(), (*b).unique_id);
+               if (aiter != _user.end() && biter != _user.end()) {
+                       return std::distance (_user.begin(), aiter)  < std::distance (_user.begin(), biter);
                }
-               if ((prop = geometry->property("y_size")) == 0) {
-                       prop = geometry->property ("y-size");
+               if (aiter != _user.end()) {
+                       return true;
                }
-               if (prop) {
-                       m_height = atoi(prop->value());
+               if (biter != _user.end()) {
+                       return false;
                }
+               return ARDOUR::cmp_nocase((*a).name, (*b).name) == -1;
+       }
 
-               if ((prop = geometry->property ("x_pos")) == 0) {
-                       prop = geometry->property ("x-pos");
-               }
-               if (prop) {
-                       m_root_x = atoi (prop->value());
+       PluginStateSorter(std::list<std::string> user) : _user (user)  {}
+private:
+       std::list<std::string> _user;
+};
 
-               }
-               if ((prop = geometry->property ("y_pos")) == 0) {
-                       prop = geometry->property ("y-pos");
-               }
-               if (prop) {
-                       m_root_y = atoi (prop->value());
-               }
-       }
+int
+Mixer_UI::set_state (const XMLNode& node, int version)
+{
+       XMLProperty const * prop;
 
-       set_window_pos_and_size ();
+       Tabbable::set_state (node, version);
 
        if ((prop = node.property ("narrow-strips"))) {
                if (string_is_affirmative (prop->value())) {
@@ -1586,66 +1783,84 @@ Mixer_UI::set_state (const XMLNode& node)
                Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
                bool fs = tact && tact->get_active();
                if (yn ^ fs) {
-                       ActionManager::do_action ("Common",
-                                       "ToggleMaximalMixer");
+                       ActionManager::do_action ("Common", "ToggleMaximalMixer");
                }
        }
 
+       if ((prop = node.property ("show-mixer-list"))) {
+               bool yn = string_is_affirmative (prop->value());
+               Glib::RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleMixerList"));
+               assert (act);
+               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
 
+               /* do it twice to force the change */
+               tact->set_active (!yn);
+               tact->set_active (yn);
+       }
+
+
+       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) {
+                       if ((prop = (*i)->property ("unique-id"))) {
+                               std::string unique_id = prop->value();
+                               order.push_back (unique_id);
+                               if ((prop = (*i)->property ("expanded"))) {
+                                       favorite_ui_state[unique_id] = string_is_affirmative (prop->value());
+                               }
+                       }
+               }
+               PluginStateSorter cmp (order);
+               favorite_order.sort (cmp);
+               sync_treeview_from_favorite_order ();
+       }
        return 0;
 }
 
 XMLNode&
-Mixer_UI::get_state (void)
+Mixer_UI::get_state ()
 {
-       XMLNode* node = new XMLNode ("Mixer");
-
-       if (is_realized()) {
-               Glib::RefPtr<Gdk::Window> win = get_window();
+       XMLNode* node = new XMLNode (X_("Mixer"));
+       char buf[128];
 
-               get_window_pos_and_size ();
+       node->add_child_nocopy (Tabbable::get_state());
 
-               XMLNode* geometry = new XMLNode ("geometry");
-               char buf[32];
-               snprintf(buf, sizeof(buf), "%d", m_width);
-               geometry->add_property(X_("x_size"), string(buf));
-               snprintf(buf, sizeof(buf), "%d", m_height);
-               geometry->add_property(X_("y_size"), string(buf));
-               snprintf(buf, sizeof(buf), "%d", m_root_x);
-               geometry->add_property(X_("x_pos"), string(buf));
-               snprintf(buf, sizeof(buf), "%d", m_root_y);
-               geometry->add_property(X_("y_pos"), string(buf));
-
-               // written only for compatibility, they are not used.
-               snprintf(buf, sizeof(buf), "%d", 0);
-               geometry->add_property(X_("x_off"), string(buf));
-               snprintf(buf, sizeof(buf), "%d", 0);
-               geometry->add_property(X_("y_off"), string(buf));
-
-               snprintf(buf,sizeof(buf), "%d",gtk_paned_get_position (static_cast<Paned*>(&rhs_pane1)->gobj()));
-               geometry->add_property(X_("mixer_rhs_pane1_pos"), string(buf));
-               snprintf(buf,sizeof(buf), "%d",gtk_paned_get_position (static_cast<Paned*>(&list_hpane)->gobj()));
-               geometry->add_property(X_("mixer_list_hpane_pos"), string(buf));
-
-               node->add_child_nocopy (*geometry);
-       }
+       snprintf(buf,sizeof(buf), "%d",gtk_paned_get_position (const_cast<GtkPaned*>(static_cast<const Paned*>(&rhs_pane1)->gobj())));
+       node->add_property(X_("mixer_rhs_pane1_pos"), string(buf));
+       snprintf(buf,sizeof(buf), "%d",gtk_paned_get_position (const_cast<GtkPaned*>(static_cast<const Paned*>(&list_hpane)->gobj())));
+       node->add_property(X_("mixer_list_hpane_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");
 
+       store_current_favorite_order ();
+       XMLNode* plugin_order = new XMLNode ("PluginOrder");
+       int 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);
+               if (favorite_ui_state.find ((*i)->unique_id) != favorite_ui_state.end ()) {
+                       p->add_property ("expanded", favorite_ui_state[(*i)->unique_id]);
+               }
+               plugin_order->add_child_nocopy (*p);
+       }
+       node->add_child_nocopy (*plugin_order);
+
        return *node;
 }
 
-
 void
 Mixer_UI::pane_allocation_handler (Allocation&, Gtk::Paned* which)
 {
        int pos;
-       XMLProperty* prop = 0;
-       char buf[32];
+       XMLProperty const * prop = 0;
        XMLNode* node = ARDOUR_UI::instance()->mixer_settings();
        XMLNode* geometry;
        int height;
@@ -1671,7 +1886,6 @@ Mixer_UI::pane_allocation_handler (Allocation&, Gtk::Paned* which)
 
                if (!geometry || (prop = geometry->property("mixer-rhs-pane1-pos")) == 0) {
                        pos = height / 3;
-                       snprintf (buf, sizeof(buf), "%d", pos);
                } else {
                        pos = atoi (prop->value());
                }
@@ -1680,6 +1894,20 @@ Mixer_UI::pane_allocation_handler (Allocation&, Gtk::Paned* which)
                        rhs_pane1.set_position (pos);
                }
 
+       } else if (which == static_cast<Gtk::Paned*> (&rhs_pane2)) {
+               if (done[1]) {
+                       return;
+               }
+
+               if (!geometry || (prop = geometry->property("mixer-rhs-pane2-pos")) == 0) {
+                       pos = 2 * height / 3;
+               } else {
+                       pos = atoi (prop->value());
+               }
+
+               if ((done[1] = GTK_WIDGET(rhs_pane2.gobj())->allocation.height > pos)) {
+                       rhs_pane2.set_position (pos);
+               }
        } else if (which == static_cast<Gtk::Paned*> (&list_hpane)) {
 
                if (done[2]) {
@@ -1687,10 +1915,9 @@ Mixer_UI::pane_allocation_handler (Allocation&, Gtk::Paned* which)
                }
 
                if (!geometry || (prop = geometry->property("mixer-list-hpane-pos")) == 0) {
-                       pos = 75;
-                       snprintf (buf, sizeof(buf), "%d", pos);
+                       pos = std::max ((float)100, rintf ((float) 125 * UIConfiguration::instance().get_ui_scale()));
                } else {
-                       pos = atoi (prop->value());
+                       pos = max (36, atoi (prop->value ()));
                }
 
                if ((done[2] = GTK_WIDGET(list_hpane.gobj())->allocation.width > pos)) {
@@ -1716,44 +1943,6 @@ Mixer_UI::scroll_right ()
        scroller.get_hscrollbar()->set_value (min (adj->get_upper(), adj->get_value() + adj->get_step_increment()));
 }
 
-bool
-Mixer_UI::on_key_press_event (GdkEventKey* ev)
-{
-        /* focus widget gets first shot, then bindings, otherwise
-           forward to main window
-        */
-
-       if (gtk_window_propagate_key_event (GTK_WINDOW(gobj()), ev)) {
-               return true;
-       }
-
-       KeyboardKey k (ev->state, ev->keyval);
-
-       if (bindings.activate (k, Bindings::Press)) {
-               return true;
-       }
-
-        return forward_key_press (ev);
-}
-
-bool
-Mixer_UI::on_key_release_event (GdkEventKey* ev)
-{
-       if (gtk_window_propagate_key_event (GTK_WINDOW(gobj()), ev)) {
-               return true;
-       }
-
-       KeyboardKey k (ev->state, ev->keyval);
-       
-       if (bindings.activate (k, Bindings::Release)) {
-               return true;
-       }
-
-        /* don't forward releases */
-
-        return true;
-}
-
 bool
 Mixer_UI::on_scroll_event (GdkEventScroll* ev)
 {
@@ -1795,12 +1984,16 @@ Mixer_UI::parameter_changed (string const & p)
                        _group_tabs->hide ();
                }
        } else if (p == "default-narrow_ms") {
-               bool const s = Config->get_default_narrow_ms ();
+               bool const s = UIConfiguration::instance().get_default_narrow_ms ();
                for (list<MixerStrip*>::iterator i = strips.begin(); i != strips.end(); ++i) {
                        (*i)->set_width_enum (s ? Narrow : Wide, this);
                }
        } else if (p == "remote-model") {
                reset_remote_control_ids ();
+       } else if (p == "use-monitor-bus") {
+               if (_session && !_session->monitor_out()) {
+                       monitor_section_detached ();
+               }
        }
 }
 
@@ -1832,10 +2025,12 @@ Mixer_UI::setup_track_display ()
        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.set_name (X_("EditGroupList"));
        track_display.get_selection()->set_mode (Gtk::SELECTION_NONE);
        track_display.set_reorderable (true);
        track_display.set_headers_visible (true);
+       track_display.set_can_focus(false);
 
        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));
@@ -1876,16 +2071,20 @@ Mixer_UI::setup_track_display ()
 void
 Mixer_UI::new_track_or_bus ()
 {
-       ARDOUR_UI::instance()->add_route (this);
+       ARDOUR_UI::instance()->add_route ();
 }
 
 
 void
 Mixer_UI::update_title ()
 {
+       if (!own_window()) {
+               return;
+       }
+
        if (_session) {
                string n;
-               
+
                if (_session->snap_name() != _session->name()) {
                        n = _session->snap_name ();
                } else {
@@ -1895,17 +2094,17 @@ Mixer_UI::update_title ()
                if (_session->dirty ()) {
                        n = "*" + n;
                }
-               
+
                WindowTitle title (n);
                title += S_("Window|Mixer");
                title += Glib::get_application_name ();
-               set_title (title.get_string());
+               own_window()->set_title (title.get_string());
 
        } else {
-               
+
                WindowTitle title (S_("Window|Mixer"));
                title += Glib::get_application_name ();
-               set_title (title.get_string());
+               own_window()->set_title (title.get_string());
        }
 }
 
@@ -1915,7 +2114,7 @@ Mixer_UI::strip_by_x (int x)
        for (list<MixerStrip*>::iterator i = strips.begin(); i != strips.end(); ++i) {
                int x1, x2, y;
 
-               (*i)->translate_coordinates (*this, 0, 0, x1, y);
+               (*i)->translate_coordinates (_content, 0, 0, x1, y);
                x2 = x1 + (*i)->get_width();
 
                if (x >= x1 && x <= x2) {
@@ -1944,8 +2143,11 @@ void
 Mixer_UI::monitor_section_going_away ()
 {
        if (_monitor_section) {
+               monitor_section_detached ();
                out_packer.remove (_monitor_section->tearoff());
                _monitor_section->set_session (0);
+               delete _monitor_section;
+               _monitor_section = 0;
        }
 }
 
@@ -1965,30 +2167,413 @@ Mixer_UI::toggle_midi_input_active (bool flip_others)
                        onoff = !mt->input_active();
                }
        }
-       
+
        _session->set_exclusive_input_active (rl, onoff, flip_others);
 }
 
 void
 Mixer_UI::maximise_mixer_space ()
 {
-       if (_maximised) {
+       if (!own_window()) {
                return;
        }
 
-       fullscreen ();
+       if (_maximised) {
+               return;
+       }
 
+       _window->fullscreen ();
        _maximised = true;
 }
 
 void
 Mixer_UI::restore_mixer_space ()
 {
-       if (!_maximised) {
+       if (!own_window()) {
                return;
        }
 
-       unfullscreen();
+       if (!_maximised) {
+               return;
+       }
 
+       own_window()->unfullscreen();
        _maximised = false;
 }
+
+void
+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 ();
+}
+
+void
+Mixer_UI::monitor_section_detached ()
+{
+       Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleMonitorSection");
+       act->set_sensitive (false);
+}
+
+void
+Mixer_UI::store_current_favorite_order ()
+{
+       typedef Gtk::TreeModel::Children type_children;
+       type_children children = favorite_plugins_model->children();
+       favorite_order.clear();
+       for(type_children::iterator iter = children.begin(); iter != children.end(); ++iter)
+       {
+               Gtk::TreeModel::Row row = *iter;
+               ARDOUR::PluginPresetPtr ppp = row[favorite_plugins_columns.plugin];
+               favorite_order.push_back (ppp->_pip);
+               std::string name = row[favorite_plugins_columns.name];
+               favorite_ui_state[(*ppp->_pip).unique_id] = favorite_plugins_display.row_expanded (favorite_plugins_model->get_path(iter));
+       }
+}
+
+void
+Mixer_UI::save_favorite_ui_state (const TreeModel::iterator& iter, const TreeModel::Path& path)
+{
+       Gtk::TreeModel::Row row = *iter;
+       ARDOUR::PluginPresetPtr ppp = row[favorite_plugins_columns.plugin];
+       assert (ppp);
+       favorite_ui_state[(*ppp->_pip).unique_id] = favorite_plugins_display.row_expanded (favorite_plugins_model->get_path(iter));
+}
+
+void
+Mixer_UI::refiller (PluginInfoList& result, const PluginInfoList& plugs)
+{
+       PluginManager& manager (PluginManager::instance());
+       for (PluginInfoList::const_iterator i = plugs.begin(); i != plugs.end(); ++i) {
+               if (manager.get_status (*i) != PluginManager::Favorite) {
+                       continue;
+               }
+               result.push_back (*i);
+       }
+}
+
+struct PluginCustomSorter {
+public:
+       bool operator() (PluginInfoPtr a, PluginInfoPtr b) const {
+               PluginInfoList::const_iterator aiter = _user.begin();
+               PluginInfoList::const_iterator biter = _user.begin();
+               while (aiter != _user.end()) { if ((*aiter)->unique_id == a->unique_id) { break; } ++aiter; }
+               while (biter != _user.end()) { if ((*biter)->unique_id == b->unique_id) { break; } ++biter; }
+
+               if (aiter != _user.end() && biter != _user.end()) {
+                       return std::distance (_user.begin(), aiter) < std::distance (_user.begin(), biter);
+               }
+               if (aiter != _user.end()) {
+                       return true;
+               }
+               if (biter != _user.end()) {
+                       return false;
+               }
+               return ARDOUR::cmp_nocase((*a).name, (*b).name) == -1;
+       }
+       PluginCustomSorter(PluginInfoList user) : _user (user)  {}
+private:
+       PluginInfoList _user;
+};
+
+void
+Mixer_UI::refill_favorite_plugins ()
+{
+       PluginInfoList plugs;
+       PluginManager& mgr (PluginManager::instance());
+
+#ifdef LV2_SUPPORT
+       refiller (plugs, mgr.lv2_plugin_info ());
+#endif
+#ifdef WINDOWS_VST_SUPPORT
+       refiller (plugs, mgr.windows_vst_plugin_info ());
+#endif
+#ifdef LXVST_SUPPORT
+       refiller (plugs, mgr.lxvst_plugin_info ());
+#endif
+#ifdef AUDIOUNIT_SUPPORT
+       refiller (plugs, mgr.au_plugin_info ());
+#endif
+       refiller (plugs, mgr.ladspa_plugin_info ());
+       refiller (plugs, mgr.lua_plugin_info ());
+
+       store_current_favorite_order ();
+
+       PluginCustomSorter cmp (favorite_order);
+       plugs.sort (cmp);
+
+       favorite_order = plugs;
+
+       sync_treeview_from_favorite_order ();
+}
+
+void
+Mixer_UI::sync_treeview_favorite_ui_state (const TreeModel::Path& path, const TreeModel::iterator&)
+{
+       TreeIter iter;
+       if (!(iter = favorite_plugins_model->get_iter (path))) {
+               return;
+       }
+       ARDOUR::PluginPresetPtr ppp = (*iter)[favorite_plugins_columns.plugin];
+       if (!ppp) {
+               return;
+       }
+       PluginInfoPtr pip = ppp->_pip;
+       if (favorite_ui_state.find (pip->unique_id) != favorite_ui_state.end ()) {
+               if (favorite_ui_state[pip->unique_id]) {
+                       favorite_plugins_display.expand_row (path, true);
+               }
+       }
+}
+
+void
+Mixer_UI::sync_treeview_from_favorite_order ()
+{
+       favorite_plugins_model->clear ();
+       for (PluginInfoList::const_iterator i = favorite_order.begin(); i != favorite_order.end(); ++i) {
+               PluginInfoPtr pip = (*i);
+
+               TreeModel::Row newrow = *(favorite_plugins_model->append());
+               newrow[favorite_plugins_columns.name] = (*i)->name;
+               newrow[favorite_plugins_columns.plugin] = PluginPresetPtr (new PluginPreset(pip));
+               if (!_session) {
+                       continue;
+               }
+
+               vector<ARDOUR::Plugin::PresetRecord> presets = (*i)->get_presets (true);
+               for (vector<ARDOUR::Plugin::PresetRecord>::const_iterator j = presets.begin(); j != presets.end(); ++j) {
+                       Gtk::TreeModel::Row child_row = *(favorite_plugins_model->append (newrow.children()));
+                       child_row[favorite_plugins_columns.name] = (*j).label;
+                       child_row[favorite_plugins_columns.plugin] = PluginPresetPtr (new PluginPreset(pip, &(*j)));
+               }
+               if (favorite_ui_state.find (pip->unique_id) != favorite_ui_state.end ()) {
+                       if (favorite_ui_state[pip->unique_id]) {
+                               favorite_plugins_display.expand_row (favorite_plugins_model->get_path(newrow), true);
+                       }
+               }
+       }
+}
+
+void
+Mixer_UI::popup_note_context_menu (GdkEventButton *ev)
+{
+       using namespace Gtk::Menu_Helpers;
+
+       Gtk::Menu* m = manage (new Menu);
+       MenuList& items = m->items ();
+
+       if (_selection.routes.empty()) {
+               items.push_back (MenuElem (_("No Track/Bus is selected.")));
+       } else {
+               items.push_back (MenuElem (_("Add at the top"),
+                                       sigc::bind (sigc::mem_fun (*this, &Mixer_UI::add_selected_processor), AddTop)));
+               items.push_back (MenuElem (_("Add Pre-Fader"),
+                                       sigc::bind (sigc::mem_fun (*this, &Mixer_UI::add_selected_processor), AddPreFader)));
+               items.push_back (MenuElem (_("Add Post-Fader"),
+                                       sigc::bind (sigc::mem_fun (*this, &Mixer_UI::add_selected_processor), AddPostFader)));
+               items.push_back (MenuElem (_("Add at the end"),
+                                       sigc::bind (sigc::mem_fun (*this, &Mixer_UI::add_selected_processor), AddBottom)));
+       }
+
+       items.push_back (SeparatorElem());
+
+       items.push_back (MenuElem (_("Remove from favorites"), sigc::mem_fun (*this, &Mixer_UI::remove_selected_from_favorites)));
+
+       ARDOUR::PluginPresetPtr ppp = selected_plugin();
+       if (ppp && ppp->_preset.valid && ppp->_preset.user) {
+               // we cannot currently delete AU presets
+               if (!ppp->_pip || ppp->_pip->type != AudioUnit) {
+                       items.push_back (MenuElem (_("Delete Preset"), sigc::mem_fun (*this, &Mixer_UI::delete_selected_preset)));
+               }
+       }
+
+       m->popup (ev->button, ev->time);
+}
+
+bool
+Mixer_UI::plugin_row_button_press (GdkEventButton *ev)
+{
+       if ((ev->type == GDK_BUTTON_PRESS) && (ev->button == 3) ) {
+               TreeModel::Path path;
+               TreeViewColumn* column;
+               int cellx, celly;
+               if (favorite_plugins_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) {
+                       Glib::RefPtr<Gtk::TreeView::Selection> selection = favorite_plugins_display.get_selection();
+                       if (selection) {
+                               selection->unselect_all();
+                               selection->select(path);
+                       }
+               }
+               ARDOUR::PluginPresetPtr ppp = selected_plugin();
+               if (ppp) {
+                       popup_note_context_menu (ev);
+               }
+       }
+       return false;
+}
+
+
+PluginPresetPtr
+Mixer_UI::selected_plugin ()
+{
+       Glib::RefPtr<Gtk::TreeView::Selection> selection = favorite_plugins_display.get_selection();
+       if (!selection) {
+               return PluginPresetPtr();
+       }
+       Gtk::TreeModel::iterator iter = selection->get_selected();
+       if (!iter) {
+               return PluginPresetPtr();
+       }
+       return (*iter)[favorite_plugins_columns.plugin];
+}
+
+void
+Mixer_UI::add_selected_processor (ProcessorPosition pos)
+{
+       ARDOUR::PluginPresetPtr ppp = selected_plugin();
+       if (ppp) {
+               add_favorite_processor (ppp, pos);
+       }
+}
+
+void
+Mixer_UI::delete_selected_preset ()
+{
+       if (!_session) {
+               return;
+       }
+       ARDOUR::PluginPresetPtr ppp = selected_plugin();
+       if (!ppp || !ppp->_preset.valid || !ppp->_preset.user) {
+               return;
+       }
+       PluginPtr plugin = ppp->_pip->load (*_session);
+       plugin->get_presets();
+       plugin->remove_preset (ppp->_preset.label);
+}
+
+void
+Mixer_UI::remove_selected_from_favorites ()
+{
+       ARDOUR::PluginPresetPtr ppp = selected_plugin();
+       if (!ppp) {
+               return;
+       }
+       PluginManager::PluginStatusType status = PluginManager::Normal;
+       PluginManager& manager (PluginManager::instance());
+
+       manager.set_status (ppp->_pip->type, ppp->_pip->unique_id, status);
+       manager.save_statuses ();
+}
+
+void
+Mixer_UI::plugin_row_activated (const TreeModel::Path& path, TreeViewColumn* column)
+{
+       TreeIter iter;
+       if (!(iter = favorite_plugins_model->get_iter (path))) {
+               return;
+       }
+       ARDOUR::PluginPresetPtr ppp = (*iter)[favorite_plugins_columns.plugin];
+       add_favorite_processor (ppp, AddPreFader); // TODO: preference?!
+}
+
+void
+Mixer_UI::add_favorite_processor (ARDOUR::PluginPresetPtr ppp, ProcessorPosition pos)
+{
+       if (!_session || _selection.routes.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; }
+
+               PluginPtr p = pip->load (*_session);
+               if (!p) { continue; }
+
+               if (ppp->_preset.valid) {
+                       p->load_preset (ppp->_preset);
+               }
+
+               Route::ProcessorStreams err;
+               boost::shared_ptr<Processor> processor (new PluginInsert (*_session, p));
+
+               switch (pos) {
+                       case AddTop:
+                               rt->add_processor_by_index (processor, 0, &err, Config->get_new_plugins_active ());
+                               break;
+                       case AddPreFader:
+                               rt->add_processor (processor, PreFader, &err, Config->get_new_plugins_active ());
+                               break;
+                       case AddPostFader:
+                               {
+                                       int idx = 0;
+                                       int pos = 0;
+                                       for (;;++idx) {
+                                               boost::shared_ptr<Processor> np = rt->nth_processor (idx);
+                                               if (!np) {
+                                                       break;
+                                               }
+                                               if (!np->display_to_user()) {
+                                                       continue;
+                                               }
+                                               if (boost::dynamic_pointer_cast<Amp> (np) && // Fader, not Trim
+                                                               boost::dynamic_pointer_cast<Amp> (np)->gain_control()->parameter().type() == GainAutomation) {
+                                                       break;
+                                               }
+                                               ++pos;
+                                       }
+                                       rt->add_processor_by_index (processor, ++pos, &err, Config->get_new_plugins_active ());
+                               }
+                               break;
+                       case AddBottom:
+                               rt->add_processor_by_index (processor, -1, &err, Config->get_new_plugins_active ());
+                               break;
+               }
+       }
+}
+
+bool
+PluginTreeStore::row_drop_possible_vfunc(const Gtk::TreeModel::Path& dest, const Gtk::SelectionData& data) const
+{
+       if (data.get_target() != "GTK_TREE_MODEL_ROW") {
+               return false;
+       }
+
+       // only allow to re-order top-level items
+       TreePath src;
+       if (TreePath::get_from_selection_data (data, src)) {
+               if (src.up() && src.up()) {
+                       return false;
+               }
+       }
+
+       // don't allow to drop as child-rows.
+       Gtk::TreeModel::Path _dest = dest; // un const
+       const bool is_child = _dest.up (); // explicit bool for clang
+       if (!is_child || _dest.empty ()) {
+               return true;
+       }
+       return false;
+}
+
+void
+Mixer_UI::plugin_drop (const Glib::RefPtr<Gdk::DragContext>&, const Gtk::SelectionData& data)
+{
+       if (data.get_target() != "PluginPresetPtr") {
+               return;
+       }
+       if (data.get_length() != sizeof (PluginPresetPtr)) {
+               return;
+       }
+       const void *d = data.get_data();
+       const PluginPresetPtr ppp = *(static_cast<const PluginPresetPtr*> (d));
+
+       PluginManager::PluginStatusType status = PluginManager::Favorite;
+       PluginManager& manager (PluginManager::instance());
+
+       manager.set_status (ppp->_pip->type, ppp->_pip->unique_id, status);
+       manager.save_statuses ();
+}