tweak display logic for monitoring state so that explicit preferences take precedence over what is reported by Track::monitor_state() (this seems as if it should be unnecessary, but ...)

git-svn-id: svn://localhost/ardour2/branches/3.0@10269 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-10-21 17:32:31 +00:00
parent bfe9010959
commit d8390f2195
1 changed files with 14 additions and 14 deletions

View File

@ -606,24 +606,24 @@ RouteUI::update_monitoring_display ()
MonitorState ms = t->monitoring_state();
if (ms & MonitoringInput) {
if (t->monitoring_choice() & MonitorInput) {
monitor_input_button->set_visual_state (1);
} else {
monitor_input_button->set_visual_state (2);
}
if (t->monitoring_choice() & MonitorInput) {
monitor_input_button->set_visual_state (1);
} else {
monitor_input_button->set_visual_state (0);
if (ms & MonitoringInput) {
monitor_input_button->set_visual_state (2);
} else {
monitor_input_button->set_visual_state (0);
}
}
if (ms & MonitoringDisk) {
if (t->monitoring_choice() & MonitorDisk) {
monitor_disk_button->set_visual_state (1);
} else {
monitor_disk_button->set_visual_state (2);
}
if (t->monitoring_choice() & MonitorDisk) {
monitor_disk_button->set_visual_state (1);
} else {
monitor_disk_button->set_visual_state (0);
if (ms & MonitoringDisk) {
monitor_disk_button->set_visual_state (2);
} else {
monitor_disk_button->set_visual_state (0);
}
}
}