quick hack: hide unfinished processor sidebar for 4.5 release
[ardour.git] / gtk2_ardour / mixer_ui.cc
index d6ed651e48ae4b534dcde47a43e64c842a8e536f..f0dc9ee254879744cafd0529cd1e4ec6158b8a6e 100644 (file)
@@ -43,6 +43,7 @@
 #include "ardour/route_group.h"
 #include "ardour/route_sorters.h"
 #include "ardour/session.h"
+#include "ardour/revision.h" // XXX remove after 4.5 release
 
 #include "keyboard.h"
 #include "mixer_ui.h"
@@ -58,6 +59,7 @@
 #include "gui_thread.h"
 #include "mixer_group_tabs.h"
 #include "timers.h"
+#include "ui_config.h"
 
 #include "i18n.h"
 
@@ -75,11 +77,11 @@ 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;
 }
@@ -92,12 +94,14 @@ Mixer_UI::Mixer_UI ()
        , in_group_row_change (false)
        , track_menu (0)
        , _monitor_section (0)
-       , _strip_width (ARDOUR_UI::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);
@@ -138,6 +142,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 */
 
@@ -189,23 +194,47 @@ 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);
+       favorite_plugins_model = ListStore::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_MULTIPLE); // XXX needs focus/keyboard
+       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(), "PluginInfoPtr");
+
+       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);
+
+       //  XXX remove after 4.5 release
+       if (!strcmp (ARDOUR::revision, "4.5") || strcmp (PROGRAM_NAME, "Ardour")) {
+               rhs_pane2.pack1 (track_display_frame);
+               rhs_pane2.pack2 (group_display_frame);
+       } else {
+               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_pane1, true, true);
+       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, 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)));
 
@@ -237,26 +266,37 @@ 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();
        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());
 
 #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());
+       refill_favorite_plugins();
 }
 
 Mixer_UI::~Mixer_UI ()
 {
        if (_monitor_section) {
+               monitor_section_detached ();
                delete _monitor_section;
        }
+       delete _plugin_selector;
 }
 
 void
@@ -295,7 +335,7 @@ Mixer_UI::show_window ()
                        ms->parameter_changed (X_("mixer-element-visibility"));
                }
        }
-       
+
        /* force focus into main area */
        scroller_base.grab_focus ();
 
@@ -339,44 +379,49 @@ 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);
 
-                       ARDOUR_UI::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();
@@ -386,9 +431,9 @@ Mixer_UI::add_strips (RouteList& routes)
                        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));
                }
@@ -398,7 +443,7 @@ Mixer_UI::add_strips (RouteList& routes)
 
        no_track_list_redisplay = false;
        track_display.set_model (track_model);
-       
+
        sync_order_keys_from_treeview ();
        redisplay_track_list ();
 }
@@ -438,11 +483,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);
@@ -460,7 +505,7 @@ Mixer_UI::reset_remote_control_ids ()
        }
 
        TreeModel::Children rows = track_model->children();
-       
+
        if (rows.empty()) {
                return;
        }
@@ -475,11 +520,11 @@ Mixer_UI::reset_remote_control_ids ()
        for (ri = rows.begin(); ri != rows.end(); ++ri) {
 
                /* skip two special values */
-               
+
                if (rid == Route::MasterBusRemoteControlID) {
                        rid++;
                }
-               
+
                if (rid == Route::MonitorBusRemoteControlID) {
                        rid++;
                }
@@ -488,14 +533,14 @@ Mixer_UI::reset_remote_control_ids ()
                bool visible = (*ri)[track_columns.visible];
 
                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++;
                        }
@@ -516,7 +561,7 @@ Mixer_UI::sync_order_keys_from_treeview ()
        }
 
        TreeModel::Children rows = track_model->children();
-       
+
        if (rows.empty()) {
                return;
        }
@@ -546,10 +591,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++;
                        }
@@ -606,7 +651,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;
@@ -630,13 +675,13 @@ Mixer_UI::sync_treeview_from_order_keys ()
 void
 Mixer_UI::follow_editor_selection ()
 {
-       if (!ARDOUR_UI::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 ();
@@ -676,25 +721,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) {
@@ -774,12 +822,6 @@ Mixer_UI::set_session (Session* sess)
 
        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 ();
@@ -801,9 +843,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 ();
 
@@ -844,15 +888,15 @@ 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 ();
                }
-               
+
                /* force route order keys catch up with visibility changes
                 */
-               
+
                sync_order_keys_from_treeview ();
        }
 
@@ -925,20 +969,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) {
                                continue;
                        }
-                       
+
                        if (strip->route()->is_master() || strip->route()->is_monitor()) {
                                continue;
                        }
-                       
+
                        (*i)[track_columns.visible] = yn;
                }
        }
@@ -948,41 +992,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) {
                                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;
@@ -1008,25 +1059,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*/)
 {
@@ -1039,7 +1102,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.
        */
@@ -1057,7 +1120,7 @@ Mixer_UI::redisplay_track_list ()
 {
        TreeModel::Children rows = track_model->children();
        TreeModel::Children::iterator i;
-       
+
        if (no_track_list_redisplay) {
                return;
        }
@@ -1156,7 +1219,7 @@ Mixer_UI::initial_track_display ()
                track_model->clear ();
                add_strips (copy);
        }
-       
+
        _session->sync_order_keys ();
 
        redisplay_track_list ();
@@ -1199,6 +1262,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)));
 
 }
 
@@ -1233,12 +1298,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];
@@ -1405,6 +1472,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)
 {
@@ -1537,13 +1638,36 @@ Mixer_UI::set_window_pos_and_size ()
        move (m_root_x, m_root_y);
 }
 
-       void
+void
 Mixer_UI::get_window_pos_and_size ()
 {
        get_position(m_root_x, m_root_y);
        get_size(m_width, m_height);
 }
 
+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 (aiter != _user.end()) {
+                       return true;
+               }
+               if (biter != _user.end()) {
+                       return false;
+               }
+               printf("BITTER\n");
+               return ARDOUR::cmp_nocase((*a).name, (*b).name) == -1;
+       }
+
+       PluginStateSorter(std::list<std::string> user) : _user (user)  {}
+private:
+       std::list<std::string> _user;
+};
+
 int
 Mixer_UI::set_state (const XMLNode& node)
 {
@@ -1615,6 +1739,33 @@ Mixer_UI::set_state (const XMLNode& node)
                }
        }
 
+       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) {
+               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"))) {
+                               order.push_back (prop->value());
+                       }
+               }
+
+               store_current_favorite_order ();
+               PluginStateSorter cmp (order);
+               favorite_order.sort (cmp);
+               sync_treeview_from_favorite_order ();
+       }
 
        return 0;
 }
@@ -1648,6 +1799,8 @@ Mixer_UI::get_state (void)
 
                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*>(&rhs_pane2)->gobj()));
+               geometry->add_property(X_("mixer_rhs_pane2_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));
 
@@ -1658,8 +1811,21 @@ Mixer_UI::get_state (void)
 
        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);
+                       plugin_order->add_child_nocopy (*p);
+               ;
+       }
+       node->add_child_nocopy (*plugin_order);
        return *node;
 }
 
@@ -1669,7 +1835,6 @@ Mixer_UI::pane_allocation_handler (Allocation&, Gtk::Paned* which)
 {
        int pos;
        XMLProperty* prop = 0;
-       char buf[32];
        XMLNode* node = ARDOUR_UI::instance()->mixer_settings();
        XMLNode* geometry;
        int height;
@@ -1695,7 +1860,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());
                }
@@ -1704,6 +1868,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]) {
@@ -1711,10 +1889,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)) {
@@ -1768,7 +1945,7 @@ Mixer_UI::on_key_release_event (GdkEventKey* ev)
        }
 
        KeyboardKey k (ev->state, ev->keyval);
-       
+
        if (bindings.activate (k, Bindings::Release)) {
                return true;
        }
@@ -1819,12 +1996,16 @@ Mixer_UI::parameter_changed (string const & p)
                        _group_tabs->hide ();
                }
        } else if (p == "default-narrow_ms") {
-               bool const s = ARDOUR_UI::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->monitor_out()) {
+                       monitor_section_detached ();
+               }
        }
 }
 
@@ -1861,6 +2042,7 @@ Mixer_UI::setup_track_display ()
        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));
@@ -1910,7 +2092,7 @@ Mixer_UI::update_title ()
 {
        if (_session) {
                string n;
-               
+
                if (_session->snap_name() != _session->name()) {
                        n = _session->snap_name ();
                } else {
@@ -1920,14 +2102,14 @@ 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());
 
        } else {
-               
+
                WindowTitle title (S_("Window|Mixer"));
                title += Glib::get_application_name ();
                set_title (title.get_string());
@@ -1969,8 +2151,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;
        }
 }
 
@@ -1990,7 +2175,7 @@ Mixer_UI::toggle_midi_input_active (bool flip_others)
                        onoff = !mt->input_active();
                }
        }
-       
+
        _session->set_exclusive_input_active (rl, onoff, flip_others);
 }
 
@@ -2017,3 +2202,108 @@ Mixer_UI::restore_mixer_space ()
 
        _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;
+               favorite_order.push_back (row[favorite_plugins_columns.plugin]);
+               std::string name = row[favorite_plugins_columns.name];
+       }
+}
+
+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 = std::find(_user.begin(), _user.end(), a);
+               PluginInfoList::const_iterator biter = std::find(_user.begin(), _user.end(), b);
+
+               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 ());
+
+       store_current_favorite_order ();
+
+       PluginCustomSorter cmp (favorite_order);
+       plugs.sort (cmp);
+
+       favorite_order = plugs;
+
+       sync_treeview_from_favorite_order ();
+}
+
+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) {
+               TreeModel::Row newrow = *(favorite_plugins_model->append());
+               newrow[favorite_plugins_columns.name] = (*i)->name;
+               newrow[favorite_plugins_columns.plugin] = *i;
+       }
+}