From 6face5e57ee2e2151ed8fed7ba64895a549fcbce Mon Sep 17 00:00:00 2001 From: Nikolay Date: Tue, 20 Jan 2015 17:36:36 +0200 Subject: [PATCH] [Summary] Apply Input Monitoring to all selected tracks [Reviewed] GZharun --- gtk2_ardour/route_ui.cc | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 9f7f35e044..8346e09951 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -752,8 +752,7 @@ RouteUI::monitor_press (GdkEventButton* ev, MonitorChoice monitor_choice) } MonitorChoice mc; - boost::shared_ptr rl; - + /* XXX for now, monitoring choices are orthogonal. cue monitoring will follow in 3.X but requires mixing the input and playback (disk) signal together, which requires yet more buffers. @@ -767,19 +766,25 @@ RouteUI::monitor_press (GdkEventButton* ev, MonitorChoice monitor_choice) mc = monitor_choice; } +#if 0 if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { if (_route->route_group() && _route->route_group()->is_monitoring()) { rl = _route->route_group()->route_list(); } else { rl.reset (new RouteList); - rl->push_back (route()); + rl->push_back (_route); } - } else { - rl.reset (new RouteList); - rl->push_back (route()); } +#endif + + boost::shared_ptr rl(new RouteList); - _session->set_monitoring (rl, mc, Session::rt_cleanup, true); + if ( is_selected () ) { + rl = get_selected_route_list (); + } else { + rl->push_back (_route); + } + _session->set_monitoring (rl, mc, Session::rt_cleanup, true); return true; }