X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_markers.cc;h=c9a151f96ea0073b7acb2b20ac233b79e7ec1309;hb=d1f45e9b3d6a7e272e5563cc50175dfb6d904361;hp=6406f04e543d7528550267e3a8d746fd2a96594b;hpb=e0aaed6d65f160c328cb8b56d7c6552ee15d65e2;p=ardour.git

diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 6406f04e54..c9a151f96e 100644
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000 Paul Davis 
+    Copyright (C) 2000 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,31 +17,32 @@
 
 */
 
-#include <sigc++/retype.h>
 #include <cstdlib>
 #include <cmath>
 
-#include <libgnomecanvas/libgnomecanvas.h>
 #include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/window_title.h>
 
+#include "ardour/session.h"
 #include "ardour/location.h"
 #include "ardour/profile.h"
 #include "pbd/memento_command.h"
 
+#include "canvas/canvas.h"
+#include "canvas/item.h"
+#include "canvas/rectangle.h"
+
 #include "editor.h"
 #include "marker.h"
 #include "selection.h"
 #include "editing.h"
 #include "gui_thread.h"
-#include "simplerect.h"
 #include "actions.h"
 #include "prompter.h"
+#include "editor_drag.h"
 
 #include "i18n.h"
 
 using namespace std;
-using namespace sigc;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;
@@ -55,16 +56,33 @@ Editor::clear_marker_display ()
 	}
 
 	location_markers.clear ();
+	_sorted_marker_lists.clear ();
 }
 
 void
 Editor::add_new_location (Location *location)
 {
-	ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::add_new_location), location));
+	ENSURE_GUI_THREAD (*this, &Editor::add_new_location, location);
+
+	ArdourCanvas::Group* group = add_new_location_internal (location);
+
+	/* Do a full update of the markers in this group */
+	update_marker_labels (group);
+}
 
+/** Add a new location, without a time-consuming update of all marker labels;
+ *  the caller must call update_marker_labels () after calling this.
+ *  @return canvas group that the location's marker was added to.
+ */
+ArdourCanvas::Group*
+Editor::add_new_location_internal (Location* location)
+{
 	LocationMarkers *lam = new LocationMarkers;
 	uint32_t color;
 
+	/* make a note here of which group this marker ends up in */
+	ArdourCanvas::Group* group = 0;
+
 	if (location->is_cd_marker()) {
 		color = location_cd_marker_color;
 	} else if (location->is_mark()) {
@@ -81,40 +99,53 @@ Editor::add_new_location (Location *location)
 
 		if (location->is_cd_marker() && ruler_cd_marker_action->get_active()) {
 			lam->start = new Marker (*this, *cd_marker_group, color, location->name(), Marker::Mark, location->start());
-		}
-		else {
+			group = cd_marker_group;
+		} else {
 			lam->start = new Marker (*this, *marker_group, color, location->name(), Marker::Mark, location->start());
+			group = marker_group;
 		}
-		lam->end   = 0;
-			
+
+		lam->end = 0;
+
 	} else if (location->is_auto_loop()) {
+
 		// transport marker
-		lam->start = new Marker (*this, *transport_marker_group, color, 
+		lam->start = new Marker (*this, *transport_marker_group, color,
 					 location->name(), Marker::LoopStart, location->start());
-		lam->end   = new Marker (*this, *transport_marker_group, color, 
+		lam->end   = new Marker (*this, *transport_marker_group, color,
 					 location->name(), Marker::LoopEnd, location->end());
-		
+		group = transport_marker_group;
+
 	} else if (location->is_auto_punch()) {
+
 		// transport marker
-		lam->start = new Marker (*this, *transport_marker_group, color, 
+		lam->start = new Marker (*this, *transport_marker_group, color,
 					 location->name(), Marker::PunchIn, location->start());
-		lam->end   = new Marker (*this, *transport_marker_group, color, 
+		lam->end   = new Marker (*this, *transport_marker_group, color,
 					 location->name(), Marker::PunchOut, location->end());
-		
+		group = transport_marker_group;
+
+	} else if (location->is_session_range()) {
+
+		// session range
+		lam->start = new Marker (*this, *marker_group, color, _("start"), Marker::SessionStart, location->start());
+		lam->end = new Marker (*this, *marker_group, color, _("end"), Marker::SessionEnd, location->end());
+		group = marker_group;
+
 	} else {
 		// range marker
 		if (location->is_cd_marker() && ruler_cd_marker_action->get_active()) {
-			lam->start = new Marker (*this, *cd_marker_group, color, 
-						 location->name(), Marker::Start, location->start());
-			lam->end   = new Marker (*this, *cd_marker_group, color, 
-						 location->name(), Marker::End, location->end());
-		}
-		else {
-			
-			lam->start = new Marker (*this, *range_marker_group, color, 
-						 location->name(), Marker::Start, location->start());
-			lam->end   = new Marker (*this, *range_marker_group, color, 
-						 location->name(), Marker::End, location->end());
+			lam->start = new Marker (*this, *cd_marker_group, color,
+						 location->name(), Marker::RangeStart, location->start());
+			lam->end   = new Marker (*this, *cd_marker_group, color,
+						 location->name(), Marker::RangeEnd, location->end());
+			group = cd_marker_group;
+		} else {
+			lam->start = new Marker (*this, *range_marker_group, color,
+						 location->name(), Marker::RangeStart, location->start());
+			lam->end   = new Marker (*this, *range_marker_group, color,
+						 location->name(), Marker::RangeEnd, location->end());
+			group = range_marker_group;
 		}
 	}
 
@@ -124,11 +155,11 @@ Editor::add_new_location (Location *location)
 		lam->show ();
 	}
 
-	location->start_changed.connect (mem_fun(*this, &Editor::location_changed));
-	location->end_changed.connect (mem_fun(*this, &Editor::location_changed));
-	location->changed.connect (mem_fun(*this, &Editor::location_changed));
-	location->name_changed.connect (mem_fun(*this, &Editor::location_changed));
-	location->FlagsChanged.connect (mem_fun(*this, &Editor::location_flags_changed));
+	location->start_changed.connect (*this, invalidator (*this), boost::bind (&Editor::location_changed, this, _1), gui_context());
+	location->end_changed.connect (*this, invalidator (*this), boost::bind (&Editor::location_changed, this, _1), gui_context());
+	location->changed.connect (*this, invalidator (*this), boost::bind (&Editor::location_changed, this, _1), gui_context());
+	location->name_changed.connect (*this, invalidator (*this), boost::bind (&Editor::location_changed, this, _1), gui_context());
+	location->FlagsChanged.connect (*this, invalidator (*this), boost::bind (&Editor::location_flags_changed, this, _1, _2), gui_context());
 
 	pair<Location*,LocationMarkers*> newpair;
 
@@ -141,12 +172,25 @@ Editor::add_new_location (Location *location)
 		selection->set (lam->start);
 		select_new_marker = false;
 	}
+
+	lam->canvas_height_set (_visible_canvas_height);
+	lam->set_show_lines (_show_marker_lines);
+
+	/* Add these markers to the appropriate sorted marker lists, which will render
+	   them unsorted until a call to update_marker_labels() sorts them out.
+	*/
+	_sorted_marker_lists[group].push_back (lam->start);
+	if (lam->end) {
+		_sorted_marker_lists[group].push_back (lam->end);
+	}
+
+	return group;
 }
 
 void
 Editor::location_changed (Location *location)
 {
-	ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::location_changed), location));
+	ENSURE_GUI_THREAD (*this, &Editor::location_changed, location)
 
 	LocationMarkers *lam = find_location_markers (location);
 
@@ -154,8 +198,8 @@ Editor::location_changed (Location *location)
 		/* a location that isn't "marked" with markers */
 		return;
 	}
-	
-	lam->set_name (location->name());
+
+	lam->set_name (location->name ());
 	lam->set_position (location->start(), location->end());
 
 	if (location->is_auto_loop()) {
@@ -163,15 +207,163 @@ Editor::location_changed (Location *location)
 	} else if (location->is_auto_punch()) {
 		update_punch_range_view ();
 	}
+
+	check_marker_label (lam->start);
+	if (lam->end) {
+		check_marker_label (lam->end);
+	}
 }
 
+/** Look at a marker and check whether its label, and those of the previous and next markers,
+ *  need to have their labels updated (in case those labels need to be shortened or can be
+ *  lengthened)
+ */
 void
-Editor::location_flags_changed (Location *location, void *src)
+Editor::check_marker_label (Marker* m)
 {
-	ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::location_flags_changed), location, src));
-	
+	/* Get a time-ordered list of markers from the last time anything changed */
+	std::list<Marker*>& sorted = _sorted_marker_lists[m->get_parent()];
+
+	list<Marker*>::iterator i = find (sorted.begin(), sorted.end(), m);
+
+	list<Marker*>::iterator prev = sorted.end ();
+	list<Marker*>::iterator next = i;
+	++next;
+
+	/* Look to see if the previous marker is still behind `m' in time */
+	if (i != sorted.begin()) {
+
+		prev = i;
+		--prev;
+
+		if ((*prev)->position() > m->position()) {
+			/* This marker is no longer in the correct order with the previous one, so
+			 * update all the markers in this group.
+			 */
+			update_marker_labels (m->get_parent ());
+			return;
+		}
+	}
+
+	/* Look to see if the next marker is still ahead of `m' in time */
+	if (next != sorted.end() && (*next)->position() < m->position()) {
+		/* This marker is no longer in the correct order with the next one, so
+		 * update all the markers in this group.
+		 */
+		update_marker_labels (m->get_parent ());
+		return;
+	}
+
+	if (prev != sorted.end()) {
+
+		/* Update just the available space between the previous marker and this one */
+
+		double const p = sample_to_pixel (m->position() - (*prev)->position());
+
+		if (m->label_on_left()) {
+			(*prev)->set_right_label_limit (p / 2);
+		} else {
+			(*prev)->set_right_label_limit (p);
+		}
+
+		if ((*prev)->label_on_left ()) {
+			m->set_left_label_limit (p);
+		} else {
+			m->set_left_label_limit (p / 2);
+		}
+	}
+
+	if (next != sorted.end()) {
+
+		/* Update just the available space between this marker and the next */
+
+		double const p = sample_to_pixel ((*next)->position() - m->position());
+
+		if ((*next)->label_on_left()) {
+			m->set_right_label_limit (p / 2);
+		} else {
+			m->set_right_label_limit (p);
+		}
+
+		if (m->label_on_left()) {
+			(*next)->set_left_label_limit (p);
+		} else {
+			(*next)->set_left_label_limit (p / 2);
+		}
+	}
+}
+
+struct MarkerComparator {
+	bool operator() (Marker const * a, Marker const * b) {
+		return a->position() < b->position();
+	}
+};
+
+/** Update all marker labels in all groups */
+void
+Editor::update_marker_labels ()
+{
+	for (std::map<ArdourCanvas::Group *, std::list<Marker *> >::iterator i = _sorted_marker_lists.begin(); i != _sorted_marker_lists.end(); ++i) {
+		update_marker_labels (i->first);
+	}
+}
+
+/** Look at all markers in a group and update label widths */
+void
+Editor::update_marker_labels (ArdourCanvas::Group* group)
+{
+	list<Marker*>& sorted = _sorted_marker_lists[group];
+
+	if (sorted.empty()) {
+		return;
+	}
+
+	/* We sort the list of markers and then set up the space available between each one */
+
+	sorted.sort (MarkerComparator ());
+
+	list<Marker*>::iterator i = sorted.begin ();
+
+	list<Marker*>::iterator prev = sorted.end ();
+	list<Marker*>::iterator next = i;
+	++next;
+
+	while (i != sorted.end()) {
+
+		if (prev != sorted.end()) {
+			double const p = sample_to_pixel ((*i)->position() - (*prev)->position());
+
+			if ((*prev)->label_on_left()) {
+				(*i)->set_left_label_limit (p);
+			} else {
+				(*i)->set_left_label_limit (p / 2);
+			}
+
+		}
+
+		if (next != sorted.end()) {
+			double const p = sample_to_pixel ((*next)->position() - (*i)->position());
+
+			if ((*next)->label_on_left()) {
+				(*i)->set_right_label_limit (p / 2);
+			} else {
+				(*i)->set_right_label_limit (p);
+			}
+		}
+
+		prev = i;
+		++i;
+		++next;
+	}
+}
+
+void
+Editor::location_flags_changed (Location *location, void*)
+{
+	ENSURE_GUI_THREAD (*this, &Editor::location_flags_changed, location, src)
+
 	LocationMarkers *lam = find_location_markers (location);
-	
+
 	if (lam == 0) {
 		/* a location that isn't "marked" with markers */
 		return;
@@ -191,7 +383,7 @@ Editor::location_flags_changed (Location *location, void *src)
 	} else {
 		lam->set_color_rgba (location_range_color);
 	}
-	
+
 	if (location->is_hidden()) {
 		lam->hide();
 	} else {
@@ -222,8 +414,8 @@ void Editor::ensure_cd_marker_updated (LocationMarkers * lam, Location * locatio
 			lam->end->reparent (*cd_marker_group);
 		}
 	}
-	else if ( (!location->is_cd_marker() || !ruler_cd_marker_action->get_active()) 
-		  && (lam->start->get_parent() == cd_marker_group))  
+	else if ( (!location->is_cd_marker() || !ruler_cd_marker_action->get_active())
+		  && (lam->start->get_parent() == cd_marker_group))
 	{
 		//cerr << "reparenting non-cd marker so it can be relocated: " << location->name() << endl;
 		if (location->is_mark()) {
@@ -292,7 +484,7 @@ Editor::refresh_location_display_internal (Locations::LocationList& locations)
 	for (LocationMarkerMap::iterator i = location_markers.begin(); i != location_markers.end(); ++i) {
 		i->second->valid = false;
 	}
-	
+
 	/* add new ones */
 
 	for (Locations::LocationList::iterator i = locations.begin(); i != locations.end(); ++i) {
@@ -304,7 +496,7 @@ Editor::refresh_location_display_internal (Locations::LocationList& locations)
 			continue;
 		}
 
-		add_new_location (*i);
+		add_new_location_internal (*i);
 	}
 
 	/* remove dead ones */
@@ -317,9 +509,16 @@ Editor::refresh_location_display_internal (Locations::LocationList& locations)
 		++tmp;
 
 		if (!i->second->valid) {
-			delete i->second;
+
+			remove_sorted_marker (i->second->start);
+			if (i->second->end) {
+				remove_sorted_marker (i->second->end);
+			}
+
+			LocationMarkers* m = i->second;
 			location_markers.erase (i);
-		} 
+			delete m;
+		}
 
 		i = tmp;
 	}
@@ -331,61 +530,104 @@ Editor::refresh_location_display_internal (Locations::LocationList& locations)
 void
 Editor::refresh_location_display ()
 {
-	ENSURE_GUI_THREAD(mem_fun(*this, &Editor::refresh_location_display));
-	
-	if (session) {
-		session->locations()->apply (*this, &Editor::refresh_location_display_internal);
+	ENSURE_GUI_THREAD (*this, &Editor::refresh_location_display)
+
+	if (_session) {
+		_session->locations()->apply (*this, &Editor::refresh_location_display_internal);
 	}
+
+	update_marker_labels ();
 }
 
 void
-Editor::refresh_location_display_s (Change ignored)
+Editor::LocationMarkers::hide()
 {
-	ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::refresh_location_display_s), ignored));
-
-	if (session) {
-		session->locations()->apply (*this, &Editor::refresh_location_display_internal);
+	start->hide ();
+	if (end) {
+		end->hide ();
 	}
 }
 
 void
-Editor::LocationMarkers::hide() 
+Editor::LocationMarkers::show()
 {
-	start->hide ();
-	if (end) { end->hide(); }
+	start->show ();
+	if (end) {
+		end->show ();
+	}
 }
 
 void
-Editor::LocationMarkers::show() 
+Editor::LocationMarkers::canvas_height_set (double h)
 {
-	start->show ();
-	if (end) { end->show(); }
+	start->canvas_height_set (h);
+	if (end) {
+		end->canvas_height_set (h);
+	}
 }
 
 void
-Editor::LocationMarkers::set_name (const string& str) 
+Editor::LocationMarkers::set_name (const string& str)
 {
-	start->set_name (str);
-	if (end) { end->set_name (str); }
+	/* XXX: hack: don't change names of session start/end markers */
+
+	if (start->type() != Marker::SessionStart) {
+		start->set_name (str);
+	}
+
+	if (end && end->type() != Marker::SessionEnd) {
+		end->set_name (str);
+	}
 }
 
 void
-Editor::LocationMarkers::set_position (nframes64_t startf, 
-				       nframes64_t endf) 
+Editor::LocationMarkers::set_position (framepos_t startf,
+				       framepos_t endf)
 {
 	start->set_position (startf);
-	if (end) { end->set_position (endf); }
+	if (end) {
+		end->set_position (endf);
+	}
 }
 
 void
-Editor::LocationMarkers::set_color_rgba (uint32_t rgba) 
+Editor::LocationMarkers::set_color_rgba (uint32_t rgba)
 {
 	start->set_color_rgba (rgba);
-	if (end) { end->set_color_rgba (rgba); }
+	if (end) {
+		end->set_color_rgba (rgba);
+	}
 }
 
 void
-Editor::mouse_add_new_marker (nframes64_t where, bool is_cd, bool is_xrun)
+Editor::LocationMarkers::set_show_lines (bool s)
+{
+	start->set_show_line (s);
+	if (end) {
+		end->set_show_line (s);
+	}
+}
+
+void
+Editor::LocationMarkers::set_selected (bool s)
+{
+	start->set_selected (s);
+	if (end) {
+		end->set_selected (s);
+	}
+}
+
+void
+Editor::LocationMarkers::setup_lines ()
+{
+	start->setup_line ();
+	if (end) {
+		end->setup_line ();
+	}
+}
+
+void
+Editor::mouse_add_new_marker (framepos_t where, bool is_cd, bool is_xrun)
 {
 	string markername, markerprefix;
 	int flags = (is_cd ? Location::IsCDMarker|Location::IsMark : Location::IsMark);
@@ -397,18 +639,18 @@ Editor::mouse_add_new_marker (nframes64_t where, bool is_cd, bool is_xrun)
 		markerprefix = "mark";
 	}
 
-	if (session) {
-		session->locations()->next_available_name(markername, markerprefix);
+	if (_session) {
+		_session->locations()->next_available_name(markername, markerprefix);
 		if (!is_xrun && !choose_new_marker_name(markername)) {
-		    	return;
-		}		
-		Location *location = new Location (where, where, markername, (Location::Flags) flags);
-		session->begin_reversible_command (_("add marker"));
-                XMLNode &before = session->locations()->get_state();
-		session->locations()->add (location, true);
-                XMLNode &after = session->locations()->get_state();
-		session->add_command (new MementoCommand<Locations>(*(session->locations()), &before, &after));
-		session->commit_reversible_command ();
+			return;
+		}
+		Location *location = new Location (*_session, where, where, markername, (Location::Flags) flags);
+		_session->begin_reversible_command (_("add marker"));
+		XMLNode &before = _session->locations()->get_state();
+		_session->locations()->add (location, true);
+		XMLNode &after = _session->locations()->get_state();
+		_session->add_command (new MementoCommand<Locations>(*(_session->locations()), &before, &after));
+		_session->commit_reversible_command ();
 
 		/* find the marker we just added */
 
@@ -421,7 +663,32 @@ Editor::mouse_add_new_marker (nframes64_t where, bool is_cd, bool is_xrun)
 }
 
 void
-Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent* event)
+Editor::mouse_add_new_range (framepos_t where)
+{
+	if (!_session) {
+		return;
+	}
+
+	/* Make this marker 1/8th of the visible area of the session so that
+	   it's reasonably easy to manipulate after creation.
+	*/
+
+	framepos_t const end = where + current_page_samples() / 8;
+
+	string name;
+	_session->locations()->next_available_name (name, _("range"));
+	Location* loc = new Location (*_session, where, end, name, Location::IsRangeMarker);
+
+	begin_reversible_command (_("new range marker"));
+	XMLNode& before = _session->locations()->get_state ();
+	_session->locations()->add (loc, true);
+	XMLNode& after = _session->locations()->get_state ();
+	_session->add_command (new MementoCommand<Locations> (*_session->locations(), &before, &after));
+	commit_reversible_command ();
+}
+
+void
+Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent*)
 {
 	Marker* marker;
 	bool is_start;
@@ -437,28 +704,28 @@ Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent* event)
 
 	Location* loc = find_location_from_marker (marker, is_start);
 
-	if (session && loc) {
-	  	Glib::signal_idle().connect (bind (mem_fun(*this, &Editor::really_remove_marker), loc));
+	if (_session && loc) {
+	  	Glib::signal_idle().connect (sigc::bind (sigc::mem_fun(*this, &Editor::really_remove_marker), loc));
 	}
 }
 
 gint
 Editor::really_remove_marker (Location* loc)
 {
-	session->begin_reversible_command (_("remove marker"));
-	XMLNode &before = session->locations()->get_state();
-	session->locations()->remove (loc);
-	XMLNode &after = session->locations()->get_state();
-	session->add_command (new MementoCommand<Locations>(*(session->locations()), &before, &after));
-	session->commit_reversible_command ();
+	_session->begin_reversible_command (_("remove marker"));
+	XMLNode &before = _session->locations()->get_state();
+	_session->locations()->remove (loc);
+	XMLNode &after = _session->locations()->get_state();
+	_session->add_command (new MementoCommand<Locations>(*(_session->locations()), &before, &after));
+	_session->commit_reversible_command ();
 	return FALSE;
 }
 
 void
 Editor::location_gone (Location *location)
 {
-	ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::location_gone), location));
-	
+	ENSURE_GUI_THREAD (*this, &Editor::location_gone, location)
+
 	LocationMarkerMap::iterator i;
 
 	if (location == transport_loop_location()) {
@@ -468,26 +735,45 @@ Editor::location_gone (Location *location)
 	if (location == transport_punch_location()) {
 		update_punch_range_view (true);
 	}
-	
+
 	for (i = location_markers.begin(); i != location_markers.end(); ++i) {
-		if ((*i).first == location) {
-			delete (*i).second;
+		if (i->first == location) {
+
+			remove_sorted_marker (i->second->start);
+			if (i->second->end) {
+				remove_sorted_marker (i->second->end);
+			}
+
+			LocationMarkers* m = i->second;
 			location_markers.erase (i);
+			delete m;
 			break;
 		}
 	}
 }
 
 void
-Editor::tm_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
+Editor::tempo_or_meter_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
 {
-	if (tm_marker_menu == 0) {
-		build_tm_marker_menu ();
-	}
-
 	marker_menu_item = item;
-	tm_marker_menu->popup (1, ev->time);
 
+	MeterMarker* mm;
+	TempoMarker* tm;
+	dynamic_cast_marker_object (marker_menu_item->get_data ("marker"), &mm, &tm);
+
+	bool can_remove = false;
+
+	if (mm) {
+		can_remove = mm->meter().movable ();
+	} else if (tm) {
+		can_remove = tm->tempo().movable ();
+	} else {
+		return;
+	}
+
+	delete tempo_or_meter_marker_menu;
+	build_tempo_or_meter_marker_menu (can_remove);
+	tempo_or_meter_marker_menu->popup (1, ev->time);
 }
 
 void
@@ -498,61 +784,52 @@ Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
 		fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
 		/*NOTREACHED*/
 	}
-	
+
 	bool is_start;
 	Location * loc = find_location_from_marker (marker, is_start);
-	if (loc == transport_loop_location() || loc == transport_punch_location()) {
+
+	if (loc == transport_loop_location() || loc == transport_punch_location() || loc->is_session_range ()) {
+
 		if (transport_marker_menu == 0) {
-			build_range_marker_menu (true);
+			build_range_marker_menu (loc == transport_loop_location() || loc == transport_punch_location(), loc->is_session_range());
 		}
+
 		marker_menu_item = item;
 		transport_marker_menu->popup (1, ev->time);
-	} else {
 
-		if (loc->is_mark()) {
-			bool start_or_end = loc->is_start() || loc->is_end();
-			Menu *markerMenu;
-			if (start_or_end) {
-				if (start_end_marker_menu == 0)
-			   		build_marker_menu (true);
-				markerMenu = start_end_marker_menu;
-			} else {
-				if (marker_menu == 0)
-			   		build_marker_menu (false);
-				markerMenu = marker_menu;
-			}
+	} else if (loc->is_mark()) {
 
+			delete marker_menu;
+			build_marker_menu (loc);
 
 		// GTK2FIX use action group sensitivity
 #ifdef GTK2FIX
-		if (children.size() >= 3) {
-			MenuItem * loopitem = &children[2];
-			if (loopitem) {
-				if (loc->is_mark()) {
-					loopitem->set_sensitive(false);
-				}
-				else {
-					loopitem->set_sensitive(true);
+			if (children.size() >= 3) {
+				MenuItem * loopitem = &children[2];
+				if (loopitem) {
+					if (loc->is_mark()) {
+						loopitem->set_sensitive(false);
+					}
+					else {
+						loopitem->set_sensitive(true);
+					}
 				}
 			}
+#endif
+			marker_menu_item = item;
+			marker_menu->popup (1, ev->time);
+
+	} else if (loc->is_range_marker()) {
+		if (range_marker_menu == 0) {
+			build_range_marker_menu (false, false);
 		}
-#endif		
 		marker_menu_item = item;
-		markerMenu->popup (1, ev->time);
-		}
-
-	        if (loc->is_range_marker()) {
-		       if (range_marker_menu == 0){
-			      build_range_marker_menu (false);
-		       }
-		       marker_menu_item = item;
-		       range_marker_menu->popup (1, ev->time);
-	        }
+		range_marker_menu->popup (1, ev->time);
 	}
 }
 
 void
-Editor::new_transport_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
+Editor::new_transport_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item*)
 {
 	if (new_transport_marker_menu == 0) {
 		build_new_transport_marker_menu ();
@@ -563,55 +840,53 @@ Editor::new_transport_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Ite
 }
 
 void
-Editor::transport_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
-{
-	if (transport_marker_menu == 0) {
-		build_range_marker_menu (true);
-	}
-
-	transport_marker_menu->popup (1, ev->time);
-}
-
-void
-Editor::build_marker_menu (bool start_or_end)
+Editor::build_marker_menu (Location* loc)
 {
 	using namespace Menu_Helpers;
 
-	Menu *markerMenu = new Menu;
-	if (start_or_end) {
-		start_end_marker_menu = markerMenu;
-	} else {
-		marker_menu = markerMenu;
-	}
-	MenuList& items = markerMenu->items();
-	markerMenu->set_name ("ArdourContextMenu");
+	marker_menu = new Menu;
+	MenuList& items = marker_menu->items();
+	marker_menu->set_name ("ArdourContextMenu");
 
-	items.push_back (MenuElem (_("Locate to here"), mem_fun(*this, &Editor::marker_menu_set_playhead)));
-	items.push_back (MenuElem (_("Play from here"), mem_fun(*this, &Editor::marker_menu_play_from)));
-	items.push_back (MenuElem (_("Move Mark to Playhead"), mem_fun(*this, &Editor::marker_menu_set_from_playhead)));
+	items.push_back (MenuElem (_("Locate to Here"), sigc::mem_fun(*this, &Editor::marker_menu_set_playhead)));
+	items.push_back (MenuElem (_("Play from Here"), sigc::mem_fun(*this, &Editor::marker_menu_play_from)));
+	items.push_back (MenuElem (_("Move Mark to Playhead"), sigc::mem_fun(*this, &Editor::marker_menu_set_from_playhead)));
 
 	items.push_back (SeparatorElem());
 
-	items.push_back (MenuElem (_("Create range to next marker"), mem_fun(*this, &Editor::marker_menu_range_to_next)));
+	items.push_back (MenuElem (_("Create Range to Next Marker"), sigc::mem_fun(*this, &Editor::marker_menu_range_to_next)));
+
+	items.push_back (MenuElem (_("Hide"), sigc::mem_fun(*this, &Editor::marker_menu_hide)));
+	items.push_back (MenuElem (_("Rename..."), sigc::mem_fun(*this, &Editor::marker_menu_rename)));
 
-	items.push_back (MenuElem (_("Hide"), mem_fun(*this, &Editor::marker_menu_hide)));
-	if (start_or_end) return;
-	items.push_back (MenuElem (_("Rename"), mem_fun(*this, &Editor::marker_menu_rename)));
-	items.push_back (MenuElem (_("Lock"), bind (mem_fun(*this, &Editor::marker_menu_lock), true)));
-	items.push_back (MenuElem (_("Unlock"), bind (mem_fun(*this, &Editor::marker_menu_lock), false)));
+	items.push_back (CheckMenuElem (_("Lock")));
+	CheckMenuItem* lock_item = static_cast<CheckMenuItem*> (&items.back());
+	if (loc->locked ()) {
+		lock_item->set_active ();
+	}
+	lock_item->signal_activate().connect (sigc::mem_fun (*this, &Editor::toggle_marker_menu_lock));
+
+	items.push_back (CheckMenuElem (_("Glue to Bars and Beats")));
+	CheckMenuItem* glue_item = static_cast<CheckMenuItem*> (&items.back());
+	if (loc->position_lock_style() == MusicTime) {
+		glue_item->set_active ();
+	}
+	glue_item->signal_activate().connect (sigc::mem_fun (*this, &Editor::toggle_marker_menu_glue));
 
 	items.push_back (SeparatorElem());
 
-	items.push_back (MenuElem (_("Remove"), mem_fun(*this, &Editor::marker_menu_remove)));
+	items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &Editor::marker_menu_remove)));
 }
 
 void
-Editor::build_range_marker_menu (bool loop_or_punch)
+Editor::build_range_marker_menu (bool loop_or_punch, bool session)
 {
 	using namespace Menu_Helpers;
 
+	bool const loop_or_punch_or_session = loop_or_punch | session;
+
 	Menu *markerMenu = new Menu;
-	if (loop_or_punch) {
+	if (loop_or_punch_or_session) {
 		transport_marker_menu = markerMenu;
 	} else {
 		range_marker_menu = markerMenu;
@@ -619,47 +894,55 @@ Editor::build_range_marker_menu (bool loop_or_punch)
 	MenuList& items = markerMenu->items();
 	markerMenu->set_name ("ArdourContextMenu");
 
-	items.push_back (MenuElem (_("Play Range"), mem_fun(*this, &Editor::marker_menu_play_range)));
-	items.push_back (MenuElem (_("Locate to Range Mark"), mem_fun(*this, &Editor::marker_menu_set_playhead)));
-	items.push_back (MenuElem (_("Play from Range Mark"), mem_fun(*this, &Editor::marker_menu_play_from)));
-	if (! loop_or_punch) {
-		items.push_back (MenuElem (_("Loop Range"), mem_fun(*this, &Editor::marker_menu_loop_range)));
-	}
-	items.push_back (MenuElem (_("Set Range Mark from Playhead"), mem_fun(*this, &Editor::marker_menu_set_from_playhead)));
+	items.push_back (MenuElem (_("Play Range"), sigc::mem_fun(*this, &Editor::marker_menu_play_range)));
+	items.push_back (MenuElem (_("Locate to Marker"), sigc::mem_fun(*this, &Editor::marker_menu_set_playhead)));
+	items.push_back (MenuElem (_("Play from Marker"), sigc::mem_fun(*this, &Editor::marker_menu_play_from)));
+	items.push_back (MenuElem (_("Loop Range"), sigc::mem_fun(*this, &Editor::marker_menu_loop_range)));
+
+	items.push_back (MenuElem (_("Set Marker from Playhead"), sigc::mem_fun(*this, &Editor::marker_menu_set_from_playhead)));
 	if (!Profile->get_sae()) {
-		items.push_back (MenuElem (_("Set Range from Range Selection"), mem_fun(*this, &Editor::marker_menu_set_from_selection)));
+		items.push_back (MenuElem (_("Set Range from Selection"), sigc::bind (sigc::mem_fun(*this, &Editor::marker_menu_set_from_selection), false)));
 	}
 
+	items.push_back (MenuElem (_("Zoom to Range"), sigc::mem_fun (*this, &Editor::marker_menu_zoom_to_range)));
+
 	items.push_back (SeparatorElem());
-	items.push_back (MenuElem (_("Export Range"), mem_fun(*this, &Editor::export_range)));
+	items.push_back (MenuElem (_("Export Range..."), sigc::mem_fun(*this, &Editor::export_range)));
 	items.push_back (SeparatorElem());
 
-	if (!loop_or_punch) {
-		items.push_back (MenuElem (_("Hide Range"), mem_fun(*this, &Editor::marker_menu_hide)));
-		items.push_back (MenuElem (_("Rename Range"), mem_fun(*this, &Editor::marker_menu_rename)));
-		items.push_back (MenuElem (_("Remove Range"), mem_fun(*this, &Editor::marker_menu_remove)));
+	if (!loop_or_punch_or_session) {
+		items.push_back (MenuElem (_("Hide Range"), sigc::mem_fun(*this, &Editor::marker_menu_hide)));
+		items.push_back (MenuElem (_("Rename Range..."), sigc::mem_fun(*this, &Editor::marker_menu_rename)));
 	}
 
-	items.push_back (SeparatorElem());
+	if (!session) {
+		items.push_back (MenuElem (_("Remove Range"), sigc::mem_fun(*this, &Editor::marker_menu_remove)));
+	}
 
-	items.push_back (MenuElem (_("Separate Regions in Range"), mem_fun(*this, &Editor::marker_menu_separate_regions_using_location)));
-	items.push_back (MenuElem (_("Select All in Range"), mem_fun(*this, &Editor::marker_menu_select_all_selectables_using_range)));
+	if (!loop_or_punch_or_session || !session) {
+		items.push_back (SeparatorElem());
+	}
+	
+	items.push_back (MenuElem (_("Separate Regions in Range"), sigc::mem_fun(*this, &Editor::marker_menu_separate_regions_using_location)));
+	items.push_back (MenuElem (_("Select All in Range"), sigc::mem_fun(*this, &Editor::marker_menu_select_all_selectables_using_range)));
 	if (!Profile->get_sae()) {
-		items.push_back (MenuElem (_("Select Range"), mem_fun(*this, &Editor::marker_menu_select_using_range)));
+		items.push_back (MenuElem (_("Select Range"), sigc::mem_fun(*this, &Editor::marker_menu_select_using_range)));
 	}
 }
 
 void
-Editor::build_tm_marker_menu ()
+Editor::build_tempo_or_meter_marker_menu (bool can_remove)
 {
 	using namespace Menu_Helpers;
 
-	tm_marker_menu = new Menu;
-	MenuList& items = tm_marker_menu->items();
-	tm_marker_menu->set_name ("ArdourContextMenu");
+	tempo_or_meter_marker_menu = new Menu;
+	MenuList& items = tempo_or_meter_marker_menu->items();
+	tempo_or_meter_marker_menu->set_name ("ArdourContextMenu");
 
-	items.push_back (MenuElem (_("Edit"), mem_fun(*this, &Editor::marker_menu_edit)));
-	items.push_back (MenuElem (_("Remove"), mem_fun(*this, &Editor::marker_menu_remove)));
+	items.push_back (MenuElem (_("Edit..."), sigc::mem_fun(*this, &Editor::marker_menu_edit)));
+	items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &Editor::marker_menu_remove)));
+
+	items.back().set_sensitive (can_remove);
 }
 
 void
@@ -671,10 +954,10 @@ Editor::build_new_transport_marker_menu ()
 	MenuList& items = new_transport_marker_menu->items();
 	new_transport_marker_menu->set_name ("ArdourContextMenu");
 
-	items.push_back (MenuElem (_("Set Loop Range"), mem_fun(*this, &Editor::new_transport_marker_menu_set_loop)));
-	items.push_back (MenuElem (_("Set Punch Range"), mem_fun(*this, &Editor::new_transport_marker_menu_set_punch)));
+	items.push_back (MenuElem (_("Set Loop Range"), sigc::mem_fun(*this, &Editor::new_transport_marker_menu_set_loop)));
+	items.push_back (MenuElem (_("Set Punch Range"), sigc::mem_fun(*this, &Editor::new_transport_marker_menu_set_punch)));
 
-	new_transport_marker_menu->signal_unmap().connect ( mem_fun(*this, &Editor::new_transport_marker_menu_popdown)); 
+	new_transport_marker_menu->signal_unmap().connect ( sigc::mem_fun(*this, &Editor::new_transport_marker_menu_popdown));
 }
 
 void
@@ -689,7 +972,7 @@ Editor::marker_menu_hide ()
 
 	Location* l;
 	bool is_start;
-	
+
 	if ((l = find_location_from_marker (marker, is_start)) != 0) {
 		l->set_hidden (true, this);
 	}
@@ -727,9 +1010,9 @@ Editor::marker_menu_select_all_selectables_using_range ()
 	bool is_start;
 
 	if (((l = find_location_from_marker (marker, is_start)) != 0) && (l->end() > l->start())) {
-	        select_all_within (l->start(), l->end() - 1, 0,  DBL_MAX, track_views, Selection::Set);
+	        select_all_within (l->start(), l->end() - 1, 0,  DBL_MAX, track_views, Selection::Set, false);
 	}
-	  
+
 }
 
 void
@@ -748,7 +1031,7 @@ Editor::marker_menu_separate_regions_using_location ()
 	if (((l = find_location_from_marker (marker, is_start)) != 0) && (l->end() > l->start())) {
 	        separate_regions_using_location (*l);
 	}
-	  
+
 }
 
 void
@@ -763,19 +1046,19 @@ Editor::marker_menu_play_from ()
 
 	Location* l;
 	bool is_start;
-	
+
 	if ((l = find_location_from_marker (marker, is_start)) != 0) {
 
 		if (l->is_mark()) {
-			session->request_locate (l->start(), true);
+			_session->request_locate (l->start(), true);
 		}
 		else {
-			//session->request_bounded_roll (l->start(), l->end());
-			
+			//_session->request_bounded_roll (l->start(), l->end());
+
 			if (is_start) {
-				session->request_locate (l->start(), true);
+				_session->request_locate (l->start(), true);
 			} else {
-				session->request_locate (l->end(), true);
+				_session->request_locate (l->end(), true);
 			}
 		}
 	}
@@ -793,17 +1076,17 @@ Editor::marker_menu_set_playhead ()
 
 	Location* l;
 	bool is_start;
-	
+
 	if ((l = find_location_from_marker (marker, is_start)) != 0) {
 
 		if (l->is_mark()) {
-			session->request_locate (l->start(), false);
+			_session->request_locate (l->start(), false);
 		}
 		else {
 			if (is_start) {
-				session->request_locate (l->start(), false);
+				_session->request_locate (l->start(), false);
 			} else {
-				session->request_locate (l->end(), false);
+				_session->request_locate (l->end(), false);
 			}
 		}
 	}
@@ -813,7 +1096,7 @@ void
 Editor::marker_menu_range_to_next ()
 {
 	Marker* marker;
-	if (!session) {
+	if (!_session) {
 		return;
 	}
 
@@ -828,15 +1111,17 @@ Editor::marker_menu_range_to_next ()
 	if ((l = find_location_from_marker (marker, is_start)) == 0) {
 		return;
 	}
-		
-	nframes_t end = session->locations()->first_mark_after (marker->position());
 
-	if (end != max_frames) {
+	framepos_t start;
+	framepos_t end;
+	_session->locations()->marks_either_side (marker->position(), start, end);
+
+	if (end != max_framepos) {
 		string range_name = l->name();
 		range_name += "-range";
 
-		Location* newrange = new Location (marker->position(), end, range_name, Location::IsRangeMarker);
-		session->locations()->add (newrange);
+		Location* newrange = new Location (*_session, marker->position(), end, range_name, Location::IsRangeMarker);
+		_session->locations()->add (newrange);
 	}
 }
 
@@ -852,24 +1137,24 @@ Editor::marker_menu_set_from_playhead ()
 
 	Location* l;
 	bool is_start;
-	
+
 	if ((l = find_location_from_marker (marker, is_start)) != 0) {
 
 		if (l->is_mark()) {
-			l->set_start (session->audible_frame ());
+			l->set_start (_session->audible_frame ());
 		}
 		else {
 			if (is_start) {
-				l->set_start (session->audible_frame ());
+				l->set_start (_session->audible_frame ());
 			} else {
-				l->set_end (session->audible_frame ());
+				l->set_end (_session->audible_frame ());
 			}
 		}
 	}
 }
 
 void
-Editor::marker_menu_set_from_selection ()
+Editor::marker_menu_set_from_selection (bool /*force_regions*/)
 {
 	Marker* marker;
 
@@ -880,27 +1165,19 @@ Editor::marker_menu_set_from_selection ()
 
 	Location* l;
 	bool is_start;
-	
+
 	if ((l = find_location_from_marker (marker, is_start)) != 0) {
 
 		if (l->is_mark()) {
-			// nothing for now
-		}
-		else {
 
-			/* if range selection use first to last */
+			// nothing for now
 
-			if (mouse_mode == Editing::MouseRange) {
-				if (!selection->time.empty()) {
-					l->set_start (selection->time.start());
-					l->set_end (selection->time.end_frame());
-				}
-			}
-			else {
-				if (!selection->regions.empty()) {
-					l->set_start (selection->regions.start());
-					l->set_end (selection->regions.end_frame());
-				}
+		} else {
+			
+			if (!selection->time.empty()) {
+				l->set (selection->time.start(), selection->time.end_frame());
+			} else if (!selection->regions.empty()) {
+				l->set (selection->regions.start(), selection->regions.end_frame());
 			}
 		}
 	}
@@ -919,15 +1196,15 @@ Editor::marker_menu_play_range ()
 
 	Location* l;
 	bool is_start;
-	
+
 	if ((l = find_location_from_marker (marker, is_start)) != 0) {
 
 		if (l->is_mark()) {
-			session->request_locate (l->start(), true);
+			_session->request_locate (l->start(), true);
 		}
 		else {
-			session->request_bounded_roll (l->start(), l->end());
-			
+			_session->request_bounded_roll (l->start(), l->end());
+
 		}
 	}
 }
@@ -944,39 +1221,70 @@ Editor::marker_menu_loop_range ()
 
 	Location* l;
 	bool is_start;
-	
+
 	if ((l = find_location_from_marker (marker, is_start)) != 0) {
 		Location* l2;
 		if ((l2 = transport_loop_location()) != 0) {
 			l2->set (l->start(), l->end());
-			
+
 			// enable looping, reposition and start rolling
-			session->request_play_loop(true);
-			session->request_locate (l2->start(), true);
+			_session->request_play_loop(true);
+			_session->request_locate (l2->start(), true);
 		}
 	}
 }
 
+/** Temporal zoom to the range of the marker_menu_item (plus 5% either side) */
 void
-Editor::marker_menu_edit ()
+Editor::marker_menu_zoom_to_range ()
 {
-	MeterMarker* mm;
-	TempoMarker* tm;
-	Marker* marker;
+	Marker* marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"));
+	assert (marker);
 
-	if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
+	bool is_start;
+	Location* l = find_location_from_marker (marker, is_start);
+	if (l == 0) {
+		return;
+	}
+
+	framecnt_t const extra = l->length() * 0.05;
+	framepos_t a = l->start ();
+	if (a >= extra) {
+		a -= extra;
+	}
+	
+	framepos_t b = l->end ();
+	if (b < (max_framepos - extra)) {
+		b += extra;
+	}
+
+	temporal_zoom_by_frame (a, b);
+}
+
+void
+Editor::dynamic_cast_marker_object (void* p, MeterMarker** m, TempoMarker** t) const
+{
+	Marker* marker = reinterpret_cast<Marker*> (p);
+	if (!marker) {
 		fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
 		/*NOTREACHED*/
 	}
 
-	if ((mm = dynamic_cast<MeterMarker*> (marker)) != 0) {
+	*m = dynamic_cast<MeterMarker*> (marker);
+	*t = dynamic_cast<TempoMarker*> (marker);
+}
+
+void
+Editor::marker_menu_edit ()
+{
+	MeterMarker* mm;
+	TempoMarker* tm;
+	dynamic_cast_marker_object (marker_menu_item->get_data ("marker"), &mm, &tm);
+
+	if (mm) {
 		edit_meter_section (&mm->meter());
-	} else if ((tm = dynamic_cast<TempoMarker*> (marker)) != 0) {
+	} else if (tm) {
 		edit_tempo_section (&tm->tempo());
-	} else {
-		fatal << X_("programming erorr: unhandled marker type in Editor::marker_menu_edit")
-		      << endmsg;
-		/*NOTREACHED*/
 	}
 }
 
@@ -985,16 +1293,11 @@ Editor::marker_menu_remove ()
 {
 	MeterMarker* mm;
 	TempoMarker* tm;
-	Marker* marker;
+	dynamic_cast_marker_object (marker_menu_item->get_data ("marker"), &mm, &tm);
 
-	if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
-		fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
-		/*NOTREACHED*/
-	}
-
-	if ((mm = dynamic_cast<MeterMarker*> (marker)) != 0) {
+	if (mm) {
 		remove_meter_marker (marker_menu_item);
-	} else if ((tm = dynamic_cast<TempoMarker*> (marker)) != 0) {
+	} else if (tm) {
 		remove_tempo_marker (marker_menu_item);
 	} else {
 		remove_marker (*marker_menu_item, (GdkEvent*) 0);
@@ -1002,9 +1305,8 @@ Editor::marker_menu_remove ()
 }
 
 void
-Editor::marker_menu_lock (bool yn)
+Editor::toggle_marker_menu_lock ()
 {
-
 	Marker* marker;
 
 	if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
@@ -1017,12 +1319,14 @@ Editor::marker_menu_lock (bool yn)
 
 	loc = find_location_from_marker (marker, ignored);
 
-	if (!loc) return;
+	if (!loc) {
+		return;
+	}
 
-	if (yn) {
-		loc->lock();
-	} else {
+	if (loc->locked()) {
 		loc->unlock ();
+	} else {
+		loc->lock ();
 	}
 }
 
@@ -1042,21 +1346,18 @@ Editor::marker_menu_rename ()
 	loc = find_location_from_marker (marker, is_start);
 
 	if (!loc) return;
-	
+
 	ArdourPrompter dialog (true);
 	string txt;
 
 	dialog.set_prompt (_("New Name:"));
 
-	WindowTitle title(Glib::get_application_name());
 	if (loc->is_mark()) {
-		title += _("Rename Mark");
+		dialog.set_title (_("Rename Mark"));
 	} else {
-		title += _("Rename Range");
+		dialog.set_title (_("Rename Range"));
 	}
 
-	dialog.set_title(title.get_string());
-
 	dialog.set_name ("MarkRenameWindow");
 	dialog.set_size_request (250, -1);
 	dialog.set_position (Gtk::WIN_POS_MOUSE);
@@ -1075,13 +1376,13 @@ Editor::marker_menu_rename ()
 	}
 
 	begin_reversible_command ( _("rename marker") );
-        XMLNode &before = session->locations()->get_state();
+	XMLNode &before = _session->locations()->get_state();
 
 	dialog.get_result(txt);
 	loc->set_name (txt);
-	
-        XMLNode &after = session->locations()->get_state();
-	session->add_command (new MementoCommand<Locations>(*(session->locations()), &before, &after));
+
+	XMLNode &after = _session->locations()->get_state();
+	_session->add_command (new MementoCommand<Locations>(*(_session->locations()), &before, &after));
 	commit_reversible_command ();
 }
 
@@ -1090,7 +1391,8 @@ Editor::new_transport_marker_menu_popdown ()
 {
 	// hide rects
 	transport_bar_drag_rect->hide();
-	range_marker_drag_rect->hide();
+
+	_drags->abort ();
 }
 
 void
@@ -1108,20 +1410,20 @@ Editor::new_transport_marker_menu_set_punch ()
 void
 Editor::update_loop_range_view (bool visibility)
 {
-	if (session == 0) {
+	if (_session == 0) {
 		return;
 	}
 
 	Location* tll;
 
-	if (session->get_play_loop() && ((tll = transport_loop_location()) != 0)) {
+	if (_session->get_play_loop() && ((tll = transport_loop_location()) != 0)) {
+
+		double x1 = sample_to_pixel (tll->start());
+		double x2 = sample_to_pixel (tll->end());
+
+		transport_loop_range_rect->set_x0 (x1);
+		transport_loop_range_rect->set_x1 (x2);
 
-		double x1 = frame_to_pixel (tll->start());
-		double x2 = frame_to_pixel (tll->end());
-		
-		transport_loop_range_rect->property_x1() = x1;
-		transport_loop_range_rect->property_x2() = x2;
-		
 		if (visibility) {
 			transport_loop_range_rect->show();
 		}
@@ -1134,23 +1436,22 @@ Editor::update_loop_range_view (bool visibility)
 void
 Editor::update_punch_range_view (bool visibility)
 {
-	if (session == 0) {
+	if (_session == 0) {
 		return;
 	}
 
 	Location* tpl;
 
-	if ((Config->get_punch_in() || Config->get_punch_out()) && ((tpl = transport_punch_location()) != 0)) {
-		guint track_canvas_width,track_canvas_height;
-		track_canvas->get_size(track_canvas_width,track_canvas_height);
-		if (Config->get_punch_in()) {
-			transport_punch_range_rect->property_x1() = frame_to_pixel (tpl->start());
-			transport_punch_range_rect->property_x2() = (Config->get_punch_out() ? frame_to_pixel (tpl->end()) : frame_to_pixel (JACK_MAX_FRAMES));
+	if ((_session->config.get_punch_in() || _session->config.get_punch_out()) && ((tpl = transport_punch_location()) != 0)) {
+		ArdourCanvas::Rect const v = _track_canvas->visible_area ();
+		if (_session->config.get_punch_in()) {
+			transport_punch_range_rect->set_x0 (sample_to_pixel (tpl->start()));
+			transport_punch_range_rect->set_x1 (_session->config.get_punch_out() ? sample_to_pixel (tpl->end()) : sample_to_pixel (JACK_MAX_FRAMES));
 		} else {
-			transport_punch_range_rect->property_x1() = 0;
-			transport_punch_range_rect->property_x2() = (Config->get_punch_out() ? frame_to_pixel (tpl->end()) : track_canvas_width);
+			transport_punch_range_rect->set_x0 (0);
+			transport_punch_range_rect->set_x1 (_session->config.get_punch_out() ? sample_to_pixel (tpl->end()) : v.width ());
 		}
-		
+
 		if (visibility) {
 		        transport_punch_range_rect->show();
 		}
@@ -1162,53 +1463,20 @@ Editor::update_punch_range_view (bool visibility)
 void
 Editor::marker_selection_changed ()
 {
-	if (session && session->deletion_in_progress()) {
+	if (_session && _session->deletion_in_progress()) {
 		return;
 	}
 
 	for (LocationMarkerMap::iterator i = location_markers.begin(); i != location_markers.end(); ++i) {
-		LocationMarkers* lam = i->second;
-
-		if (lam->start) {
-			lam->start->hide_line();
-		} 
-
-		if (lam->end) {
-			lam->end->hide_line();
-		}
-	}
-
-	edit_point_clock_connection_a.disconnect();
-	edit_point_clock_connection_b.disconnect();
-
-	if (selection->markers.empty()) {
-		edit_point_clock.set (0);
-		return;
+		i->second->set_selected (false);
 	}
 
 	for (MarkerSelection::iterator x = selection->markers.begin(); x != selection->markers.end(); ++x) {
-		(*x)->add_line (cursor_group, 0, canvas_height);
-		(*x)->show_line ();
-	}
-
-	edit_point_clock.set (selection->markers.front()->position());
-
-	bool ignored;
-	Location* loc = find_location_from_marker (selection->markers.front(), ignored);
-
-	if (loc) {
-		edit_point_clock_connection_a = loc->changed.connect (mem_fun (*this, &Editor::selected_marker_moved));
-		edit_point_clock_connection_b = loc->start_changed.connect (mem_fun (*this, &Editor::selected_marker_moved));
+		(*x)->set_selected (true);
 	}
 }
 
-void
-Editor::selected_marker_moved (Location* loc)
-{
-	edit_point_clock.set (loc->start());
-}
-
-struct SortLocationsByPosition { 
+struct SortLocationsByPosition {
     bool operator() (Location* a, Location* b) {
 	    return a->start() < b->start();
     }
@@ -1217,23 +1485,80 @@ struct SortLocationsByPosition {
 void
 Editor::goto_nth_marker (int n)
 {
-	if (!session) {
+	if (!_session) {
 		return;
 	}
-	const Locations::LocationList& l (session->locations()->list());
+	const Locations::LocationList& l (_session->locations()->list());
 	Locations::LocationList ordered;
 	ordered = l;
 
 	SortLocationsByPosition cmp;
 	ordered.sort (cmp);
-	
+
 	for (Locations::LocationList::iterator i = ordered.begin(); n >= 0 && i != ordered.end(); ++i) {
-		if ((*i)->is_mark() && !(*i)->is_hidden() && !(*i)->is_start()) {
+		if ((*i)->is_mark() && !(*i)->is_hidden() && !(*i)->is_session_range()) {
 			if (n == 0) {
-				session->request_locate ((*i)->start(), session->transport_rolling());
+				_session->request_locate ((*i)->start(), _session->transport_rolling());
 				break;
 			}
 			--n;
 		}
 	}
 }
+
+void
+Editor::toggle_marker_menu_glue ()
+{
+	Marker* marker;
+
+	if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
+		fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
+		/*NOTREACHED*/
+	}
+
+	Location* loc;
+	bool ignored;
+
+	loc = find_location_from_marker (marker, ignored);
+
+	if (!loc) {
+		return;
+	}
+
+	if (loc->position_lock_style() == MusicTime) {
+		loc->set_position_lock_style (AudioTime);
+	} else {
+		loc->set_position_lock_style (MusicTime);
+	}
+
+}
+
+void
+Editor::toggle_marker_lines ()
+{
+	_show_marker_lines = !_show_marker_lines;
+
+	for (LocationMarkerMap::iterator i = location_markers.begin(); i != location_markers.end(); ++i) {
+		i->second->set_show_lines (_show_marker_lines);
+	}
+}
+
+void
+Editor::remove_sorted_marker (Marker* m)
+{
+	for (std::map<ArdourCanvas::Group *, std::list<Marker *> >::iterator i = _sorted_marker_lists.begin(); i != _sorted_marker_lists.end(); ++i) {
+		i->second.remove (m);
+	}
+}
+
+Marker *
+Editor::find_marker_from_location_id (PBD::ID const & id, bool is_start) const
+{
+	for (LocationMarkerMap::const_iterator i = location_markers.begin(); i != location_markers.end(); ++i) {
+		if (i->first->id() == id) {
+			return is_start ? i->second->start : i->second->end;
+		}
+	}
+
+	return 0;
+}