diff options
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/generic_pluginui.cc | 10 | ||||
| -rw-r--r-- | gtk2_ardour/themes/blueberry-milk-ardour.colors | 1 | ||||
| -rw-r--r-- | gtk2_ardour/themes/caineville-ardour.colors | 1 | ||||
| -rw-r--r-- | gtk2_ardour/themes/clear-gray-ardour.colors | 1 | ||||
| -rw-r--r-- | gtk2_ardour/themes/cubasish-ardour.colors | 1 | ||||
| -rw-r--r-- | gtk2_ardour/themes/dark-ardour.colors | 1 | ||||
| -rw-r--r-- | gtk2_ardour/themes/unastudia-ardour.colors | 1 |
7 files changed, 12 insertions, 4 deletions
diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc index c68c699caf..010dfe5237 100644 --- a/gtk2_ardour/generic_pluginui.cc +++ b/gtk2_ardour/generic_pluginui.cc @@ -588,15 +588,17 @@ 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 + AutoState state = insert->get_parameter_automation_state (cui->parameter()); + + cui->automate_button.set_active((state != ARDOUR::Off)); + if (cui->knobtable) { cui->automate_button.set_text ( - GainMeterBase::astate_string ( - insert->get_parameter_automation_state (cui->parameter())) - ); + GainMeterBase::astate_string (state)); return; } - switch (insert->get_parameter_automation_state (cui->parameter()) & (ARDOUR::Off|Play|Touch|Write)) { + switch (state & (ARDOUR::Off|Play|Touch|Write)) { case ARDOUR::Off: cui->automate_button.set_text (S_("Automation|Manual")); break; diff --git a/gtk2_ardour/themes/blueberry-milk-ardour.colors b/gtk2_ardour/themes/blueberry-milk-ardour.colors index af542ef9bf..e667a0aa0d 100644 --- a/gtk2_ardour/themes/blueberry-milk-ardour.colors +++ b/gtk2_ardour/themes/blueberry-milk-ardour.colors @@ -286,6 +286,7 @@ <ColorAlias name="midi sysex fill" alias="color 32"/> <ColorAlias name="midi sysex outline" alias="color 64"/> <ColorAlias name="midi track base" alias="color 82"/> + <ColorAlias name="PluginAutomateButton: fill active" alias="color 8"/> <ColorAlias name="mixer strip button: fill active" alias="color 8"/> <ColorAlias name="mixer strip button: led active" alias="color 8"/> <ColorAlias name="mixer strip name button: fill active" alias="color 67"/> diff --git a/gtk2_ardour/themes/caineville-ardour.colors b/gtk2_ardour/themes/caineville-ardour.colors index b80b1dcc1e..fee34cea17 100644 --- a/gtk2_ardour/themes/caineville-ardour.colors +++ b/gtk2_ardour/themes/caineville-ardour.colors @@ -286,6 +286,7 @@ <ColorAlias name="midi sysex fill" alias="color 32"/> <ColorAlias name="midi sysex outline" alias="color 64"/> <ColorAlias name="midi track base" alias="color 39"/> + <ColorAlias name="PluginAutomateButton: fill active" alias="color 8"/> <ColorAlias name="mixer strip button: fill active" alias="color 8"/> <ColorAlias name="mixer strip button: led active" alias="color 8"/> <ColorAlias name="mixer strip name button: fill active" alias="color 67"/> diff --git a/gtk2_ardour/themes/clear-gray-ardour.colors b/gtk2_ardour/themes/clear-gray-ardour.colors index ad9f3f6327..4ecc33df22 100644 --- a/gtk2_ardour/themes/clear-gray-ardour.colors +++ b/gtk2_ardour/themes/clear-gray-ardour.colors @@ -286,6 +286,7 @@ <ColorAlias name="midi sysex fill" alias="color 10"/> <ColorAlias name="midi sysex outline" alias="color 64"/> <ColorAlias name="midi track base" alias="color 74"/> + <ColorAlias name="PluginAutomateButton: fill active" alias="color 8"/> <ColorAlias name="mixer strip button: fill active" alias="color 8"/> <ColorAlias name="mixer strip button: led active" alias="color 8"/> <ColorAlias name="mixer strip name button: fill active" alias="color 67"/> diff --git a/gtk2_ardour/themes/cubasish-ardour.colors b/gtk2_ardour/themes/cubasish-ardour.colors index 2e33bbdcb1..88bd48dad2 100644 --- a/gtk2_ardour/themes/cubasish-ardour.colors +++ b/gtk2_ardour/themes/cubasish-ardour.colors @@ -286,6 +286,7 @@ <ColorAlias name="midi sysex fill" alias="color 32"/> <ColorAlias name="midi sysex outline" alias="color 64"/> <ColorAlias name="midi track base" alias="color 39"/> + <ColorAlias name="PluginAutomateButton: fill active" alias="color 8"/> <ColorAlias name="mixer strip button: fill active" alias="color 8"/> <ColorAlias name="mixer strip button: led active" alias="color 8"/> <ColorAlias name="mixer strip name button: fill active" alias="color 67"/> diff --git a/gtk2_ardour/themes/dark-ardour.colors b/gtk2_ardour/themes/dark-ardour.colors index 557647e8f2..95d6888523 100644 --- a/gtk2_ardour/themes/dark-ardour.colors +++ b/gtk2_ardour/themes/dark-ardour.colors @@ -286,6 +286,7 @@ <ColorAlias name="midi sysex fill" alias="color 32"/> <ColorAlias name="midi sysex outline" alias="color 64"/> <ColorAlias name="midi track base" alias="color 41"/> + <ColorAlias name="PluginAutomateButton: fill active" alias="color 8"/> <ColorAlias name="mixer strip button: fill active" alias="color 8"/> <ColorAlias name="mixer strip button: led active" alias="color 8"/> <ColorAlias name="mixer strip name button: fill active" alias="color 67"/> diff --git a/gtk2_ardour/themes/unastudia-ardour.colors b/gtk2_ardour/themes/unastudia-ardour.colors index fd0c1484eb..07b9179b25 100644 --- a/gtk2_ardour/themes/unastudia-ardour.colors +++ b/gtk2_ardour/themes/unastudia-ardour.colors @@ -291,6 +291,7 @@ <ColorAlias name="midi sysex fill" alias="color 105"/> <ColorAlias name="midi sysex outline" alias="color 17"/> <ColorAlias name="midi track base" alias="color 27"/> + <ColorAlias name="PluginAutomateButton: fill active" alias="color 1"/> <ColorAlias name="mixer strip button: fill active" alias="color 1"/> <ColorAlias name="mixer strip button: led active" alias="color 1"/> <ColorAlias name="mixer strip name button: fill active" alias="color 67"/> |