diff options
author | Ben Loftis <ben@harrisonconsoles.com> | 2018-02-11 09:39:45 -0600 |
---|---|---|
committer | Ben Loftis <ben@harrisonconsoles.com> | 2018-02-11 09:39:45 -0600 |
commit | 0299229e417ad6b8332ae3c9eafbf67a1c369727 (patch) | |
tree | 378fb89cc2c0a775a20fbdc732bbefd3818282aa /gtk2_ardour/editor_mouse.cc | |
parent | e6da4c4846cd3097e2393f0e43016b870e7cf592 (diff) |
SoloSelection: gui part.
Diffstat (limited to 'gtk2_ardour/editor_mouse.cc')
-rw-r--r-- | gtk2_ardour/editor_mouse.cc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 930b17a708..1a90513f72 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -272,6 +272,7 @@ Editor::set_mouse_mode (MouseMode m, bool force) if (ARDOUR::Profile->get_mixbus()) { if ( m == MouseCut) m = MouseObject; + if ( m == MouseAudition) m = MouseRange; } Glib::RefPtr<Action> act = get_mouse_mode_action(m); @@ -289,6 +290,7 @@ Editor::mouse_mode_toggled (MouseMode m) { if (ARDOUR::Profile->get_mixbus()) { if ( m == MouseCut) m = MouseObject; + if ( m == MouseAudition) m = MouseRange; } Glib::RefPtr<Action> act = get_mouse_mode_action(m); @@ -2557,6 +2559,17 @@ Editor::escape () _drags->abort (); } else { selection->clear (); + + //if session is playing a range, cancel that + if (_session->get_play_range()) { + _session->request_cancel_play_range(); + } + + if ( _session->solo_selection_active() ) { + StripableList sl; + _session->solo_selection( sl, false ); + } + } ARDOUR_UI::instance()->reset_focus (&contents()); |