X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_markers.cc;h=6517d7de85f5a35578ddd8b24839dfb67e198f0b;hb=aad62fc6608ccbb6edd9c5cb94e2721edd890bec;hp=0610b6aa9f43c918b5d5558b2197bad07c553744;hpb=656d56b12d0b86f9140956badd9c9e11d791549b;p=ardour.git

diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 0610b6aa9f..6517d7de85 100644
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -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>
@@ -26,6 +25,8 @@
 #include <gtkmm2ext/gtk_ui.h>
 
 #include <ardour/location.h>
+#include <ardour/profile.h>
+#include <pbd/memento_command.h>
 
 #include "editor.h"
 #include "marker.h"
@@ -43,6 +44,7 @@ using namespace sigc;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;
+using namespace Gtkmm2ext;
 
 void
 Editor::clear_marker_display ()
@@ -75,9 +77,15 @@ Editor::add_new_location (Location *location)
 	}
 
 	if (location->is_mark()) {
-		lam->start = new Marker (*this, *marker_group, color, location->name(), Marker::Mark, location->start());
-		lam->end   = 0;
 
+		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, 
@@ -93,12 +101,20 @@ Editor::add_new_location (Location *location)
 					 location->name(), Marker::PunchOut, 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 ()) {
@@ -119,6 +135,11 @@ 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
@@ -155,6 +176,9 @@ Editor::location_flags_changed (Location *location, void *src)
 		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()) {
@@ -174,6 +198,52 @@ Editor::location_flags_changed (Location *location, void *src)
 	}
 }
 
+void Editor::update_cd_marker_display ()
+{
+	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);
+	}
+}
+
+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 ()
 {
 	if (start) {
@@ -186,9 +256,9 @@ Editor::LocationMarkers::~LocationMarkers ()
 }
 
 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) {
@@ -200,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;
@@ -221,11 +291,45 @@ 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
@@ -270,8 +374,8 @@ Editor::LocationMarkers::set_name (const string& 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); }
@@ -285,17 +389,38 @@ Editor::LocationMarkers::set_color_rgba (uint32_t 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)
 {
+	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) {
-		Location *location = new Location (where, where, "mark", Location::IsMark);
+		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, &after;
-                before = session->locations()->get_state();
+                XMLNode &before = session->locations()->get_state();
 		session->locations()->add (location, true);
-                after = session->locations()->get_state();
-		session->add_command (MementoCommand<Locations>(*(session->locations()), before, after));
+                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);
+		}
 	}
 }
 
@@ -310,20 +435,14 @@ 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));
-		}
+	  	Glib::signal_idle().connect (bind (mem_fun(*this, &Editor::really_remove_marker), loc));
 	}
 }
 
@@ -331,11 +450,10 @@ gint
 Editor::really_remove_marker (Location* loc)
 {
 	session->begin_reversible_command (_("remove marker"));
-        XMLNode &before, &after;
-	before = session->locations()->get_state();
+	XMLNode &before = session->locations()->get_state();
 	session->locations()->remove (loc);
-	after = session->locations()->get_state();
-	session->add_command (MementoCommand<Locations>(*(session->locations()), before, after));
+	XMLNode &after = session->locations()->get_state();
+	session->add_command (new MementoCommand<Locations>(*(session->locations()), &before, &after));
 	session->commit_reversible_command ();
 	return FALSE;
 }
@@ -389,16 +507,24 @@ Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
 	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 ();
-		       }
+			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;
+			}
 
 
 		// GTK2FIX use action group sensitivity
@@ -416,12 +542,12 @@ Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
 		}
 #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);
@@ -444,59 +570,90 @@ void
 Editor::transport_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* 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 start_or_end)
 {
 	using namespace Menu_Helpers;
 
-	marker_menu = new Menu;
-	MenuList& items = marker_menu->items();
-	marker_menu->set_name ("ArdourContextMenu");
+	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");
 
-	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"), 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 (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"), mem_fun(*this, &Editor::marker_menu_range_to_next)));
 
+	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 (SeparatorElem());
+
+	items.push_back (MenuElem (_("Remove"), 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");
+	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"), 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)));
-	items.push_back (MenuElem (_("Loop Range"), mem_fun(*this, &Editor::marker_menu_loop_range)));
+	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 (_("Set Range from Range Selection"), mem_fun(*this, &Editor::marker_menu_set_from_selection)));
+	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 (SeparatorElem());
+
+	items.push_back (MenuElem (_("Export Range"), mem_fun(*this, &Editor::marker_menu_export_range)));
 
 	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)));
+	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)));
+	}
 
 	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 (!Profile->get_sae()) {
+		items.push_back (MenuElem (_("Select Range"), mem_fun(*this, &Editor::marker_menu_select_using_range)));
+	}
 }
 
 void
@@ -524,31 +681,29 @@ Editor::build_new_transport_marker_menu ()
 	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)));
 
-	new_transport_marker_menu->signal_unmap_event().connect ( mem_fun(*this, &Editor::new_transport_marker_menu_popdown)); 
+	new_transport_marker_menu->signal_unmap().connect ( 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;
 
-	transport_marker_menu = new Menu;
-	MenuList& items = transport_marker_menu->items();
-	transport_marker_menu->set_name ("ArdourContextMenu");
+	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*/
+	}
 
-	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)));
+	Location* l;
+	bool is_start;
+	
+	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;
 
@@ -559,9 +714,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);
 	}
 }
 
@@ -579,7 +734,7 @@ 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);
 	}
 	  
 }
@@ -661,6 +816,57 @@ Editor::marker_menu_set_playhead ()
 	}
 }
 
+void
+Editor::marker_menu_export_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_range_marker()) {
+			export_range (l->start(), l->end());
+		}
+	}
+}
+
+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;
+	}
+		
+	nframes_t end = session->locations()->first_mark_after (marker->position());
+
+	if (end != max_frames) {
+		string range_name = l->name();
+		range_name += "-range";
+
+		Location* newrange = new Location (marker->position(), end, range_name, Location::IsRangeMarker);
+		session->locations()->add (newrange);
+	}
+}
+
 void
 Editor::marker_menu_set_from_playhead ()
 {
@@ -677,13 +883,13 @@ Editor::marker_menu_set_from_playhead ()
 	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 ());
 			}
 		}
 	}
@@ -706,8 +912,7 @@ Editor::marker_menu_set_from_selection ()
 
 		if (l->is_mark()) {
 			// nothing for now
-		}
-		else {
+		} else {
 
 			/* if range selection use first to last */
 
@@ -718,15 +923,41 @@ Editor::marker_menu_set_from_selection ()
 				}
 			}
 			else {
-				if (!selection->audio_regions.empty()) {
-					l->set_start (selection->audio_regions.start());
-					l->set_end (selection->audio_regions.end_frame());
+				if (!selection->regions.empty()) {
+					l->set_start (selection->regions.start());
+					l->set_end (selection->regions.end_frame());
 				}
 			}
 		}
 	}
 }
 
+
+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 ()
 {
@@ -746,7 +977,7 @@ Editor::marker_menu_loop_range ()
 			l2->set (l->start(), l->end());
 			
 			// enable looping, reposition and start rolling
-			session->request_auto_loop(true);
+			session->request_play_loop(true);
 			session->request_locate (l2->start(), true);
 		}
 	}
@@ -796,6 +1027,31 @@ Editor::marker_menu_remove ()
 	}
 }
 
+void
+Editor::marker_menu_lock (bool yn)
+{
+
+	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 (yn) {
+		loc->lock();
+	} else {
+		loc->unlock ();
+	}
+}
+
 void
 Editor::marker_menu_rename ()
 {
@@ -817,11 +1073,11 @@ Editor::marker_menu_rename ()
 	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");
@@ -848,72 +1104,28 @@ Editor::marker_menu_rename ()
 	loc->set_name (txt);
 	
         XMLNode &after = session->locations()->get_state();
-	session->add_command (MementoCommand<Locations>(*(session->locations()), before, after));
+	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;
 }
 
 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 (MementoCommand<Locations>(*(session->locations()), before, after));
-	}
-	else {
-		session->add_undo (retype_return<void>(bind (mem_fun (*tll, &Location::set), tll->start(), tll->end())));
-		session->add_redo (retype_return<void>(bind (mem_fun (*tll, &Location::set), temp_location->start(), temp_location->end())));
-		tll->set_hidden (false, this);
-		tll->set (temp_location->start(), temp_location->end());
-	}
-	
-	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 (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 (MementoCommand<Location>(*tpl, before, after));
-	}
-	
-	commit_reversible_command ();
+	set_punch_range (temp_location->start(), temp_location->end(), _("set punch range"));
 }
 
 void
@@ -925,7 +1137,7 @@ Editor::update_loop_range_view (bool visibility)
 
 	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());
@@ -936,8 +1148,8 @@ Editor::update_loop_range_view (bool visibility)
 		if (visibility) {
 			transport_loop_range_rect->show();
 		}
-	}
-	else if (visibility) {
+
+	} else if (visibility) {
 		transport_loop_range_rect->hide();
 	}
 }
@@ -951,44 +1163,100 @@ Editor::update_punch_range_view (bool visibility)
 
 	Location* tpl;
 
-	if ((session->get_punch_in() || session->get_punch_out()) && ((tpl = transport_punch_location()) != 0)) {
-
-		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 ((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));
+		} 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);
+		}
 		
 		if (visibility) {
 		        transport_punch_range_rect->show();
 		}
-	}
-	else if (visibility) {
+	} else if (visibility) {
 	        transport_punch_range_rect->hide();
 	}
+}
 
-// 	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);
-// 	}
+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();
+		}
+	}
+
+	edit_point_clock_connection_a.disconnect();
+	edit_point_clock_connection_b.disconnect();
+
+	if (selection->markers.empty()) {
+		edit_point_clock.set (0);
+		return;
+	}
+
+	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));
+	}
+}
+
+void
+Editor::selected_marker_moved (Location* loc)
+{
+	edit_point_clock.set (loc->start());
+}
+
+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);
 	
-// 	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);
-// 	}
+	for (Locations::LocationList::iterator i = ordered.begin(); n >= 0 && i != ordered.end(); ++i) {
+		if ((*i)->is_mark() && !(*i)->is_hidden() && !(*i)->is_start()) {
+			if (n == 0) {
+				session->request_locate ((*i)->start(), session->transport_rolling());
+				break;
+			}
+			--n;
+		}
+	}
 }