diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2017-06-11 19:53:22 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 11:40:53 -0400 |
| commit | 58e49e351253d04dcd394e9132daaceb65b7abdc (patch) | |
| tree | 672dbe3001b0c8c5eebc1db0ef59619884c6539f /gtk2_ardour/route_ui.cc | |
| parent | 982d173b5741a7ac4c76f858feb2ae0c9e60e1c2 (diff) | |
cue monitoring for audio (GUI aspects)
Diffstat (limited to 'gtk2_ardour/route_ui.cc')
| -rw-r--r-- | gtk2_ardour/route_ui.cc | 9 |
1 files changed, 1 insertions, 8 deletions
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<RouteList> 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))) { |