From 58e49e351253d04dcd394e9132daaceb65b7abdc Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 11 Jun 2017 19:53:22 -0400 Subject: cue monitoring for audio (GUI aspects) --- gtk2_ardour/route_ui.cc | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 6eca450f17..2aa3212a90 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -906,17 +906,10 @@ RouteUI::monitor_release (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. - */ - if (t->monitoring_control()->monitoring_choice() & monitor_choice) { mc = MonitorChoice (t->monitoring_control()->monitoring_choice() & ~monitor_choice); } else { - /* this line will change when the options are non-orthogonal */ - // mc = MonitorChoice (t->monitoring_choice() | monitor_choice); - mc = monitor_choice; + mc = MonitorChoice (t->monitoring_control()->monitoring_choice() | monitor_choice); } if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) { -- cgit v1.2.3