X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_markers.cc;h=23332047bd6bd8152c224ecec446cd829ab1d63f;hb=2c90b4f36cd074428631eb94b4a95ea0844870bc;hp=ccc1415888449f1c92bfac39f810de0106c48f25;hpb=dca612e82af4f89dad4f15454cbbb15694fa077c;p=ardour.git

diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index ccc1415888..23332047bd 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
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <sigc++/retype.h>
@@ -25,8 +24,10 @@
 #include <libgnomecanvas/libgnomecanvas.h>
 #include <gtkmm2ext/gtk_ui.h>
 
-#include <ardour/location.h>
-#include <pbd/memento_command.h>
+#include "ardour/session.h"
+#include "ardour/location.h"
+#include "ardour/profile.h"
+#include "pbd/memento_command.h"
 
 #include "editor.h"
 #include "marker.h"
@@ -36,14 +37,15 @@
 #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;
+using namespace Gtkmm2ext;
 
 void
 Editor::clear_marker_display ()
@@ -58,7 +60,7 @@ Editor::clear_marker_display ()
 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)
 
 	LocationMarkers *lam = new LocationMarkers;
 	uint32_t color;
@@ -76,30 +78,48 @@ Editor::add_new_location (Location *location)
 	}
 
 	if (location->is_mark()) {
-		lam->start = new Marker (*this, *marker_group, color, location->name(), Marker::Mark, location->start());
+
+		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 {
+			lam->start = new Marker (*this, *marker_group, color, location->name(), Marker::Mark, location->start());
+		}
 		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());
-		
+
 	} 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());
+
+	} else if (location->is_session_range()) {
+		// session range
+		lam->start = new Marker (*this, *marker_group, color, _("start"), Marker::Start, location->start());
+		lam->end = new Marker (*this, *marker_group, color, _("end"), Marker::End, location->end());
 		
 	} else {
-
 		// range marker
-		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());
+		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());
+		}
 	}
 
 	if (location->is_hidden ()) {
@@ -108,11 +128,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), ui_bind (&Editor::location_changed, this, _1), gui_context());
+	location->end_changed.connect (*this, invalidator (*this), ui_bind (&Editor::location_changed, this, _1), gui_context());
+	location->changed.connect (*this, invalidator (*this), ui_bind (&Editor::location_changed, this, _1), gui_context());
+	location->name_changed.connect (*this, invalidator (*this), ui_bind (&Editor::location_changed, this, _1), gui_context());
+	location->FlagsChanged.connect (*this, invalidator (*this), ui_bind (&Editor::location_flags_changed, this, _1, _2), gui_context());
 
 	pair<Location*,LocationMarkers*> newpair;
 
@@ -120,12 +140,17 @@ Editor::add_new_location (Location *location)
 	newpair.second = lam;
 
 	location_markers.insert (newpair);
+
+	if (select_new_marker && location->is_mark()) {
+		selection->set (lam->start);
+		select_new_marker = false;
+	}
 }
 
 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);
 
@@ -133,8 +158,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()) {
@@ -145,17 +170,20 @@ Editor::location_changed (Location *location)
 }
 
 void
-Editor::location_flags_changed (Location *location, void *src)
+Editor::location_flags_changed (Location *location, void*)
 {
-	ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::location_flags_changed), location, src));
-	
+	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;
 	}
 
+	// move cd markers to/from cd marker bar as appropriate
+	ensure_cd_marker_updated (lam, location);
+
 	if (location->is_cd_marker()) {
 		lam->set_color_rgba (location_cd_marker_color);
 	} else if (location->is_mark()) {
@@ -167,7 +195,7 @@ Editor::location_flags_changed (Location *location, void *src)
 	} else {
 		lam->set_color_rgba (location_range_color);
 	}
-	
+
 	if (location->is_hidden()) {
 		lam->hide();
 	} else {
@@ -175,21 +203,62 @@ Editor::location_flags_changed (Location *location, void *src)
 	}
 }
 
-Editor::LocationMarkers::~LocationMarkers ()
+void Editor::update_cd_marker_display ()
 {
-	if (start) {
-		delete start;
+	for (LocationMarkerMap::iterator i = location_markers.begin(); i != location_markers.end(); ++i) {
+		LocationMarkers * lam = i->second;
+		Location * location = i->first;
+
+		ensure_cd_marker_updated (lam, location);
 	}
+}
 
-	if (end) {
-		delete end;
+void Editor::ensure_cd_marker_updated (LocationMarkers * lam, Location * location)
+{
+	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 (lam->start) {
+			lam->start->reparent (*cd_marker_group);
+		}
+		if (lam->end) {
+			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))
+	{
+		//cerr << "reparenting non-cd marker so it can be relocated: " << location->name() << endl;
+		if (location->is_mark()) {
+			if (lam->start) {
+				lam->start->reparent (*marker_group);
+			}
+			if (lam->end) {
+				lam->end->reparent (*marker_group);
+			}
+		}
+		else {
+			if (lam->start) {
+				lam->start->reparent (*range_marker_group);
+			}
+			if (lam->end) {
+				lam->end->reparent (*range_marker_group);
+			}
+		}
 	}
 }
 
+Editor::LocationMarkers::~LocationMarkers ()
+{
+	delete start;
+	delete end;
+}
+
 Editor::LocationMarkers *
-Editor::find_location_markers (Location *location)
+Editor::find_location_markers (Location *location) const
 {
-	LocationMarkerMap::iterator i;
+	LocationMarkerMap::const_iterator i;
 
 	for (i = location_markers.begin(); i != location_markers.end(); ++i) {
 		if ((*i).first == location) {
@@ -201,9 +270,9 @@ Editor::find_location_markers (Location *location)
 }
 
 Location *
-Editor::find_location_from_marker (Marker *marker, bool& is_start)
+Editor::find_location_from_marker (Marker *marker, bool& is_start) const
 {
-	LocationMarkerMap::iterator i;
+	LocationMarkerMap::const_iterator i;
 
 	for (i = location_markers.begin(); i != location_markers.end(); ++i) {
 		LocationMarkers *lm = (*i).second;
@@ -222,85 +291,148 @@ Editor::find_location_from_marker (Marker *marker, bool& is_start)
 void
 Editor::refresh_location_display_internal (Locations::LocationList& locations)
 {
-	clear_marker_display ();
-	
+	/* invalidate all */
+
+	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) {
+
+		LocationMarkerMap::iterator x;
+
+		if ((x = location_markers.find (*i)) != location_markers.end()) {
+			x->second->valid = true;
+			continue;
+		}
+
 		add_new_location (*i);
 	}
+
+	/* remove dead ones */
+
+	for (LocationMarkerMap::iterator i = location_markers.begin(); i != location_markers.end(); ) {
+
+		LocationMarkerMap::iterator tmp;
+
+		tmp = i;
+		++tmp;
+
+		if (!i->second->valid) {
+			delete i->second;
+			location_markers.erase (i);
+		}
+
+		i = tmp;
+	}
+
+	update_punch_range_view (false);
+	update_loop_range_view (false);
 }
 
 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);
 	}
 }
 
 void
-Editor::refresh_location_display_s (Change ignored)
+Editor::refresh_location_display_s (const PropertyChange&)
 {
-	ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::refresh_location_display_s), ignored));
+	ENSURE_GUI_THREAD (*this, &Editor::refresh_location_display_s, ignored)
 
-	if (session) {
-		session->locations()->apply (*this, &Editor::refresh_location_display_internal);
+	if (_session) {
+		_session->locations()->apply (*this, &Editor::refresh_location_display_internal);
 	}
 }
 
 void
-Editor::LocationMarkers::hide() 
+Editor::LocationMarkers::hide()
 {
 	start->hide ();
 	if (end) { end->hide(); }
 }
 
 void
-Editor::LocationMarkers::show() 
+Editor::LocationMarkers::show()
 {
 	start->show ();
 	if (end) { end->show(); }
 }
 
 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::Start) {
+		start->set_name (str);
+	}
+	
+	if (end && end->type() != Marker::End) {
+		end->set_name (str);
+	}
 }
 
 void
-Editor::LocationMarkers::set_position (jack_nframes_t startf, 
-				       jack_nframes_t endf) 
+Editor::LocationMarkers::set_position (nframes64_t startf,
+				       nframes64_t endf)
 {
 	start->set_position (startf);
 	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); }
 }
 
 void
-Editor::mouse_add_new_marker (jack_nframes_t where)
+Editor::mouse_add_new_marker (nframes64_t where, bool is_cd, bool is_xrun)
 {
-	if (session) {
-		Location *location = new Location (where, where, "mark", Location::IsMark);
-		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 ();
+	string markername, markerprefix;
+	int flags = (is_cd ? Location::IsCDMarker|Location::IsMark : Location::IsMark);
+
+	if (is_xrun) {
+		markerprefix = "xrun";
+		flags = Location::IsMark;
+	} else {
+		markerprefix = "mark";
+	}
+
+	if (_session) {
+		_session->locations()->next_available_name(markername, markerprefix);
+		if (!is_xrun && !choose_new_marker_name(markername)) {
+			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 */
+
+		LocationMarkers *lam = find_location_markers (location);
+		if (lam) {
+			/* make it the selected marker */
+			selection->set (lam->start);
+		}
 	}
 }
 
 void
-Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent* event)
+Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent*)
 {
 	Marker* marker;
 	bool is_start;
@@ -310,40 +442,34 @@ Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent* event)
 		/*NOTREACHED*/
 	}
 
+	if (entered_marker == marker) {
+		entered_marker = NULL;
+	}
+
 	Location* loc = find_location_from_marker (marker, is_start);
 
-	if (session && loc) {
-		if (loc->is_end()) {
-			/* you can't hide or delete this marker */
-			return;
-		}
-		if (loc->is_auto_loop() || loc->is_auto_punch()) {
-			// just hide them
-			loc->set_hidden (true, this);
-		}
-		else {
-		  	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()) {
@@ -353,7 +479,7 @@ 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;
@@ -364,15 +490,27 @@ Editor::location_gone (Location *location)
 }
 
 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
@@ -383,21 +521,28 @@ 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 (transport_marker_menu == 0) {
-			build_transport_marker_menu ();
+			build_range_marker_menu (true);
 		}
 		marker_menu_item = item;
 		transport_marker_menu->popup (1, ev->time);
 	} else {
 
 		if (loc->is_mark()) {
-		       if (marker_menu == 0) {
-			      build_marker_menu ();
-		       }
+			Menu *markerMenu;
+			if (loc->is_session_range ()) {
+				delete session_range_marker_menu;
+				build_marker_menu (true, loc);
+				markerMenu = session_range_marker_menu;
+			} else {
+				delete marker_menu;
+				build_marker_menu (false, loc);
+				markerMenu = marker_menu;
+			}
 
 
 		// GTK2FIX use action group sensitivity
@@ -413,14 +558,14 @@ Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
 				}
 			}
 		}
-#endif		
+#endif
 		marker_menu_item = item;
-		marker_menu->popup (1, ev->time);
+		markerMenu->popup (1, ev->time);
 		}
 
 	        if (loc->is_range_marker()) {
 		       if (range_marker_menu == 0){
-			      build_range_marker_menu ();
+			      build_range_marker_menu (false);
 		       }
 		       marker_menu_item = item;
 		       range_marker_menu->popup (1, ev->time);
@@ -429,7 +574,7 @@ Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
 }
 
 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 ();
@@ -440,75 +585,118 @@ Editor::new_transport_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Ite
 }
 
 void
-Editor::transport_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
+Editor::transport_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item*)
 {
 	if (transport_marker_menu == 0) {
-		build_transport_marker_menu ();
+		build_range_marker_menu (true);
 	}
 
 	transport_marker_menu->popup (1, ev->time);
 }
 
 void
-Editor::build_marker_menu ()
+Editor::build_marker_menu (bool session_range, Location* loc)
 {
 	using namespace Menu_Helpers;
 
-	marker_menu = new Menu;
-	MenuList& items = marker_menu->items();
-	marker_menu->set_name ("ArdourContextMenu");
+	Menu *markerMenu = new Menu;
+	if (session_range) {
+		session_range_marker_menu = markerMenu;
+	} else {
+		marker_menu = markerMenu;
+	}
+	MenuList& items = markerMenu->items();
+	markerMenu->set_name ("ArdourContextMenu");
 
-	items.push_back (MenuElem (_("Locate to Mark"), mem_fun(*this, &Editor::marker_menu_set_playhead)));
-	items.push_back (MenuElem (_("Play from Mark"), mem_fun(*this, &Editor::marker_menu_play_from)));
-	items.push_back (MenuElem (_("Set Mark from 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 (_("Rename Mark"), mem_fun(*this, &Editor::marker_menu_rename)));
-	items.push_back (MenuElem (_("Hide Mark"), mem_fun(*this, &Editor::marker_menu_hide)));
-	items.push_back (MenuElem (_("Remove Mark"), mem_fun(*this, &Editor::marker_menu_remove)));
+	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)));
+	if (session_range) {
+		return;
+	}
+	items.push_back (MenuElem (_("Rename"), sigc::mem_fun(*this, &Editor::marker_menu_rename)));
+
+	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"), sigc::mem_fun(*this, &Editor::marker_menu_remove)));
 }
 
 void
-Editor::build_range_marker_menu ()
+Editor::build_range_marker_menu (bool loop_or_punch)
 {
 	using namespace Menu_Helpers;
 
-	range_marker_menu = new Menu;
-	MenuList& items = range_marker_menu->items();
-	range_marker_menu->set_name ("ArdourContextMenu");
-
-	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)));
-	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 (_("Set Range from Range Selection"), mem_fun(*this, &Editor::marker_menu_set_from_selection)));
+	Menu *markerMenu = new Menu;
+	if (loop_or_punch) {
+		transport_marker_menu = markerMenu;
+	} else {
+		range_marker_menu = markerMenu;
+	}
+	MenuList& items = markerMenu->items();
+	markerMenu->set_name ("ArdourContextMenu");
+
+	items.push_back (MenuElem (_("Play Range"), sigc::mem_fun(*this, &Editor::marker_menu_play_range)));
+	items.push_back (MenuElem (_("Locate to Range Mark"), sigc::mem_fun(*this, &Editor::marker_menu_set_playhead)));
+	items.push_back (MenuElem (_("Play from Range Mark"), sigc::mem_fun(*this, &Editor::marker_menu_play_from)));
+	if (! loop_or_punch) {
+		items.push_back (MenuElem (_("Loop Range"), sigc::mem_fun(*this, &Editor::marker_menu_loop_range)));
+	}
+	items.push_back (MenuElem (_("Set Range Mark 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"), sigc::mem_fun(*this, &Editor::marker_menu_set_from_selection)));
+	}
 
 	items.push_back (SeparatorElem());
-
-	items.push_back (MenuElem (_("Rename Range"), mem_fun(*this, &Editor::marker_menu_rename)));
-	items.push_back (MenuElem (_("Hide Range"), mem_fun(*this, &Editor::marker_menu_hide)));
-	items.push_back (MenuElem (_("Remove Range"), mem_fun(*this, &Editor::marker_menu_remove)));
-
+	items.push_back (MenuElem (_("Export Range"), sigc::mem_fun(*this, &Editor::export_range)));
 	items.push_back (SeparatorElem());
 
-	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) {
+		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 (MenuElem (_("Remove Range"), sigc::mem_fun(*this, &Editor::marker_menu_remove)));
+		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"), 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"), sigc::mem_fun(*this, &Editor::marker_menu_edit)));
+	items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &Editor::marker_menu_remove)));
 
-	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.back().set_sensitive (can_remove);
 }
 
 void
@@ -520,34 +708,32 @@ 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_event().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
-Editor::build_transport_marker_menu ()
+Editor::marker_menu_hide ()
 {
-	using namespace Menu_Helpers;
+	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*/
+	}
 
-	transport_marker_menu = new Menu;
-	MenuList& items = transport_marker_menu->items();
-	transport_marker_menu->set_name ("ArdourContextMenu");
+	Location* l;
+	bool is_start;
 
-	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)));
-	items.push_back (MenuElem (_("Set Range Mark from Playhead"), mem_fun(*this, &Editor::marker_menu_set_from_playhead)));
-	items.push_back (MenuElem (_("Set Range from Range Selection"), mem_fun(*this, &Editor::marker_menu_set_from_selection)));
-	items.push_back (SeparatorElem());
-	items.push_back (MenuElem (_("Hide Range"), mem_fun(*this, &Editor::marker_menu_hide)));
-	items.push_back (SeparatorElem());
-	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 ((l = find_location_from_marker (marker, is_start)) != 0) {
+		l->set_hidden (true, this);
+	}
 }
 
 void
-Editor::marker_menu_hide ()
+Editor::marker_menu_select_using_range ()
 {
 	Marker* marker;
 
@@ -558,9 +744,9 @@ Editor::marker_menu_hide ()
 
 	Location* l;
 	bool is_start;
-	
-	if ((l = find_location_from_marker (marker, is_start)) != 0) {
-		l->set_hidden (true, this);
+
+	if (((l = find_location_from_marker (marker, is_start)) != 0) && (l->end() > l->start())) {
+	        set_selection_from_range (*l);
 	}
 }
 
@@ -578,9 +764,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, Selection::Set);
+	        select_all_within (l->start(), l->end() - 1, 0,  DBL_MAX, track_views, Selection::Set);
 	}
-	  
+
 }
 
 void
@@ -599,7 +785,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
@@ -614,19 +800,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);
 			}
 		}
 	}
@@ -644,22 +830,55 @@ 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);
 			}
 		}
 	}
 }
 
+void
+Editor::marker_menu_range_to_next ()
+{
+	Marker* marker;
+	if (!_session) {
+		return;
+	}
+
+	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* l;
+	bool is_start;
+
+	if ((l = find_location_from_marker (marker, is_start)) == 0) {
+		return;
+	}
+
+	nframes64_t start;
+	nframes64_t end;
+	_session->locations()->marks_either_side (marker->position(), start, end);
+
+	if (end != max_frames) {
+		string range_name = l->name();
+		range_name += "-range";
+
+		Location* newrange = new Location (*_session, marker->position(), end, range_name, Location::IsRangeMarker);
+		_session->locations()->add (newrange);
+	}
+}
+
 void
 Editor::marker_menu_set_from_playhead ()
 {
@@ -672,17 +891,17 @@ 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->transport_frame ());
+			l->set_start (_session->audible_frame ());
 		}
 		else {
 			if (is_start) {
-				l->set_start (session->transport_frame ());
+				l->set_start (_session->audible_frame ());
 			} else {
-				l->set_end (session->transport_frame ());
+				l->set_end (_session->audible_frame ());
 			}
 		}
 	}
@@ -700,7 +919,7 @@ 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()) {
@@ -726,6 +945,32 @@ Editor::marker_menu_set_from_selection ()
 	}
 }
 
+
+void
+Editor::marker_menu_play_range ()
+{
+	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* l;
+	bool is_start;
+
+	if ((l = find_location_from_marker (marker, is_start)) != 0) {
+
+		if (l->is_mark()) {
+			_session->request_locate (l->start(), true);
+		}
+		else {
+			_session->request_bounded_roll (l->start(), l->end());
+
+		}
+	}
+}
+
 void
 Editor::marker_menu_loop_range ()
 {
@@ -738,39 +983,43 @@ 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_auto_loop(true);
-			session->request_locate (l2->start(), true);
+			_session->request_play_loop(true);
+			_session->request_locate (l2->start(), true);
 		}
 	}
 }
 
 void
-Editor::marker_menu_edit ()
+Editor::dynamic_cast_marker_object (void* p, MeterMarker** m, TempoMarker** t) const
 {
-	MeterMarker* mm;
-	TempoMarker* tm;
-	Marker* marker;
-
-	if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
+	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*/
 	}
 }
 
@@ -779,6 +1028,20 @@ Editor::marker_menu_remove ()
 {
 	MeterMarker* mm;
 	TempoMarker* tm;
+	dynamic_cast_marker_object (marker_menu_item->get_data ("marker"), &mm, &tm);
+
+	if (mm) {
+		remove_meter_marker (marker_menu_item);
+	} else if (tm) {
+		remove_tempo_marker (marker_menu_item);
+	} else {
+		remove_marker (*marker_menu_item, (GdkEvent*) 0);
+	}
+}
+
+void
+Editor::toggle_marker_menu_lock ()
+{
 	Marker* marker;
 
 	if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
@@ -786,12 +1049,19 @@ Editor::marker_menu_remove ()
 		/*NOTREACHED*/
 	}
 
-	if ((mm = dynamic_cast<MeterMarker*> (marker)) != 0) {
-		remove_meter_marker (marker_menu_item);
-	} else if ((tm = dynamic_cast<TempoMarker*> (marker)) != 0) {
-		remove_tempo_marker (marker_menu_item);
+	Location* loc;
+	bool ignored;
+
+	loc = find_location_from_marker (marker, ignored);
+
+	if (!loc) {
+		return;
+	}
+
+	if (loc->locked()) {
+		loc->unlock ();
 	} else {
-		remove_marker (*marker_menu_item, (GdkEvent*) 0);
+		loc->lock ();
 	}
 }
 
@@ -811,16 +1081,16 @@ 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:"));
-	
+
 	if (loc->is_mark()) {
-		dialog.set_title (_("ardour: rename mark"));
+		dialog.set_title (_("Rename Mark"));
 	} else {
-		dialog.set_title (_("ardour: rename range"));
+		dialog.set_title (_("Rename Range"));
 	}
 
 	dialog.set_name ("MarkRenameWindow");
@@ -841,103 +1111,59 @@ 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 ();
 }
 
-gint
-Editor::new_transport_marker_menu_popdown (GdkEventAny *ev)
+void
+Editor::new_transport_marker_menu_popdown ()
 {
 	// hide rects
 	transport_bar_drag_rect->hide();
-	range_marker_drag_rect->hide();
 
-	return FALSE;
+	_drags->abort ();
 }
 
 void
 Editor::new_transport_marker_menu_set_loop ()
 {
-	if (!session) return;
-	
-	begin_reversible_command (_("set loop range"));
-	
-	Location* tll;
-
-	if ((tll = transport_loop_location()) == 0) {
-		Location* loc = new Location (temp_location->start(), temp_location->end(), _("Loop"),  Location::IsAutoLoop);
-                XMLNode &before = session->locations()->get_state();
-		session->locations()->add (loc, true);
-		session->set_auto_loop_location (loc);
-                XMLNode &after = session->locations()->get_state();
-		session->add_command (new MementoCommand<Locations>(*(session->locations()), before, after));
-	}
-	else {
-                XMLNode &before = tll->get_state();
-		tll->set_hidden (false, this);
-		tll->set (temp_location->start(), temp_location->end());
-                XMLNode &after = tll->get_state();
-                session->add_command (new MementoCommand<Location>(*tll, before, after));
-	}
-	
-	commit_reversible_command ();
+	set_loop_range (temp_location->start(), temp_location->end(), _("set loop range"));
 }
 
 void
 Editor::new_transport_marker_menu_set_punch ()
 {
-	if (!session) return;
-	
-	begin_reversible_command (_("set punch range"));
-	
-	Location* tpl;
-
-	if ((tpl = transport_punch_location()) == 0) {
-		tpl = new Location (temp_location->start(), temp_location->end(), _("Punch"), Location::IsAutoPunch);
-                XMLNode &before = session->locations()->get_state();
-		session->locations()->add (tpl, true);
-		session->set_auto_punch_location (tpl);
-                XMLNode &after = session->locations()->get_state();
-		session->add_command (new MementoCommand<Locations>(*(session->locations()), before, after));
-	} else {
-                XMLNode &before = tpl->get_state();
-		tpl->set_hidden(false, this);
-		tpl->set(temp_location->start(), temp_location->end());
-                XMLNode &after = tpl->get_state();
-                session->add_command (new MementoCommand<Location>(*tpl, before, after));
-	}
-	
-	commit_reversible_command ();
+	set_punch_range (temp_location->start(), temp_location->end(), _("set punch range"));
 }
 
 void
 Editor::update_loop_range_view (bool visibility)
 {
-	if (session == 0) {
+	if (_session == 0) {
 		return;
 	}
 
 	Location* tll;
 
-	if (session->get_auto_loop() && ((tll = transport_loop_location()) != 0)) {
+	if (_session->get_play_loop() && ((tll = transport_loop_location()) != 0)) {
 
 		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();
 		}
-	}
-	else if (visibility) {
+
+	} else if (visibility) {
 		transport_loop_range_rect->hide();
 	}
 }
@@ -945,50 +1171,109 @@ 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 ((session->get_punch_in() || session->get_punch_out()) && ((tpl = transport_punch_location()) != 0)) {
+	if ((_session->config.get_punch_in() || _session->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 (_session->config.get_punch_in()) {
+			transport_punch_range_rect->property_x1() = frame_to_pixel (tpl->start());
+			transport_punch_range_rect->property_x2() = (_session->config.get_punch_out() ? frame_to_pixel (tpl->end()) : frame_to_pixel (JACK_MAX_FRAMES));
+		} else {
+			transport_punch_range_rect->property_x1() = 0;
+			transport_punch_range_rect->property_x2() = (_session->config.get_punch_out() ? frame_to_pixel (tpl->end()) : track_canvas_width);
+		}
 
-		double x1 = frame_to_pixel (tpl->start());
-		double x2 = frame_to_pixel (tpl->end());
-		
-		transport_punch_range_rect->property_x1() = x1;
-		transport_punch_range_rect->property_x2() = x2;
-		
 		if (visibility) {
 		        transport_punch_range_rect->show();
 		}
-	}
-	else if (visibility) {
+	} else if (visibility) {
 	        transport_punch_range_rect->hide();
 	}
+}
+
+void
+Editor::marker_selection_changed ()
+{
+	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();
+		}
+	}
+
+	for (MarkerSelection::iterator x = selection->markers.begin(); x != selection->markers.end(); ++x) {
+		(*x)->add_line (cursor_group, 0, _canvas_height);
+		(*x)->show_line ();
+	}
+}
+
+struct SortLocationsByPosition {
+    bool operator() (Location* a, Location* b) {
+	    return a->start() < b->start();
+    }
+};
+
+void
+Editor::goto_nth_marker (int n)
+{
+	if (!_session) {
+		return;
+	}
+	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_session_range()) {
+			if (n == 0) {
+				_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);
+	}
 
-// 	if (session->get_punch_in()) {
-// 		double x = frame_to_pixel (transport_punch_location->start());
-// 		gnome_canvas_item_set (transport_punchin_line, "x1", x, "x2", x, NULL);
-		
-// 		if (visibility) {
-// 			gnome_canvas_item_show (transport_punchin_line);
-// 		}
-// 	}
-// 	else if (visibility) {
-// 		gnome_canvas_item_hide (transport_punchin_line);
-// 	}
-	
-// 	if (session->get_punch_out()) {
-// 		double x = frame_to_pixel (transport_punch_location->end());
-		
-// 		gnome_canvas_item_set (transport_punchout_line, "x1", x, "x2", x, NULL);
-		
-// 		if (visibility) {
-// 			gnome_canvas_item_show (transport_punchout_line);
-// 		}
-// 	}
-// 	else if (visibility) {
-// 		gnome_canvas_item_hide (transport_punchout_line);
-// 	}
 }