Don't report an error when the user cancels a time stretch operation.
[ardour.git] / gtk2_ardour / mixer_ui.cc
index 1d83ca881019943fa2a31d9cbb2c0c54eb982b29..2bb2548164cb107679ec1a9180241e1e71452e58 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2004 Paul Davis 
+    Copyright (C) 2000-2004 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <algorithm>
+#include <map>
 #include <sigc++/bind.h>
 
-#include <pbd/lockmonitor.h>
+#include <gtkmm/accelmap.h>
+
+#include "pbd/convert.h"
+#include "pbd/stacktrace.h"
+#include <glibmm/thread.h>
+
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/stop_signal.h>
+#include <gtkmm2ext/tearoff.h>
+#include <gtkmm2ext/window_title.h>
 
-#include <ardour/audioengine.h>
-#include <ardour/session.h>
-#include <ardour/session_route.h>
-#include <ardour/diskstream.h>
-#include <ardour/plugin_manager.h>
+#include "ardour/audio_track.h"
+#include "ardour/plugin_manager.h"
+#include "ardour/route_group.h"
+#include "ardour/session.h"
+#include "ardour/session_route.h"
 
+#include "keyboard.h"
 #include "mixer_ui.h"
 #include "mixer_strip.h"
+#include "monitor_section.h"
 #include "plugin_selector.h"
 #include "ardour_ui.h"
-#include "check_mark.h"
 #include "prompter.h"
 #include "utils.h"
+#include "actions.h"
 #include "gui_thread.h"
+#include "mixer_group_tabs.h"
 
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace PBD;
 using namespace Gtk;
+using namespace Glib;
 using namespace Gtkmm2ext;
-using namespace sigc;
+using namespace std;
 
-static const gchar* track_display_titles[] = { 
-       N_("Strips"),
-       0
-};
-static const gchar* snapshot_display_titles[] = { 
-       N_("Snapshots"),
-       0
-};
+using PBD::atoi;
 
-static const gchar* group_list_titles[] = { 
-       N_("***"), 
-       N_("Bar"),
-       0
-};
+Mixer_UI::Mixer_UI ()
+       : Window (Gtk::WINDOW_TOPLEVEL)
+{
+       _strip_width = Config->get_default_narrow_ms() ? Narrow : Wide;
+       track_menu = 0;
+        _monitor_section = 0;
+       route_group_context_menu = 0;
+       no_track_list_redisplay = false;
+       in_group_row_change = false;
+       _visible = false;
+       strip_redisplay_does_not_reset_order_keys = false;
+       strip_redisplay_does_not_sync_order_keys = false;
+       ignore_sync = false;
+
+       Route::SyncOrderKeys.connect (*this, invalidator (*this), ui_bind (&Mixer_UI::sync_order_keys, this, _1), gui_context());
+
+       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));
+       // add as last item of strip packer
+       strip_packer.pack_end (scroller_base, true, true);
 
-GdkPixmap* Mixer_UI::check_pixmap = 0;
-GdkBitmap* Mixer_UI::check_mask = 0;
-GdkPixmap* Mixer_UI::empty_pixmap = 0;
-GdkBitmap* Mixer_UI::empty_mask = 0;
+       _group_tabs = new MixerGroupTabs (this);
+       VBox* b = manage (new VBox);
+       b->pack_start (*_group_tabs, PACK_SHRINK);
+       b->pack_start (strip_packer);
+       b->show_all ();
+
+       scroller.add (*b);
+       scroller.set_policy (Gtk::POLICY_ALWAYS, Gtk::POLICY_AUTOMATIC);
+
+       track_model = ListStore::create (track_columns);
+       track_display.set_model (track_model);
+       track_display.append_column (_("Strips"), track_columns.text);
+       track_display.append_column (_("Show"), track_columns.visible);
+       track_display.get_column (0)->set_data (X_("colnum"), GUINT_TO_POINTER(0));
+       track_display.get_column (1)->set_data (X_("colnum"), GUINT_TO_POINTER(1));
+       track_display.get_column (0)->set_expand(true);
+       track_display.get_column (1)->set_expand(false);
+       track_display.set_name (X_("MixerTrackDisplayList"));
+       track_display.get_selection()->set_mode (Gtk::SELECTION_NONE);
+       track_display.set_reorderable (true);
+       track_display.set_headers_visible (true);
+
+       track_model->signal_row_deleted().connect (sigc::mem_fun (*this, &Mixer_UI::track_list_delete));
+       track_model->signal_row_changed().connect (sigc::mem_fun (*this, &Mixer_UI::track_list_change));
+       track_model->signal_rows_reordered().connect (sigc::mem_fun (*this, &Mixer_UI::track_list_reorder));
+
+       CellRendererToggle* track_list_visible_cell = dynamic_cast<CellRendererToggle*>(track_display.get_column_cell_renderer (1));
+       track_list_visible_cell->property_activatable() = true;
+       track_list_visible_cell->property_radio() = false;
+
+       track_display.signal_button_press_event().connect (sigc::mem_fun (*this, &Mixer_UI::track_display_button_press), false);
+
+       track_display_scroller.add (track_display);
+       track_display_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
 
+       group_model = ListStore::create (group_columns);
+       group_display.set_model (group_model);
+       group_display.append_column (_("Group"), group_columns.text);
+       group_display.append_column (_("Show"), group_columns.visible);
+       group_display.get_column (0)->set_data (X_("colnum"), GUINT_TO_POINTER(0));
+       group_display.get_column (1)->set_data (X_("colnum"), GUINT_TO_POINTER(1));
+       group_display.get_column (0)->set_expand(true);
+       group_display.get_column (1)->set_expand(false);
+       group_display.set_name ("MixerGroupList");
+       group_display.get_selection()->set_mode (Gtk::SELECTION_SINGLE);
+       group_display.set_reorderable (true);
+       group_display.set_headers_visible (true);
+       group_display.set_rules_hint (true);
 
-Mixer_UI::Mixer_UI (AudioEngine& eng)
-       : Gtk::Window (GTK_WINDOW_TOPLEVEL),
-         KeyboardTarget (*this, "mixer"),
-         engine (eng),
-         track_display_list (internationalize (track_display_titles)),
-         group_list (internationalize (group_list_titles)),
-         snapshot_display (internationalize (snapshot_display_titles))
-       
-{
-       _strip_width = Wide;
-       track_menu = 0;
+       /* name is directly editable */
 
-       check_pixmap = gdk_pixmap_colormap_create_from_xpm_d (NULL, 
-                     gtk_widget_get_colormap (GTK_WIDGET(group_list.gobj())),
-                     &check_mask, NULL, (gchar **) check_xpm);
-       empty_pixmap = gdk_pixmap_colormap_create_from_xpm_d (NULL, 
-                     gtk_widget_get_colormap (GTK_WIDGET(group_list.gobj())),
-                     &empty_mask, NULL, (gchar **) empty_xpm);
+       CellRendererText* name_cell = dynamic_cast<CellRendererText*>(group_display.get_column_cell_renderer (0));
+       name_cell->property_editable() = true;
+       name_cell->signal_edited().connect (sigc::mem_fun (*this, &Mixer_UI::route_group_name_edit));
 
-       XMLNode* node = ARDOUR_UI::instance()->mixer_settings();
-       set_state (*node);
+       /* use checkbox for the active column */
 
-       scroller_base.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
-       scroller_base.set_name ("MixerWindow");
-       scroller_base.button_release_event.connect (mem_fun(*this, &Mixer_UI::strip_scroller_button_release));
-       // add as last item of strip packer
-       strip_packer.pack_end (scroller_base, true, true);
+       CellRendererToggle* active_cell = dynamic_cast<CellRendererToggle*>(group_display.get_column_cell_renderer (1));
+       active_cell->property_activatable() = true;
+       active_cell->property_radio() = false;
 
-       scroller.add_with_viewport (strip_packer);
-       scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+       group_model->signal_row_changed().connect (sigc::mem_fun (*this, &Mixer_UI::route_group_row_change));
 
-       track_display_list.column_titles_active();
-       track_display_list.set_name ("MixerTrackDisplayList");
-       track_display_list.set_shadow_type (Gtk::SHADOW_IN);
-       track_display_list.set_selection_mode (GTK_SELECTION_MULTIPLE);
-       track_display_list.set_reorderable (true);
-       track_display_list.set_size_request (75, -1);
-       track_display_scroller.add (track_display_list);
-       track_display_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
+       group_display.signal_button_press_event().connect (sigc::mem_fun (*this, &Mixer_UI::group_display_button_press), false);
+
+       group_display_scroller.add (group_display);
+       group_display_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
+
+       HBox* route_group_display_button_box = manage (new HBox());
+
+       Button* route_group_add_button = manage (new Button ());
+       Button* route_group_remove_button = manage (new Button ());
+
+       Widget* w;
+
+       w = manage (new Image (Stock::ADD, ICON_SIZE_BUTTON));
+       w->show();
+       route_group_add_button->add (*w);
 
-       snapshot_display.column_titles_active();
-       snapshot_display.set_name ("MixerSnapshotDisplayList");
-       snapshot_display.set_shadow_type (Gtk::SHADOW_IN);
-       snapshot_display.set_selection_mode (GTK_SELECTION_SINGLE);
-       snapshot_display.set_reorderable (true);
-       snapshot_display.set_size_request (75, -1);
-       snapshot_display_scroller.add (snapshot_display);
-       snapshot_display_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
-
-       group_list_button_label.set_text (_("Mix Groups"));
-       group_list_button_label.set_name ("MixerGroupTitleButton");
-       group_list_button.add (group_list_button_label);
-       group_list_button.set_name ("MixerGroupTitleButton");
-
-       group_list.column_titles_hide();
-       group_list.set_name ("MixerGroupList");
-       group_list.set_shadow_type (Gtk::SHADOW_IN);
-       group_list.set_selection_mode (GTK_SELECTION_MULTIPLE);
-       group_list.set_reorderable (false);
-       group_list.set_size_request (75, -1);
-       group_list.set_column_auto_resize (0, true);
-       group_list_scroller.add (group_list);
-       group_list_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
-       
-       group_list_vbox.pack_start (group_list_button, false, false);
-       group_list_vbox.pack_start (group_list_scroller, true, true);
-
-       list<string> stupid_list;
-
-       stupid_list.push_back ("");
-       stupid_list.push_back (_("-all-"));
-
-       group_list.rows().push_back (stupid_list);
-       group_list.rows().back().set_data (0);
-       group_list.rows().back().select();
-       group_list.cell(0,0).set_pixmap (check_pixmap);
+       w = manage (new Image (Stock::REMOVE, ICON_SIZE_BUTTON));
+       w->show();
+       route_group_remove_button->add (*w);
+
+       route_group_display_button_box->set_homogeneous (true);
+
+       route_group_add_button->signal_clicked().connect (sigc::mem_fun (*this, &Mixer_UI::new_route_group));
+       route_group_remove_button->signal_clicked().connect (sigc::mem_fun (*this, &Mixer_UI::remove_selected_route_group));
+
+       route_group_display_button_box->add (*route_group_remove_button);
+       route_group_display_button_box->add (*route_group_add_button);
+
+       group_display_vbox.pack_start (group_display_scroller, true, true);
+       group_display_vbox.pack_start (*route_group_display_button_box, false, false);
 
        track_display_frame.set_name("BaseFrame");
        track_display_frame.set_shadow_type (Gtk::SHADOW_IN);
        track_display_frame.add(track_display_scroller);
 
-       group_list_frame.set_name ("BaseFrame");
-       group_list_frame.set_shadow_type (Gtk::SHADOW_IN);
-       group_list_frame.add (group_list_vbox);
+       group_display_frame.set_name ("BaseFrame");
+       group_display_frame.set_shadow_type (Gtk::SHADOW_IN);
+       group_display_frame.add (group_display_vbox);
 
-       rhs_pane1.add1 (track_display_frame);
-       rhs_pane1.add2 (rhs_pane2);
-
-       rhs_pane2.add1 (group_list_frame);
-       rhs_pane2.add2 (snapshot_display_scroller);
+       rhs_pane1.pack1 (track_display_frame);
+       rhs_pane1.pack2 (group_display_frame);
 
        list_vpacker.pack_start (rhs_pane1, true, true);
 
        global_hpacker.pack_start (scroller, true, true);
-       global_hpacker.pack_start (out_packer, false, false);
-
+#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.add1(list_vpacker);
        list_hpane.add2(global_hpacker);
 
-       rhs_pane1.size_allocate.connect_after (bind (mem_fun(*this, &Mixer_UI::pane_allocation_handler), 
-                                                     static_cast<Gtk::Paned*> (&rhs_pane1)));
-       rhs_pane2.size_allocate.connect_after (bind (mem_fun(*this, &Mixer_UI::pane_allocation_handler), 
-                                                     static_cast<Gtk::Paned*> (&rhs_pane2)));
-       list_hpane.size_allocate.connect_after (bind (mem_fun(*this, &Mixer_UI::pane_allocation_handler), 
-                                                     static_cast<Gtk::Paned*> (&list_hpane)));
-
+       rhs_pane1.signal_size_allocate().connect (sigc::bind (sigc::mem_fun(*this, &Mixer_UI::pane_allocation_handler),
+                                                       static_cast<Gtk::Paned*> (&rhs_pane1)));
+       list_hpane.signal_size_allocate().connect (sigc::bind (sigc::mem_fun(*this, &Mixer_UI::pane_allocation_handler),
+                                                        static_cast<Gtk::Paned*> (&list_hpane)));
 
-       rhs_pane1.set_data ("collapse-direction", (gpointer) 0);
-       rhs_pane2.set_data ("collapse-direction", (gpointer) 0);
-       list_hpane.set_data ("collapse-direction", (gpointer) 1);
-
-       rhs_pane1.button_release_event.connect (bind (ptr_fun (pane_handler), static_cast<Paned*>(&rhs_pane1)));
-       rhs_pane2.button_release_event.connect (bind (ptr_fun (pane_handler), static_cast<Paned*>(&rhs_pane2)));
-       list_hpane.button_release_event.connect (bind (ptr_fun (pane_handler), static_cast<Paned*>(&list_hpane)));
-       
        global_vpacker.pack_start (list_hpane, true, true);
 
        add (global_vpacker);
        set_name ("MixerWindow");
-       set_title (_("ardour: mixer"));
-       set_wmclass (_("ardour_mixer"), "Ardour");
-
-       delete_event.connect (bind (ptr_fun (just_hide_it), 
-                                                   static_cast<Gtk::Window *>(this)));
-       add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
-
-       snapshot_display.select_row.connect (mem_fun(*this, &Mixer_UI::snapshot_display_selected));
 
-       track_display_list.select_row.connect (mem_fun(*this, &Mixer_UI::track_display_selected));
-       track_display_list.unselect_row.connect (mem_fun(*this, &Mixer_UI::track_display_unselected));
-       track_display_list.row_move.connect (mem_fun(*this, &Mixer_UI::queue_track_display_reordered));
-       track_display_list.click_column.connect (mem_fun(*this, &Mixer_UI::track_column_click));
+       WindowTitle title(Glib::get_application_name());
+       title += _("Mixer");
+       set_title (title.get_string());
 
-       group_list_button.signal_clicked().connect (mem_fun(*this, &Mixer_UI::group_list_button_clicked));
-       group_list.button_press_event.connect (mem_fun(*this, &Mixer_UI::group_list_button_press_event));
-       group_list.select_row.connect (mem_fun(*this, &Mixer_UI::group_selected));
-       group_list.unselect_row.connect (mem_fun(*this, &Mixer_UI::group_unselected));
+       set_wmclass (X_("ardour_mixer"), "Ardour");
 
-       _plugin_selector = new PluginSelector (PluginManager::the_manager());
-       _plugin_selector->delete_event.connect (bind (ptr_fun (just_hide_it), 
-                                                    static_cast<Window *> (_plugin_selector)));
+       add_accel_group (ActionManager::ui_manager->get_accel_group());
 
-       configure_event.connect (mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler));
+       signal_delete_event().connect (sigc::mem_fun (*this, &Mixer_UI::hide_window));
+       add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
 
-       _selection.RoutesChanged.connect (mem_fun(*this, &Mixer_UI::follow_strip_selection));
+       signal_configure_event().connect (sigc::mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler));
+
+       _selection.RoutesChanged.connect (sigc::mem_fun(*this, &Mixer_UI::follow_strip_selection));
+
+       route_group_display_button_box->show();
+       route_group_add_button->show();
+       route_group_remove_button->show();
+
+       global_hpacker.show();
+       global_vpacker.show();
+       scroller.show();
+       scroller_base.show();
+       scroller_hpacker.show();
+       mixer_scroller_vpacker.show();
+       list_vpacker.show();
+       group_display_button_label.show();
+       group_display_button.show();
+       track_display_scroller.show();
+       group_display_scroller.show();
+       group_display_vbox.show();
+       track_display_frame.show();
+       group_display_frame.show();
+       rhs_pane1.show();
+       strip_packer.show();
+       out_packer.show();
+       list_hpane.show();
+       track_display.show();
+       group_display.show();
+
+       auto_rebinding = FALSE;
+
+       MixerStrip::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&Mixer_UI::remove_strip, this, _1), gui_context());
+
+        MonitorSection::setup_knob_images ();
+
+#ifndef DEFER_PLUGIN_SELECTOR_LOAD
+       _plugin_selector = new PluginSelector (PluginManager::the_manager ());
+#endif
 }
 
 Mixer_UI::~Mixer_UI ()
@@ -229,86 +275,192 @@ Mixer_UI::ensure_float (Window& win)
 void
 Mixer_UI::show_window ()
 {
-       show_all ();
+       present ();
+       if (!_visible) {
+               set_window_pos_and_size ();
+
+               /* 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;
-       CList_Helpers::RowList::iterator i;
+               TreeModel::Children rows = track_model->children();
+               TreeModel::Children::iterator ri;
 
-       for (i = track_display_list.rows().begin(); i != track_display_list.rows().end(); ++i) {
-               ms = (MixerStrip *) i->get_data ();
-               ms->set_width (ms->get_width());
+               for (ri = rows.begin(); ri != rows.end(); ++ri) {
+                       ms = (*ri)[track_columns.strip];
+                       ms->set_width_enum (ms->get_width_enum (), ms->width_owner());
+               }
        }
+       _visible = true;
 }
 
+bool
+Mixer_UI::hide_window (GdkEventAny *ev)
+{
+       get_window_pos_and_size ();
+
+       _visible = false;
+       return just_hide_it(ev, static_cast<Gtk::Window *>(this));
+}
+
+
 void
-Mixer_UI::add_strip (Route* route)
+Mixer_UI::add_strip (RouteList& routes)
 {
-       ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::add_strip), route));
-       
+       ENSURE_GUI_THREAD (*this, &Mixer_UI::add_strip, routes)
+
        MixerStrip* strip;
-       
-       if (route->hidden()) {
-               return;
-       }
 
-       strip = new MixerStrip (*this, *session, *route);
-       strips.push_back (strip);
+       no_track_list_redisplay = true;
+       strip_redisplay_does_not_sync_order_keys = true;
 
-       strip->set_width (_strip_width);
-       show_strip (strip);
+       for (RouteList::iterator x = routes.begin(); x != routes.end(); ++x) {
+               boost::shared_ptr<Route> route = (*x);
 
-       const gchar* rowdata[1];
-       rowdata[0] = route->name().c_str();
-       
-       track_display_list.freeze ();
-       track_display_list.rows().push_back (rowdata);
-       track_display_list.rows().back().set_data (strip);
-       track_display_list.thaw ();
+               if (route->is_hidden()) {
+                       continue;
+               }
+
+                if (route->is_monitor()) {
+                        if (!_monitor_section) {
+                                _monitor_section = new MonitorSection (_session);
+                                out_packer.pack_end (_monitor_section->tearoff(), false, false);
+                        } else {
+                                _monitor_section->set_session (_session);
+                        }
+
+                        _monitor_section->tearoff().show_all ();
+
+                        XMLNode* mnode = ARDOUR_UI::instance()->tearoff_settings (X_("monitor-section"));
+                        if (mnode) {
+                                _monitor_section->tearoff().set_state (*mnode);
+                        }
+
+                        /* no regular strip shown for control out */
+
+                        continue;
+                }
+
+               strip = new MixerStrip (*this, _session, route);
+               strips.push_back (strip);
 
-       if (strip->marked_for_display() || strip->packed()) {
-               track_display_list.rows().back().select ();
+               Config->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->append());
+               row[track_columns.text] = route->name();
+               row[track_columns.visible] = strip->marked_for_display();
+               row[track_columns.route] = route;
+               row[track_columns.strip] = strip;
+
+               if (route->order_key (N_("signal")) == -1) {
+                       route->set_order_key (N_("signal"), track_model->children().size()-1);
+               }
+
+               route->PropertyChanged.connect (*this, invalidator (*this), ui_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));
        }
-       
-       route->name_changed.connect (bind (mem_fun(*this, &Mixer_UI::strip_name_changed), strip));
-       strip->GoingAway.connect (bind (mem_fun(*this, &Mixer_UI::remove_strip), strip));
 
-       strip->button_release_event.connect (bind (mem_fun(*this, &Mixer_UI::strip_button_release_event), strip));
+       no_track_list_redisplay = false;
 
-//     if (width() < gdk_screen_width()) {
-//             set_size_request (width() + (_strip_width == Wide ? 75 : 50), height());
-//     }
+       redisplay_track_list ();
+
+       strip_redisplay_does_not_sync_order_keys = false;
 }
 
 void
 Mixer_UI::remove_strip (MixerStrip* strip)
 {
-       ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::remove_strip), strip));
-       
-       CList_Helpers::RowList::iterator ri;
+       if (_session && _session->deletion_in_progress()) {
+               /* its all being taken care of */
+               return;
+       }
+
+       ENSURE_GUI_THREAD (*this, &Mixer_UI::remove_strip, strip);
+
+       cerr << "Mixer UI removing strip for " << strip << endl;
+
+       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 = track_display_list.rows().begin(); ri != track_display_list.rows().end(); ++ri) {
-               if ((MixerStrip *) ri->get_data () == strip) {
-                       track_display_list.rows().erase (ri);
+       strip_redisplay_does_not_sync_order_keys = true;
+
+       for (ri = rows.begin(); ri != rows.end(); ++ri) {
+               if ((*ri)[track_columns.strip] == strip) {
+                       track_model->erase (ri);
                        break;
                }
        }
+
+       strip_redisplay_does_not_sync_order_keys = false;
+}
+
+void
+Mixer_UI::sync_order_keys (string const & src)
+{
+       TreeModel::Children rows = track_model->children();
+       TreeModel::Children::iterator ri;
+
+       if (src == N_("signal") || !_session || (_session->state_of_the_state() & (Session::Loading|Session::Deletion)) || rows.empty()) {
+               return;
+       }
+
+       std::map<int,int> keys;
+
+       bool changed = false;
+
+       unsigned order = 0;
+       for (ri = rows.begin(); ri != rows.end(); ++ri, ++order) {
+               boost::shared_ptr<Route> route = (*ri)[track_columns.route];
+               unsigned int old_key = order;
+               unsigned int new_key = route->order_key (N_("signal"));
+
+               keys[new_key] = old_key;
+
+               if (new_key != old_key) {
+                       changed = true;
+               }
+       }
+
+       if (keys.size() != rows.size()) {
+               PBD::stacktrace (cerr, 20);
+       }
+       assert(keys.size() == rows.size());
+
+       // Remove any gaps in keys caused by automation children tracks
+       vector<int> neworder;
+       for (std::map<int,int>::const_iterator i = keys.begin(); i != keys.end(); ++i) {
+               neworder.push_back(i->second);
+       }
+       assert(neworder.size() == rows.size());
+
+       if (changed) {
+               strip_redisplay_does_not_reset_order_keys = true;
+               track_model->reorder (neworder);
+               strip_redisplay_does_not_reset_order_keys = false;
+       }
 }
 
 void
 Mixer_UI::follow_strip_selection ()
 {
        for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
-               (*i)->set_selected (_selection.selected (&(*i)->route()));
+               (*i)->set_selected (_selection.selected ((*i)->route()));
        }
 }
 
-gint
+bool
 Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip)
 {
        if (ev->button == 1) {
@@ -317,345 +469,551 @@ Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip)
                   editing. XXX it needs improving so that we don't select the strip
                   at the same time.
                */
-               
-               ARDOUR_UI::instance()->allow_focus (false);
-               
-               if (_selection.selected (&strip->route())) {
-                       _selection.remove (&strip->route());
+
+               if (_selection.selected (strip->route())) {
+                       _selection.remove (strip->route());
                } else {
-                       if (Keyboard::modifier_state_equals (ev->state, Keyboard::Shift)) {
-                               _selection.add (&strip->route());
+                       if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
+                               _selection.add (strip->route());
                        } else {
-                               _selection.set (&strip->route());
+                               _selection.set (strip->route());
                        }
                }
        }
 
-       return TRUE;
+       return true;
 }
 
 void
-Mixer_UI::connect_to_session (Session* sess)
+Mixer_UI::set_session (Session* sess)
 {
-       session = sess;
+       SessionHandlePtr::set_session (sess);
+
+       if (_plugin_selector) {
+               _plugin_selector->set_session (_session);
+       }
+
+       _group_tabs->set_session (sess);
+
+       if (!_session) {
+               return;
+       }
 
-       string wintitle = _("ardour: mixer: ");
-       wintitle += session->name();
-       set_title (wintitle);
+       XMLNode* node = ARDOUR_UI::instance()->mixer_settings();
+       set_state (*node);
 
-       track_display_list.freeze ();
-       track_display_list.clear ();
+       WindowTitle title(_session->name());
+       title += _("Mixer");
+       title += Glib::get_application_name();
 
-       session->foreach_route (this, &Mixer_UI::add_strip);
-       
-       track_display_list.thaw ();
+       set_title (title.get_string());
 
-       session->going_away.connect (mem_fun(*this, &Mixer_UI::disconnect_from_session));
-       session->RouteAdded.connect (mem_fun(*this, &Mixer_UI::add_strip));
-       session->mix_group_added.connect (mem_fun(*this, &Mixer_UI::add_mix_group));
+       initial_track_display ();
 
-       session->foreach_mix_group(this, &Mixer_UI::add_mix_group);
-       
-       session->StateSaved.connect (mem_fun(*this, &Mixer_UI::session_state_saved));
-       redisplay_snapshots ();
-       
-       _plugin_selector->set_session (session);
+       _session->RouteAdded.connect (_session_connections, invalidator (*this), ui_bind (&Mixer_UI::add_strip, this, _1), gui_context());
+       _session->route_group_added.connect (_session_connections, invalidator (*this), ui_bind (&Mixer_UI::add_route_group, this, _1), gui_context());
+       _session->route_group_removed.connect (_session_connections, invalidator (*this), boost::bind (&Mixer_UI::route_groups_changed, this), gui_context());
+       _session->config.ParameterChanged.connect (_session_connections, invalidator (*this), ui_bind (&Mixer_UI::parameter_changed, this, _1), gui_context());
+
+       route_groups_changed ();
+
+       if (_visible) {
+               show_window();
+       }
 
        start_updating ();
 }
 
 void
-Mixer_UI::disconnect_from_session ()
+Mixer_UI::session_going_away ()
 {
-       ENSURE_GUI_THREAD(mem_fun(*this, &Mixer_UI::disconnect_from_session));
-       
-       group_list.clear ();
-       set_title (_("ardour: mixer"));
+       ENSURE_GUI_THREAD (*this, &Mixer_UI::session_going_away)
+
+       group_model->clear ();
+       _selection.clear ();
+       track_model->clear ();
+
+       for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
+               delete (*i);
+       }
+
+        if (_monitor_section) {
+                _monitor_section->tearoff().hide_visible ();
+        }
+
+       strips.clear ();
+
+       WindowTitle title(Glib::get_application_name());
+       title += _("Mixer");
+       set_title (title.get_string());
+
        stop_updating ();
-       hide_all_strips (false);
+
+       SessionHandlePtr::session_going_away ();
 }
 
 void
-Mixer_UI::hide_all_strips (bool with_select)
+Mixer_UI::show_strip (MixerStrip* ms)
 {
-       MixerStrip* ms;
-       CList_Helpers::RowList::iterator i;
+       TreeModel::Children rows = track_model->children();
+       TreeModel::Children::iterator i;
 
-       track_display_list.freeze ();
-       
-       for (i = track_display_list.rows().begin(); i != track_display_list.rows().end(); ++i) {
-               ms = (MixerStrip *) i->get_data ();
+       for (i = rows.begin(); i != rows.end(); ++i) {
 
-               if (with_select) {
-                       i->unselect ();
-               } else {
-                       hide_strip (ms);
+               MixerStrip* strip = (*i)[track_columns.strip];
+               if (strip == ms) {
+                       (*i)[track_columns.visible] = true;
+                       break;
                }
        }
-
-       track_display_list.thaw ();
 }
 
 void
-Mixer_UI::unselect_all_strips ()
+Mixer_UI::hide_strip (MixerStrip* ms)
 {
-       hide_all_strips (false);
-}
+       TreeModel::Children rows = track_model->children();
+       TreeModel::Children::iterator i;
 
-void
-Mixer_UI::select_all_strips ()
-{
-       CList_Helpers::RowList::iterator i;
+       for (i = rows.begin(); i != rows.end(); ++i) {
 
-       for (i = track_display_list.rows().begin(); i != track_display_list.rows().end(); ++i) {
-               i->select ();
+               MixerStrip* strip = (*i)[track_columns.strip];
+               if (strip == ms) {
+                       (*i)[track_columns.visible] = false;
+                       break;
+               }
        }
 }
 
-void
-Mixer_UI::select_all_audiotrack_strips ()
+gint
+Mixer_UI::start_updating ()
 {
-       MixerStrip* ms;
-       CList_Helpers::RowList::iterator i;
+    fast_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (sigc::mem_fun(*this, &Mixer_UI::fast_update_strips));
+    return 0;
+}
 
-       track_display_list.freeze ();
-       
-       for (i = track_display_list.rows().begin(); i != track_display_list.rows().end(); ++i) {
-               ms = (MixerStrip *) i->get_data ();
+gint
+Mixer_UI::stop_updating ()
+{
+    fast_screen_update_connection.disconnect();
+    return 0;
+}
 
-               if (ms->is_audio_track()) {
-                       i->select ();
+void
+Mixer_UI::fast_update_strips ()
+{
+       if (is_mapped () && _session) {
+               for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
+                       (*i)->fast_update ();
                }
        }
-       
-       track_display_list.thaw ();     
 }
 
 void
-Mixer_UI::unselect_all_audiotrack_strips ()
+Mixer_UI::set_all_strips_visibility (bool yn)
 {
-       MixerStrip* ms;
-       CList_Helpers::RowList::iterator i;
+       TreeModel::Children rows = track_model->children();
+       TreeModel::Children::iterator i;
+
+       no_track_list_redisplay = true;
 
-       track_display_list.freeze ();
-       
-       for (i = track_display_list.rows().begin(); i != track_display_list.rows().end(); ++i) {
-               ms = (MixerStrip *) i->get_data ();
+       for (i = rows.begin(); i != rows.end(); ++i) {
+
+               TreeModel::Row row = (*i);
+               MixerStrip* strip = row[track_columns.strip];
+
+               if (strip == 0) {
+                       continue;
+               }
 
-               if (ms->is_audio_track()) {
-                       i->unselect ();
+               if (strip->route()->is_master() || strip->route()->is_monitor()) {
+                       continue;
                }
+
+               (*i)[track_columns.visible] = yn;
        }
-       
-       track_display_list.thaw ();     
+
+       no_track_list_redisplay = false;
+       redisplay_track_list ();
 }
 
+
 void
-Mixer_UI::select_all_audiobus_strips ()
+Mixer_UI::set_all_audio_visibility (int tracks, bool yn)
 {
-       MixerStrip* ms;
-       CList_Helpers::RowList::iterator i;
+       TreeModel::Children rows = track_model->children();
+       TreeModel::Children::iterator i;
+
+       no_track_list_redisplay = true;
 
-       track_display_list.freeze ();
-       
-       for (i = track_display_list.rows().begin(); i != track_display_list.rows().end(); ++i) {
-               ms = (MixerStrip *) i->get_data ();
+       for (i = rows.begin(); i != rows.end(); ++i) {
+               TreeModel::Row row = (*i);
+               MixerStrip* strip = row[track_columns.strip];
 
-               if (!ms->is_audio_track()) {
-                       i->select ();
+               if (strip == 0) {
+                       continue;
                }
-       }
-       
-       track_display_list.thaw ();
-}
 
-void
-Mixer_UI::unselect_all_audiobus_strips ()
-{
-       MixerStrip* ms;
-       CList_Helpers::RowList::iterator i;
+               if (strip->route()->is_master() || strip->route()->is_monitor()) {
+                       continue;
+               }
 
-       track_display_list.freeze ();
-       
-       for (i = track_display_list.rows().begin(); i != track_display_list.rows().end(); ++i) {
-               ms = (MixerStrip *) i->get_data ();
+               boost::shared_ptr<AudioTrack> at = strip->audio_track();
+
+               switch (tracks) {
+               case 0:
+                       (*i)[track_columns.visible] = yn;
+                       break;
+
+               case 1:
+                       if (at) { /* track */
+                               (*i)[track_columns.visible] = yn;
+                       }
+                       break;
 
-               if (!ms->is_audio_track()) {
-                       i->unselect ();
+               case 2:
+                       if (!at) { /* bus */
+                               (*i)[track_columns.visible] = yn;
+                       }
+                       break;
                }
        }
-       
-       track_display_list.thaw ();
+
+       no_track_list_redisplay = false;
+       redisplay_track_list ();
 }
 
 void
-Mixer_UI::show_strip (MixerStrip* ms)
+Mixer_UI::hide_all_routes ()
 {
-       if (!ms->packed()) {
-               
-               if (ms->route().master() || ms->route().control()) {
-                       out_packer.pack_start (*ms, false, false);
-               } else {
-                       strip_packer.pack_start (*ms, false, false);
-               }
-               ms->set_packed (true);
-               ms->show ();
-
-       }
+       set_all_strips_visibility (false);
 }
 
 void
-Mixer_UI::hide_strip (MixerStrip* ms)
+Mixer_UI::show_all_routes ()
 {
-       if (ms->packed()) {
-               if (ms->route().master() || ms->route().control()) {
-                       out_packer.remove (*ms);
-               } else {
-                       strip_packer.remove (*ms);
-               }
-               ms->set_packed (false);
-       }
+       set_all_strips_visibility (true);
 }
 
-gint
-Mixer_UI::start_updating ()
+void
+Mixer_UI::show_all_audiobus ()
 {
-       screen_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect (mem_fun(*this, &Mixer_UI::update_strips));
-       fast_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (mem_fun(*this, &Mixer_UI::fast_update_strips));
-       return 0;
+       set_all_audio_visibility (2, true);
+}
+void
+Mixer_UI::hide_all_audiobus ()
+{
+       set_all_audio_visibility (2, false);
 }
 
-gint
-Mixer_UI::stop_updating ()
+void
+Mixer_UI::show_all_audiotracks()
 {
-       screen_update_connection.disconnect();
-       fast_screen_update_connection.disconnect();
-       return 0;
+       set_all_audio_visibility (1, true);
+}
+void
+Mixer_UI::hide_all_audiotracks ()
+{
+       set_all_audio_visibility (1, false);
 }
 
 void
-Mixer_UI::update_strips ()
+Mixer_UI::track_list_reorder (const TreeModel::Path&, const TreeModel::iterator&, int* /*new_order*/)
 {
-       if (is_mapped () && session) {
-               for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
-                       (*i)->update ();
-               }
-       }
+       strip_redisplay_does_not_sync_order_keys = true;
+       _session->set_remote_control_ids();
+       redisplay_track_list ();
+       strip_redisplay_does_not_sync_order_keys = false;
 }
 
 void
-Mixer_UI::fast_update_strips ()
+Mixer_UI::track_list_change (const Gtk::TreeModel::Path&, const Gtk::TreeModel::iterator&)
 {
-       if (is_mapped () && session) {
-               for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
-                       (*i)->fast_update ();
-               }
-       }
+       // never reset order keys because of a property change
+       strip_redisplay_does_not_reset_order_keys = true;
+       _session->set_remote_control_ids();
+       redisplay_track_list ();
+       strip_redisplay_does_not_reset_order_keys = false;
 }
 
 void
-Mixer_UI::snapshot_display_selected (gint row, gint col, GdkEvent* ev)
+Mixer_UI::track_list_delete (const Gtk::TreeModel::Path&)
 {
-       string* snap_name;
-       
-       if ((snap_name = (string*) snapshot_display.get_row_data(row)) != 0){
-               if (session->snap_name() == *snap_name){
-                       return;
-               }
-               string path = session->path();
-               ARDOUR_UI::instance()->load_session(path, *snap_name);
+       /* this could require an order sync */
+       if (_session && !_session->deletion_in_progress()) {
+               _session->set_remote_control_ids();
+               redisplay_track_list ();
        }
 }
 
 void
-Mixer_UI::track_display_selected (gint row, gint col, GdkEvent* ev)
+Mixer_UI::redisplay_track_list ()
 {
-       MixerStrip* strip;
+       TreeModel::Children rows = track_model->children();
+       TreeModel::Children::iterator i;
+       long order;
 
-       if ((strip = (MixerStrip *) track_display_list.get_row_data (row)) != 0) {
-               strip->set_marked_for_display  (true);
-               show_strip (strip);
+       if (no_track_list_redisplay) {
+               return;
+       }
 
-               /* just redraw the whole thing so that we get the right order
-                  when we reinsert the strip.
-               */
-               
-               track_display_reordered ();
+       for (order = 0, i = rows.begin(); i != rows.end(); ++i, ++order) {
+               MixerStrip* strip = (*i)[track_columns.strip];
+
+               if (strip == 0) {
+                       /* we're in the middle of changing a row, don't worry */
+                       continue;
+               }
+
+               bool visible = (*i)[track_columns.visible];
+
+               if (visible) {
+                       strip->set_marked_for_display (true);
+                       strip->route()->set_order_key (N_("signal"), order);
+
+                       if (!strip_redisplay_does_not_reset_order_keys) {
+                               strip->route()->set_order_key (N_("signal"), order);
+                       }
+
+                       if (strip->packed()) {
+
+                               if (strip->route()->is_master() || strip->route()->is_monitor()) {
+                                       out_packer.reorder_child (*strip, -1);
+                               } else {
+                                       strip_packer.reorder_child (*strip, -1); /* put at end */
+                               }
+
+                       } else {
+
+                               if (strip->route()->is_master() || strip->route()->is_monitor()) {
+                                       out_packer.pack_start (*strip, false, false);
+                               } else {
+                                       strip_packer.pack_start (*strip, false, false);
+                               }
+                               strip->set_packed (true);
+                               //strip->show();
+                       }
+
+               } else {
+
+                       strip->set_marked_for_display (false);
+
+                       if (strip->route()->is_master() || strip->route()->is_monitor()) {
+                               /* do nothing, these cannot be hidden */
+                       } else {
+                               if (strip->packed()) {
+                                       strip_packer.remove (*strip);
+                                       strip->set_packed (false);
+                               }
+                       }
+               }
        }
+
+       if (!strip_redisplay_does_not_reset_order_keys && !strip_redisplay_does_not_sync_order_keys) {
+               _session->sync_order_keys (N_("signal"));
+       }
+
+       // Resigc::bind all of the midi controls automatically
+
+       if (auto_rebinding)
+               auto_rebind_midi_controls ();
+
+       _group_tabs->set_dirty ();
 }
 
 void
-Mixer_UI::track_display_unselected (gint row, gint col, GdkEvent* ev)
+Mixer_UI::strip_width_changed ()
 {
-       MixerStrip* strip;
+       _group_tabs->set_dirty ();
+
+#ifdef GTKOSX
+       TreeModel::Children rows = track_model->children();
+       TreeModel::Children::iterator i;
+       long order;
+
+       for (order = 0, i = rows.begin(); i != rows.end(); ++i, ++order) {
+               MixerStrip* strip = (*i)[track_columns.strip];
+
+               if (strip == 0) {
+                       continue;
+               }
+
+               bool visible = (*i)[track_columns.visible];
 
-       if ((strip = (MixerStrip *) track_display_list.get_row_data (row)) != 0) {
-               strip->set_marked_for_display (false);
-               hide_strip (strip);
+               if (visible) {
+                       strip->queue_draw();
+               }
        }
+#endif
+
 }
 
 void
-Mixer_UI::unselect_strip_in_display (MixerStrip *strip)
+Mixer_UI::set_auto_rebinding( bool val )
 {
-       CList_Helpers::RowIterator i;
-
-       if ((i = track_display_list.rows().find_data (strip)) != track_display_list.rows().end()) {
-               (*i).unselect ();
+       if( val == TRUE )
+       {
+               auto_rebinding = TRUE;
+               Session::AutoBindingOff();
+       }
+       else
+       {
+               auto_rebinding = FALSE;
+               Session::AutoBindingOn();
        }
 }
 
 void
-Mixer_UI::select_strip_in_display (MixerStrip *strip)
+Mixer_UI::toggle_auto_rebinding()
 {
-       CList_Helpers::RowIterator i;
+       if (auto_rebinding)
+       {
+               set_auto_rebinding( FALSE );
+       }
 
-       if ((i = track_display_list.rows().find_data (strip)) != track_display_list.rows().end()) {
-               (*i).select ();
+       else
+       {
+               set_auto_rebinding( TRUE );
        }
+
+       auto_rebind_midi_controls();
 }
 
 void
-Mixer_UI::queue_track_display_reordered (gint arg1, gint arg2)
+Mixer_UI::auto_rebind_midi_controls ()
 {
-       /* the problem here is that we are called *before* the
-          list has been reordered. so just queue up
-          the actual re-drawer to happen once the re-ordering
-          is complete.
-       */
+       TreeModel::Children rows = track_model->children();
+       TreeModel::Children::iterator i;
+       int pos;
+
+       // Create bindings for all visible strips and remove those that are not visible
+       pos = 1;  // 0 is reserved for the master strip
+       for (i = rows.begin(); i != rows.end(); ++i) {
+               MixerStrip* strip = (*i)[track_columns.strip];
+
+               if ( (*i)[track_columns.visible] == true ) {  // add bindings for
+                       // make the actual binding
+                       //cout<<"Auto Binding:  Visible Strip Found: "<<strip->name()<<endl;
+
+                       int controlValue = pos;
+                       if( strip->route()->is_master() ) {
+                               controlValue = 0;
+                       }
+                       else {
+                               pos++;
+                       }
+
+                       PBD::Controllable::CreateBinding ( strip->solo_button->get_controllable().get(), controlValue, 0);
+                       PBD::Controllable::CreateBinding ( strip->mute_button->get_controllable().get(), controlValue, 1);
+
+                       if( strip->is_audio_track() ) {
+                               PBD::Controllable::CreateBinding ( strip->rec_enable_button->get_controllable().get(), controlValue, 2);
+                       }
+
+                       PBD::Controllable::CreateBinding ( strip->gpm.get_controllable().get(), controlValue, 3);
+                       PBD::Controllable::CreateBinding ( strip->panners.get_controllable().get(), controlValue, 4);
+
+               }
+               else {  // Remove any existing binding
+                       PBD::Controllable::DeleteBinding ( strip->solo_button->get_controllable().get() );
+                       PBD::Controllable::DeleteBinding ( strip->mute_button->get_controllable().get() );
+
+                       if( strip->is_audio_track() ) {
+                               PBD::Controllable::DeleteBinding ( strip->rec_enable_button->get_controllable().get() );
+                       }
+
+                       PBD::Controllable::DeleteBinding ( strip->gpm.get_controllable().get() );
+                       PBD::Controllable::DeleteBinding ( strip->panners.get_controllable().get() ); // This only takes the first panner if there are multiples...
+               }
+
+       } // for
 
-       Main::idle.connect (mem_fun(*this, &Mixer_UI::track_display_reordered));
 }
 
-int
-Mixer_UI::track_display_reordered ()
+struct SignalOrderRouteSorter {
+    bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
+           /* use of ">" forces the correct sort order */
+           return a->order_key (N_("signal")) < b->order_key (N_("signal"));
+    }
+};
+
+void
+Mixer_UI::initial_track_display ()
 {
-       CList_Helpers::RowList::iterator i;
-       long order;
+       boost::shared_ptr<RouteList> routes = _session->get_routes();
+       RouteList copy (*routes);
+       SignalOrderRouteSorter sorter;
 
-       // hide_all_strips (false);
+       copy.sort (sorter);
 
-       for (order = 0, i  = track_display_list.rows().begin(); i != track_display_list.rows().end(); ++i, ++order) {
-               MixerStrip* strip = (MixerStrip *) (*i)->get_data ();
-               if (strip->marked_for_display()) {
-                       strip->route().set_order_key (N_("signal"), order);
-                       strip_packer.reorder_child (*strip, -1); /* put at end */
-               }
-       }
+       no_track_list_redisplay = true;
+
+       track_model->clear ();
+
+       add_strip (copy);
+
+       no_track_list_redisplay = false;
 
-       return FALSE;
+       redisplay_track_list ();
 }
 
 void
-Mixer_UI::track_column_click (gint col)
+Mixer_UI::show_track_list_menu ()
 {
        if (track_menu == 0) {
                build_track_menu ();
        }
 
-       track_menu->popup (0, 0);
+       track_menu->popup (1, gtk_get_current_event_time());
 }
 
+bool
+Mixer_UI::track_display_button_press (GdkEventButton* ev)
+{
+       if (Keyboard::is_context_menu_event (ev)) {
+               show_track_list_menu ();
+               return true;
+       }
+
+       TreeIter iter;
+       TreeModel::Path path;
+       TreeViewColumn* column;
+       int cellx;
+       int celly;
+
+       if (!track_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) {
+               return false;
+       }
+
+       switch (GPOINTER_TO_UINT (column->get_data (X_("colnum")))) {
+       case 0:
+               /* allow normal processing to occur */
+               return false;
+
+       case 1: /* visibility */
+
+               if ((iter = track_model->get_iter (path))) {
+                       MixerStrip* strip = (*iter)[track_columns.strip];
+                       if (strip) {
+
+                               if (!strip->route()->is_master() && !strip->route()->is_monitor()) {
+                                       bool visible = (*iter)[track_columns.visible];
+                                       (*iter)[track_columns.visible] = !visible;
+                               }
+#ifdef GTKOSX
+                               track_display.queue_draw();
+#endif
+                       }
+               }
+               return true;
+
+       default:
+               break;
+       }
+
+       return false;
+}
+
+
 void
 Mixer_UI::build_track_menu ()
 {
@@ -665,233 +1023,316 @@ Mixer_UI::build_track_menu ()
        track_menu = new Menu;
        track_menu->set_name ("ArdourContextMenu");
        MenuList& items = track_menu->items();
-       track_menu->set_name ("ArdourContextMenu");
-       
-       items.push_back (MenuElem (_("Show All"), mem_fun(*this, &Mixer_UI::select_all_strips)));
-       items.push_back (MenuElem (_("Hide All"), mem_fun(*this, &Mixer_UI::unselect_all_strips)));
-       items.push_back (MenuElem (_("Show All AudioTrack MixerStrips"), mem_fun(*this, &Mixer_UI::select_all_audiotrack_strips)));
-       items.push_back (MenuElem (_("Hide All AudioTrack MixerStrips"), mem_fun(*this, &Mixer_UI::unselect_all_audiotrack_strips)));
-       items.push_back (MenuElem (_("Show All AudioBus MixerStrips"), mem_fun(*this, &Mixer_UI::select_all_audiobus_strips)));
-       items.push_back (MenuElem (_("Hide All AudioBus MixerStrips"), mem_fun(*this, &Mixer_UI::unselect_all_audiobus_strips)));
+
+       items.push_back (MenuElem (_("Show All"), sigc::mem_fun(*this, &Mixer_UI::show_all_routes)));
+       items.push_back (MenuElem (_("Hide All"), sigc::mem_fun(*this, &Mixer_UI::hide_all_routes)));
+       items.push_back (MenuElem (_("Show All Audio Tracks"), sigc::mem_fun(*this, &Mixer_UI::show_all_audiotracks)));
+       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)));
 
 }
 
 void
-Mixer_UI::strip_name_changed (void* src, MixerStrip* mx)
+Mixer_UI::strip_property_changed (const PropertyChange& what_changed, MixerStrip* mx)
 {
-       ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::strip_name_changed), src, mx));
-       
-       CList_Helpers::RowList::iterator i;
-
-       if ((i = track_display_list.rows().find_data (mx)) == track_display_list.rows().end()) {
-               error << _("track display list item for renamed strip not found!") << endmsg;
+       if (!what_changed.contains (ARDOUR::Properties::name)) {
                return;
        }
 
-       track_display_list.cell ((*i)->get_row_num(), 0).set_text (mx->route().name());
+       ENSURE_GUI_THREAD (*this, &Mixer_UI::strip_name_changed, what_changed, mx)
+
+       TreeModel::Children rows = track_model->children();
+       TreeModel::Children::iterator i;
+
+       for (i = rows.begin(); i != rows.end(); ++i) {
+               if ((*i)[track_columns.strip] == mx) {
+                       (*i)[track_columns.text] = mx->route()->name();
+                       return;
+               }
+       }
+
+       error << _("track display list item for renamed strip not found!") << endmsg;
 }
 
+
 void
-Mixer_UI::new_mix_group ()
+Mixer_UI::build_route_group_context_menu ()
 {
-       ArdourPrompter prompter;
-       string result;
+       using namespace Gtk::Menu_Helpers;
 
-       prompter.set_prompt (_("Name for new mix group"));
-       prompter.done.connect (Main::quit.slot());
+       route_group_context_menu = new Menu;
+       route_group_context_menu->set_name ("ArdourContextMenu");
+       MenuList& items = route_group_context_menu->items();
 
-       prompter.show_all ();
-       
-       Main::run ();
-       
-       if (prompter.status != Gtkmm2ext::Prompter::entered) {
-               return;
-       }
-       
-       prompter.get_result (result);
+       items.push_back (MenuElem (_("Activate All"), sigc::mem_fun(*this, &Mixer_UI::activate_all_route_groups)));
+       items.push_back (MenuElem (_("Disable All"), sigc::mem_fun(*this, &Mixer_UI::disable_all_route_groups)));
+       items.push_back (SeparatorElem());
+       items.push_back (MenuElem (_("Add group"), sigc::mem_fun(*this, &Mixer_UI::new_route_group)));
 
-       if (result.length()) {
-               session->add_mix_group (result);
-       }
 }
 
-void
-Mixer_UI::group_list_button_clicked ()
+bool
+Mixer_UI::group_display_button_press (GdkEventButton* ev)
 {
-       if (session) {
-               new_mix_group ();
+       if (Keyboard::is_context_menu_event (ev)) {
+               if (route_group_context_menu == 0) {
+                       build_route_group_context_menu ();
+               }
+               route_group_context_menu->popup (1, ev->time);
+               return true;
        }
-}
 
-gint
-Mixer_UI::group_list_button_press_event (GdkEventButton* ev)
-{
-       gint row, col;
-       RouteGroup* group;
 
-       if (group_list.get_selection_info ((int)ev->x, (int)ev->y, &row, &col) == 0) {
-               return FALSE;
+        RouteGroup* group;
+       TreeIter iter;
+       TreeModel::Path path;
+       TreeViewColumn* column;
+       int cellx;
+       int celly;
+
+       if (!group_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) {
+               return false;
        }
 
-       switch (col) {
-       case 1:
+       switch (GPOINTER_TO_UINT (column->get_data (X_("colnum")))) {
+       case 0:
                if (Keyboard::is_edit_event (ev)) {
-                       // RouteGroup* group = (RouteGroup *) group_list.row(row).get_data ();
-
-                       // edit_mix_group (group);
-
-                       return stop_signal (group_list, "button_press_event");
+                       if ((iter = group_model->get_iter (path))) {
+                               if ((group = (*iter)[group_columns.group]) != 0) {
+                                       // edit_route_group (group);
+#ifdef GTKOSX
+                                       group_display.queue_draw();
+#endif
+                                       return true;
+                               }
+                       }
 
-               } else {
-                       /* allow regular select to occur */
-                       return FALSE;
                }
+               break;
 
-       case 0:
-               stop_signal (group_list, "button_press_event");
-               if ((group = (RouteGroup *) group_list.row(row).get_data ()) != 0) {
-                       group->set_active (!group->is_active (), this);
+       case 1:
+               if ((iter = group_model->get_iter (path))) {
+                       bool visible = (*iter)[group_columns.visible];
+                       (*iter)[group_columns.visible] = !visible;
+#ifdef GTKOSX
+                       group_display.queue_draw();
+#endif
+                       return true;
                }
                break;
+
+       default:
+               break;
        }
-               
-       return TRUE;
+
+       return false;
+ }
+
+void
+Mixer_UI::activate_all_route_groups ()
+{
+       _session->foreach_route_group (sigc::bind (sigc::mem_fun (*this, &Mixer_UI::set_route_group_activation), true));
 }
 
 void
-Mixer_UI::group_selected (gint row, gint col, GdkEvent* ev)
+Mixer_UI::disable_all_route_groups ()
 {
-       RouteGroup* group = (RouteGroup *) group_list.row(row).get_data ();
+       _session->foreach_route_group (sigc::bind (sigc::mem_fun (*this, &Mixer_UI::set_route_group_activation), false));
+}
 
-       if (group) {
-               group->set_hidden (false, this);
-       } else {
-               /* the master group */
+void
+Mixer_UI::route_groups_changed ()
+{
+       ENSURE_GUI_THREAD (*this, &Mixer_UI::route_groups_changed)
 
-               for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
-                       show_strip (*i);
-               }
+       /* just rebuild the while thing */
 
-               track_display_reordered ();
+       group_model->clear ();
+
+       {
+               TreeModel::Row row;
+               row = *(group_model->append());
+               row[group_columns.visible] = true;
+               row[group_columns.text] = (_("-all-"));
+               row[group_columns.group] = 0;
        }
+
+       _session->foreach_route_group (sigc::mem_fun (*this, &Mixer_UI::add_route_group));
 }
 
 void
-Mixer_UI::group_unselected (gint row, gint col, GdkEvent* ev)
+Mixer_UI::new_route_group ()
+{
+       PropertyList plist;
+
+       plist.add (Properties::active, true);
+       plist.add (Properties::gain, true);
+       plist.add (Properties::mute, true);
+       plist.add (Properties::solo, true);
+
+       RouteGroup* g = new RouteGroup (*_session, "");
+       g->set_properties (plist);
 
+       _session->add_route_group (g);
+}
+
+void
+Mixer_UI::remove_selected_route_group ()
 {
-       RouteGroup* group = (RouteGroup *) group_list.row(row).get_data ();
+       Glib::RefPtr<TreeSelection> selection = group_display.get_selection();
+       TreeView::Selection::ListHandle_Path rows = selection->get_selected_rows ();
 
-       if (group) {
-               group->set_hidden (true, this);
-       } else {
-               /* the master group */
+       if (rows.empty()) {
+               return;
+       }
 
-               for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
-                       hide_strip (*i);
+       TreeView::Selection::ListHandle_Path::iterator i = rows.begin();
+       TreeIter iter;
+
+       /* selection mode is single, so rows.begin() is it */
+
+       if ((iter = group_model->get_iter (*i))) {
+
+               RouteGroup* rg = (*iter)[group_columns.group];
+
+               if (rg) {
+                       _session->remove_route_group (*rg);
                }
        }
 }
 
 void
-Mixer_UI::group_flags_changed (void* src, RouteGroup* group)
+Mixer_UI::route_group_property_changed (RouteGroup* group, const PropertyChange& change)
 {
-       ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::group_flags_changed), src, group));
-       
-       if (src != this) {
-               // select row
+       if (in_group_row_change) {
+               return;
        }
 
-       CList_Helpers::RowIterator ri = group_list.rows().find_data (group);
+       /* force an update of any mixer strips that are using this group,
+          otherwise mix group names don't change in mixer strips
+       */
 
        for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
-               if ((*i)->route().mix_group() == group) {
-                       if (group->is_hidden ()) {
-                               unselect_strip_in_display(*i);
-                       } else {
-                               select_strip_in_display(*i);
-                               (*ri)->select();
-                       }
+               if ((*i)->route_group() == group) {
+                       (*i)->route_group_changed();
                }
        }
 
-       if (group->is_active()) {
-               group_list.cell (ri->get_row_num(),0).set_pixmap (check_pixmap, check_mask);
-       } else {
-               group_list.cell (ri->get_row_num(),0).set_pixmap (empty_pixmap, empty_mask);
+       TreeModel::iterator i;
+       TreeModel::Children rows = group_model->children();
+       Glib::RefPtr<TreeSelection> selection = group_display.get_selection();
+
+       in_group_row_change = true;
+
+       for (i = rows.begin(); i != rows.end(); ++i) {
+               if ((*i)[group_columns.group] == group) {
+                       (*i)[group_columns.visible] = !group->is_hidden ();
+                       (*i)[group_columns.text] = group->name ();
+                       break;
+               }
+       }
+
+       in_group_row_change = false;
+
+       if (change.contains (Properties::name)) {
+               _group_tabs->set_dirty ();
        }
 }
 
 void
-Mixer_UI::add_mix_group (RouteGroup* group)
-
+Mixer_UI::route_group_name_edit (const Glib::ustring& path, const Glib::ustring& new_text)
 {
-       ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::add_mix_group), group));
-       
-       list<string> names;
-
-       names.push_back ("");
-       names.push_back (group->name());
+       RouteGroup* group;
+       TreeIter iter;
 
-       group_list.rows().push_back (names);
-       group_list.rows().back().set_data (group);
-       
-       /* update display to reflect group flags */
+       if ((iter = group_model->get_iter (path))) {
 
-       group_flags_changed (0, group);
+               if ((group = (*iter)[group_columns.group]) == 0) {
+                       return;
+               }
 
-       group->FlagsChanged.connect (bind (mem_fun(*this, &Mixer_UI::group_flags_changed), group));
+               if (new_text != group->name()) {
+                       group->set_name (new_text);
+               }
+       }
 }
 
 void
-Mixer_UI::redisplay_snapshots ()
+Mixer_UI::route_group_row_change (const Gtk::TreeModel::Path&, const Gtk::TreeModel::iterator& iter)
 {
-       if (session == 0) {
+       RouteGroup* group;
+
+       if (in_group_row_change) {
                return;
        }
 
-       vector<string*>* states;
-       if ((states = session->possible_states()) == 0) {
+       if ((group = (*iter)[group_columns.group]) == 0) {
                return;
        }
 
-       snapshot_display.freeze();
-       snapshot_display.rows().clear ();
-       
-       for (vector<string*>::iterator i = states->begin(); i != states->end(); ++i) {
-               string statename = *(*i);
-               const char *rowtext[1];
-
-               rowtext[0] = statename.c_str();
+       if ((*iter)[group_columns.visible]) {
+               for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
+                       if ((*i)->route_group() == group) {
+                               show_strip (*i);
+                       }
+               }
+       } else {
+               for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
+                       if ((*i)->route_group() == group) {
+                               hide_strip (*i);
+                       }
+               }
+       }
 
-               snapshot_display.rows().push_back (rowtext);
-               snapshot_display.rows().back().set_data (new string (statename), deferred_delete<string>);
+       Glib::ustring name = (*iter)[group_columns.text];
 
-               delete *i;
+       if (name != group->name()) {
+               group->set_name (name);
        }
 
-       delete states;
-       snapshot_display.thaw();
 }
 
 void
-Mixer_UI::session_state_saved (string snap_name)
+Mixer_UI::add_route_group (RouteGroup* group)
 {
-       ENSURE_GUI_THREAD (bind (mem_fun(*this, &Mixer_UI::session_state_saved), snap_name));
-       redisplay_snapshots ();
+       ENSURE_GUI_THREAD (*this, &Mixer_UI::add_route_group, group)
+       bool focus = false;
+
+       in_group_row_change = true;
+
+       TreeModel::Row row = *(group_model->append());
+       row[group_columns.visible] = true;
+       row[group_columns.group] = group;
+       if (!group->name().empty()) {
+               row[group_columns.text] = group->name();
+       } else {
+               row[group_columns.text] = _("unnamed");
+               focus = true;
+       }
+
+       group->PropertyChanged.connect (*this, invalidator (*this), ui_bind (&Mixer_UI::route_group_property_changed, this, group, _1), gui_context());
+
+       if (focus) {
+               TreeViewColumn* col = group_display.get_column (0);
+               CellRendererText* name_cell = dynamic_cast<CellRendererText*>(group_display.get_column_cell_renderer (0));
+               group_display.set_cursor (group_model->get_path (row), *col, *name_cell, true);
+       }
+
+       in_group_row_change = false;
 }
 
-gint
+bool
 Mixer_UI::strip_scroller_button_release (GdkEventButton* ev)
 {
        using namespace Menu_Helpers;
 
        if (Keyboard::is_context_menu_event (ev)) {
-               ARDOUR_UI::instance()->add_route();
-               return TRUE;
+               ARDOUR_UI::instance()->add_route (this);
+               return true;
        }
 
-       return FALSE;
+       return false;
 }
 
 void
@@ -900,48 +1341,83 @@ Mixer_UI::set_strip_width (Width w)
        _strip_width = w;
 
        for (list<MixerStrip*>::iterator i = strips.begin(); i != strips.end(); ++i) {
-               (*i)->set_width (w);
+               (*i)->set_width_enum (w, this);
        }
 }
 
+void
+Mixer_UI::set_window_pos_and_size ()
+{
+       resize (m_width, m_height);
+       move (m_root_x, m_root_y);
+}
+
+       void
+Mixer_UI::get_window_pos_and_size ()
+{
+       get_position(m_root_x, m_root_y);
+       get_size(m_width, m_height);
+}
 
 int
 Mixer_UI::set_state (const XMLNode& node)
 {
        const XMLProperty* prop;
        XMLNode* geometry;
-       int x, y, width, height, xoff, yoff;
-       
-       if ((geometry = find_named_node (node, "geometry")) == 0) {
 
-               width = default_width;
-               height = default_height;
-               x = 1;
-               y = 1;
-               xoff = 0;
-               yoff = 21;
+       m_width = default_width;
+       m_height = default_height;
+       m_root_x = 1;
+       m_root_y = 1;
 
-       } else {
+       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());
+               }
+               if ((prop = geometry->property("y_size")) == 0) {
+                       prop = geometry->property ("y-size");
+               }
+               if (prop) {
+                       m_height = atoi(prop->value());
+               }
+
+               if ((prop = geometry->property ("x_pos")) == 0) {
+                       prop = geometry->property ("x-pos");
+               }
+               if (prop) {
+                       m_root_x = atoi (prop->value());
 
-               width = atoi(geometry->property("x_size")->value().c_str());
-               height = atoi(geometry->property("y_size")->value().c_str());
-               x = atoi(geometry->property("x_pos")->value().c_str());
-               y = atoi(geometry->property("y_pos")->value().c_str());
-               xoff = atoi(geometry->property("x_off")->value().c_str());
-               yoff = atoi(geometry->property("y_off")->value().c_str());
+               }
+               if ((prop = geometry->property ("y_pos")) == 0) {
+                       prop = geometry->property ("y-pos");
+               }
+               if (prop) {
+                       m_root_y = atoi (prop->value());
+               }
        }
-               
-       set_default_size(width, height);
-       set_uposition(x, y-yoff);
+
+       set_window_pos_and_size ();
 
        if ((prop = node.property ("narrow-strips"))) {
-               if (prop->value() == "yes") {
+               if (string_is_affirmative (prop->value())) {
                        set_strip_width (Narrow);
                } else {
                        set_strip_width (Wide);
                }
        }
 
+       if ((prop = node.property ("show-mixer"))) {
+               if (string_is_affirmative (prop->value())) {
+                      _visible = true;
+               }
+       }
+
        return 0;
 }
 
@@ -951,32 +1427,29 @@ Mixer_UI::get_state (void)
        XMLNode* node = new XMLNode ("Mixer");
 
        if (is_realized()) {
-               Gdk_Window win = get_window();
-               
-               int x, y, xoff, yoff, width, height;
-               win.get_root_origin(x, y);
-               win.get_position(xoff, yoff);
-               win.get_size(width, height);
+               Glib::RefPtr<Gdk::Window> win = get_window();
+
+               get_window_pos_and_size ();
 
                XMLNode* geometry = new XMLNode ("geometry");
                char buf[32];
-               snprintf(buf, sizeof(buf), "%d", width);
+               snprintf(buf, sizeof(buf), "%d", m_width);
                geometry->add_property(X_("x_size"), string(buf));
-               snprintf(buf, sizeof(buf), "%d", height);
+               snprintf(buf, sizeof(buf), "%d", m_height);
                geometry->add_property(X_("y_size"), string(buf));
-               snprintf(buf, sizeof(buf), "%d", x);
+               snprintf(buf, sizeof(buf), "%d", m_root_x);
                geometry->add_property(X_("x_pos"), string(buf));
-               snprintf(buf, sizeof(buf), "%d", y);
+               snprintf(buf, sizeof(buf), "%d", m_root_y);
                geometry->add_property(X_("y_pos"), string(buf));
-               snprintf(buf, sizeof(buf), "%d", xoff);
+
+               // 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", yoff);
+               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*>(&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));
 
@@ -985,12 +1458,14 @@ Mixer_UI::get_state (void)
 
        node->add_property ("narrow-strips", _strip_width == Narrow ? "yes" : "no");
 
+       node->add_property ("show-mixer", _visible ? "yes" : "no");
+
        return *node;
 }
 
 
-void 
-Mixer_UI::pane_allocation_handler (GtkAllocation *alloc, Gtk::Paned* which)
+void
+Mixer_UI::pane_allocation_handler (Allocation&, Gtk::Paned* which)
 {
        int pos;
        XMLProperty* prop = 0;
@@ -1000,12 +1475,24 @@ Mixer_UI::pane_allocation_handler (GtkAllocation *alloc, Gtk::Paned* which)
        int width, height;
        static int32_t done[3] = { 0, 0, 0 };
 
-       if ((geometry = find_named_node (*node, "geometry")) == 0) {
-               width = default_width;
-               height = default_height;
-       } else {
-               width = atoi(geometry->property("x_size")->value());
-               height = atoi(geometry->property("y_size")->value());
+       width = default_width;
+       height = default_height;
+
+       if ((geometry = find_named_node (*node, "geometry")) != 0) {
+
+
+               if ((prop = geometry->property ("x_size")) == 0) {
+                       prop = geometry->property ("x-size");
+               }
+               if (prop) {
+                       width = atoi (prop->value());
+               }
+               if ((prop = geometry->property ("y_size")) == 0) {
+                       prop = geometry->property ("y-size");
+               }
+               if (prop) {
+                       height = atoi (prop->value());
+               }
        }
 
        if (which == static_cast<Gtk::Paned*> (&rhs_pane1)) {
@@ -1014,7 +1501,7 @@ Mixer_UI::pane_allocation_handler (GtkAllocation *alloc, Gtk::Paned* which)
                        return;
                }
 
-               if (!geometry || (prop = geometry->property("mixer_rhs_pane1_pos")) == 0) {
+               if (!geometry || (prop = geometry->property("mixer-rhs-pane1-pos")) == 0) {
                        pos = height / 3;
                        snprintf (buf, sizeof(buf), "%d", pos);
                } else {
@@ -1025,39 +1512,123 @@ Mixer_UI::pane_allocation_handler (GtkAllocation *alloc, Gtk::Paned* which)
                        rhs_pane1.set_position (pos);
                }
 
-       } else if (which == static_cast<Gtk::Paned*> (&rhs_pane2)) {
+       } else if (which == static_cast<Gtk::Paned*> (&list_hpane)) {
 
-               if (done[1]) {
+               if (done[2]) {
                        return;
                }
 
-               if (!geometry || (prop = geometry->property("mixer_rhs_pane2_pos")) == 0) {
-                       pos = height / 3;
+               if (!geometry || (prop = geometry->property("mixer-list-hpane-pos")) == 0) {
+                       pos = 75;
                        snprintf (buf, sizeof(buf), "%d", pos);
                } else {
                        pos = atoi (prop->value());
                }
 
-               if ((done[1] = GTK_WIDGET(rhs_pane2.gobj())->allocation.height > pos)) {
-                       rhs_pane2.set_position (pos);
+               if ((done[2] = GTK_WIDGET(list_hpane.gobj())->allocation.width > pos)) {
+                       list_hpane.set_position (pos);
                }
+       }
+}
+void
+Mixer_UI::scroll_left () 
+{
+       Adjustment* adj = scroller.get_hscrollbar()->get_adjustment();
+       /* stupid GTK: can't rely on clamping across versions */
+       scroller.get_hscrollbar()->set_value (max (adj->get_lower(), adj->get_value() - adj->get_step_increment()));
+}
 
-       } else if (which == static_cast<Gtk::Paned*> (&list_hpane)) {
+void
+Mixer_UI::scroll_right ()
+{
+       Adjustment* adj = scroller.get_hscrollbar()->get_adjustment();
+       /* stupid GTK: can't rely on clamping across versions */
+       scroller.get_hscrollbar()->set_value (min (adj->get_upper(), adj->get_value() + adj->get_step_increment()));
+}
 
-               if (done[2]) {
-                       return;
+bool
+Mixer_UI::on_key_press_event (GdkEventKey* ev)
+{
+       switch (ev->keyval) {
+       case GDK_Left:
+               scroll_left ();
+               return true;
+
+       case GDK_Right:
+               scroll_right ();
+               return true;
+
+       default:
+               break;
+       }
+
+       return key_press_focus_accelerator_handler (*this, ev);
+}
+
+bool
+Mixer_UI::on_key_release_event (GdkEventKey* ev)
+{
+       return Gtk::Window::on_key_release_event (ev);
+       // return key_press_focus_accelerator_handler (*this, ev);
+}
+
+
+bool
+Mixer_UI::on_scroll_event (GdkEventScroll* ev)
+{
+       switch (ev->direction) {
+       case GDK_SCROLL_LEFT:
+               scroll_left ();
+               return true;
+       case GDK_SCROLL_UP:
+               if (ev->state & Keyboard::TertiaryModifier) {
+                       scroll_left ();
+                       return true;
                }
+               return false;
 
-               if (!geometry || (prop = geometry->property("mixer_list_hpane_pos")) == 0) {
-                       pos = 75;
-                       snprintf (buf, sizeof(buf), "%d", pos);
-               } else {
-                       pos = atoi (prop->value());
+       case GDK_SCROLL_RIGHT:
+               scroll_right ();
+               return true;
+
+       case GDK_SCROLL_DOWN:
+               if (ev->state & Keyboard::TertiaryModifier) {
+                       scroll_right ();
+                       return true;
                }
+               return false;
+       }
 
-               if ((done[2] = GTK_WIDGET(list_hpane.gobj())->allocation.width > pos)) {
-                       list_hpane.set_position (pos);
+       return false;
+}
+
+
+void
+Mixer_UI::parameter_changed (string const & p)
+{
+       if (p == "show-group-tabs") {
+               bool const s = _session->config.get_show_group_tabs ();
+               if (s) {
+                       _group_tabs->show ();
+               } else {
+                       _group_tabs->hide ();
                }
        }
 }
 
+void
+Mixer_UI::set_route_group_activation (RouteGroup* g, bool a)
+{
+       g->set_active (a, this);
+}
+
+PluginSelector*
+Mixer_UI::plugin_selector()
+{
+#ifdef DEFER_PLUGIN_SELECTOR_LOAD
+       if (!_plugin_selector)
+               _plugin_selector = new PluginSelector (PluginManager::the_manager ());
+#endif
+
+       return _plugin_selector;
+}