cue monitoring for audio (GUI aspects)

This commit is contained in:
Paul Davis 2017-06-11 19:53:22 -04:00
parent 982d173b57
commit 58e49e3512
1 changed files with 1 additions and 8 deletions

View File

@ -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))) {