diff options
| author | nick_m <mainsbridge@gmail.com> | 2015-05-19 03:27:50 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2015-05-19 03:27:50 +1000 |
| commit | dc50730059771b4b2899ffb4c3b5ef49d5ffae91 (patch) | |
| tree | 172dcfbf00268f24787cf400ed44f2982fd6c27a /gtk2_ardour/editor.cc | |
| parent | aac167a19f32accfbd867f3c72cec13f374f9199 (diff) | |
Revert to old Lock mode (still called Lock).
Also make midi notes obey the snap delta modifire
Diffstat (limited to 'gtk2_ardour/editor.cc')
| -rw-r--r-- | gtk2_ardour/editor.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index e785db3de7..ff9d480a35 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -195,7 +195,7 @@ static const gchar *_edit_mode_strings[] = { N_("Slide"), N_("Splice"), N_("Ripple"), - N_("Constrained"), + N_("Lock"), 0 }; @@ -3171,7 +3171,7 @@ Editor::build_edit_mode_menu () edit_mode_selector.AddMenuElem (MenuElem ( edit_mode_strings[(int)Slide], sigc::bind (sigc::mem_fun(*this, &Editor::edit_mode_selection_done), (EditMode) Slide))); // edit_mode_selector.AddMenuElem (MenuElem ( edit_mode_strings[(int)Splice], sigc::bind (sigc::mem_fun(*this, &Editor::edit_mode_selection_done), (EditMode) Splice))); edit_mode_selector.AddMenuElem (MenuElem ( edit_mode_strings[(int)Ripple], sigc::bind (sigc::mem_fun(*this, &Editor::edit_mode_selection_done), (EditMode) Ripple))); - edit_mode_selector.AddMenuElem (MenuElem ( edit_mode_strings[(int)Constrained], sigc::bind (sigc::mem_fun(*this, &Editor::edit_mode_selection_done), (EditMode) Constrained))); + edit_mode_selector.AddMenuElem (MenuElem ( edit_mode_strings[(int)Lock], sigc::bind (sigc::mem_fun(*this, &Editor::edit_mode_selection_done), (EditMode) Lock))); set_size_request_to_display_given_text (edit_mode_selector, edit_mode_strings, COMBO_TRIANGLE_WIDTH, 2); } @@ -3617,16 +3617,16 @@ Editor::cycle_edit_mode () switch (Config->get_edit_mode()) { case Slide: if (Profile->get_sae()) { - Config->set_edit_mode (Constrained); + Config->set_edit_mode (Lock); } else { Config->set_edit_mode (Ripple); } break; case Splice: case Ripple: - Config->set_edit_mode (Constrained); + Config->set_edit_mode (Lock); break; - case Constrained: + case Lock: Config->set_edit_mode (Slide); break; } |