diff options
| author | Nick Mainsbridge <beatroute@iprimus.com.au> | 2008-11-09 14:12:02 +0000 |
|---|---|---|
| committer | Nick Mainsbridge <beatroute@iprimus.com.au> | 2008-11-09 14:12:02 +0000 |
| commit | 6b4453078b8f4649f23fb7c03b53e59b223d2554 (patch) | |
| tree | 42a0547bac658634a12c44ae43de22aec37bb8c8 /gtk2_ardour | |
| parent | 709f77b65e0c43f969bf20f0dd4de78544cab9c0 (diff) | |
Remove Splice edit mode from SAE version, sync instant.xml files.
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4119 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/editor.cc | 10 | ||||
| -rw-r--r-- | gtk2_ardour/editor_actions.cc | 5 |
2 files changed, 11 insertions, 4 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 06446aefb5..49aa9010f5 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -2851,7 +2851,9 @@ Editor::setup_toolbar () vector<string> edit_mode_strings; edit_mode_strings.push_back (edit_mode_to_string (Slide)); - edit_mode_strings.push_back (edit_mode_to_string (Splice)); + if (!Profile->get_sae()) { + edit_mode_strings.push_back (edit_mode_to_string (Splice)); + } edit_mode_strings.push_back (edit_mode_to_string (Lock)); edit_mode_selector.set_name ("EditModeSelector"); @@ -3380,7 +3382,11 @@ Editor::cycle_edit_mode () { switch (Config->get_edit_mode()) { case Slide: - Config->set_edit_mode (Splice); + if (Profile->get_sae()) { + Config->set_edit_mode (Lock); + } else { + Config->set_edit_mode (Splice); + } break; case Splice: Config->set_edit_mode (Lock); diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 5ecb529bdf..e1750f307a 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -646,8 +646,9 @@ Editor::register_actions () ActionManager::register_action (editor_actions, "cycle-edit-point", _("Change edit point"), bind (mem_fun (*this, &Editor::cycle_edit_point), false)); ActionManager::register_action (editor_actions, "cycle-edit-point-with-marker", _("Change edit point (w/Marker)"), bind (mem_fun (*this, &Editor::cycle_edit_point), true)); - - ActionManager::register_action (editor_actions, "set-edit-splice", _("Splice"), bind (mem_fun (*this, &Editor::set_edit_mode), Splice)); + if (!Profile->get_sae()) { + ActionManager::register_action (editor_actions, "set-edit-splice", _("Splice"), bind (mem_fun (*this, &Editor::set_edit_mode), Splice)); + } ActionManager::register_action (editor_actions, "set-edit-slide", _("Slide"), bind (mem_fun (*this, &Editor::set_edit_mode), Slide)); ActionManager::register_action (editor_actions, "set-edit-lock", _("Lock"), bind (mem_fun (*this, &Editor::set_edit_mode), Lock)); ActionManager::register_action (editor_actions, "toggle-edit-mode", _("Toggle Edit Mode"), mem_fun (*this, &Editor::cycle_edit_mode)); |