X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Feditor.cc;h=bb7ae142ecc8b76022294d96c94e14f5cc520dfb;hb=f420fed45db5417b5360c525ae1fcc8e919f3ac9;hp=0031c613f1ddfdc3dc294b77a4ace6a317786647;hpb=355c078023fb10078e24ac171e99125c02e08fad;p=ardour.git

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 0031c613f1..bb7ae142ec 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2006 Paul Davis 
+    Copyright (C) 2000-2007 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
@@ -17,6 +17,8 @@
 
 */
 
+/* Note: public Editor methods are documented in public_editor.h */
+
 #include <unistd.h>
 #include <cstdlib>
 #include <cmath>
@@ -27,9 +29,10 @@
 
 #include <pbd/convert.h>
 #include <pbd/error.h>
-#include <pbd/stacktrace.h>
+#include <pbd/enumwriter.h>
 #include <pbd/memento_command.h>
 
+#include <glibmm/miscutils.h>
 #include <gtkmm/image.h>
 #include <gdkmm/color.h>
 #include <gdkmm/bitmap.h>
@@ -38,6 +41,8 @@
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/tearoff.h>
 #include <gtkmm2ext/utils.h>
+#include <gtkmm2ext/window_title.h>
+#include <gtkmm2ext/choice.h>
 
 #include <ardour/audio_track.h>
 #include <ardour/audio_diskstream.h>
@@ -78,9 +83,9 @@
 
 #include "i18n.h"
 
-/* <CMT Additions> */
+#ifdef WITH_CMT
 #include "imageframe_socket_handler.h"
-/* </CMT Additions> */
+#endif
 
 using namespace std;
 using namespace sigc;
@@ -91,6 +96,7 @@ using namespace Glib;
 using namespace Gtkmm2ext;
 using namespace Editing;
 
+using PBD::internationalize;
 using PBD::atoi;
 
 const double Editor::timebar_height = 15.0;
@@ -131,8 +137,8 @@ static const gchar *_zoom_focus_strings[] = {
 	N_("Left"),
 	N_("Right"),
 	N_("Center"),
-	N_("Playhead"),
- 	N_("Edit Cursor"),
+	N_("Play"),
+ 	N_("Edit"),
 	0
 };
 
@@ -146,6 +152,7 @@ Gdk::Cursor* Editor::zoom_cursor = 0;
 Gdk::Cursor* Editor::time_fx_cursor = 0;
 Gdk::Cursor* Editor::fader_cursor = 0;
 Gdk::Cursor* Editor::speaker_cursor = 0;
+Gdk::Cursor* Editor::note_cursor = 0;
 Gdk::Cursor* Editor::wait_cursor = 0;
 Gdk::Cursor* Editor::timebar_cursor = 0;
 
@@ -169,9 +176,8 @@ check_adjustment (Gtk::Adjustment* adj)
 
 }
 
-Editor::Editor (AudioEngine& eng) 
-	: engine (eng),
-
+Editor::Editor ()
+	: 
 	  /* time display buttons */
 
 	  minsec_label (_("Mins:Secs")),
@@ -193,6 +199,9 @@ Editor::Editor (AudioEngine& eng)
 	  vertical_adjustment (0.0, 0.0, 10.0, 400.0),
 	  horizontal_adjustment (0.0, 0.0, 20.0, 1200.0),
 
+	  tempo_lines(0),
+	  marker_tempo_lines(0),
+
 	  /* tool bar related */
 
 	  edit_cursor_clock (X_("editcursor"), false, X_("EditCursorClock"), true),
@@ -203,9 +212,9 @@ Editor::Editor (AudioEngine& eng)
 	  automation_mode_button (_("mode")),
 	  global_automation_button (_("automation")),
 
-	  /* <CMT Additions> */
+#ifdef WITH_CMT
 	  image_socket_listener(0),
-	  /* </CMT Additions> */
+#endif
 
 	  /* nudge */
 
@@ -229,8 +238,8 @@ Editor::Editor (AudioEngine& eng)
 	selection->PointsChanged.connect (mem_fun(*this, &Editor::point_selection_changed));
 
 	clicked_regionview = 0;
-	clicked_trackview = 0;
-	clicked_audio_trackview = 0;
+	clicked_axisview = 0;
+	clicked_routeview = 0;
 	clicked_crossfadeview = 0;
 	clicked_control_point = 0;
 	latest_regionview = 0;
@@ -270,7 +279,6 @@ Editor::Editor (AudioEngine& eng)
 	no_route_list_redisplay = false;
 	verbose_cursor_on = true;
 	route_removal = false;
-	track_spacing = 0;
 	show_automatic_regions_in_region_list = true;
 	region_list_sort_type = (Editing::RegionListSortType) 0; 
 	have_pending_keyboard_selection = false;
@@ -290,9 +298,7 @@ Editor::Editor (AudioEngine& eng)
 	new_transport_marker_menu = 0;
 	editor_mixer_strip_width = Wide;
 	show_editor_mixer_when_tracks_arrive = false;
-	region_edit_menu_split_item = 0;
 	temp_location = 0;
-	region_edit_menu_split_multichannel_item = 0;
 	leftmost_frame = 0;
 	ignore_mouse_mode_toggle = false;
 	current_stepping_trackview = 0;
@@ -310,11 +316,11 @@ Editor::Editor (AudioEngine& eng)
 	_dragging_playhead = false;
 	_dragging_hscrollbar = false;
 
-	location_marker_color = color_map[cLocationMarker];
-	location_range_color = color_map[cLocationRange];
-	location_cd_marker_color = color_map[cLocationCDMarker];
-	location_loop_color = color_map[cLocationLoop];
-	location_punch_color = color_map[cLocationPunch];
+	location_marker_color = ARDOUR_UI::config()->canvasvar_LocationMarker.get();
+	location_range_color = ARDOUR_UI::config()->canvasvar_LocationRange.get();
+	location_cd_marker_color = ARDOUR_UI::config()->canvasvar_LocationCDMarker.get();
+	location_loop_color = ARDOUR_UI::config()->canvasvar_LocationLoop.get();
+	location_punch_color = ARDOUR_UI::config()->canvasvar_LocationPunch.get();
 
 	range_marker_drag_rect = 0;
 	marker_drag_line = 0;
@@ -365,12 +371,20 @@ Editor::Editor (AudioEngine& eng)
 
  	edit_cursor_clock.ValueChanged.connect (mem_fun(*this, &Editor::edit_cursor_clock_changed));
 	
+	ArdourCanvas::Canvas* time_pad = manage(new ArdourCanvas::Canvas());
+	ArdourCanvas::SimpleLine* pad_line_1 = manage(new ArdourCanvas::SimpleLine(*time_pad->root(),
+			0.0, 1.0, 100.0, 1.0));
+	pad_line_1->property_color_rgba() = 0xFF0000FF;
+	pad_line_1->show();
+	time_pad->show();
+
+	time_canvas_vbox.pack_start (*_ruler_separator, false, false);
 	time_canvas_vbox.pack_start (*minsec_ruler, false, false);
 	time_canvas_vbox.pack_start (*smpte_ruler, false, false);
 	time_canvas_vbox.pack_start (*frames_ruler, false, false);
 	time_canvas_vbox.pack_start (*bbt_ruler, false, false);
 	time_canvas_vbox.pack_start (time_canvas, true, true);
-	time_canvas_vbox.set_size_request (-1, (int)(timebar_height * visible_timebars));
+	time_canvas_vbox.set_size_request (-1, (int)(timebar_height * visible_timebars) + 5);
 
 	bbt_label.set_name ("EditorTimeButton");
 	bbt_label.set_size_request (-1, (int)timebar_height);
@@ -418,11 +432,16 @@ Editor::Editor (AudioEngine& eng)
 	time_button_vbox.pack_start (mark_label, false, false);
 
 	time_button_event_box.add (time_button_vbox);
+	time_button_event_box.set_name ("TimebarLabelBase");
+	time_button_frame.set_shadow_type (Gtk::SHADOW_NONE);
 	
 	time_button_event_box.set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
-	time_button_event_box.set_name ("TimebarLabelBase");
 	time_button_event_box.signal_button_release_event().connect (mem_fun(*this, &Editor::ruler_label_button_release));
 
+	time_button_frame.add (time_button_event_box);
+	time_button_frame.set_name ("TimebarLabelBase");
+	time_button_frame.set_shadow_type (Gtk::SHADOW_ETCHED_OUT);
+
 	/* these enable us to have a dedicated window (for cursor setting, etc.) 
 	   for the canvas areas.
 	*/
@@ -438,10 +457,10 @@ Editor::Editor (AudioEngine& eng)
 	edit_packer.set_border_width (0);
 	edit_packer.set_name ("EditorWindow");
 	
-	edit_packer.attach (edit_vscrollbar,         0, 1, 1, 3,    FILL,        FILL|EXPAND, 0, 0);
+	edit_packer.attach (edit_vscrollbar,         3, 4, 1, 2,    FILL,        FILL|EXPAND, 0, 0);
 
-	edit_packer.attach (time_button_event_box,   1, 2, 0, 1,    FILL,        FILL, 0, 0);
-	edit_packer.attach (time_canvas_event_box,   2, 3, 0, 1,    FILL|EXPAND, FILL, 0, 0);
+	edit_packer.attach (time_button_frame,       0, 2, 0, 1,    FILL,        SHRINK, 0, 0);
+	edit_packer.attach (time_canvas_event_box,   2, 4, 0, 1,    FILL|EXPAND, FILL, 0, 0);
 
 	edit_packer.attach (controls_layout,         1, 2, 1, 2,    FILL,        FILL|EXPAND, 0, 0);
 	edit_packer.attach (track_canvas_event_box,  2, 3, 1, 2,    FILL|EXPAND, FILL|EXPAND, 0, 0);
@@ -509,7 +528,7 @@ Editor::Editor (AudioEngine& eng)
 
 	edit_group_display.set_name ("EditGroupList");
 	edit_group_display.get_selection()->set_mode (SELECTION_SINGLE);
-	edit_group_display.set_headers_visible (false);
+	edit_group_display.set_headers_visible (true);
 	edit_group_display.set_reorderable (false);
 	edit_group_display.set_rules_hint (true);
 	edit_group_display.set_size_request (75, -1);
@@ -622,10 +641,10 @@ Editor::Editor (AudioEngine& eng)
 
 	nlabel = manage (new Label (_("Regions")));
 	nlabel->set_angle (-90);
-       	the_notebook.append_page (region_list_scroller, *nlabel);
+	the_notebook.append_page (region_list_scroller, *nlabel);
 	nlabel = manage (new Label (_("Tracks/Busses")));
 	nlabel->set_angle (-90);
-       	the_notebook.append_page (route_list_scroller, *nlabel);
+	the_notebook.append_page (route_list_scroller, *nlabel);
 	nlabel = manage (new Label (_("Snapshots")));
 	nlabel->set_angle (-90);
 	the_notebook.append_page (snapshot_display_scroller, *nlabel);
@@ -709,7 +728,10 @@ Editor::Editor (AudioEngine& eng)
 		set_icon_list (window_icons);
 		set_default_icon_list (window_icons);
 	}
-	set_title (_("ardour: editor"));
+
+	WindowTitle title(Glib::get_application_name());
+	title += _("Editor");
+	set_title (title.get_string());
 	set_wmclass (X_("ardour_editor"), "Ardour");
 
 	add (vpacker);
@@ -733,7 +755,7 @@ Editor::Editor (AudioEngine& eng)
 
 Editor::~Editor()
 {
-	/* <CMT Additions> */
+#ifdef WITH_CMT
 	if(image_socket_listener)
 	{
 		if(image_socket_listener->is_connected())
@@ -744,7 +766,7 @@ Editor::~Editor()
 		delete image_socket_listener ;
 		image_socket_listener = 0 ;
 	}
-	/* </CMT Additions> */
+#endif
 }
 
 void
@@ -801,8 +823,10 @@ Editor::set_entered_track (TimeAxisView* tav)
 void
 Editor::show_window ()
 {
-	show_all ();
-	present ();
+	show_all_children ();
+	
+	/* re-hide editor list if necessary */
+	editor_list_button_toggled ();
 
 	/* now reset all audio_time_axis heights, because widgets might need
 	   to be re-hidden
@@ -814,6 +838,8 @@ Editor::show_window ()
 		tv = (static_cast<TimeAxisView*>(*i));
 		tv->reset_height ();
 	}
+
+	present ();
 }
 
 void
@@ -833,9 +859,9 @@ Editor::instant_save ()
 	}
 
 	if (session) {
-		session->add_instant_xml(get_state(), session->path());
+		session->add_instant_xml(get_state());
 	} else {
-		Config->add_instant_xml(get_state(), get_user_ardour_path());
+		Config->add_instant_xml(get_state());
 	}
 }
 
@@ -1007,24 +1033,21 @@ Editor::update_title ()
 	if (session) {
 		bool dirty = session->dirty();
 
-		string wintitle = _("ardour: editor: ");
-
-		if (dirty) {
-			wintitle += '[';
-		}
-
-		wintitle += session->name();
+		string session_name;
 
 		if (session->snap_name() != session->name()) {
-			wintitle += ':';
-			wintitle += session->snap_name();
+			session_name = session->snap_name();
+		} else {
+			session_name = session->name();
 		}
 
 		if (dirty) {
-			wintitle += ']';
+			session_name = "*" + session_name;
 		}
 
-		set_title (wintitle);
+		WindowTitle title(session_name);
+		title += Glib::get_application_name();
+		set_title (title.get_string());
 	}
 }
 
@@ -1057,8 +1080,8 @@ Editor::connect_to_session (Session *t)
 	session_connections.push_back (session->TransportStateChange.connect (mem_fun(*this, &Editor::map_transport_state)));
 	session_connections.push_back (session->PositionChanged.connect (mem_fun(*this, &Editor::map_position_change)));
 	session_connections.push_back (session->RouteAdded.connect (mem_fun(*this, &Editor::handle_new_route)));
-	session_connections.push_back (session->AudioRegionAdded.connect (mem_fun(*this, &Editor::handle_new_audio_region)));
-	session_connections.push_back (session->AudioRegionRemoved.connect (mem_fun(*this, &Editor::handle_audio_region_removed)));
+	session_connections.push_back (session->RegionAdded.connect (mem_fun(*this, &Editor::handle_new_region)));
+	session_connections.push_back (session->RegionRemoved.connect (mem_fun(*this, &Editor::handle_region_removed)));
 	session_connections.push_back (session->DurationChanged.connect (mem_fun(*this, &Editor::handle_new_duration)));
 	session_connections.push_back (session->edit_group_added.connect (mem_fun(*this, &Editor::add_edit_group)));
 	session_connections.push_back (session->edit_group_removed.connect (mem_fun(*this, &Editor::edit_groups_changed)));
@@ -1071,7 +1094,7 @@ Editor::connect_to_session (Session *t)
 
 	session_connections.push_back (session->SMPTEOffsetChanged.connect (mem_fun(*this, &Editor::update_just_smpte)));
 
-	session_connections.push_back (session->tempo_map().StateChanged.connect (bind (mem_fun(*this, &Editor::tempo_map_changed), false)));
+	session_connections.push_back (session->tempo_map().StateChanged.connect (mem_fun(*this, &Editor::tempo_map_changed)));
 
 	edit_groups_changed ();
 
@@ -1144,17 +1167,17 @@ Editor::connect_to_session (Session *t)
 
 	if (ARDOUR_UI::instance()->session_is_new ()) {
 
-	        TreeModel::Children rows = route_display_model->children();
+		TreeModel::Children rows = route_display_model->children();
 		TreeModel::Children::iterator i;
 	
 		no_route_list_redisplay = true;
 		
 		for (i = rows.begin(); i != rows.end(); ++i) {
 			TimeAxisView *tv =  (*i)[route_display_columns.tv];
-			AudioTimeAxisView *atv;
+			RouteTimeAxisView *rtv;
 			
-			if ((atv = dynamic_cast<AudioTimeAxisView*>(tv)) != 0) {
-				if (atv->route()->master()) {
+			if ((rtv = dynamic_cast<RouteTimeAxisView*>(tv)) != 0) {
+				if (rtv->route()->is_master()) {
 					route_list_display.get_selection()->unselect (i);
 				}
 			}
@@ -1164,9 +1187,9 @@ Editor::connect_to_session (Session *t)
 		redisplay_route_list ();
 	}
 
-        /* register for undo history */
+	/* register for undo history */
 
-        session->register_with_memento_command_factory(_id, this);
+	session->register_with_memento_command_factory(_id, this);
 }
 
 void
@@ -1201,7 +1224,7 @@ Editor::build_cursors ()
 		mask = Bitmap::create (speaker_cursor_mask_bits, speaker_cursor_width, speaker_cursor_height);
 		speaker_cursor = new Gdk::Cursor (source, mask, ffg, fbg, speaker_cursor_x_hot, speaker_cursor_y_hot);
 	}
-
+	
 	grabber_cursor = new Gdk::Cursor (HAND2);
 	cross_hair_cursor = new Gdk::Cursor (CROSSHAIR);
 	trimmer_cursor =  new Gdk::Cursor (SB_H_DOUBLE_ARROW);
@@ -1209,8 +1232,10 @@ Editor::build_cursors ()
 	time_fx_cursor = new Gdk::Cursor (SIZING);
 	wait_cursor = new Gdk::Cursor  (WATCH);
 	timebar_cursor = new Gdk::Cursor(LEFT_PTR);
+	note_cursor = new Gdk::Cursor (PENCIL);
 }
 
+/** Pop up a context menu for when the user clicks on a fade in or fade out */
 void
 Editor::popup_fade_context_menu (int button, int32_t time, ArdourCanvas::Item* item, ItemType item_type)
 {
@@ -1272,180 +1297,29 @@ Editor::popup_fade_context_menu (int button, int32_t time, ArdourCanvas::Item* i
 	fade_context_menu.popup (button, time);
 }
 
+/* Pop up the general track context menu for when the user clicks pretty much anywhere in a track or bus */
 void
-Editor::popup_track_context_menu (int button, int32_t time, ItemType item_type, bool with_selection, nframes_t frame)
-{
-	using namespace Menu_Helpers;
-	Menu* (Editor::*build_menu_function)(nframes_t);
-	Menu *menu;
-
-	switch (item_type) {
-	case RegionItem:
-	case RegionViewName:
-	case RegionViewNameHighlight:
-		if (with_selection) {
-			build_menu_function = &Editor::build_track_selection_context_menu;
-		} else {
-			build_menu_function = &Editor::build_track_region_context_menu;
-		}
-		break;
-
-	case SelectionItem:
-		if (with_selection) {
-			build_menu_function = &Editor::build_track_selection_context_menu;
-		} else {
-			build_menu_function = &Editor::build_track_context_menu;
-		}
-		break;
-
-	case CrossfadeViewItem:
-		build_menu_function = &Editor::build_track_crossfade_context_menu;
-		break;
-
-	case StreamItem:
-		if (clicked_audio_trackview->get_diskstream()) {
-			build_menu_function = &Editor::build_track_context_menu;
-		} else {
-			build_menu_function = &Editor::build_track_bus_context_menu;
-		}
-		break;
-
-	default:
-		/* probably shouldn't happen but if it does, we don't care */
-		return;
-	}
-
-	menu = (this->*build_menu_function)(frame);
-	menu->set_name ("ArdourContextMenu");
-	
-	/* now handle specific situations */
-
-	switch (item_type) {
-	case RegionItem:
-	case RegionViewName:
-	case RegionViewNameHighlight:
-		if (!with_selection) {
-			if (region_edit_menu_split_item) {
-				if (clicked_regionview && clicked_regionview->region()->covers (edit_cursor->current_frame)) {
-					ActionManager::set_sensitive (ActionManager::edit_cursor_in_region_sensitive_actions, true);
-				} else {
-					ActionManager::set_sensitive (ActionManager::edit_cursor_in_region_sensitive_actions, false);
-				}
-			}
-			/*
-			if (region_edit_menu_split_multichannel_item) {
-				if (clicked_regionview && clicked_regionview->region().n_channels() > 1) {
-					// GTK2FIX find the action, change its sensitivity
-					// region_edit_menu_split_multichannel_item->set_sensitive (true);
-				} else {
-					// GTK2FIX see above
-					// region_edit_menu_split_multichannel_item->set_sensitive (false);
-				}
-			}*/
-		}
-		break;
-
-	case SelectionItem:
-		break;
-
-	case CrossfadeViewItem:
-		break;
-
-	case StreamItem:
-		break;
-
-	default:
-		/* probably shouldn't happen but if it does, we don't care */
-		return;
-	}
-
-	if (clicked_audio_trackview && clicked_audio_trackview->audio_track()) {
-
-		/* Bounce to disk */
-		
-		using namespace Menu_Helpers;
-		MenuList& edit_items  = menu->items();
-		
-		edit_items.push_back (SeparatorElem());
-
-		switch (clicked_audio_trackview->audio_track()->freeze_state()) {
-		case AudioTrack::NoFreeze:
-			edit_items.push_back (MenuElem (_("Freeze"), mem_fun(*this, &Editor::freeze_route)));
-			break;
-
-		case AudioTrack::Frozen:
-			edit_items.push_back (MenuElem (_("Unfreeze"), mem_fun(*this, &Editor::unfreeze_route)));
-			break;
-			
-		case AudioTrack::UnFrozen:
-			edit_items.push_back (MenuElem (_("Freeze"), mem_fun(*this, &Editor::freeze_route)));
-			break;
-		}
-
-	}
-
-	menu->popup (button, time);
-}
-
-Menu*
-Editor::build_track_context_menu (nframes_t ignored)
+Editor::popup_track_context_menu (int button, int32_t time, nframes_t frame)
 {
-	using namespace Menu_Helpers;
-
- 	MenuList& edit_items = track_context_menu.items();
-	edit_items.clear();
-
-	add_dstream_context_items (edit_items);
-	return &track_context_menu;
+	build_track_context_menu (frame)->popup (button, time);
 }
 
 Menu*
-Editor::build_track_bus_context_menu (nframes_t ignored)
+Editor::build_track_context_menu (nframes_t frame)
 {
 	using namespace Menu_Helpers;
 
- 	MenuList& edit_items = track_context_menu.items();
+	Menu* menu = manage (new Menu);
+ 	MenuList& edit_items = menu->items();
 	edit_items.clear();
 
-	add_bus_context_items (edit_items);
-	return &track_context_menu;
-}
-
-Menu*
-Editor::build_track_region_context_menu (nframes_t frame)
-{
-	using namespace Menu_Helpers;
-	MenuList& edit_items  = track_region_context_menu.items();
-	edit_items.clear();
-
-	AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*> (clicked_trackview);
-
-	if (atv) {
-		boost::shared_ptr<Diskstream> ds;
-		boost::shared_ptr<Playlist> pl;
-		
-		if ((ds = atv->get_diskstream()) && ((pl = ds->playlist()))) {
-			Playlist::RegionList* regions = pl->regions_at ((nframes_t) floor ( (double)frame * ds->speed()));
-			for (Playlist::RegionList::iterator i = regions->begin(); i != regions->end(); ++i) {
-				add_region_context_items (atv->audio_view(), (*i), edit_items);
-			}
-			delete regions;
-		}
-	}
-
-	add_dstream_context_items (edit_items);
-
-	return &track_region_context_menu;
-}
-
-Menu*
-Editor::build_track_crossfade_context_menu (nframes_t frame)
-{
-	using namespace Menu_Helpers;
-	MenuList& edit_items  = track_crossfade_context_menu.items();
-	edit_items.clear ();
+	/* Build the general `track' context menu, adding what is appropriate given
+	   the current selection */
 
-	AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*> (clicked_trackview);
+	/* XXX: currently crossfades can't be selected, so we can't use the selection
+	   to decide which crossfades to mention in the menu.  I believe this will
+	   change at some point.  For now we have to use clicked_trackview to decide. */
+	AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*> (clicked_axisview);
 
 	if (atv) {
 		boost::shared_ptr<Diskstream> ds;
@@ -1454,9 +1328,7 @@ Editor::build_track_crossfade_context_menu (nframes_t frame)
 
 		if ((ds = atv->get_diskstream()) && ((pl = ds->playlist()) != 0) && ((apl = boost::dynamic_pointer_cast<AudioPlaylist> (pl)) != 0)) {
 
-			Playlist::RegionList* regions = pl->regions_at (frame);
 			AudioPlaylist::Crossfades xfades;
-
 			apl->crossfades_at (frame, xfades);
 
 			bool many = xfades.size() > 1;
@@ -1464,18 +1336,24 @@ Editor::build_track_crossfade_context_menu (nframes_t frame)
 			for (AudioPlaylist::Crossfades::iterator i = xfades.begin(); i != xfades.end(); ++i) {
 				add_crossfade_context_items (atv->audio_view(), (*i), edit_items, many);
 			}
+		}
+	}	
 
-			for (Playlist::RegionList::iterator i = regions->begin(); i != regions->end(); ++i) {
-				add_region_context_items (atv->audio_view(), (*i), edit_items);
-			}
+	if (!selection->time.empty()) {
+		add_selection_context_items (edit_items);
+	}
 
-			delete regions;
-		}
+	if (!selection->regions.empty()) {
+		add_region_context_items (edit_items);
 	}
 
-	add_dstream_context_items (edit_items);
+	if (!selection->tracks.empty()) {
+		add_bus_or_audio_track_context_items (edit_items);
+	}
+	
+	menu->set_name ("ArdourContextMenu");
 
-	return &track_crossfade_context_menu;
+	return menu;
 }
 
 #ifdef FFT_ANALYSIS
@@ -1517,20 +1395,9 @@ Editor::analyze_range_selection()
 #endif /* FFT_ANALYSIS */
 
 
-
-Menu*
-Editor::build_track_selection_context_menu (nframes_t ignored)
-{
-	using namespace Menu_Helpers;
-	MenuList& edit_items  = track_selection_context_menu.items();
-	edit_items.clear ();
-
-	add_selection_context_items (edit_items);
-	add_dstream_context_items (edit_items);
-
-	return &track_selection_context_menu;
-}
-
+/** Add context menu items relevant to crossfades.
+ * @param edit_items List to add the items to.
+ */
 void
 Editor::add_crossfade_context_items (AudioStreamView* view, boost::shared_ptr<Crossfade> xfade, Menu_Helpers::MenuList& edit_items, bool many)
 {
@@ -1588,36 +1455,48 @@ Editor::xfade_edit_right_region ()
 	}
 }
 
+/** Add an element to a menu, settings its sensitivity.
+ * @param m Menu to add to.
+ * @param e Element to add.
+ * @param s true to make sensitive, false to make insensitive
+ */
+void
+Editor::add_item_with_sensitivity (Menu_Helpers::MenuList& m, Menu_Helpers::MenuElem e, bool s) const
+{
+	m.push_back (e);
+	if (!s) {
+		m.back().set_sensitive (false);
+	}
+}
+
+/** Add context menu items relevant to regions.
+ * @param edit_items List to add the items to.
+ */
 void
-Editor::add_region_context_items (AudioStreamView* sv, boost::shared_ptr<Region> region, Menu_Helpers::MenuList& edit_items)
+Editor::add_region_context_items (Menu_Helpers::MenuList& edit_items)
 {
 	using namespace Menu_Helpers;
-	Menu     *region_menu = manage (new Menu);
-	MenuList& items       = region_menu->items();
+	Menu *region_menu = manage (new Menu);
+	MenuList& items = region_menu->items();
 	region_menu->set_name ("ArdourContextMenu");
 	
-	boost::shared_ptr<AudioRegion> ar;
-
-	if (region) {
-		ar = boost::dynamic_pointer_cast<AudioRegion> (region);
-	}
+	items.push_back (MenuElem (_("Edit..."), mem_fun(*this, &Editor::edit_region)));
+	items.push_back (MenuElem (_("Raise to top layer"), mem_fun(*this, &Editor::raise_region_to_top)));
+	items.push_back (MenuElem (_("Lower to bottom layer"), mem_fun  (*this, &Editor::lower_region_to_bottom)));
 
-	/* when this particular menu pops up, make the relevant region 
-	   become selected.
-	*/
+	Menu* sync_point_menu = manage (new Menu);
+	MenuList& sync_point_items = sync_point_menu->items();
+	sync_point_menu->set_name("ArdourContextMenu");
+	
+	sync_point_items.push_back (MenuElem (_("Define"), mem_fun(*this, &Editor::set_region_sync_from_edit_cursor)));
+	sync_point_items.push_back (MenuElem (_("Remove"), mem_fun(*this, &Editor::remove_region_sync)));
 
-	region_menu->signal_map_event().connect (bind (mem_fun(*this, &Editor::set_selected_regionview_from_map_event), sv, boost::weak_ptr<Region>(region)));
+	items.push_back (MenuElem (_("Sync points"), *sync_point_menu));
 
-	items.push_back (MenuElem (_("Popup region editor"), mem_fun(*this, &Editor::edit_region)));
-	items.push_back (MenuElem (_("Raise to top layer"), mem_fun(*this, &Editor::raise_region_to_top)));
-	items.push_back (MenuElem (_("Lower to bottom layer"), mem_fun  (*this, &Editor::lower_region_to_bottom)));
-	items.push_back (SeparatorElem());
-	items.push_back (MenuElem (_("Define sync point"), mem_fun(*this, &Editor::set_region_sync_from_edit_cursor)));
-	items.push_back (MenuElem (_("Remove sync point"), mem_fun(*this, &Editor::remove_region_sync)));
-	items.push_back (SeparatorElem());
+	add_item_with_sensitivity (items, MenuElem (_("Audition"), mem_fun(*this, &Editor::audition_selected_region)), selection->regions.size() == 1);
+	
+	add_item_with_sensitivity (items, MenuElem (_("Export"), mem_fun(*this, &Editor::export_region)), selection->regions.size() == 1);
 
-	items.push_back (MenuElem (_("Audition"), mem_fun(*this, &Editor::audition_selected_region)));
-	items.push_back (MenuElem (_("Export"), mem_fun(*this, &Editor::export_region)));
 	items.push_back (MenuElem (_("Bounce"), mem_fun(*this, &Editor::bounce_region_selection)));
 
 #ifdef FFT_ANALYSIS
@@ -1626,66 +1505,62 @@ Editor::add_region_context_items (AudioStreamView* sv, boost::shared_ptr<Region>
 
 	items.push_back (SeparatorElem());
 
-	items.push_back (CheckMenuElem (_("Lock"), mem_fun(*this, &Editor::toggle_region_lock)));
-	region_lock_item = static_cast<CheckMenuItem*>(&items.back());
-	if (region->locked()) {
-		region_lock_item->set_active();
-	}
-	items.push_back (CheckMenuElem (_("Mute"), mem_fun(*this, &Editor::toggle_region_mute)));
-	region_mute_item = static_cast<CheckMenuItem*>(&items.back());
-	if (region->muted()) {
-		region_mute_item->set_active();
-	}
-	items.push_back (CheckMenuElem (_("Opaque"), mem_fun(*this, &Editor::toggle_region_opaque)));
-	region_opaque_item = static_cast<CheckMenuItem*>(&items.back());
-	if (region->opaque()) {
-		region_opaque_item->set_active();
-	}
-
-	items.push_back (CheckMenuElem (_("Original position"), mem_fun(*this, &Editor::naturalize)));
-	if (region->at_natural_position()) {
-		items.back().set_sensitive (false);
+	items.push_back (MenuElem (_("Lock"), bind (mem_fun (*this, &Editor::set_region_lock), true)));
+	items.push_back (MenuElem (_("Unlock"), bind (mem_fun (*this, &Editor::set_region_lock), false)));
+	items.push_back (MenuElem (_("Lock Position"), bind (mem_fun (*this, &Editor::set_region_position_lock), true)));
+	items.push_back (MenuElem (_("Unlock Position"), bind (mem_fun (*this, &Editor::set_region_position_lock), false)));
+	items.push_back (MenuElem (_("Mute"), bind (mem_fun (*this, &Editor::set_region_mute), true)));
+	items.push_back (MenuElem (_("Unmute"), bind (mem_fun (*this, &Editor::set_region_mute), false)));
+	items.push_back (MenuElem (_("Opaque"), bind (mem_fun (*this, &Editor::set_region_opaque), true)));
+	items.push_back (MenuElem (_("Transparent"), bind (mem_fun (*this, &Editor::set_region_opaque), false)));
+
+	/* We allow "Original position" if at least one region is not at its
+	   natural position 
+	*/
+	RegionSelection::iterator i = selection->regions.begin();
+	while (i != selection->regions.end() && (*i)->region()->at_natural_position() == true) {
+		++i;
 	}
 
+	add_item_with_sensitivity (items, MenuElem (_("Original position"), mem_fun(*this, &Editor::naturalize)), i != selection->regions.end());
+	
 	items.push_back (SeparatorElem());
 
-	if (ar) {
-		
-		RegionView* rv = sv->find_view (ar);
-		AudioRegionView* arv = dynamic_cast<AudioRegionView*>(rv);
-
-		items.push_back (MenuElem (_("Reset Envelope"), mem_fun(*this, &Editor::reset_region_gain_envelopes)));
-		
-		items.push_back (CheckMenuElem (_("Envelope Visible"), mem_fun(*this, &Editor::toggle_gain_envelope_visibility)));
-		region_envelope_visible_item = static_cast<CheckMenuItem*> (&items.back());
-
-		if (arv->envelope_visible()) {
-			region_envelope_visible_item->set_active (true);
-		}
+	/* Find out if we have a selected audio region */
+	i = selection->regions.begin();
+	while (i != selection->regions.end() && boost::dynamic_pointer_cast<AudioRegion>((*i)->region()) == 0) {
+		++i;
+	}
+	bool const have_selected_audio_region = (i != selection->regions.end());
 
-		items.push_back (CheckMenuElem (_("Envelope Active"), mem_fun(*this, &Editor::toggle_gain_envelope_active)));
-		region_envelope_active_item = static_cast<CheckMenuItem*> (&items.back());
+	if (have_selected_audio_region) {
 
-		if (ar->envelope_active()) {
-			region_envelope_active_item->set_active (true);
-		}
+		Menu* envelopes_menu = manage (new Menu);
+		MenuList& envelopes_items = envelopes_menu->items();
+		envelopes_menu->set_name ("ArdourContextMenu");
 
-		items.push_back (SeparatorElem());
+ 		envelopes_items.push_back (MenuElem (_("Reset"), mem_fun(*this, &Editor::reset_region_gain_envelopes)));
+		envelopes_items.push_back (MenuElem (_("Visible"), bind (mem_fun (*this, &Editor::set_gain_envelope_visibility), true)));
+		envelopes_items.push_back (MenuElem (_("Invisible"), bind (mem_fun (*this, &Editor::set_gain_envelope_visibility), false)));
+		envelopes_items.push_back (MenuElem (_("Active"), bind (mem_fun (*this, &Editor::set_gain_envelope_active), true)));
+		envelopes_items.push_back (MenuElem (_("Inactive"), bind (mem_fun (*this, &Editor::set_gain_envelope_active), false)));
 
-		if (ar->scale_amplitude() != 1.0f) {
-			items.push_back (MenuElem (_("DeNormalize"), mem_fun(*this, &Editor::denormalize_region)));
-		} else {
-			items.push_back (MenuElem (_("Normalize"), mem_fun(*this, &Editor::normalize_region)));
-		}
+		items.push_back (MenuElem (_("Envelopes"), *envelopes_menu));
+		
+		items.push_back (MenuElem (_("Denormalize"), mem_fun (*this, &Editor::denormalize_regions)));
+		items.push_back (MenuElem (_("Normalize"), mem_fun (*this, &Editor::normalize_regions)));
 	}
-	items.push_back (MenuElem (_("Reverse"), mem_fun(*this, &Editor::reverse_region)));
+	
+	items.push_back (MenuElem (_("Reverse"), mem_fun(*this, &Editor::reverse_regions)));
 	items.push_back (SeparatorElem());
 
 
 	/* range related stuff */
-
-	items.push_back (MenuElem (_("Add Range Markers"), mem_fun (*this, &Editor::add_location_from_audio_region)));
-	items.push_back (MenuElem (_("Set Range Selection"), mem_fun (*this, &Editor::set_selection_from_audio_region)));
+	
+	add_item_with_sensitivity (items, MenuElem (_("Add range markers"), mem_fun (*this, &Editor::add_location_from_audio_region)), selection->regions.size() == 1);
+	
+	add_item_with_sensitivity (items, MenuElem (_("Set range selection"), mem_fun (*this, &Editor::set_selection_from_audio_region)), selection->regions.size() == 1);
+	
 	items.push_back (SeparatorElem());
 			 
 	/* Nudge region */
@@ -1694,13 +1569,12 @@ Editor::add_region_context_items (AudioStreamView* sv, boost::shared_ptr<Region>
 	MenuList& nudge_items = nudge_menu->items();
 	nudge_menu->set_name ("ArdourContextMenu");
 	
-	nudge_items.push_back (MenuElem (_("Nudge fwd"), (bind (mem_fun(*this, &Editor::nudge_forward), false))));
-	nudge_items.push_back (MenuElem (_("Nudge bwd"), (bind (mem_fun(*this, &Editor::nudge_backward), false))));
-	nudge_items.push_back (MenuElem (_("Nudge fwd by capture offset"), (mem_fun(*this, &Editor::nudge_forward_capture_offset))));
-	nudge_items.push_back (MenuElem (_("Nudge bwd by capture offset"), (mem_fun(*this, &Editor::nudge_backward_capture_offset))));
+	nudge_items.push_back (MenuElem (_("Nudge forward"), (bind (mem_fun(*this, &Editor::nudge_forward), false))));
+	nudge_items.push_back (MenuElem (_("Nudge backward"), (bind (mem_fun(*this, &Editor::nudge_backward), false))));
+	nudge_items.push_back (MenuElem (_("Nudge forward by capture offset"), (mem_fun(*this, &Editor::nudge_forward_capture_offset))));
+	nudge_items.push_back (MenuElem (_("Nudge backward by capture offset"), (mem_fun(*this, &Editor::nudge_backward_capture_offset))));
 
 	items.push_back (MenuElem (_("Nudge"), *nudge_menu));
-	items.push_back (SeparatorElem());
 
 	Menu *trim_menu = manage (new Menu);
 	MenuList& trim_items = trim_menu->items();
@@ -1710,39 +1584,24 @@ Editor::add_region_context_items (AudioStreamView* sv, boost::shared_ptr<Region>
 	trim_items.push_back (MenuElem (_("Edit cursor to end"), mem_fun(*this, &Editor::trim_region_to_edit_cursor)));
 			     
 	items.push_back (MenuElem (_("Trim"), *trim_menu));
-	items.push_back (SeparatorElem());
-
 	items.push_back (MenuElem (_("Split"), (mem_fun(*this, &Editor::split_region))));
-	region_edit_menu_split_item = &items.back();
-
 	items.push_back (MenuElem (_("Make mono regions"), (mem_fun(*this, &Editor::split_multichannel_region))));
-	region_edit_menu_split_multichannel_item = &items.back();
-
 	items.push_back (MenuElem (_("Duplicate"), (bind (mem_fun(*this, &Editor::duplicate_dialog), true))));
-	items.push_back (MenuElem (_("Fill Track"), (mem_fun(*this, &Editor::region_fill_track))));
+	items.push_back (MenuElem (_("Fill track"), (mem_fun(*this, &Editor::region_fill_track))));
 	items.push_back (SeparatorElem());
-	items.push_back (MenuElem (_("Remove"), mem_fun(*this, &Editor::remove_clicked_region)));
+	items.push_back (MenuElem (_("Remove"), mem_fun(*this, &Editor::remove_selected_regions)));
 
 	/* OK, stick the region submenu at the top of the list, and then add
 	   the standard items.
 	*/
 
-	/* we have to hack up the region name because "_" has a special
-	   meaning for menu titles.
-	*/
-
-	string::size_type pos = 0;
-	string menu_item_name = region->name();
-
-	while ((pos = menu_item_name.find ("_", pos)) != string::npos) {
-		menu_item_name.replace (pos, 1, "__");
-		pos += 2;
-	}
-	
+	string const menu_item_name = selection->regions.size() > 1 ? _("Regions") : _("Region");
 	edit_items.push_back (MenuElem (menu_item_name, *region_menu));
-	edit_items.push_back (SeparatorElem());
 }
 
+/** Add context menu items relevant to selection ranges.
+ * @param edit_items List to add the items to.
+ */
 void
 Editor::add_selection_context_items (Menu_Helpers::MenuList& edit_items)
 {
@@ -1766,7 +1625,7 @@ Editor::add_selection_context_items (Menu_Helpers::MenuList& edit_items)
 	items.push_back (SeparatorElem());
 	items.push_back (MenuElem (_("Select all in range"), mem_fun(*this, &Editor::select_all_selectables_using_time_selection)));
 	items.push_back (SeparatorElem());
-	items.push_back (MenuElem (_("Add Range Markers"), mem_fun (*this, &Editor::add_location_from_selection)));
+	items.push_back (MenuElem (_("Add range markers"), mem_fun (*this, &Editor::add_location_from_selection)));
 	items.push_back (MenuElem (_("Set range to loop range"), mem_fun(*this, &Editor::set_selection_from_loop)));
 	items.push_back (MenuElem (_("Set range to punch range"), mem_fun(*this, &Editor::set_selection_from_punch)));
 	items.push_back (SeparatorElem());
@@ -1782,11 +1641,33 @@ Editor::add_selection_context_items (Menu_Helpers::MenuList& edit_items)
 	edit_items.push_back (SeparatorElem());
 }
 
+/** Add context menu items relevant to busses or audio tracks.
+ * @param edit_items List to add the items to.
+ */
 void
-Editor::add_dstream_context_items (Menu_Helpers::MenuList& edit_items)
+Editor::add_bus_or_audio_track_context_items (Menu_Helpers::MenuList& edit_items)
 {
 	using namespace Menu_Helpers;
 
+	/* We add every possible action here, and de-sensitize things
+	   that aren't allowed.  The sensitivity logic is a bit spread out;
+	   on the one hand I'm using things like can_cut_copy (), which is
+	   reasonably complicated and so perhaps better near the function that
+	   it expresses sensitivity for, and on the other hand checks
+	   in this function as well.  You can't really have can_* for everything
+	   or the number of methods would get silly. */
+
+	bool const one_selected_region = selection->regions.size() == 1;
+
+	/* Count the number of selected audio tracks */
+	int n_audio_tracks = 0;
+	for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
+		RouteTimeAxisView const * r = dynamic_cast<RouteTimeAxisView*>(*i);
+		if (r && r->is_audio_track()) {
+			n_audio_tracks++;
+		}
+	}
+
 	/* Playback */
 
 	Menu *play_menu = manage (new Menu);
@@ -1795,9 +1676,9 @@ Editor::add_dstream_context_items (Menu_Helpers::MenuList& edit_items)
 	
 	play_items.push_back (MenuElem (_("Play from edit cursor"), mem_fun(*this, &Editor::play_from_edit_cursor)));
 	play_items.push_back (MenuElem (_("Play from start"), mem_fun(*this, &Editor::play_from_start)));
-	play_items.push_back (MenuElem (_("Play region"), mem_fun(*this, &Editor::play_selected_region)));
-	play_items.push_back (SeparatorElem());
-	play_items.push_back (MenuElem (_("Loop Region"), mem_fun(*this, &Editor::loop_selected_region)));
+	add_item_with_sensitivity (play_items, MenuElem (_("Play region"), mem_fun(*this, &Editor::play_selected_region)), one_selected_region);
+	
+	add_item_with_sensitivity (play_items, MenuElem (_("Loop region"), mem_fun(*this, &Editor::loop_selected_region)), one_selected_region);
 	
 	edit_items.push_back (MenuElem (_("Play"), *play_menu));
 
@@ -1806,21 +1687,33 @@ Editor::add_dstream_context_items (Menu_Helpers::MenuList& edit_items)
 	Menu *select_menu = manage (new Menu);
 	MenuList& select_items = select_menu->items();
 	select_menu->set_name ("ArdourContextMenu");
+
+	string str = selection->tracks.size() == 1 ? _("Select all in track") : _("Select all in tracks");
+
+	select_items.push_back (MenuElem (str, bind (mem_fun(*this, &Editor::select_all_in_selected_tracks), Selection::Set)));
+	
+	select_items.push_back (MenuElem (_("Select all"), bind (mem_fun(*this, &Editor::select_all), Selection::Set)));
+
+	str = selection->tracks.size() == 1 ? _("Invert selection in track") : _("Invert selection in tracks");
+	
+	select_items.push_back (MenuElem (str, mem_fun(*this, &Editor::invert_selection_in_selected_tracks)));
 	
-	select_items.push_back (MenuElem (_("Select All in track"), bind (mem_fun(*this, &Editor::select_all_in_track), Selection::Set)));
-	select_items.push_back (MenuElem (_("Select All"), bind (mem_fun(*this, &Editor::select_all), Selection::Set)));
-	select_items.push_back (MenuElem (_("Invert selection in track"), mem_fun(*this, &Editor::invert_selection_in_track)));
 	select_items.push_back (MenuElem (_("Invert selection"), mem_fun(*this, &Editor::invert_selection)));
 	select_items.push_back (SeparatorElem());
-	select_items.push_back (MenuElem (_("Set range to loop range"), mem_fun(*this, &Editor::set_selection_from_loop)));
-	select_items.push_back (MenuElem (_("Set range to punch range"), mem_fun(*this, &Editor::set_selection_from_punch)));
-	select_items.push_back (SeparatorElem());
+
+	if (n_audio_tracks) {
+		select_items.push_back (MenuElem (_("Set range to loop range"), mem_fun(*this, &Editor::set_selection_from_loop)));
+		select_items.push_back (MenuElem (_("Set range to punch range"), mem_fun(*this, &Editor::set_selection_from_punch)));
+	}
+	
 	select_items.push_back (MenuElem (_("Select all after edit cursor"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), edit_cursor, true)));
 	select_items.push_back (MenuElem (_("Select all before edit cursor"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), edit_cursor, false)));
 	select_items.push_back (MenuElem (_("Select all after playhead"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, true)));
 	select_items.push_back (MenuElem (_("Select all before playhead"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, false)));
-	select_items.push_back (MenuElem (_("Select all between cursors"), bind (mem_fun(*this, &Editor::select_all_selectables_between_cursors), playhead_cursor, edit_cursor)));
-	select_items.push_back (SeparatorElem());
+
+	if (n_audio_tracks) {
+		select_items.push_back (MenuElem (_("Select all between cursors"), bind (mem_fun(*this, &Editor::select_all_selectables_between_cursors), playhead_cursor, edit_cursor)));
+	}
 
 	edit_items.push_back (MenuElem (_("Select"), *select_menu));
 
@@ -1829,105 +1722,75 @@ Editor::add_dstream_context_items (Menu_Helpers::MenuList& edit_items)
 	Menu *cutnpaste_menu = manage (new Menu);
 	MenuList& cutnpaste_items = cutnpaste_menu->items();
 	cutnpaste_menu->set_name ("ArdourContextMenu");
-	
-	cutnpaste_items.push_back (MenuElem (_("Cut"), mem_fun(*this, &Editor::cut)));
-	cutnpaste_items.push_back (MenuElem (_("Copy"), mem_fun(*this, &Editor::copy)));
-	cutnpaste_items.push_back (MenuElem (_("Paste at edit cursor"), bind (mem_fun(*this, &Editor::paste), 1.0f)));
-	cutnpaste_items.push_back (MenuElem (_("Paste at mouse"), mem_fun(*this, &Editor::mouse_paste)));
-
-	cutnpaste_items.push_back (SeparatorElem());
 
-	cutnpaste_items.push_back (MenuElem (_("Align"), bind (mem_fun(*this, &Editor::align), ARDOUR::SyncPoint)));
-	cutnpaste_items.push_back (MenuElem (_("Align Relative"), bind (mem_fun(*this, &Editor::align_relative), ARDOUR::SyncPoint)));
-
-	cutnpaste_items.push_back (SeparatorElem());
-
-	cutnpaste_items.push_back (MenuElem (_("Insert chunk"), bind (mem_fun(*this, &Editor::paste_named_selection), 1.0f)));
-
-	edit_items.push_back (MenuElem (_("Edit"), *cutnpaste_menu));
-
-	/* Adding new material */
+	add_item_with_sensitivity (cutnpaste_items, MenuElem (_("Cut"), mem_fun(*this, &Editor::cut)), can_cut_copy ());
 	
-	edit_items.push_back (SeparatorElem());
-	edit_items.push_back (MenuElem (_("Insert Selected Region"), bind (mem_fun(*this, &Editor::insert_region_list_selection), 1.0f)));
-	edit_items.push_back (MenuElem (_("Insert Existing Audio"), bind (mem_fun(*this, &Editor::add_external_audio_action), ImportToTrack)));
-
-	/* Nudge track */
-
-	Menu *nudge_menu = manage (new Menu());
-	MenuList& nudge_items = nudge_menu->items();
-	nudge_menu->set_name ("ArdourContextMenu");
+	add_item_with_sensitivity (cutnpaste_items, MenuElem (_("Copy"), mem_fun(*this, &Editor::copy)), can_cut_copy ());
 	
-	edit_items.push_back (SeparatorElem());
-	nudge_items.push_back (MenuElem (_("Nudge entire track fwd"), (bind (mem_fun(*this, &Editor::nudge_track), false, true))));
-	nudge_items.push_back (MenuElem (_("Nudge track after edit cursor fwd"), (bind (mem_fun(*this, &Editor::nudge_track), true, true))));
-	nudge_items.push_back (MenuElem (_("Nudge entire track bwd"), (bind (mem_fun(*this, &Editor::nudge_track), false, false))));
-	nudge_items.push_back (MenuElem (_("Nudge track after edit cursor bwd"), (bind (mem_fun(*this, &Editor::nudge_track), true, false))));
-
-	edit_items.push_back (MenuElem (_("Nudge"), *nudge_menu));
-}
-
-void
-Editor::add_bus_context_items (Menu_Helpers::MenuList& edit_items)
-{
-	using namespace Menu_Helpers;
+	if (n_audio_tracks) {
+		cutnpaste_items.push_back (MenuElem (_("Paste at edit cursor"), bind (mem_fun(*this, &Editor::paste), 1.0f)));
+		cutnpaste_items.push_back (MenuElem (_("Paste at mouse"), mem_fun(*this, &Editor::mouse_paste)));
+		
+		cutnpaste_items.push_back (SeparatorElem());
+		
+		cutnpaste_items.push_back (MenuElem (_("Align"), bind (mem_fun(*this, &Editor::align), ARDOUR::SyncPoint)));
+		cutnpaste_items.push_back (MenuElem (_("Align relative"), bind (mem_fun(*this, &Editor::align_relative), ARDOUR::SyncPoint)));
+		cutnpaste_items.push_back (MenuElem (_("Insert chunk"), bind (mem_fun(*this, &Editor::paste_named_selection), 1.0f)));
+	} else {
+		cutnpaste_items.push_back (MenuElem (_("Paste"), bind (mem_fun(*this, &Editor::paste), 1.0f)));
+	}
 
-	/* Playback */
+	edit_items.push_back (MenuElem (_("Edit"), *cutnpaste_menu));
+		
+	if (n_audio_tracks) {
 
-	Menu *play_menu = manage (new Menu);
-	MenuList& play_items = play_menu->items();
-	play_menu->set_name ("ArdourContextMenu");
+		Menu *track_menu = manage (new Menu);
+		MenuList& track_items = track_menu->items();
+		track_menu->set_name ("ArdourContextMenu");
+		
+		/* Adding new material */
 	
-	play_items.push_back (MenuElem (_("Play from edit cursor"), mem_fun(*this, &Editor::play_from_edit_cursor)));
-	play_items.push_back (MenuElem (_("Play from start"), mem_fun(*this, &Editor::play_from_start)));
-	edit_items.push_back (MenuElem (_("Play"), *play_menu));
+		add_item_with_sensitivity (track_items, MenuElem (_("Insert selected region"), bind (mem_fun(*this, &Editor::insert_region_list_selection), 1.0f)), n_audio_tracks == 1);
+		
+		add_item_with_sensitivity (track_items, MenuElem (_("Insert existing audio"), bind (mem_fun(*this, &Editor::add_external_audio_action), ImportToTrack)), n_audio_tracks == 1);
+		
+		/* Nudge */
 
-	/* Selection */
+		Menu *nudge_menu = manage (new Menu());
+		MenuList& nudge_items = nudge_menu->items();
+		nudge_menu->set_name ("ArdourContextMenu");
 
-	Menu *select_menu = manage (new Menu);
-	MenuList& select_items = select_menu->items();
-	select_menu->set_name ("ArdourContextMenu");
-	
-	select_items.push_back (MenuElem (_("Select All in track"), bind (mem_fun(*this, &Editor::select_all_in_track), Selection::Set)));
-	select_items.push_back (MenuElem (_("Select All"), bind (mem_fun(*this, &Editor::select_all), Selection::Set)));
-	select_items.push_back (MenuElem (_("Invert selection in track"), mem_fun(*this, &Editor::invert_selection_in_track)));
-	select_items.push_back (MenuElem (_("Invert selection"), mem_fun(*this, &Editor::invert_selection)));
-	select_items.push_back (SeparatorElem());
-	select_items.push_back (MenuElem (_("Select all after edit cursor"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), edit_cursor, true)));
-	select_items.push_back (MenuElem (_("Select all before edit cursor"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), edit_cursor, false)));
-	select_items.push_back (MenuElem (_("Select all after playhead"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, true)));
-	select_items.push_back (MenuElem (_("Select all before playhead"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, false)));
+		str = selection->tracks.size() == 1 ? _("Nudge track forward") : _("Nude tracks forward");
+		nudge_items.push_back (MenuElem (str, (bind (mem_fun(*this, &Editor::nudge_selected_tracks), false, true))));
 
-	edit_items.push_back (MenuElem (_("Select"), *select_menu));
+		str = selection->tracks.size() == 1 ? _("Nudge track after edit cursor forward") : _("Nudge tracks after edit cursor forward");
+		
+		nudge_items.push_back (MenuElem (str, (bind (mem_fun(*this, &Editor::nudge_selected_tracks), true, true))));
 
-	/* Cut-n-Paste */
+		str = selection->tracks.size() == 1 ? _("Nudge track backward") : _("Nudge tracks backward");
+		
+		nudge_items.push_back (MenuElem (str, (bind (mem_fun(*this, &Editor::nudge_selected_tracks), false, false))));
 
-	Menu *cutnpaste_menu = manage (new Menu);
-	MenuList& cutnpaste_items = cutnpaste_menu->items();
-	cutnpaste_menu->set_name ("ArdourContextMenu");
-	
-	cutnpaste_items.push_back (MenuElem (_("Cut"), mem_fun(*this, &Editor::cut)));
-	cutnpaste_items.push_back (MenuElem (_("Copy"), mem_fun(*this, &Editor::copy)));
-	cutnpaste_items.push_back (MenuElem (_("Paste"), bind (mem_fun(*this, &Editor::paste), 1.0f)));
+		str = selection->tracks.size() == 1 ? _("Nudge track after edit cursor backward") : _("Nudge tracks after edit cursor backward");
+		
+		nudge_items.push_back (MenuElem (str, (bind (mem_fun(*this, &Editor::nudge_selected_tracks), true, false))));
+		
+		track_items.push_back (MenuElem (_("Nudge"), *nudge_menu));
 
-	Menu *nudge_menu = manage (new Menu());
-	MenuList& nudge_items = nudge_menu->items();
-	nudge_menu->set_name ("ArdourContextMenu");
-	
-	edit_items.push_back (SeparatorElem());
-	nudge_items.push_back (MenuElem (_("Nudge entire track fwd"), (bind (mem_fun(*this, &Editor::nudge_track), false, true))));
-	nudge_items.push_back (MenuElem (_("Nudge track after edit cursor fwd"), (bind (mem_fun(*this, &Editor::nudge_track), true, true))));
-	nudge_items.push_back (MenuElem (_("Nudge entire track bwd"), (bind (mem_fun(*this, &Editor::nudge_track), false, false))));
-	nudge_items.push_back (MenuElem (_("Nudge track after edit cursor bwd"), (bind (mem_fun(*this, &Editor::nudge_track), true, false))));
+		/* Freeze */
+		track_items.push_back (MenuElem (_("Freeze"), mem_fun(*this, &Editor::freeze_routes)));
+		track_items.push_back (MenuElem (_("Unfreeze"), mem_fun(*this, &Editor::unfreeze_routes)));
 
-	edit_items.push_back (MenuElem (_("Nudge"), *nudge_menu));
+		str = selection->tracks.size() == 1 ? _("Track") : _("Tracks");
+		edit_items.push_back (MenuElem (str, *track_menu));
+	}
 }
 
 /* CURSOR SETTING AND MARKS AND STUFF */
 
 void
 Editor::set_snap_to (SnapType st)
-{
+{	
 	snap_type = st;
 	string str = snap_type_strings[(int) st];
 
@@ -2019,6 +1882,10 @@ Editor::set_state (const XMLNode& node)
 		edit_cursor->set_position (0);
 	}
 
+	if ((prop = node.property ("mixer-width"))) {
+		editor_mixer_strip_width = Width (string_2_enum (prop->value(), editor_mixer_strip_width));
+	}
+
 	if ((prop = node.property ("zoom-focus"))) {
 		set_zoom_focus ((ZoomFocus) atoi (prop->value()));
 	}
@@ -2082,16 +1949,16 @@ Editor::set_state (const XMLNode& node)
 
 	if ((prop = node.property ("follow-playhead"))) {
 		bool yn = (prop->value() == "yes");
+		set_follow_playhead (yn);
 		RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("toggle-follow-playhead"));
 		if (act) {
 			RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic(act);
-			/* do it twice to force the change */
-			tact->set_active (!yn);
-			tact->set_active (yn);
+			if (tact->get_active() != yn) {
+				tact->set_active (yn);
+			}
 		}
 	}
 
-
 	if ((prop = node.property ("region-list-sort-type"))) {
 		region_list_sort_type = (Editing::RegionListSortType) -1; // force change 
 		reset_region_list_sort_type(str2regionlistsorttype(prop->value()));
@@ -2117,6 +1984,22 @@ Editor::set_state (const XMLNode& node)
 			tact->set_active (yn);
 		}
 	}
+	
+	if ((prop = node.property ("show-editor-list"))) {
+
+		Glib::RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("show-editor-list"));
+		assert(act);
+		if (act) {
+
+			Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
+			bool yn = (prop->value() == X_("yes"));
+
+			/* do it twice to force the change */
+			
+			tact->set_active (!yn);
+			tact->set_active (yn);
+		}
+	}
 
 
 	return 0;
@@ -2159,6 +2042,8 @@ Editor::get_state ()
 		node->add_child_nocopy (*geometry);
 	}
 
+	maybe_add_mixer_strip_width (*node);
+	
 	snprintf (buf, sizeof(buf), "%d", (int) zoom_focus);
 	node->add_property ("zoom-focus", buf);
 	snprintf (buf, sizeof(buf), "%f", frames_per_unit);
@@ -2186,6 +2071,12 @@ Editor::get_state ()
 		Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
 		node->add_property (X_("show-editor-mixer"), tact->get_active() ? "yes" : "no");
 	}
+	
+	act = ActionManager::get_action (X_("Editor"), X_("show-editor-list"));
+	if (act) {
+		Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
+		node->add_property (X_("show-editor-list"), tact->get_active() ? "yes" : "no");
+	}
 
 	return *node;
 }
@@ -2208,7 +2099,7 @@ Editor::trackview_by_y_position (double y)
 }
 
 void
-Editor::snap_to (nframes_t& start, int32_t direction, bool for_mark)
+Editor::snap_to (nframes64_t& start, int32_t direction, bool for_mark)
 {
 	Location* before = 0;
 	Location* after = 0;
@@ -2217,11 +2108,11 @@ Editor::snap_to (nframes_t& start, int32_t direction, bool for_mark)
 		return;
 	}
 
-	const nframes_t one_second = session->frame_rate();
-	const nframes_t one_minute = session->frame_rate() * 60;
-	const nframes_t one_smpte_second = (nframes_t)(rint(session->smpte_frames_per_second()) * session->frames_per_smpte_frame());
-	nframes_t one_smpte_minute = (nframes_t)(rint(session->smpte_frames_per_second()) * session->frames_per_smpte_frame() * 60);
-	nframes_t presnap = start;
+	const nframes64_t one_second = session->frame_rate();
+	const nframes64_t one_minute = session->frame_rate() * 60;
+	const nframes64_t one_smpte_second = (nframes64_t)(rint(session->smpte_frames_per_second()) * session->frames_per_smpte_frame());
+	nframes64_t one_smpte_minute = (nframes64_t)(rint(session->smpte_frames_per_second()) * session->frames_per_smpte_frame() * 60);
+	nframes64_t presnap = start;
 
 	switch (snap_type) {
 	case SnapToFrame:
@@ -2446,6 +2337,9 @@ Editor::setup_toolbar ()
 	mouse_mode_buttons.push_back (&mouse_timefx_button);
 	mouse_audition_button.add (*(manage (new Image (::get_icon("tool_audition")))));
 	mouse_audition_button.set_relief(Gtk::RELIEF_NONE);
+	mouse_note_button.add (*(manage (new Image (::get_icon("tool_note")))));
+	mouse_note_button.set_relief(Gtk::RELIEF_NONE);
+	mouse_mode_buttons.push_back (&mouse_note_button);
 	mouse_mode_buttons.push_back (&mouse_audition_button);
 	
 	mouse_mode_button_set = new GroupedButtons (mouse_mode_buttons);
@@ -2460,6 +2354,7 @@ Editor::setup_toolbar ()
 	mouse_mode_button_box.pack_start(mouse_gain_button, true, true);
 	mouse_mode_button_box.pack_start(mouse_timefx_button, true, true);
 	mouse_mode_button_box.pack_start(mouse_audition_button, true, true);
+	mouse_mode_button_box.pack_start(mouse_note_button, true, true);
 	mouse_mode_button_box.set_homogeneous(true);
 
 	vector<string> edit_mode_strings;
@@ -2492,6 +2387,7 @@ Editor::setup_toolbar ()
 	mouse_zoom_button.set_name ("MouseModeButton");
 	mouse_timefx_button.set_name ("MouseModeButton");
 	mouse_audition_button.set_name ("MouseModeButton");
+	mouse_note_button.set_name ("MouseModeButton");
 
 	ARDOUR_UI::instance()->tooltips().set_tip (mouse_move_button, _("Select/Move Objects"));
 	ARDOUR_UI::instance()->tooltips().set_tip (mouse_select_button, _("Select/Move Ranges"));
@@ -2499,6 +2395,7 @@ Editor::setup_toolbar ()
 	ARDOUR_UI::instance()->tooltips().set_tip (mouse_zoom_button, _("Select Zoom Range"));
 	ARDOUR_UI::instance()->tooltips().set_tip (mouse_timefx_button, _("Stretch/Shrink Regions"));
 	ARDOUR_UI::instance()->tooltips().set_tip (mouse_audition_button, _("Listen to Specific Regions"));
+	ARDOUR_UI::instance()->tooltips().set_tip (mouse_note_button, _("Edit MIDI Notes"));
 
 	mouse_move_button.unset_flags (CAN_FOCUS);
 	mouse_select_button.unset_flags (CAN_FOCUS);
@@ -2506,6 +2403,7 @@ Editor::setup_toolbar ()
 	mouse_zoom_button.unset_flags (CAN_FOCUS);
 	mouse_timefx_button.unset_flags (CAN_FOCUS);
 	mouse_audition_button.unset_flags (CAN_FOCUS);
+	mouse_note_button.unset_flags (CAN_FOCUS);
 
 	mouse_select_button.signal_toggled().connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseRange));
 	mouse_select_button.signal_button_release_event().connect (mem_fun(*this, &Editor::mouse_select_button_release));
@@ -2515,6 +2413,7 @@ Editor::setup_toolbar ()
 	mouse_zoom_button.signal_toggled().connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseZoom));
 	mouse_timefx_button.signal_toggled().connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseTimeFX));
 	mouse_audition_button.signal_toggled().connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseAudition));
+	mouse_note_button.signal_toggled().connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseNote));
 
 	// mouse_move_button.set_active (true);
 	
@@ -2543,7 +2442,7 @@ Editor::setup_toolbar ()
 	ARDOUR_UI::instance()->tooltips().set_tip (zoom_out_full_button, _("Zoom to Session"));
 
 	zoom_focus_selector.set_name ("ZoomFocusSelector");
-	Gtkmm2ext::set_size_request_to_display_given_text (zoom_focus_selector, "Edit Cursor", FUDGE, 0);
+	Gtkmm2ext::set_size_request_to_display_given_text (zoom_focus_selector, "Center", FUDGE, 0);
 	set_popdown_strings (zoom_focus_selector, zoom_focus_strings);
 	zoom_focus_selector.signal_changed().connect (mem_fun(*this, &Editor::zoom_focus_selection_done));
 	ARDOUR_UI::instance()->tooltips().set_tip (zoom_focus_selector, _("Zoom focus"));
@@ -2717,6 +2616,8 @@ Editor::map_transport_state ()
 	if (session->transport_stopped()) {
 		have_pending_keyboard_selection = false;
 	}
+
+	update_loop_range_view (true);
 }
 
 /* UNDO/REDO */
@@ -2828,32 +2729,34 @@ Editor::history_changed ()
 void
 Editor::duplicate_dialog (bool dup_region)
 {
-	if (dup_region) {
-		if (clicked_regionview == 0) {
-			return;
-		}
-	} else {
-		if (selection->time.length() == 0) {
-			return;
-		}
+	if (selection->regions.empty() && (selection->time.length() == 0)) {
+		return;
 	}
 
 	ArdourDialog win ("duplicate dialog");
-	Entry  entry;
 	Label  label (_("Duplicate how many times?"));
+	Adjustment adjustment (1.0, 1.0, 1000000.0, 1.0, 5.0);
+	SpinButton spinner (adjustment);
 
+	win.get_vbox()->set_spacing (12);
 	win.get_vbox()->pack_start (label);
-	win.add_action_widget (entry, RESPONSE_ACCEPT);
+
+	/* dialogs have ::add_action_widget() but that puts the spinner in the wrong
+	   place, visually. so do this by hand.
+	*/
+
+	win.get_vbox()->pack_start (spinner);
+	spinner.signal_activate().connect (sigc::bind (mem_fun (win, &ArdourDialog::response), RESPONSE_ACCEPT));
+
+	label.show ();
+	spinner.show ();
+
 	win.add_button (Stock::OK, RESPONSE_ACCEPT);
 	win.add_button (Stock::CANCEL, RESPONSE_CANCEL);
 
 	win.set_position (WIN_POS_MOUSE);
 
-	entry.set_text ("1");
-	set_size_request_to_display_given_text (entry, X_("12345678"), 20, 15);
-	entry.select_region (0, -1);
-	entry.grab_focus ();
-
+	spinner.grab_focus ();
 
 	switch (win.run ()) {
 	case RESPONSE_ACCEPT:
@@ -2862,32 +2765,27 @@ Editor::duplicate_dialog (bool dup_region)
 		return;
 	}
 
-	string text = entry.get_text();
-	float times;
+	float times = adjustment.get_value();
 
-	if (sscanf (text.c_str(), "%f", &times) == 1) {
-		if (dup_region) {
-			RegionSelection regions;
-			regions.add (clicked_regionview);
-			duplicate_some_regions (regions, times);
-		} else {
-			duplicate_selection (times);
-		}
+	if (!selection->regions.empty()) {
+		duplicate_some_regions (selection->regions, times);
+	} else {
+		duplicate_selection (times);
 	}
 }
 
 void
 Editor::show_verbose_canvas_cursor ()
 {
-        verbose_canvas_cursor->raise_to_top();
-        verbose_canvas_cursor->show();
+	verbose_canvas_cursor->raise_to_top();
+	verbose_canvas_cursor->show();
 	verbose_cursor_visible = true;
 }
 
 void
 Editor::hide_verbose_canvas_cursor ()
 {
-        verbose_canvas_cursor->hide();
+	verbose_canvas_cursor->hide();
 	verbose_cursor_visible = false;
 }
 
@@ -3012,9 +2910,9 @@ Editor::zoom_focus_selection_done ()
 		focus_type = ZoomFocusRight;
 	} else if (choice == _("Center")) {
 		focus_type = ZoomFocusCenter;
-	} else if (choice == _("Playhead")) {
+	} else if (choice == _("Play")) {
 		focus_type = ZoomFocusPlayhead;
-	} else if (choice == _("Edit Cursor")) {
+	} else if (choice == _("Edit")) {
 		focus_type = ZoomFocusEdit;
 	} 
 	
@@ -3285,7 +3183,7 @@ Editor::playlist_deletion_dialog (boost::shared_ptr<Playlist> pl)
 	label.show ();
 
 	dialog.add_button (_("Delete playlist"), RESPONSE_ACCEPT);
-	dialog.add_button (_("Keep playlist"), RESPONSE_CANCEL);
+	dialog.add_button (_("Keep playlist"), RESPONSE_REJECT);
 	dialog.add_button (_("Cancel"), RESPONSE_CANCEL);
 
 	switch (dialog.run ()) {
@@ -3369,6 +3267,9 @@ Editor::control_layout_scroll (GdkEventScroll* ev)
 	return false;
 }
 
+
+/** A new snapshot has been selected.
+ */
 void
 Editor::snapshot_display_selection_changed ()
 {
@@ -3393,7 +3294,87 @@ Editor::snapshot_display_selection_changed ()
 bool
 Editor::snapshot_display_button_press (GdkEventButton* ev)
 {
-	 return false;
+	if (ev->button == 3) {
+		/* Right-click on the snapshot list. Work out which snapshot it
+		   was over. */
+		Gtk::TreeModel::Path path;
+		Gtk::TreeViewColumn* col;
+		int cx;
+		int cy;
+		snapshot_display.get_path_at_pos ((int) ev->x, (int) ev->y, path, col, cx, cy);
+		Gtk::TreeModel::iterator iter = snapshot_display_model->get_iter (path);
+		if (iter) {
+			Gtk::TreeModel::Row row = *iter;
+			popup_snapshot_context_menu (ev->button, ev->time, row[snapshot_display_columns.real_name]);
+		}
+		return true;
+	}
+
+	return false;
+}
+
+
+/** Pop up the snapshot display context menu.
+ * @param button Button used to open the menu.
+ * @param time Menu open time.
+ * @snapshot_name Name of the snapshot that the menu click was over.
+ */
+
+void
+Editor::popup_snapshot_context_menu (int button, int32_t time, Glib::ustring snapshot_name)
+{
+	using namespace Menu_Helpers;
+
+	MenuList& items (snapshot_context_menu.items());
+	items.clear ();
+
+	const bool modification_allowed = (session->snap_name() != snapshot_name && session->name() != snapshot_name);
+
+	add_item_with_sensitivity (items, MenuElem (_("Remove"), bind (mem_fun (*this, &Editor::remove_snapshot), snapshot_name)), modification_allowed);
+
+	add_item_with_sensitivity (items, MenuElem (_("Rename"), bind (mem_fun (*this, &Editor::rename_snapshot), snapshot_name)), modification_allowed);
+
+	snapshot_context_menu.popup (button, time);
+}
+
+void
+Editor::rename_snapshot (Glib::ustring old_name)
+{
+	ArdourPrompter prompter(true);
+
+	string new_name;
+
+	prompter.set_name ("Prompter");
+	prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
+	prompter.set_prompt (_("New name of snapshot"));
+	prompter.set_initial_text (old_name);
+	
+	if (prompter.run() == RESPONSE_ACCEPT) {
+		prompter.get_result (new_name);
+		if (new_name.length()) {
+			session->rename_state (old_name, new_name);
+		        redisplay_snapshots ();
+		}
+	}
+}
+
+
+void
+Editor::remove_snapshot (Glib::ustring name)
+{
+	vector<string> choices;
+
+	std::string prompt  = string_compose (_("Do you really want to remove snapshot \"%1\" ?\n(cannot be undone)"), name);
+
+	choices.push_back (_("No, do nothing."));
+	choices.push_back (_("Yes, remove it."));
+
+	Gtkmm2ext::Choice prompter (prompt, choices);
+
+	if (prompter.run () == 1) {
+		session->remove_state (name);
+		redisplay_snapshots ();
+	}
 }
 
 void
@@ -3491,7 +3472,7 @@ void
 Editor::new_playlists ()
 {
 	begin_reversible_command (_("new playlists"));
-	mapover_audio_tracks (mem_fun (*this, &Editor::mapped_use_new_playlist));
+	mapover_tracks (mem_fun (*this, &Editor::mapped_use_new_playlist));
 	commit_reversible_command ();
 }
 
@@ -3499,7 +3480,7 @@ void
 Editor::copy_playlists ()
 {
 	begin_reversible_command (_("copy playlists"));
-	mapover_audio_tracks (mem_fun (*this, &Editor::mapped_use_copy_playlist));
+	mapover_tracks (mem_fun (*this, &Editor::mapped_use_copy_playlist));
 	commit_reversible_command ();
 }
 
@@ -3507,24 +3488,24 @@ void
 Editor::clear_playlists ()
 {
 	begin_reversible_command (_("clear playlists"));
-	mapover_audio_tracks (mem_fun (*this, &Editor::mapped_clear_playlist));
+	mapover_tracks (mem_fun (*this, &Editor::mapped_clear_playlist));
 	commit_reversible_command ();
 }
 
 void 
-Editor::mapped_use_new_playlist (AudioTimeAxisView& atv, uint32_t sz)
+Editor::mapped_use_new_playlist (RouteTimeAxisView& atv, uint32_t sz)
 {
 	atv.use_new_playlist (sz > 1 ? false : true);
 }
 
 void
-Editor::mapped_use_copy_playlist (AudioTimeAxisView& atv, uint32_t sz)
+Editor::mapped_use_copy_playlist (RouteTimeAxisView& atv, uint32_t sz)
 {
 	atv.use_copy_playlist (sz > 1 ? false : true);
 }
 
 void 
-Editor::mapped_clear_playlist (AudioTimeAxisView& atv, uint32_t sz)
+Editor::mapped_clear_playlist (RouteTimeAxisView& atv, uint32_t sz)
 {
 	atv.clear_playlist ();
 }
@@ -3662,11 +3643,11 @@ Editor::idle_visual_changer ()
 			/* the signal handler will do the rest */
 		} else {
 			update_fixed_rulers();
-			tempo_map_changed (Change (0), true);
+			redisplay_tempo (true);
 		}
 	}
 
-	return 0;
+	return 0; /* this is always a one-shot call */
 }
 
 struct EditorOrderTimeAxisSorter {
@@ -3691,3 +3672,4 @@ Editor::edit_cursor_position(bool sync)
 
 	return edit_cursor->current_frame;
 }
+