Revert to old Lock mode (still called Lock).

	Also make midi notes obey the snap delta modifire

1 files changed, 3 insertions, 3 deletions

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 0ff9cbb732..5c45951e04 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -6960,7 +6960,7 @@ Editor::insert_time (
 {
 	bool commit = false;
 
-	if (Config->get_edit_mode() == Constrained) {
+	if (Config->get_edit_mode() == Lock) {
 		return;
 	}
 
@@ -7133,8 +7133,8 @@ Editor::cut_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt,
 {
 	bool commit = false;
 	
-	if (Config->get_edit_mode() == Constrained) {
-		error << (_("Cannot insert or delete time when in Constrained edit.")) << endmsg;
+	if (Config->get_edit_mode() == Lock) {
+		error << (_("Cannot insert or delete time when in Lock edit.")) << endmsg;
 		return;
 	}