diff options
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/automation_streamview.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/generic_pluginui.cc | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/gtk2_ardour/automation_streamview.cc b/gtk2_ardour/automation_streamview.cc index cdca5ec08f..27ee2ca086 100644 --- a/gtk2_ardour/automation_streamview.cc +++ b/gtk2_ardour/automation_streamview.cc @@ -151,9 +151,7 @@ AutomationStreamView::display_region(AutomationRegionView* region_view) void AutomationStreamView::set_automation_state (AutoState state) { - /* XXX: not sure if this is right, but for now the automation state is basically held by - the regions' AutomationLists. Each region is always set to have the same AutoState. - */ + /* Setting the automation state for this view sets the state of all regions' lists to the same thing */ if (region_views.empty()) { _pending_automation_state = state; diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc index 04e753bf0c..40f8e16ef8 100644 --- a/gtk2_ardour/generic_pluginui.cc +++ b/gtk2_ardour/generic_pluginui.cc @@ -346,7 +346,7 @@ GenericPluginUI::automation_state_changed (ControlUI* cui) // don't lock to avoid deadlock because we're triggered by // AutomationControl::Changed() while the automation lock is taken - switch (insert->get_parameter_automation_state (cui->parameter(), false) + switch (insert->get_parameter_automation_state (cui->parameter()) & (Off|Play|Touch|Write)) { case Off: cui->automate_button.set_label (_("Manual")); |