X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_ui.cc;h=89d7ef5cc4558f860944088ccdfbaa5c5f8b286e;hb=a5abcd306ba589411aa8b4e5b2729621bdc77d3a;hp=4c94ba94d96fa9d780cc6edf5ab7d9aa08d76d8b;hpb=08d33fcb0d35b6448ac1b5a4bcc54095cacbfccd;p=ardour.git

diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 4c94ba94d9..89d7ef5cc4 100644
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -15,205 +15,235 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <algorithm>
 #include <sigc++/bind.h>
 
-#include <pbd/lockmonitor.h>
+#include <gtkmm/accelmap.h>
+
+#include <pbd/convert.h>
+#include <glibmm/thread.h>
+
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/stop_signal.h>
+#include <gtkmm2ext/window_title.h>
 
-#include <ardour/audioengine.h>
 #include <ardour/session.h>
+#include <ardour/audio_track.h>
 #include <ardour/session_route.h>
-#include <ardour/diskstream.h>
+#include <ardour/audio_diskstream.h>
 #include <ardour/plugin_manager.h>
 
+#include "keyboard.h"
 #include "mixer_ui.h"
 #include "mixer_strip.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 "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
-};
-
-static const gchar* group_list_titles[] = { 
-	N_("***"), 
-	N_("Bar"),
-	0
-};
-
-GdkPixmap* Mixer_UI::check_pixmap = 0;
-GdkBitmap* Mixer_UI::check_mask = 0;
-GdkPixmap* Mixer_UI::empty_pixmap = 0;
-GdkBitmap* Mixer_UI::empty_mask = 0;
-
+using PBD::atoi;
 
-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))
-	
+Mixer_UI::Mixer_UI ()
+	: Window (Gtk::WINDOW_TOPLEVEL)
 {
 	_strip_width = Wide;
 	track_menu = 0;
+	mix_group_context_menu = 0;
+	no_track_list_redisplay = false;
+	in_group_row_change = false;
+	_visible = false;
 
-	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);
-
-	XMLNode* node = ARDOUR_UI::instance()->mixer_settings();
-	set_state (*node);
-
- 	scroller_base.signal_add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
+ 	scroller_base.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
  	scroller_base.set_name ("MixerWindow");
- 	scroller_base.signal_button_release_event.connect (mem_fun(*this, &Mixer_UI::strip_scroller_button_release));
+ 	scroller_base.signal_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);
 
-	scroller.add_with_viewport (strip_packer);
-	scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+	scroller.add (strip_packer);
+	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 (mem_fun (*this, &Mixer_UI::track_list_delete));
+	track_model->signal_row_changed().connect (mem_fun (*this, &Mixer_UI::track_list_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);
+	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 (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);
 
-	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);
+	group_model = ListStore::create (group_columns);
+	group_display.set_model (group_model);
+	group_display.append_column (_("Group"), group_columns.text);
+	group_display.append_column (_("Active"), group_columns.active);
+	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 (2)->set_data (X_("colnum"), GUINT_TO_POINTER(2));
+	group_display.get_column (0)->set_expand(true);
+	group_display.get_column (1)->set_expand(false);
+	group_display.get_column (2)->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);
+
+	/* name is directly editable */
+
+	CellRendererText* name_cell = dynamic_cast<CellRendererText*>(group_display.get_column_cell_renderer (0));
+	name_cell->property_editable() = true;
+	name_cell->signal_edited().connect (mem_fun (*this, &Mixer_UI::mix_group_name_edit));
+
+	/* use checkbox for the active column */
+
+	CellRendererToggle* active_cell = dynamic_cast<CellRendererToggle*>(group_display.get_column_cell_renderer (1));
+	active_cell->property_activatable() = true;
+	active_cell->property_radio() = false;
+
+	/* use checkbox for the visible column */
+
+	active_cell = dynamic_cast<CellRendererToggle*>(group_display.get_column_cell_renderer (2));
+	active_cell->property_activatable() = true;
+	active_cell->property_radio() = false;
 
-	list<string> stupid_list;
+	group_model->signal_row_changed().connect (mem_fun (*this, &Mixer_UI::mix_group_row_change));
 
-	stupid_list.push_back ("");
-	stupid_list.push_back (_("-all-"));
+	group_display.signal_button_press_event().connect (mem_fun (*this, &Mixer_UI::group_display_button_press), false);
 
-	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);
+	group_display_scroller.add (group_display);
+	group_display_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
+
+	HBox* mix_group_display_button_box = manage (new HBox());
+
+	Button* mix_group_add_button = manage (new Button ());
+	Button* mix_group_remove_button = manage (new Button ());
+
+	Widget* w;
+
+	w = manage (new Image (Stock::ADD, ICON_SIZE_BUTTON));
+	w->show();
+	mix_group_add_button->add (*w);
+
+	w = manage (new Image (Stock::REMOVE, ICON_SIZE_BUTTON));
+	w->show();
+	mix_group_remove_button->add (*w);
+
+	mix_group_display_button_box->set_homogeneous (true);
+
+	mix_group_add_button->signal_clicked().connect (mem_fun (*this, &Mixer_UI::new_mix_group));
+	mix_group_remove_button->signal_clicked().connect (mem_fun (*this, &Mixer_UI::remove_selected_mix_group));
+
+	mix_group_display_button_box->add (*mix_group_remove_button);
+	mix_group_display_button_box->add (*mix_group_add_button);
+
+	group_display_vbox.pack_start (group_display_scroller, true, true);
+	group_display_vbox.pack_start (*mix_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);
+	global_hpacker.pack_start (out_packer, false, false, 12);
 
 	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 (bind (mem_fun(*this, &Mixer_UI::pane_allocation_handler), 
+							static_cast<Gtk::Paned*> (&rhs_pane1)));
+	list_hpane.signal_size_allocate().connect (bind (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.signal_button_release_event.connect (bind (ptr_fun (pane_handler), static_cast<Paned*>(&rhs_pane1)));
-	rhs_pane2.signal_button_release_event.connect (bind (ptr_fun (pane_handler), static_cast<Paned*>(&rhs_pane2)));
-	list_hpane.signal_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);
+	
+	WindowTitle title(Glib::get_application_name());
+	title += _("Mixer");
+	set_title (title.get_string());
 
-	snapshot_display.select_row.connect (mem_fun(*this, &Mixer_UI::snapshot_display_selected));
+	set_wmclass (X_("ardour_mixer"), "Ardour");
 
-	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));
+	add_accel_group (ActionManager::ui_manager->get_accel_group());
 
-	group_list_button.signal_clicked().connect (mem_fun(*this, &Mixer_UI::group_list_button_clicked));
-	group_list.signal_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));
+	signal_delete_event().connect (mem_fun (*this, &Mixer_UI::hide_window));
+	add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
 
 	_plugin_selector = new PluginSelector (PluginManager::the_manager());
-	_plugin_selector->signal_delete_event.connect (bind (ptr_fun (just_hide_it), 
-						     static_cast<Window *> (_plugin_selector)));
 
-	configure_event.connect (mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler));
+	signal_configure_event().connect (mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler));
 
 	_selection.RoutesChanged.connect (mem_fun(*this, &Mixer_UI::follow_strip_selection));
+	
+	mix_group_display_button_box->show();
+	mix_group_add_button->show();
+	mix_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();
 }
 
 Mixer_UI::~Mixer_UI ()
@@ -229,55 +259,73 @@ Mixer_UI::ensure_float (Window& win)
 void
 Mixer_UI::show_window ()
 {
-	show_all ();
+	present ();
+
+	set_window_pos_and_size ();
 
 	/* now reset each strips width so the right widgets are shown */
 	MixerStrip* ms;
-	CList_Helpers::RowList::iterator i;
 
-	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());
+	TreeModel::Children rows = track_model->children();
+	TreeModel::Children::iterator ri;
+
+	for (ri = rows.begin(); ri != rows.end(); ++ri) {
+		ms = (*ri)[track_columns.strip];
+		ms->set_width (ms->get_width(), ms->width_owner());
 	}
+	_visible = true;
 }
 
-void
-Mixer_UI::add_strip (Route* route)
+bool
+Mixer_UI::hide_window (GdkEventAny *ev)
 {
-	ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::add_strip), route));
-	
-	MixerStrip* strip;
-	
-	if (route->hidden()) {
-		return;
-	}
+	get_window_pos_and_size ();
 
-	strip = new MixerStrip (*this, *session, *route);
-	strips.push_back (strip);
+	_visible = false;
+	return just_hide_it(ev, static_cast<Gtk::Window *>(this));
+}
 
-	strip->set_width (_strip_width);
-	show_strip (strip);
 
-	const gchar* rowdata[1];
-	rowdata[0] = route->name().c_str();
+void
+Mixer_UI::add_strip (Session::RouteList& routes)
+{
+	ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::add_strip), routes));
 	
-	track_display_list.freeze ();
-	track_display_list.rows().push_back (rowdata);
-	track_display_list.rows().back().set_data (strip);
-	track_display_list.thaw ();
+	MixerStrip* strip;
 
-	if (strip->marked_for_display() || strip->packed()) {
-		track_display_list.rows().back().select ();
-	}
-	
-	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));
+	for (Session::RouteList::iterator x = routes.begin(); x != routes.end(); ++x) {
+		boost::shared_ptr<Route> route = (*x);
 
-	strip->signal_button_release_event.connect (bind (mem_fun(*this, &Mixer_UI::strip_button_release_event), strip));
+		if (route->is_hidden()) {
+			return;
+		}
+		
+		strip = new MixerStrip (*this, *session, route);
+		strips.push_back (strip);
+		
+		if (strip->width_owner() != strip) {
+			strip->set_width (_strip_width, this);
+		}
 
-//	if (width() < gdk_screen_width()) {
-//		set_size_request (width() + (_strip_width == Wide ? 75 : 50), height());
-//	}
+		show_strip (strip);
+		
+		no_track_list_redisplay = true;
+		
+		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;
+		
+		no_track_list_redisplay = false;
+		redisplay_track_list ();
+		
+		route->NameChanged.connect (bind (mem_fun(*this, &Mixer_UI::strip_name_changed), strip));
+		strip->GoingAway.connect (bind (mem_fun(*this, &Mixer_UI::remove_strip), strip));
+		
+		strip->signal_button_release_event().connect (bind (mem_fun(*this, &Mixer_UI::strip_button_release_event), strip));
+	}
 }
 
 void
@@ -285,16 +333,17 @@ Mixer_UI::remove_strip (MixerStrip* strip)
 {
 	ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::remove_strip), strip));
 	
-	CList_Helpers::RowList::iterator ri;
+	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);
+	for (ri = rows.begin(); ri != rows.end(); ++ri) {
+		if ((*ri)[track_columns.strip] == strip) {
+			track_model->erase (ri);
 			break;
 		}
 	}
@@ -304,11 +353,11 @@ 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) {
@@ -318,49 +367,50 @@ Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *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());
+				_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)
 {
+
 	session = sess;
 
-	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));
+	initial_track_display ();
+
+	session->GoingAway.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));
+	session->mix_group_removed.connect (mem_fun(*this, &Mixer_UI::mix_groups_changed));
 
-	session->foreach_mix_group(this, &Mixer_UI::add_mix_group);
-	
-	session->StateSaved.connect (mem_fun(*this, &Mixer_UI::session_state_saved));
-	redisplay_snapshots ();
+	mix_groups_changed ();
 	
 	_plugin_selector->set_session (session);
 
+	if (_visible) {
+	       show_window();
+	}
+
 	start_updating ();
 }
 
@@ -369,293 +419,334 @@ Mixer_UI::disconnect_from_session ()
 {
 	ENSURE_GUI_THREAD(mem_fun(*this, &Mixer_UI::disconnect_from_session));
 	
-	group_list.clear ();
-	set_title (_("ardour: mixer"));
+	group_model->clear ();
+	_selection.clear ();
+
+	WindowTitle title(Glib::get_application_name());
+	title += _("Mixer");
+	set_title (title.get_string());
+	
 	stop_updating ();
-	hide_all_strips (false);
 }
 
 void
-Mixer_UI::hide_all_strips (bool with_select)
+Mixer_UI::show_strip (MixerStrip* ms)
 {
-	MixerStrip* ms;
-	CList_Helpers::RowList::iterator i;
-
-	track_display_list.freeze ();
+	TreeModel::Children rows = track_model->children();
+	TreeModel::Children::iterator i;
 	
-	for (i = track_display_list.rows().begin(); i != track_display_list.rows().end(); ++i) {
-		ms = (MixerStrip *) i->get_data ();
-
-		if (with_select) {
-			i->unselect ();
-		} else {
-			hide_strip (ms);
+	for (i = rows.begin(); i != rows.end(); ++i) {
+	
+		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;
+	
+	for (i = rows.begin(); i != rows.end(); ++i) {
+		
+		MixerStrip* strip = (*i)[track_columns.strip];
+		if (strip == ms) {
+			(*i)[track_columns.visible] = false;
+			break;
+		}
+	}
 }
 
-void
-Mixer_UI::select_all_strips ()
+gint
+Mixer_UI::start_updating ()
 {
-	CList_Helpers::RowList::iterator i;
+    fast_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (mem_fun(*this, &Mixer_UI::fast_update_strips));
+    return 0;
+}
 
-	for (i = track_display_list.rows().begin(); i != track_display_list.rows().end(); ++i) {
-		i->select ();
-	}
+gint
+Mixer_UI::stop_updating ()
+{
+    fast_screen_update_connection.disconnect();
+    return 0;
 }
 
 void
-Mixer_UI::select_all_audiotrack_strips ()
+Mixer_UI::fast_update_strips ()
 {
-	MixerStrip* ms;
-	CList_Helpers::RowList::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 ();
-
-		if (ms->is_audio_track()) {
-			i->select ();
+	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;
 
-	track_display_list.freeze ();
-	
-	for (i = track_display_list.rows().begin(); i != track_display_list.rows().end(); ++i) {
-		ms = (MixerStrip *) i->get_data ();
+	no_track_list_redisplay = true;
 
-		if (ms->is_audio_track()) {
-			i->unselect ();
+	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_control()) {
+			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;
 
-	track_display_list.freeze ();
-	
-	for (i = track_display_list.rows().begin(); i != track_display_list.rows().end(); ++i) {
-		ms = (MixerStrip *) i->get_data ();
+	no_track_list_redisplay = true;
+
+	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_control()) {
+			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();
 
-		if (!ms->is_audio_track()) {
-			i->unselect ();
+		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 */
+				(*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);
 }
-
-gint
-Mixer_UI::stop_updating ()
+void
+Mixer_UI::hide_all_audiobus ()
 {
-	screen_update_connection.disconnect();
-	fast_screen_update_connection.disconnect();
-	return 0;
+	set_all_audio_visibility (2, false);
 }
 
 void
-Mixer_UI::update_strips ()
+Mixer_UI::show_all_audiotracks()
 {
-	if (is_mapped () && session) {
-		for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
-			(*i)->update ();
-		}
-	}
+	set_all_audio_visibility (1, true);
 }
-
 void
-Mixer_UI::fast_update_strips ()
+Mixer_UI::hide_all_audiotracks ()
 {
-	if (is_mapped () && session) {
-		for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
-			(*i)->fast_update ();
-		}
-	}
+	set_all_audio_visibility (1, false);
 }
 
 void
-Mixer_UI::snapshot_display_selected (gint row, gint col, GdkEvent* ev)
+Mixer_UI::track_list_change (const Gtk::TreeModel::Path& path,const Gtk::TreeModel::iterator& iter)
 {
-	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);
-	}
+	session->set_remote_control_ids();
+	redisplay_track_list ();
 }
 
 void
-Mixer_UI::track_display_selected (gint row, gint col, GdkEvent* ev)
+Mixer_UI::track_list_delete (const Gtk::TreeModel::Path& path)
 {
-	MixerStrip* strip;
-
-	if ((strip = (MixerStrip *) track_display_list.get_row_data (row)) != 0) {
-		strip->set_marked_for_display  (true);
-		show_strip (strip);
-
-		/* just redraw the whole thing so that we get the right order
-		   when we reinsert the strip.
-		*/
-		
-		track_display_reordered ();
-	}
+	session->set_remote_control_ids();
+	redisplay_track_list ();
 }
 
 void
-Mixer_UI::track_display_unselected (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 (false);
-		hide_strip (strip);
+	if (no_track_list_redisplay) {
+		return;
 	}
-}
 
-void
-Mixer_UI::unselect_strip_in_display (MixerStrip *strip)
-{
-	CList_Helpers::RowIterator i;
+	for (order = 0, i = rows.begin(); i != rows.end(); ++i, ++order) {
+		MixerStrip* strip = (*i)[track_columns.strip];
 
-	if ((i = track_display_list.rows().find_data (strip)) != track_display_list.rows().end()) {
-		(*i).unselect ();
-	}
-}
+		if (strip == 0) {
+			/* we're in the middle of changing a row, don't worry */
+			continue;
+		}
 
-void
-Mixer_UI::select_strip_in_display (MixerStrip *strip)
-{
-	CList_Helpers::RowIterator i;
+		bool visible = (*i)[track_columns.visible];
 
-	if ((i = track_display_list.rows().find_data (strip)) != track_display_list.rows().end()) {
-		(*i).select ();
+		if (visible) {
+			strip->set_marked_for_display (true);
+			strip->route()->set_order_key (N_("signal"), order);
+
+			if (strip->packed()) {
+
+				if (strip->route()->is_master() || strip->route()->is_control()) {
+					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_control()) {
+					out_packer.pack_start (*strip, false, false);
+				} else {
+					strip_packer.pack_start (*strip, false, false);
+				}
+				strip->set_packed (true);
+				//strip->show();
+			}
+
+		} else {
+
+			if (strip->route()->is_master() || strip->route()->is_control()) {
+				/* do nothing, these cannot be hidden */
+			} else {
+				if (strip->packed()) {
+					strip_packer.remove (*strip);
+					strip->set_packed (false);
+				}
+			}
+		}
 	}
 }
 
+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 ("signal") < b->order_key ("signal");
+    }
+};
+
 void
-Mixer_UI::queue_track_display_reordered (gint arg1, gint arg2)
+Mixer_UI::initial_track_display ()
 {
-	/* 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.
-	*/
+	boost::shared_ptr<Session::RouteList> routes = session->get_routes();
+	Session::RouteList copy (*routes);
+	SignalOrderRouteSorter sorter;
 
-	Main::idle.connect (mem_fun(*this, &Mixer_UI::track_display_reordered));
-}
+	copy.sort (sorter);
+	
+	no_track_list_redisplay = true;
 
-int
-Mixer_UI::track_display_reordered ()
-{
-	CList_Helpers::RowList::iterator i;
-	long order;
+	track_model->clear ();
 
-	// hide_all_strips (false);
+	add_strip (copy);
 
-	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 = 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_control()) {
+					bool visible = (*iter)[track_columns.visible];
+					(*iter)[track_columns.visible] = !visible;
+				}
+			}
+		}
+		return true;
+
+	default:
+		break;
+	}
+
+	return false;
 }
 
+
 void
 Mixer_UI::build_track_menu ()
 {
@@ -665,130 +756,176 @@ 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"), mem_fun(*this, &Mixer_UI::show_all_routes)));
+	items.push_back (MenuElem (_("Hide All"), mem_fun(*this, &Mixer_UI::hide_all_routes)));
+	items.push_back (MenuElem (_("Show All Audio Tracks"), mem_fun(*this, &Mixer_UI::show_all_audiotracks)));
+	items.push_back (MenuElem (_("Hide All Audio Tracks"), mem_fun(*this, &Mixer_UI::hide_all_audiotracks)));
+	items.push_back (MenuElem (_("Show All Audio Busses"), mem_fun(*this, &Mixer_UI::show_all_audiobus)));
+	items.push_back (MenuElem (_("Hide All Audio Busses"), mem_fun(*this, &Mixer_UI::hide_all_audiobus)));
 
 }
 
 void
-Mixer_UI::strip_name_changed (void* src, MixerStrip* mx)
+Mixer_UI::strip_name_changed (MixerStrip* mx)
 {
-	ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::strip_name_changed), src, mx));
+	ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::strip_name_changed), 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;
-		return;
-	}
+	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;
+		}
+	} 
 
-	track_display_list.cell ((*i)->get_row_num(), 0).set_text (mx->route().name());
+	error << _("track display list item for renamed strip not found!") << endmsg;
 }
 
+
 void
-Mixer_UI::new_mix_group ()
+Mixer_UI::build_mix_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());
+	mix_group_context_menu = new Menu;
+	mix_group_context_menu->set_name ("ArdourContextMenu");
+	MenuList& items = mix_group_context_menu->items();
 
-	prompter.show_all ();
-	
-	Main::run ();
-	
-	if (prompter.status != Gtkmm2ext::Prompter::entered) {
-		return;
-	}
+	items.push_back (MenuElem (_("Activate All"), mem_fun(*this, &Mixer_UI::activate_all_mix_groups)));
+	items.push_back (MenuElem (_("Disable All"), mem_fun(*this, &Mixer_UI::disable_all_mix_groups)));
+	items.push_back (SeparatorElem());
+	items.push_back (MenuElem (_("Add group"), mem_fun(*this, &Mixer_UI::new_mix_group)));
 	
-	prompter.get_result (result);
-
-	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 (mix_group_context_menu == 0) {
+			build_mix_group_context_menu ();
+		}
+		mix_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_mix_group (group);
+					return true;
+				}
+			}
+			
+		} 
+		break;
 
-		} else {
-			/* allow regular select to occur */
-			return FALSE;
+	case 1:
+		if ((iter = group_model->get_iter (path))) {
+			bool active = (*iter)[group_columns.active];
+			(*iter)[group_columns.active] = !active;
+			return true;
 		}
-
-	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);
+		break;
+		
+	case 2:
+		if ((iter = group_model->get_iter (path))) {
+			bool visible = (*iter)[group_columns.visible];
+			(*iter)[group_columns.visible] = !visible;
+			return true;
 		}
 		break;
+
+	default:
+		break;
+	}
+	
+	return false;
+ }
+
+void
+Mixer_UI::activate_all_mix_groups ()
+{
+        Gtk::TreeModel::Children children = group_model->children();
+	for(Gtk::TreeModel::Children::iterator iter = children.begin(); iter != children.end(); ++iter) {
+	        (*iter)[group_columns.active] = true;
 	}
-		
-	return TRUE;
 }
 
 void
-Mixer_UI::group_selected (gint row, gint col, GdkEvent* ev)
+Mixer_UI::disable_all_mix_groups ()
 {
-	RouteGroup* group = (RouteGroup *) group_list.row(row).get_data ();
+        Gtk::TreeModel::Children children = group_model->children();
+	for(Gtk::TreeModel::Children::iterator iter = children.begin(); iter != children.end(); ++iter) {
+	        (*iter)[group_columns.active] = false;
+	}
+}
 
-	if (group) {
-		group->set_hidden (false, this);
-	} else {
-		/* the master group */
+void
+Mixer_UI::mix_groups_changed ()
+{
+	ENSURE_GUI_THREAD (mem_fun (*this, &Mixer_UI::mix_groups_changed));
 
-		for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
-			show_strip (*i);
-		}
+	/* just rebuild the while thing */
+
+	group_model->clear ();
 
-		track_display_reordered ();
+	{
+		TreeModel::Row row;
+		row = *(group_model->append());
+		row[group_columns.active] = false;
+		row[group_columns.visible] = true;
+		row[group_columns.text] = (_("-all-"));
+		row[group_columns.group] = 0;
 	}
+
+	session->foreach_mix_group (mem_fun (*this, &Mixer_UI::add_mix_group));
 }
 
 void
-Mixer_UI::group_unselected (gint row, gint col, GdkEvent* ev)
+Mixer_UI::new_mix_group ()
+{
+	session->add_mix_group ("");
+}
 
+void
+Mixer_UI::remove_selected_mix_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_mix_group (*rg);
 		}
 	}
 }
@@ -796,102 +933,137 @@ Mixer_UI::group_unselected (gint row, gint col, GdkEvent* ev)
 void
 Mixer_UI::group_flags_changed (void* src, RouteGroup* group)
 {
-	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);
+	ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::group_flags_changed), src, 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)->mix_group() == group) {
+			(*i)->mix_group_changed(0);
 		}
 	}
+	
+	TreeModel::iterator i;
+	TreeModel::Children rows = group_model->children();
+	Glib::RefPtr<TreeSelection> selection = group_display.get_selection();
 
-	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);
+	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.active] = group->is_active ();
+			(*i)[group_columns.text] = group->name ();
+			break;
+		}
 	}
+
+	in_group_row_change = false;
 }
 
 void
-Mixer_UI::add_mix_group (RouteGroup* group)
-
+Mixer_UI::mix_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);
+	if ((iter = group_model->get_iter (path))) {
 	
-	/* update display to reflect group flags */
-
-	group_flags_changed (0, group);
-
-	group->FlagsChanged.connect (bind (mem_fun(*this, &Mixer_UI::group_flags_changed), group));
+		if ((group = (*iter)[group_columns.group]) == 0) {
+			return;
+		}
+		
+		if (new_text != group->name()) {
+			group->set_name (new_text);
+		}
+	}
 }
 
-void
-Mixer_UI::redisplay_snapshots ()
+void 
+Mixer_UI::mix_group_row_change (const Gtk::TreeModel::Path& 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];
+	if ((*iter)[group_columns.visible]) {
+		for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
+			if ((*i)->mix_group() == group) {
+				show_strip (*i);
+			}
+		}
+	} else {
+		for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
+			if ((*i)->mix_group() == group) {
+				hide_strip (*i);
+			}
+		}
+	} 
 
-		rowtext[0] = statename.c_str();
+	bool active = (*iter)[group_columns.active];
+	group->set_active (active, this);
 
-		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_mix_group (RouteGroup* group)
+
 {
-	ENSURE_GUI_THREAD (bind (mem_fun(*this, &Mixer_UI::session_state_saved), snap_name));
-	redisplay_snapshots ();
+	ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::add_mix_group), group));
+	bool focus = false;
+
+	in_group_row_change = true;
+
+	TreeModel::Row row = *(group_model->append());
+	row[group_columns.active] = group->is_active();
+	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->FlagsChanged.connect (bind (mem_fun(*this, &Mixer_UI::group_flags_changed), group));
+	
+	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,39 +1072,46 @@ 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 (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 {
 
-		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());
+		m_width = atoi(geometry->property("x_size")->value().c_str());
+		m_height = atoi(geometry->property("y_size")->value().c_str());
+		m_root_x = atoi(geometry->property("x_pos")->value().c_str());
+		m_root_y = atoi(geometry->property("y_pos")->value().c_str());
 	}
-		
-	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") {
@@ -942,6 +1121,12 @@ Mixer_UI::set_state (const XMLNode& node)
 		}
 	}
 
+	if ((prop = node.property ("show-mixer"))) {
+		if (prop->value() == "yes") {
+		       _visible = true;
+		}
+	}
+
 	return 0;
 }
 
@@ -951,32 +1136,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 +1167,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)
+Mixer_UI::pane_allocation_handler (Allocation& alloc, Gtk::Paned* which)
 {
 	int pos;
 	XMLProperty* prop = 0;
@@ -1025,23 +1209,6 @@ Mixer_UI::pane_allocation_handler (GtkAllocation *alloc, 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 = height / 3;
-			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);
-		}
-
 	} else if (which == static_cast<Gtk::Paned*> (&list_hpane)) {
 
 		if (done[2]) {
@@ -1061,3 +1228,8 @@ Mixer_UI::pane_allocation_handler (GtkAllocation *alloc, Gtk::Paned* which)
 	}
 }
 
+bool
+Mixer_UI::on_key_press_event (GdkEventKey* ev)
+{
+	return key_press_focus_accelerator_handler (*this, ev);
+}