merge from 2.0-ongoing by hand, minus key binding editor

git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 2 insertions, 45 deletions

diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 29a212f2f5..724ff2c31a 100644
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -909,56 +909,13 @@ Editor::new_transport_marker_menu_popdown (GdkEventAny *ev)
 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