change default color of plugin-UI gauge/meter

[ardour.git] / gtk2_ardour / generic_pluginui.cc

diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc
index af294e89c27392819e5489b2aa88b79208e340d5..0233b1192fe4d1bec8e4456af9b78345eae955fb 100644 (file)
--- a/gtk2_ardour/generic_pluginui.cc
+++ b/gtk2_ardour/generic_pluginui.cc
@@ -101,6 +101,9 @@ GenericPluginUI::GenericPluginUI (boost::shared_ptr<PluginInsert> pi, bool scrol
        VBox* v1_box = manage (new VBox);
        VBox* v2_box = manage (new VBox);
        pack_end (plugin_analysis_expander, false, false);
+       if (!plugin->get_docs().empty()) {
+               pack_end (description_expander, false, false);
+       }
 
        v1_box->pack_start (*smaller_hbox, false, true);
        v2_box->pack_start (focus_button, false, true);
@@ -253,6 +256,10 @@ GenericPluginUI::build ()
                                continue;
                        }
 
+                       if (plugin->describe_parameter (Evoral::Parameter(PluginAutomation, 0, i)) == X_("hidden")) {
+                               continue;
+                       }
+
                        ControlUI* cui;
 
                        boost::shared_ptr<ARDOUR::AutomationControl> c
@@ -264,6 +271,11 @@ GenericPluginUI::build ()
                                continue;
                        }
 
+                       const std::string param_docs = plugin->get_parameter_docs(i);
+                       if (!param_docs.empty()) {
+                               ARDOUR_UI::instance()->set_tip(cui, param_docs.c_str());
+                       }
+
                        if (cui->controller || cui->clickbox || cui->combo) {
                                // Get all of the controls into a list, so that
                                // we can lay them out a bit more nicely later.
@@ -518,7 +530,7 @@ GenericPluginUI::build_control_ui (guint32 port_index, boost::shared_ptr<Automat
                */
                int const steps = desc.integer_step ? (desc.upper - desc.lower + 1) / desc.step : 0;
 
-               if (control_ui->scale_points && ((steps && control_ui->scale_points->size() == steps) || desc.enumeration)) {
+               if (control_ui->scale_points && ((steps && int (control_ui->scale_points->size()) == steps) || desc.enumeration)) {
                        
                        /* Either:
                         *   a) There is a label for each possible value of this input, or
@@ -659,7 +671,17 @@ GenericPluginUI::build_control_ui (guint32 port_index, boost::shared_ptr<Automat
                MeterInfo * info = new MeterInfo(port_index);
                control_ui->meterinfo = info;
 
-               info->meter = new FastMeter (5, 5, FastMeter::Vertical);
+               info->meter = new FastMeter (
+                               5, 5, FastMeter::Vertical, 0,
+                               0x0000aaff,
+                               0x008800ff, 0x008800ff,
+                               0x00ff00ff, 0x00ff00ff,
+                               0xcccc00ff, 0xcccc00ff,
+                               0xffaa00ff, 0xffaa00ff,
+                               0xff0000ff,
+                               ARDOUR_UI::config()->canvasvar_MeterBackgroundBot.get(),
+                               ARDOUR_UI::config()->canvasvar_MeterBackgroundTop.get()
+                               );
 
                info->min_unbound = desc.min_unbound;
                info->max_unbound = desc.max_unbound;
@@ -824,7 +846,7 @@ GenericPluginUI::start_updating (GdkEventAny*)
 {
        if (output_controls.size() > 0 ) {
                screen_update_connection.disconnect();
-               screen_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect
+               screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect
                        (sigc::mem_fun(*this, &GenericPluginUI::output_update));
        }
        return false;