From 6507a0c9fbd5206dbe53468525f6b42b10e54aa2 Mon Sep 17 00:00:00 2001 From: Nikolay Date: Tue, 27 Jan 2015 14:50:45 +0200 Subject: [PATCH] [Summary] Eliminated stop and destroy command after finishing playback. Fixed bug #44791 "Tracks crashes when press Ctrl+Space during record". [Feature reviewed] MKosharnyy [Reviewed] YPozdnyakov --- gtk2_ardour/ardour_ui_ed.cc | 7 ++++--- gtk2_ardour/mnemonic-us.bindings.in | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index 6abf30bc68..88e1a4e509 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -700,9 +700,10 @@ ARDOUR_UI::install_actions () act = ActionManager::register_action (transport_actions, X_("ToggleRollMaybe"), _("Start/Continue/Stop"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::toggle_roll), false, true)); ActionManager::session_sensitive_actions.push_back (act); ActionManager::transport_sensitive_actions.push_back (act); - act = ActionManager::register_action (transport_actions, X_("ToggleRollForgetCapture"), _("Stop and Forget Capture"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_roll), true, false)); - ActionManager::session_sensitive_actions.push_back (act); - ActionManager::transport_sensitive_actions.push_back (act); + //Tracks Live doesn't use it +// act = ActionManager::register_action (transport_actions, X_("ToggleRollForgetCapture"), _("Stop and Forget Capture"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_roll), true, false)); +// ActionManager::session_sensitive_actions.push_back (act); +// ActionManager::transport_sensitive_actions.push_back (act); /* these two behave as follows: diff --git a/gtk2_ardour/mnemonic-us.bindings.in b/gtk2_ardour/mnemonic-us.bindings.in index 1e16eae94d..aff17a8641 100644 --- a/gtk2_ardour/mnemonic-us.bindings.in +++ b/gtk2_ardour/mnemonic-us.bindings.in @@ -103,7 +103,7 @@ This mode provides many different operations on both regions and control points, @epp|Editor/play-edit-range|<@SECONDARY@>space|play edit range @epp|Editor/play-from-edit-point-and-return|<@LEVEL4@>space|play from EP \& return @trans|Transport/ToggleRollMaybe|<@PRIMARY@><@SECONDARY@>space|stop (keep loop/range play) -@trans|Transport/ToggleRollForgetCapture|<@PRIMARY@>space|stop and destroy +;; @trans|Transport/ToggleRollForgetCapture|<@PRIMARY@>space|stop and destroy @trans|Transport/record-roll|<@TERTIARY@>space|start recording @trans|Editor/add-location-from-playhead|nabla|add marker