Make automation state buttons active when not on Manual

With the same color code as the fader automation button on mixer strips.
This is especially usefull when use_knob is true (e.g. for a-EQ) because
the automation only shows one letter and a "Write" state can thus be
easy to miss.

diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc
index c68c699cafe9ca3acc75ab078c0c43a37701adfa..010dfe52376ff5add98592ce161a997eb574cff0 100644 (file)
--- 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 af542ef9bf37b46bfb6e119ed18777a815f76df8..e667a0aa0d86a42744beca851877d202ef5f815b 100644 (file)
--- 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 b80b1dcc1e7cb2e8316efe30f201db466d56639c..fee34cea176ee66a4ea2c7a3cdb276af2004d3db 100644 (file)
--- 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 ad9f3f63275035748b2586ec50c6bade5afd17f8..4ecc33df22e7eef57eef0917fe80f7d0b3954002 100644 (file)
--- 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 2e33bbdcb14f76906da055c11c1a2e7c93619201..88bd48dad2e38b3d2aae66f7a478f18f70f8788e 100644 (file)
--- 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 557647e8f2c925ded35dc22c05dffd0063fee1a5..95d68885233e66d920341187978c867f42bce12d 100644 (file)
--- 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 fd0c1484ebe43666a19d82670a685bb44531a4f7..07b9179b258ab2887b92045c88972a1d6e89cd13 100644 (file)
--- 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"/>