From 939a2b22bff8acbc079d2f98c7af16ad88f6bc3e Mon Sep 17 00:00:00 2001 From: Nikolaus Gullotta Date: Thu, 18 Jun 2020 15:16:32 -0500 Subject: [PATCH] Make "goto-mark-x" action availalbe in the Mixer --- gtk2_ardour/ardour_ui_ed.cc | 7 +++++++ gtk2_ardour/editor_actions.cc | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index a215d660dc..0cf1573c25 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -563,6 +563,13 @@ ARDOUR_UI::install_dependent_actions () act = ActionManager::register_action (common_actions, "jump-forward-to-mark", _("Jump to Next Mark"), sigc::mem_fun(*editor, &PublicEditor::jump_forward_to_mark)); ActionManager::session_sensitive_actions.push_back (act); + for (int i = 1; i <= 9; ++i) { + string const a = string_compose(X_("goto-mark-%1"), i); + string const n = string_compose(_("Locate to Mark %1"), i); + act = ActionManager::register_action (transport_actions, a.c_str(), n.c_str(), sigc::bind(sigc::mem_fun(*editor, &PublicEditor::goto_nth_marker), i-1)); + ActionManager::session_sensitive_actions.push_back (act); + } + act = ActionManager::register_action (common_actions, X_("addExistingAudioFiles"), _("Import"), sigc::mem_fun (*editor, &PublicEditor::external_audio_dialog)); ActionManager::session_sensitive_actions.push_back (act); ActionManager::write_sensitive_actions.push_back (act); diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 5eb29cfecf..5e9e329e96 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -281,12 +281,6 @@ Editor::register_actions () reg_sens (editor_actions, a.c_str(), n.c_str(), sigc::bind (sigc::mem_fun (*this, &Editor::cancel_visual_state_op), i - 1)); } - for (int i = 1; i <= 9; ++i) { - string const a = string_compose (X_("goto-mark-%1"), i); - string const n = string_compose (_("Locate to Mark %1"), i); - reg_sens (editor_actions, a.c_str(), n.c_str(), sigc::bind (sigc::mem_fun (*this, &Editor::goto_nth_marker), i - 1)); - } - reg_sens (editor_actions, "temporal-zoom-out", _("Zoom Out"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_step), true)); reg_sens (editor_actions, "temporal-zoom-in", _("Zoom In"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_step), false)); reg_sens (editor_actions, "zoom-to-session", _("Zoom to Session"), sigc::mem_fun(*this, &Editor::temporal_zoom_session));