initial attempt at importing SMF tempo maps during MIDI import.

[ardour.git] / gtk2_ardour / generic_pluginui.cc

diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc
index 14d05df344050442d0ec5ed5f9ba5cbce8a95fdb..066aa95fa88b366b4fbfc568b406c2c7c302b9e0 100644 (file)
--- a/gtk2_ardour/generic_pluginui.cc
+++ b/gtk2_ardour/generic_pluginui.cc
@@ -222,7 +222,7 @@ void
 GenericPluginUI::build ()
 {
        std::vector<ControlUI *> control_uis;
-       bool grid = true;
+       bool grid = plugin->parameter_count() > 0;
 
        // Build a ControlUI for each control port
        for (size_t i = 0; i < plugin->parameter_count(); ++i) {
@@ -525,6 +525,8 @@ GenericPluginUI::automatic_layout (const std::vector<ControlUI*>& control_uis)
        } else {
                delete output_table;
        }
+       show_all();
+
 }
 
 void
@@ -846,7 +848,7 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter&             param,
                        input_controls_with_automation.push_back (control_ui);
                }
 
-               if (desc.toggled) {
+               if (desc.toggled && !control_ui->combo) {
                        control_ui->button = true;
                        ArdourButton* but = dynamic_cast<ArdourButton*>(control_ui->controller->widget ());
                        assert (but);
@@ -983,9 +985,7 @@ void
 GenericPluginUI::set_all_automation (AutoState as)
 {
        for (vector<ControlUI*>::iterator i = input_controls_with_automation.begin(); i != input_controls_with_automation.end(); ++i) {
-               if ((*i)->controller || (*i)->button) {
-                       set_automation_state (as, (*i));
-               }
+               set_automation_state (as, (*i));
        }
 }